WebSVN – ALCASAR – Diff – //web/acc/admin/wl_filter.php

 <body>
 <div id="ldoverlay" class="overlay">
 	<div class="lds-spinner" id="spinner"><div></div><div></div><div></div><div></div><div></div><div></div><div></div><div></div><div></div><div></div><div></div><div></div></div>
 </div>
 <?
-function form_filter ($form_content)
+function form_filter ($form_content){
-{
-	// réencodage iso + format unix + rc fin de ligne (ouf...)
+	// Re-encoding : ISO + unix format + end-of-line
 	$list = str_replace("\r\n", "\n", utf8_decode($form_content));
 	if (strlen($list) != 0){
 		if ($list[strlen($list)-1] != "\n") { $list[strlen($list)]="\n";} ;} ;
 	return $list;
+}
-function form_filter_ip($form_content, $color)
+function form_filter_ip($form_content, $color){
-{
-	//# reconstruction des ip
+	// IP reconstruction
 	$list = explode("\n", form_filter($form_content));
 	$new_list = "";
-	foreach ($list as &$value)
+	foreach ($list as &$value){
-	{
-		if(preg_match('/([0-9]{1,3}.){3}[0-9]{1,3}/', $value))
+		if(preg_match('/([0-9]{1,3}.){3}[0-9]{1,3}/', $value)){
-		{
 			$new_list = $new_list.$value."\n";
+		}
+	}
-	if($color == "white")
+	if($color == "white"){
-	{
 		return preg_replace("/(.*)\n/", "add wl_ip_allowed $1\n", $new_list);
+	}
-	else
+	else {
-	{
 		return preg_replace("/(.*)\n/", "add bl_ip_blocked $1\n", $new_list);
+	}
+}
-function echo_file ($filename)
+function echo_file ($filename){
-{
-	if (file_exists($filename))
+	if (file_exists($filename)){
-	{
-		if (filesize($filename) != 0)
+		if (filesize($filename) != 0){
-		{
 			$pointeur=fopen($filename,"r");
 			$tampon = fread($pointeur, filesize($filename));
 			fclose($pointeur);
 			echo $tampon;
+		}
+	}
-	else
+	else {
-	{
 		echo "$filename doesn't exist";
+	}
+}
-function echo_ip_file ($filename)
+function echo_ip_file ($filename){
-{
 	$filename = escapeshellarg($filename);
 	exec("cat $filename | cut -d ' ' -f3", $resultat);
-	for($i=0; $i<exec("wc -l $filename"); $i++)
+	for($i=0; $i<exec("wc -l $filename"); $i++){
-	{
 		echo $resultat[$i]."\n";
+	}
+}
 # Choice of language
 	$Langue = explode(",",$_SERVER['HTTP_ACCEPT_LANGUAGE']);
 	$Language = strtolower(substr(chop($Langue[0]),0,2));
+}
 if($Language == 'fr'){
 	$l_wl="Liste blanche principale";
+	$l_state="Sont actuellement autorisés : ";
 	$l_load="Chargement...";
 	$l_list_version="Version de la liste : ";
 	$l_wl_categories="Sélectionnez les catégories à autoriser";
 	$l_specific_filtering="Filtrage special";
 	$l_add_to_wl="Noms de domaine ou adresses IP à ajouter à la liste blanche";
 	$l_error_upload="Erreur d'envoi du fichier";
 	$l_remove="Supprimer";
 	$l_submit="Envoyer";
 	$l_nb_ip="Nombre d'IP";
 	$l_nb_domain_names="Nombre de noms de domaine";
-	$l_nbDomainNames="Noms de domaine :";
+	$l_nbDomainNames="noms de domaine";
-	$l_nbUrl="Url :";
+	$l_nbUrl="URL";
-	$l_nbIp="Ip :";
+	$l_nbIp="@IP";
 	$l_disable="Désactiver";
 	$l_enable="Activer";
 	$l_file_state="Etat";
-} else if($Language == 'es') {
+} else if($Language == 'es'){
 	$l_wl="Lista blanca principal";
+	$l_state="The following are currently authorized : ";
 	$l_load="Cargando...";
 	$l_list_version="Versión de la lista: ";
 	$l_wl_categories="Seleccione las categorías permitidas";
 	$l_specific_filtering="Filtrado específico";
 	$l_add_to_wl="Nombres de dominio o direcciones IP para agregar a la lista blanca";
 	$l_error_upload="Error durante el proceso de carga";
 	$l_remove="Borrar";
 	$l_submit="Enviar";
 	$l_nb_ip="Número de IPs";
 	$l_nb_domain_names="Número de sitios";
-	$l_nbDomainNames="Sitios:";
+	$l_nbDomainNames="sitios";
-	$l_nbUrl="Url :";
+	$l_nbUrl="URL";
-	$l_nbIp="Ip :";
+	$l_nbIp="IP@";
 	$l_disable="Desactivar";
 	$l_enable="Activar";
 	$l_file_state="Estado";
 } else {
 	$l_wl="Main WhiteList";
+	$l_state="Actualmente están autorizados los siguientes : ";
 	$l_load="Loading...";
 	$l_list_version="List version : ";
 	$l_wl_categories="Select the allowed categories";
 	$l_specific_filtering="Specific filtering";
 	$l_add_to_wl="Domain names or IP addresses to add to the whitelist";
 	$l_error_upload="Error during the upload process";
 	$l_remove="Delete";
 	$l_submit="Submit";
 	$l_nb_ip="Number of IP";
 	$l_nb_domain_names="Number of domain names";
-	$l_nbDomainNames="Domain names :";
+	$l_nbDomainNames="domain names";
-	$l_nbUrl="Url :";
+	$l_nbUrl="URL";
-	$l_nbIp="Ip :";
+	$l_nbIp="IP@";
 	$l_disable="Disable";
 	$l_enable="Enable";
 	$l_file_state="State";
+}
 $dir_etc="/usr/local/etc/";
 $dir_dg="/etc/e2guardian/lists/";
 $dir_blacklist=$dir_dg."blacklists/";
 $dir_wl_ip="/usr/local/share/iptables-wl/";
-$dir_wl_ip_enabled= "/usr/local/share/iptables-wl-enabled/";
+$dir_wl_ip_enabled="/usr/local/share/iptables-wl-enabled/";
-$dir_wl_domain_names= "/usr/local/share/unbound-wl/";
+$dir_wl_domain_names="/usr/local/share/unbound-wl/";
-$dir_wl_domain_names_enabled= "/usr/local/share/unbound-wl-enabled/";
+$dir_wl_domain_names_enabled="/usr/local/share/unbound-wl-enabled/";
 $wl_categories=$dir_etc."alcasar-wl-categories";
 $wl_categories_enabled=$dir_etc."alcasar-wl-categories-enabled";
 $conf_file=$dir_etc."alcasar.conf";
 $domainfilter_file="/etc/unbound/conf.d/whitelist/domainfilter.conf";
 $bannedsite_file=$dir_dg."bannedsitelist";
 $dir_tmp="/tmp/blacklists";
 $wl_safesearch="off";
 # default values
-if (is_file ($conf_file))
+if (is_file ($conf_file)){
-{
 	$tab=file($conf_file);
-	if ($tab)
+	if ($tab){
-	{
-		foreach ($tab as $line)
+		foreach ($tab as $line){
-		{
 			$field=explode("=", $line);
-			switch ($field[0]) {
+			switch ($field[0]){
 				case 'PRIVATE_IP':
 					$PRIVATE_IP_MASK=trim($field[1]);
 					$tmp = explode("/",$PRIVATE_IP_MASK);
 					$PRIVATE_IP=$tmp[0];
 					break;
 				case 'WL_SAFESEARCH':
-					if (strtolower(trim($field[1])) == 'on') {
+					if (strtolower(trim($field[1])) == 'on'){
 						$wl_safesearch='on';
+					}
 					break;
+			}
+		}
+	}
+}
 else { echo "$l_error_open_file $conf_file";}
 if (isset($_POST['choix'])){ $choix=$_POST['choix']; } else { $choix=""; }
-switch ($choix)
+switch ($choix){
-{
-	case 'Download_list' :
-		exec ("sudo /usr/local/bin/alcasar-bl.sh --download");
-		break;
-	case 'Active_list' :
-		exec ("sudo /usr/local/bin/alcasar-bl.sh --adapt");
-		exec ("sudo /usr/local/bin/alcasar-bl.sh --reload");
-		break;
-	case 'Reject_list' :
-		unlink ("$dir_tmp/blacklists.tar.gz"); unlink ("$dir_tmp/md5sum");
-		break;
 	case 'MAJ_cat_wl' :
-		if (file_exists($wl_categories_enabled))
+		if (file_exists($wl_categories_enabled)){
-		{
 			exec("/bin/sed -i \"/^ossi-/!d\" $wl_categories_enabled"); // keep ossi custom categories
 			$pointeur=fopen($wl_categories_enabled, "a+");
-			foreach ($_POST as $key => $value)
+			foreach ($_POST as $key => $value){
-			{
-				if (strstr($key,'chk-'))
+				if (strstr($key,'chk-')){
-				{
 					$line=str_replace('chk-','',$key)."\n";
 					fwrite($pointeur,$line);
+				}
+			}
 			fclose($pointeur);
+		}
 		else {echo "$l_error_open_file $wl_categories_enabled";}
 		$fichier=fopen($dir_blacklist."ossi-wl/domains","w+");
 		fputs($fichier, form_filter($_POST['OSSI_wl']));
 		unset($_POST['OSSI_wl']);
 		exec ("sudo /usr/local/bin/alcasar-bl.sh --reload");
 		break;
 	case 'Specific_filtering' :
 		$wl_safesearch='off';
-		foreach ($_POST as $key => $value)
+		foreach ($_POST as $key => $value){
-		{
-			if (strstr($key,'chk-safesearch')) {
+			if (strstr($key,'chk-safesearch')){
 				$wl_safesearch='on';
+			}
+		}
 		exec ("sudo /usr/local/bin/alcasar-url_filter_wl.sh -safesearch_$wl_safesearch");
 		break;
 	case 'MAJ_ossi_file' :
-		foreach ($_POST as $fichier => $value)
+		foreach ($_POST as $fichier => $value){
-		{
-			if($fichier != "choix")
+			if($fichier != "choix"){
-			{
 				$action=$_POST[$fichier];
-				if($action == $l_remove) //delete
+				if($action == $l_remove){ //delete
-				{
 					exec("/bin/sed -i ".escapeshellarg("/^$fichier\$/d")." $wl_categories_enabled");
 					exec("/bin/sed -i ".escapeshellarg("/^$fichier\$/d")." $wl_categories");
 					exec("rm -rf ".escapeshellarg("$dir_blacklist$fichier"));
 					exec("sudo /usr/local/bin/alcasar-bl.sh --reload");
+				}
-				if($action == $l_disable) //disable
+				if($action == $l_disable){ //disable
-				{
 					exec("/bin/sed -i ".escapeshellarg("/^$fichier\$/d")." $wl_categories_enabled");
 					exec("sudo /usr/local/bin/alcasar-bl.sh --reload");
+				}
-				if($action == $l_enable) //enable
+				if($action == $l_enable){ //enable
-				{
 					file_put_contents($wl_categories_enabled, $fichier."\n", FILE_APPEND);
 					exec("sudo /usr/local/bin/alcasar-bl.sh --reload");
+				}
+			}
+		}
 		break;
 	case 'MAJ_ossi_file_upload' :
 		$file_name = str_replace (".", "_",basename($_FILES['fichier_ip']['name']));
-		if(!empty($file_name))
+		if(!empty($file_name)){
-		{
 			$dest_dir = $dir_blacklist."ossi-wl-".$file_name;
 			exec("mkdir ".escapeshellarg($dest_dir));
 			$file=$_FILES['fichier_ip']['tmp_name'];
 			exec('/usr/bin/dos2unix '.escapeshellarg($file));
-			if(move_uploaded_file($_FILES['fichier_ip']['tmp_name'], $dest_dir."/domains"))
+			if(move_uploaded_file($_FILES['fichier_ip']['tmp_name'], $dest_dir."/domains")){
-			{
 				touch ($dest_dir."/urls"); // create the URL file even if it isn't used
 				file_put_contents ($wl_categories, $dest_dir."\n", FILE_APPEND);
 				file_put_contents ($wl_categories_enabled, "ossi-wl-".$file_name."\n", FILE_APPEND); //Enabled by default
 				exec ("sudo /usr/local/bin/alcasar-bl.sh --reload");
+			}
-			else
+			else {
-			{
 				exec("rm -rf ".escapeshellarg($dest_dir));
 				echo $l_error_upload;
+			}
+		}
 		break;
 <FORM action='wl_filter.php' method=POST>
 <input type='hidden' name='choix' value='MAJ_cat_wl'>
 <?php
 echo "<center>";
 // total number of IP, DNS & URLs
-$nbDomainNames = exec("wc -l $dir_wl_domain_names* | tail -n 1 | awk '{print $1}'");
+$nbDomainNames = exec("wc -l $dir_wl_domain_names_enabled* | tail -n 1 | awk '{print $1}'");
 $nbUrl = "0";
-$nbIp = exec("wc -l $dir_wl_ip* | tail -n 1 | awk '{print $1}'");
+$nbIp = exec("wc -l $dir_wl_ip_enabled* | tail -n 1 | awk '{print $1}'");
-echo "<b>$l_nbDomainNames</b> $nbDomainNames, <b>$l_nbUrl</b> $nbUrl, <b>$l_nbIp</b> $nbIp<br/>";
+echo "$l_state $nbDomainNames <b>$l_nbDomainNames</b>, $nbUrl <b>$l_nbUrl</b>, $nbIp <b>$l_nbIp</b><br/>";
 echo "$l_wl_categories</center></td></tr>";
-//read & display all WL categories (checked or not)
+//read & display all categories (checked or not)
 $cols=1;
-if (file_exists($wl_categories))
+if (file_exists($wl_categories)){
-{
 	$wl_files = file($wl_categories);
 	$wl_files = preg_grep("/ossi-/", $wl_files, 1); // don't display ossi custom categories
-	foreach ($wl_files as $fichier => $value)
+	foreach ($wl_files as $fichier => $value){
-	{
 		if ($cols == 1) { echo "<tr>";}
 		$categorie=trim(basename($value));
-		echo "<td><a href='bl_categories_help.php?liste=wl&cat=$categorie' target='cat_help' onclick=window.open('bl_categories_help.php','cat_help','width=600,height=450,toolbar=no,scrollbars=yes,resizable=yes') title='categories help page'>$categorie</a><br>";
+		echo "<td><a href='bl_categories_help.php?cat=$categorie' target='cat_help' onclick=window.open('bl_categories_help.php','cat_help','width=600,height=450,toolbar=no,scrollbars=yes,resizable=yes') title='categories help page'>$categorie</a><br>";
 		echo "<input type='checkbox' name='chk-$categorie'";
 		// if the line is commented, the category is disable
 		if (preg_match('/^#/',$value, $r)) { echo ">";}
 		else { echo "checked>"; }
 		echo "</td>";
 		$cols++;
-		if ($cols > 10) {
+		if ($cols > 10){
 			echo "</tr>";
 			$cols=1;
+		}
+	}
+}
 echo "<table cellspacing=2 cellpadding=3 border=1><tr><th>$l_file_name<th>$l_nb_ip<th>$l_nb_domain_names<th colspan=2>$l_file_action</tr>";
 //list OSSI custom categories
 $fichierswl = array_diff(scandir($dir_blacklist), array('..','.','ossi-bl','ossi-wl'));
 $fichierswl = preg_grep("/^ossi-wl-/",$fichierswl);
-foreach ($fichierswl as $fichier => $value)
+foreach ($fichierswl as $fichier => $value){
-{
-	echo "<tr><td><center><a href='bl_categories_help.php?liste=wl&cat=$value&filtre=domain' target='cat_help' onclick=window.open('bl_categories_help','cat_help','width=600,height=450,toolbar=no,scrollbars=yes,resizable=yes') title='categories help page'>".substr($value,8)."</a></center></td><td><center>".exec("wc -l $dir_wl_ip$value | cut -d\" \" -f1")."</center></td><td><center>".exec("wc -l $dir_wl_domain_names$value.conf | cut -d\" \" -f1")."</center></td><td><center><input type='submit' name='$value'";
+	echo "<tr><td><center><a href='bl_categories_help.php?cat=$value&filtre=domain' target='cat_help' onclick=window.open('bl_categories_help','cat_help','width=600,height=450,toolbar=no,scrollbars=yes,resizable=yes') title='categories help page'>".substr($value,8)."</a></center></td><td><center>".exec("wc -l $dir_wl_ip$value | cut -d\" \" -f1")."</center></td><td><center>".exec("wc -l $dir_wl_domain_names$value.conf | cut -d\" \" -f1")."</center></td><td><center><input type='submit' name='$value'";
 	if (file_exists ($dir_wl_domain_names_enabled.$value)) echo " value='$l_disable'>"; else echo " value='$l_enable'>";
 	echo "</center></td><td><center><input type='submit' name='$value' value='$l_remove'></center></td></tr>";
+}
 echo "</table><br/></td></form><form action='wl_filter.php' method='POST' enctype='multipart/form-data'>";
 echo "<input type='hidden' name='choix' value='MAJ_ossi_file_upload'><td width=50% colspan=5 align=center>";

Subversion Repositories ALCASAR

(root)//web/acc/admin/wl_filter.php – Rev 3173 → 3179