Subversion Repositories ALCASAR

Compare Revisions

Ignore whitespace Rev 1389 → Rev 1390

/web/acc/admin/filter_exceptions.php
File deleted
/web/acc/admin/bl_categories_help.php
78,11 → 78,11
{
$wl_categorie_domain_file = $wl_dnsmasq_dir.$categorie.".conf";
$wl_categorie_ip_file = $wl_iptables_dir.$categorie;
if(isset($_GET['nb_domains']) && isset($_GET['nb_ip']))
if(isset($_GET['nb_domains']))
{
$nb_domains = $_GET['nb_domains'];
$nb_urls = 0;
$nb_ip = $_GET['nb_ip'];
$nb_ip = 0;
}
else
{
91,10 → 91,7
else
$nb_domains = $l_error_open_file." ".$wl_categorie_domain_file;
$nb_urls = 0;
if(file_exists($wl_categorie_ip_file))
$nb_ip = exec("wc -l $wl_categorie_ip_file | cut -d ' ' -f1");
else
$nb_ip = $l_error_open_file." ".$wl_categorie_ip_file;
$nb_ip = 0;
}
}
$global_usage = file($bl_dir."global_usage");
/web/acc/admin/bl_filter.php
85,8 → 85,6
$l_remove="Supprimer";
$l_submit="Envoyer";
$l_nb_ip="Nombre d'IP";
$l_update_ip="Mettre à jour les IP";
$l_update_ip_info="(Temps estimé : 3 min 30 sec)";
$l_nbDomainNames="Noms de domaine :";
$l_nbUrl="Url :";
$l_nbIp="Ip :";
135,8 → 133,6
$l_remove="Delete";
$l_submit="Submit";
$l_nb_ip="Number of IP";
$l_update_ip="Update IPs";
$l_update_ip_info="(Estimated time : 3 min 30 sec)";
$l_nbDomainNames="Domain names :";
$l_nbUrl="Url :";
$l_nbIp="Ip :";
215,7 → 211,6
fputs($fichier, form_filter($_POST['BL_rehabilited_ip']));
fclose($fichier);
unset($_POST['BL_rehabilited_ip']);
exec ("sudo /usr/local/sbin/alcasar-bl.sh --reload");
break;
case 'MAJ_cat_wl' :
$tab=file($wl_categories_enabled);
241,7 → 236,6
fputs($fichier, form_filter_ip($_POST['OSSI_wl_ip'], "white"));
fclose($fichier);
unset($_POST['OSSI_wl_ip']);
exec ("sudo /usr/local/sbin/alcasar-bl.sh --ip_retrieving_ossi");
exec ("sudo /usr/local/sbin/alcasar-bl.sh --reload");
break;
case 'Specific_filtering' :
287,10 → 281,6
}
exec ("sudo /usr/local/bin/alcasar-iptables.sh");
break;
case 'Update_IP_WL' :
shell_exec ("nohup nice -n 10 sudo /usr/local/sbin/alcasar-bl.sh --ip_retrieving > /dev/null 2>/dev/null &");
exec ("sudo /usr/local/sbin/alcasar-bl.sh --reload");
break;
}
?>
<?php
/web/acc/admin/bl_filter2.php
168,7 → 168,7
echo "<center>";
$nbDomainNames = exec ("wc -l /usr/local/share/dnsmasq-wl/* | tail -n 1 | awk '{print $1}'");
$nbUrl = 0;
$nbIp = exec ("wc -l /usr/local/share/iptables-wl/* | tail -n 1 | awk '{print $1}'");
$nbIp = 0;
echo "<b>$l_nbDomainNames</b> $nbDomainNames, <b>$l_nbUrl</b> $nbUrl, <b>$l_nbIp</b> $nbIp<br/>";
echo "$l_wl_categories</center></td></tr>";
//on lit et on interprete le fichier de catégories
211,8 → 211,8
echo "<H3>$l_allowed_ip</H3>$l_forbidden_ip_explain<BR>";
echo "<textarea name='OSSI_wl_ip' rows=3 cols=40>";
echo_ip_file ($file_wl_ip);
echo "</textarea></td></tr><tr><td colspan=5>";
echo "<input type='submit' value='$l_record'></form></td><form action='bl_filter.php' method='POST'><td valign='middle' align='left' colspan=5><input type='hidden' name='choix' value='Update_IP_WL'><input type='submit' value='$l_update_ip'> $l_update_ip_info</form></td></tr>";
echo "</textarea></td></tr><tr><td colspan=10>";
echo "<input type='submit' value='$l_record'></form></td></tr>";
?>
</TABLE><br/>
<table width="100%" border="0" cellspacing="0" cellpadding="0">