Subversion Repositories ALCASAR

Compare Revisions

Regard whitespace Rev 2299 → Rev 2298

/web/acc/admin/bl_filter.php
55,7 → 55,6
}
function echo_ip_file ($filename)
{
$filename = escapeshellarg($filename);
exec("cat $filename | cut -d ' ' -f3", $resultat);
for($i=0; $i<exec("wc -l $filename"); $i++)
{
265,14 → 264,14
$action=$_POST[$fichier];
if($action == $l_remove) //delete
{
exec("/bin/sed -i ".escapeshellarg("/^$fichier$/d")." $bl_categories_enabled");
exec("/bin/sed -i ".escapeshellarg("/$fichier$/d")." $bl_categories");
exec("rm -rf $dir_blacklist".escapeshellarg($fichier));
exec("/bin/sed -i \"/^$fichier$/d\" $bl_categories_enabled");
exec("/bin/sed -i \"/$fichier$/d\" $bl_categories");
exec("rm -rf $dir_blacklist$fichier");
exec("sudo /usr/local/bin/alcasar-bl.sh --reload");
}
if($action == $l_disable) //disable
{
exec("/bin/sed -i ".escapeshellarg("/^$fichier$/d")." $bl_categories_enabled");
exec("/bin/sed -i \"/^$fichier$/d\" $bl_categories_enabled");
exec("sudo /usr/local/bin/alcasar-bl.sh --reload");
}
if($action == $l_enable) //enable
288,9 → 287,9
$dest_dir = $dir_blacklist."ossi-bl-".$file_name; # /etc/dansguardian/list/blacklist/ossi-bl-XXXXXXXX
if((!empty($file_name)) && (!file_exists($dest_dir)))
{
exec("mkdir ".escapeshellarg($dest_dir));
exec ("mkdir $dest_dir");
$file=$_FILES['fichier_ip']['tmp_name'];
exec("/usr/bin/dos2unix ".escapeshellarg($file));
exec("/usr/bin/dos2unix $file $file");
if(move_uploaded_file($_FILES['fichier_ip']['tmp_name'], $dest_dir."/domains")) // copy in the file "domains" (containing @ip & domain names (like over Toulouse categories))
{
touch ($dest_dir."/urls"); // create the URL file even if it isn't used
300,7 → 299,7
}
else
{
exec("rm -rf ".escapeshellarg($dest_dir));
exec("rm -rf $dest_dir");
echo $l_error_upload;
}
}