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

 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <HTML><!-- written by Rexy -->
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<TITLE>ALCASAR Whitelist filtering</TITLE>
+<TITLE>ALCASAR DNS WL filtering</TITLE>
 <link rel="stylesheet" href="/css/style.css" type="text/css">
 </HEAD>
 <body>
 <?
 function form_filter ($form_content)
+		{
 		if (filesize($filename) != 0)
+			{
 			$pointeur=fopen($filename,"r");
 			$tampon = fread($pointeur, filesize($filename));
-			$line = split("\n", $tampon);
-			foreach( $line as $x)
-			{
-				if(isset(split('/',$x)[1]))
-				echo split('/',$x)[1]."\n";
-			}
 			fclose($pointeur);
+			echo $tampon;
+			}
+		}
 	else
+		{
 		echo "$filename doesn't exist";
 # Choice of language
 $Language = 'en';
 if(isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])){
 	$Langue = explode(",",$_SERVER['HTTP_ACCEPT_LANGUAGE']);
-	$Language = strtolower(substr(chop($Langue[0]),0,2)); }
+	$Language = strtolower(substr(chop($Langue[0]),0,2));
+	}
 if($Language == 'fr'){
-	$l_wl="Liste blanche";
+	$l_wl="Liste blanche générale";
 	$l_load="Chargement...";
 	$l_list_version="Version de la liste : ";
+	$l_wl_categories="Sélectionnez les catégories à filtrer";
 	$l_specific_filtering="Filtrage special";
-	$l_wl_categories="Sélectionnez les catégories à autoriser";
-	$l_allowed_dns="Noms de domaine autorisés";
-	$l_one_dns="Entrez un nom de domaine par ligne (exemple : .domaine.org)";
-	$l_add_to_wl="Noms de domaine ou IP ajoutés à la liste blanche";
+	$l_add_to_wl="Noms de domaine ou adresses IP à ajouter à la liste noire";
-	$l_forbidden_ip_explain="Entrez une IP par ligne (exemple : 123.123.123.123)<br/>ou une adresse de réseau (exemple : 123.123.0.0/16)";
+	$l_one_dns_ip="Entrez un nom de domaine ou une adresse IP ou une adresse de réseau par ligne<br>exemple (domaine) : .domaine.org - exemple (ip) : 61.54.52.56 - exemple (réseau) : 172.16.0.0/16";
-	$l_allowed_ip="IP autorisées";
 	$l_record="Enregistrer les modifications";
 	$l_wait="Une fois validées, 10 secondes sont nécessaires pour traiter vos modifications";
+	$l_ip_filtering="Filtrer les URLs contenant une adresse IP au lieu d'un nom de domaine (ex: http://25.56.58.59/index.htm)";
+	$l_safe_searching="Activer le contrôle scolaire/parental des moteurs de recherche google.";
+	$l_safe_youtube="Pour un contrôle parental sur Youtube, suivez les étapes ici : ";
+	$l_youtube_id="(<a href='https://support.google.com/youtube/answer/174084?hl=fr' target='cat_help' onclick=window.open('https://support.google.com/youtube/answer/174084?hl=fr','cat_help','width=800,height=600,toolbar=no,scrollbars=yes,resizable=yes') title='Youtube for school'>lien pour créer un identifiant Youtube (Id)</a>)";
 	$l_error_open_file="Erreur d'ouverture du fichier";
-	$l_additional_file_title="Fichiers de 'listes blanche' additionnels";
+	$l_additional_file_title="Fichiers de 'listes blanches' additionnels";
 	$l_file_list="Liste des fichiers";
 	$l_add_file="Ajouter un fichier";
 	$l_add_file_explain="Chaque ligne du fichier doit être une adresse IP ou un nom de domaine";
 	$l_file_name="Nom du fichier";
-	$l_file_remove="Supprimer";
+	$l_file_action="Action";
 	$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_nbUrl="Url :";
 	$l_nbIp="Ip :";
-	$l_ip_filtering="Filtrer les URLs contenant une adresse IP au lieu d'un nom de domaine (ex: http://25.56.58.59/index.htm)";
-	$l_safe_searching="Activer le contrôle scolaire/parental des moteurs de recherche : google, yahoo, bing, metacrawler et Youtube.";
-	$l_safe_youtube="Pour Youtube restreint, suivez les étapes ici pour chaque poste : ";
-	$l_youtube_id="(<a href='https://support.google.com/youtube/answer/174084?hl=fr' target='cat_help' onclick=window.open('https://support.google.com/youtube/answer/174084?hl=fr','cat_help','width=800,height=600,toolbar=no,scrollbars=yes,resizable=yes') title='Youtube for school'>lien pour créer un identifiant Youtube (Id)</a>)";
 	$l_disable="Désactiver";
 	$l_enable="Activer";
 	$l_file_state="Etat";
+}
 else {
-	$l_wl="WhiteList";
+	$l_wl="General WhiteList";
 	$l_load="Loading...";
 	$l_list_version="List version : ";
-	$l_wl_categories="Select the categories to allow";
+	$l_wl_categories="Select the categories to filter";
+	$l_specific_filtering="Specific filtering";
 	$l_allowed_dns="Allowed domain names";
-	$l_one_dns="Enter one domain name per row (example : .domain.org)";
-	$l_add_to_wl="Domain names or IP to add to whitelist";
+	$l_add_to_wl="Domain names or IP addresses to add to the blacklist";
-	$l_forbidden_ip_explain="Enter one IP per row (example : 123.123.123.123)<br/>or a network address (example : 123.123.0.0/16)";
+	$l_one_dns_ip="Enter one domain name or one IP address or one network address per row <br>example (domain): .domain.org - example (ip): 61.54.56.52 - example (network) : 172.16.0.0/16";
-	$l_allowed_ip="Allowed IP";
 	$l_record="Save changes";
 	$l_wait="Once validated, 10 seconds are necessary to compute your modifications";
+	$l_ip_filtering="Filtering URLs that contain an IP address instead of a domain name (ie: http://25.56.58.59/index.htm)";
+	$l_safe_searching="Enabling school/parental control for the search engines google";
+	$l_safe_youtube="For a safe Youtube search, follow these steps : ";
+	$l_youtube_id="(<a href='https://support.google.com/youtube/answer/174084?hl=en' target='cat_help' onclick=window.open('https://support.google.com/youtube/answer/174084?hl=en','cat_help','width=800,height=600,toolbar=no,scrollbars=yes,resizable=yes') title='Youtube for school'>link to create a Youtube Id</a>)";
 	$l_error_open_file="Error opening file";
-	$l_additional_file_title="Additional whitelist files";
+	$l_additional_file_title="Additional WhiteList files";
 	$l_file_list="Files list";
 	$l_add_file="Add a file";
 	$l_add_file_explain="Each line of the file must be an IP address or a domain name";
 	$l_file_name="Filename";
-	$l_file_remove="Remove";
+	$l_file_action="Action";
 	$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_nbUrl="Url :";
 	$l_nbIp="Ip :";
-	$l_ip_filtering="Filtering URLs that contain an IP address instead of a domain name (ie: http://25.56.58.59/index.htm)";
-	$l_specific_filtering="Specific filtering";
-	$l_safe_youtube="For safe Youtube, follow steps here for each computer ";
-	$l_youtube_id="(<a href='https://support.google.com/youtube/answer/174084?hl=en' target='cat_help' onclick=window.open('https://support.google.com/youtube/answer/174084?hl=en','cat_help','width=800,height=600,toolbar=no,scrollbars=yes,resizable=yes') title='Youtube for school'>link to create a Youtube Id</a>)";
-	$l_safe_searching="Enabling school/parental control for the search engines google.";
 	$l_disable="Disable";
 	$l_enable="Enable";
 	$l_file_state="State";
+}
 $dir_etc="/usr/local/etc/";
 $dir_dg="/etc/dansguardian/lists/";
+$dir_blacklist=$dir_dg."blacklists/";
-$file_wl_domains="/usr/local/share/dnsmasq-wl/ossi.conf";
+$dir_wl_ip="/usr/local/share/iptables-wl/";
-$file_wl_ip="/usr/local/share/iptables-wl-enabled/ossi";
+$dir_wl_ip_enabled= "/usr/local/share/iptables-wl-enabled/";
+$dir_wl_domain_names= "/usr/local/share/dnsmasq-wl/";
+$dir_wl_domain_names_enabled= "/usr/local/share/dnsmasq-wl-enabled/";
 $wl_categories=$dir_etc."alcasar-wl-categories";
 $wl_categories_enabled=$dir_etc."alcasar-wl-categories-enabled";
 $conf_file=$dir_etc."alcasar.conf";
-$tinyproxy_conf="/etc/tinyproxy/tinyproxy.conf";
+$urlregex_file=$dir_dg."urlregexplist";
-$dnsmasq_conf="/etc/dnsmasq-whitelist.conf";
+$bannedsite_file=$dir_dg."bannedsitelist";
-$dir_tmp="/tmp/";
+$dir_tmp="/tmp/blacklists";
-$upload_dir_ip = "/usr/local/share/iptables-wl-enabled/";
-$upload_dir_domain_names = "/usr/local/share/dnsmasq-wl-enabled/";
-$dir_ip = "/usr/local/share/iptables-wl/";
-$dir_domain_names = "/usr/local/share/dnsmasq-wl/";
 # default values
 if (is_file ($conf_file))
+	{
 	$tab=file($conf_file);
 	if ($tab)
+		{
 		foreach ($tab as $line)
+			{
 			$field=explode("=", $line);
-			if ($field[0] == "DNS1")
+			if ($field[0] == "PRIVATE_IP")
+				{
-					$DNS1=trim($field[1]);
+				$PRIVATE_IP_MASK=trim($field[1]);
+				$tmp = explode("/",$PRIVATE_IP_MASK);
+				$PRIVATE_IP=$tmp[0];
+				}
+			}
+		}
+	}
 else { echo "$l_error_open_file $conf_file";}
 if (isset($_POST['choix'])){ $choix=$_POST['choix']; } else { $choix=""; }
 switch ($choix)
+{
-case 'Specific_filtering' :
+case 'Download_list' :
+	exec ("sudo /usr/local/bin/alcasar-bl.sh --download");
+	break;
-	$safesearch="-safesearch_off"; ;
+case 'Active_list' :
-	foreach ($_POST as $key => $value)
+	exec ("sudo /usr/local/bin/alcasar-bl.sh --adapt");
-	{
-		if (strstr($key,'chk-safesearch')) $safesearch="-safesearch_on";
+	exec ("sudo /usr/local/bin/alcasar-bl.sh --reload");
-	}
+	break;
+case 'Reject_list' :
-	exec ("sudo /usr/local/bin/alcasar-url_filter_wl.sh $safesearch");
+	unlink ("$dir_tmp/blacklists.tar.gz"); unlink ("$dir_tmp/md5sum");
 	break;
 case 'MAJ_cat_wl' :
 	if (file_exists($wl_categories_enabled))
+	{
 		$pointeur=fopen($wl_categories_enabled, "w+");
+			{
 				$line=str_replace('chk-','',$key)."\n";
 				fwrite($pointeur,$line);
+			}
+		}
 		fclose($pointeur);
+	}
 	else {echo "$l_error_open_file $wl_categories_enabled";}
-	$fichier=fopen($file_wl_domains,"w+");
+	$fichier=fopen($dir_blacklist."ossi-wl/domains","w+");
-	fputs($fichier, form_filter($_POST['OSSI_wl_domains']));
+	fputs($fichier, form_filter($_POST['OSSI_wl']));
-	fclose($fichier);
-	unset($_POST['OSSI_wl_domains']);
-	$fichier=fopen($file_wl_ip, "w+");
-	fputs($fichier, form_filter_ip($_POST['OSSI_wl_ip'], "white"));
 	fclose($fichier);
-	unset($_POST['OSSI_wl_ip']);
+	unset($_POST['OSSI_wl']);
 	exec ("sudo /usr/local/bin/alcasar-bl.sh --reload");
 	break;
+case 'Specific_filtering' :
+	$pureip="-pureip_off"; $safesearch="-safesearch_off"; ;
+	foreach ($_POST as $key => $value)
+	{
+		if (strstr($key,'chk-ip')) $pureip="-pureip_on";
+		if (strstr($key,'chk-safesearch')) $safesearch="-safesearch_on";
+	}
+	exec ("sudo /usr/local/bin/alcasar-url_filter_bl.sh $safesearch $pureip");
+	break;
-	case 'MAJ_ip_file_delete' :
+case 'MAJ_ossi_file' :
 	foreach($_POST as $fichier => $value)
+	{
 		if($fichier != "choix")
+		{
 			$action=$_POST[$fichier];
 			if($action == $l_remove) //delete
+			{
-				exec("rm -rf $upload_dir_ip$fichier");
-				exec("rm -rf $upload_dir_domain_names$fichier");
+				exec("/bin/sed -i \"/^$fichier$/d\" $wl_categories_enabled");
-				exec("rm -rf $dir_ip$fichier");
+				exec("rm -rf $dir_blacklist$fichier");
-				exec("rm -rf $dir_domain_names$fichier");
 				exec ("sudo /usr/local/bin/alcasar-bl.sh --reload");
+			}
 			if($action == $l_disable) //disable
+			{
-				exec("mv -f $upload_dir_ip$fichier $dir_ip$fichier");
+				exec("/bin/sed -i \"/^$fichier$/d\" $wl_categories_enabled");
-				exec("mv -f $upload_dir_domain_names$fichier $dir_domain_names$fichier");
 				exec("sudo /usr/local/bin/alcasar-bl.sh --reload");
+			}
 			if($action == $l_enable) //enable
+			{
-				exec("mv -f $dir_ip$fichier $upload_dir_ip$fichier");
-				exec("mv -f $dir_domain_names$fichier $upload_dir_domain_names$fichier");
+				file_put_contents ($wl_categories_enabled, $fichier."/n", FILE_APPEND);
 				exec ("sudo /usr/local/bin/alcasar-bl.sh --reload");
+			}
+		}
+	}
 	break;
-case 'MAJ_ip_file_upload' :
+case 'MAJ_ossi_file_upload' :
-	$nom = str_replace (".", "_",basename($_FILES['fichier_ip']['name']));
+	$file_name = str_replace (".", "_",basename($_FILES['fichier_ip']['name']));
-	# Si un fichier a été choisi
-	if(!empty($nom))
+	if(!empty($file_name))
 	{
+		$dest_dir = $dir_blacklist."ossi-wl-".$file_name;
-		# On l'upload
+		exec ("mkdir $dest_dir");
-		if(move_uploaded_file($_FILES['fichier_ip']['tmp_name'], $upload_dir_ip.$nom))
+		if(move_uploaded_file($_FILES['fichier_ip']['tmp_name'], $dest_dir."/domains"))
+		{
-		# On extrait uniquement les ip du fichier
-		exec("grep -Eo '([0-9]{1,3}\.){3}[0-9]{1,3}' $upload_dir_ip$nom > $upload_dir_ip\ossi_ip");
-		# Suppression des doublons
-		exec("sort -u $upload_dir_ip\ossi_ip > $upload_dir_ip\ossi-$nom && rm -f $upload_dir_ip\ossi_ip");
-		# On adapte le fichier à la sauvegarde du set
-		exec("sed -i \"s/^/add wl_ip_allowed /g\" $upload_dir_ip\ossi-$nom");
+			file_put_contents ($wl_categories, $dest_dir."\n", FILE_APPEND);
-		# On extrait uniquement les noms de domaine
-		# max_tld() retourne le nombre max de charactere pour un top-level dns
-		exec("grep -Eo '([a-zA-Z0-9_-]+\.){1,2}[a-zA-Z]{2,".max_tld()."}' $upload_dir_ip$nom > $upload_dir_domain_names\ossi_domain_names");
+			file_put_contents ($wl_categories_enabled, "ossi-wl-".$file_name."\n", FILE_APPEND); //Enabled by default
-		# Suppression des doublons
-		exec("sort -u $upload_dir_domain_names\ossi_domain_names > $upload_dir_domain_names\ossi-$nom && rm -f $upload_dir_domain_names\ossi_domain_names");
-		# On adapte le fichier pour Dnsmasq
-		exec("sed -i \"s/^/server=\//g\" $upload_dir_domain_names\ossi-$nom");
-		exec("sed -i \"s/$/\/$DNS1/g\" $upload_dir_domain_names\ossi-$nom");
+			exec ("sudo /usr/local/bin/alcasar-bl.sh --reload");
-		# Suppression du fichier
-		exec("rm -f $upload_dir_ip$nom");
+		}
 		else
+		{
+			exec("rm -rf $dest_dir");
 			echo $l_error_upload;
+		}
-		exec ("sudo /usr/local/bin/alcasar-bl.sh --reload");
+	}
 	break;
+}
 ?>
 <table width="100%" border="0" cellspacing="0" cellpadding="0">
 	<tr><th><?php echo $l_wl; ?></th></tr>
 	<tr bgcolor="#FFCC66"><td><img src="/images/pix.gif" width="1" height="2"></td></tr>
 </table>
-<TABLE width="100%" border=1 cellspacing=0 cellpadding=1>
+<table width="100%" border=1 cellspacing=0 cellpadding=1>
 <tr><td valign="middle" align="left" colspan=10>
 <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 /usr/local/share/dnsmasq-wl/* | tail -n 1 | awk '{print $1}'");
-$nbUrl = 0;
+$nbUrl = "0";
-$nbIp = 0;
+$nbIp = exec ("wc -l /usr/local/share/iptables-wl/* | 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_wl_categories</center></td></tr>";
-//on lit et on interprete le fichier de catégories
+//read & display all WL categories (checked or not)
 $cols=1;
 if (file_exists($wl_categories))
+	{
-	$pointeur=fopen($wl_categories,"r");
+	$wl_files = file($wl_categories);
-	while (!feof ($pointeur))
+	$wl_files = preg_grep("/ossi-/", $wl_files, 1); // don't display ossi custom categories
-		{
-		$ligne=fgets($pointeur, 4096);
+	foreach($wl_files as $fichier => $value)
-		if ($ligne)
+		{
-			if ($cols == 1) { echo "<tr>";}
+		if ($cols == 1) { echo "<tr>";}
-			$categorie=trim(basename($ligne));
+		$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?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 "<input type='checkbox' name='chk-$categorie'";
+		echo "<input type='checkbox' name='chk-$categorie'";
-			// si la ligne est commentée -> categorie non selectionnée
+		// if the line is commented, the category is disable
-			if (preg_match('/^#/',$ligne, $r)) { echo ">";}
+		if (preg_match('/^#/',$value, $r)) { echo ">";}
-			else { echo "checked>"; }
+		else { echo "checked>"; }
-			echo "</td>";
+		echo "</td>";
-			$cols++;
+		$cols++;
-			if ($cols > 10) {
+		if ($cols > 10) {
-				echo "</tr>";
+			echo "</tr>";
-				$cols=1; }
+			$cols=1; }
+		}
+	}
-	fclose($pointeur);
-	}
 else	{
 	echo "$l_error_open_file $wl_categories";
+}
 echo "<tr><td valign='middle' align='left' colspan=10>";
 echo "<center><b>$l_add_to_wl</b></center></td></tr>";
-echo "<tr><td width=50% colspan=5 align=center>";
+echo "<tr><td width=100% colspan=10 align=center>";
-echo "<H3>$l_allowed_dns</H3>$l_one_dns<BR>";
+echo "$l_one_dns_ip<BR>";
-echo "<textarea name='OSSI_wl_domains' rows=3 cols=40>";
+echo "<textarea name='OSSI_wl' rows=3 cols=40>";
-echo_file ($file_wl_domains);
+echo_file ($dir_blacklist."ossi-wl/domains");
 echo "</textarea></td>";
-echo "<td width=50% colspan=5 align=center>";
-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>";
-echo "<tr><td colspan=10>";
+echo "</tr><tr><td colspan=10>";
-echo "<input type='submit' onClick=\"this.disabled=true; this.value='$l_load';\" value='$l_record'></form></td></tr>";
+echo "<input type='submit' onClick=\"this.disabled=true; this.value='$l_load';\" value='$l_record'>";
+echo "</form> ($l_wait)";
 echo "</td></tr></table><br/>";
 ?>
 <table width="100%" border="0" cellspacing="0" cellpadding="0">
 	<tr><th><?php echo $l_additional_file_title; ?></th></tr>
 	<tr bgcolor="#FFCC66"><td><img src="/images/pix.gif" width="1" height="2"></td></tr>
 </table>
 <table width="100%" border=1 cellspacing=0 cellpadding=1>
 <form action='wl_filter.php' method='POST'>
-<input type='hidden' name='choix' value='MAJ_ip_file_delete'>
+<input type='hidden' name='choix' value='MAJ_ossi_file'>
 <?php
 echo "<tr><td width=50% colspan=5 align=center>";
 echo "<H3>$l_file_list</H3>";
-echo "<table cellspacing=2 cellpadding=3 border=1><tr><th>$l_file_name<th>$l_nb_ip<th>$l_nb_domain_names<th>$l_file_state<th>$l_file_remove</tr>";
+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>";
-//liste des fichiers activés
+//list OSSI custom categories
-$fichiersIp = array_diff(scandir($upload_dir_ip), array('ossi','ossi-ip-safesearch','..','.'));
+$fichierswl = array_diff(scandir($dir_blacklist), array('..','.','ossi-bl','ossi-wl'));
-$fichiersIp = preg_grep("/^ossi-/",$fichiersIp);
+$fichierswl = preg_grep("/^ossi-wl-/",$fichierswl);
-foreach($fichiersIp as $fichier => $value)
+foreach($fichierswl as $fichier => $value)
 {
-	echo "<tr><td><center><a href='bl_categories_help.php?liste=wl&cat=$value&ossi=yes&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'>".exec("sed 's/^.....//g' <<< $value")."</a></center></td><td><center>".exec("wc -l $upload_dir_ip$value | awk '{print $1}'")."</center></td><td><center>".exec("wc -l $upload_dir_domain_names$value | awk '{print $1}'")."</center></td><td><center><input type='submit' name='$value' value='$l_disable'></center></td><td><center><input type='submit' name='$value' value='$l_remove'></center></td></tr>";
+	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'";
-}
-//liste des fichiers desactivés
-$fichiersIp = array_diff(scandir($dir_ip), array('ossi','ossi-ip-safesearch','..','.'));
+	if (file_exists ($dir_wl_domain_names_enabled.$value)) echo " value='$l_disable'>"; else echo " value='$l_enable'>";
-$fichiersIp = preg_grep("/^ossi-/",$fichiersIp);
-foreach($fichiersIp as $fichier => $value)
-{
-	echo "<tr><td bgcolor='BEBEBE'><center><a href='bl_categories_help.php?liste=wl&cat=$value&ossi=yes&filtre=domain&state=disable' 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'>".exec("sed 's/^.....//g' <<< $value")."</a></center></td><td bgcolor='BEBEBE'><center>".exec("wc -l $dir_ip$value | awk '{print $1}'")."</center></td><td bgcolor='BEBEBE'><center>".exec("wc -l $dir_domain_names$value | awk '{print $1}'")."</center></td><td bgcolor='BEBEBE'><center><input type='submit' name='$value' value='$l_enable'></center></td><td bgcolor='BEBEBE'><center><input type='submit' name='$value' value='$l_remove'></center></td></tr>";
+	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_ip_file_upload'><td width=50% colspan=5 align=center>";
+echo "<input type='hidden' name='choix' value='MAJ_ossi_file_upload'><td width=50% colspan=5 align=center>";
 echo "<H3>$l_add_file</H3>";
 echo "$l_add_file_explain";
 echo "<input type='file' name='fichier_ip'>";
 echo "<input type='submit' onClick=\"this.disabled=true; this.value='$l_load';\" value='$l_submit'>";
 echo "</td></tr>";
 echo "</form>";
 echo "</table><br/>";
 ?>
 <table width="100%" border="0" cellspacing="0" cellpadding="0">
 	<tr><th><?php echo $l_specific_filtering; ?></th></tr>
 	<tr bgcolor="#FFCC66"><td><img src="/images/pix.gif" width="1" height="2"></td></tr>
 </table>
 <TABLE width="100%" border=1 cellspacing=0 cellpadding=1>
 <FORM action='wl_filter.php' method='POST'>
 <input type='hidden' name='choix' value='Specific_filtering'>
 <tr><td>
+<input type='checkbox' name='chk-ip'
+<?php
+// verify "pureip" filtering state
+if (file_exists($bannedsite_file))
+	{
+	$pointeur=fopen($bannedsite_file,"r");
+	while (!feof ($pointeur))
+		{
+		$ligne=fgets($pointeur, 4096);
+		if ($ligne)
+			{
+			if (preg_match('/^\*ip$/',$ligne, $r))
+				{
+				echo " checked";
+				break;
+				}
+			}
+		}
+	fclose($pointeur);
+	}
+else	{
+	echo "$l_error_open_file $bannedsite_file";
+	}
+echo "> $l_ip_filtering";
+?>
+</td></tr>
+<tr><td>
 <input type='checkbox' name='chk-safesearch'
 <?php
-//verification du safesearch
+// verify "safesearch" filtering state
-if(file_exists($dnsmasq_conf))
+if (file_exists($urlregex_file))
+	{
-	$f=fopen($dnsmasq_conf, 'r');
+	$pointeur=fopen($urlregex_file,"r");
-	while(!feof($f))
+	while (!feof ($pointeur))
+		{
-		$line=fgets($f,4096);
+		$ligne=fgets($pointeur, 4096);
+		if ($ligne)
+			{
-		if($line && preg_match('/^address=\/\.google/',$line,$r))
+			if (preg_match('/^\"\(\^http\:\/\/\[0\-9a\-z\]\+\\\.google/',$ligne, $r))
+				{
-			echo "checked";
+				echo " checked";
-			break;
+				break;
+				}
+			}
-	fclose($f);
+		}
+	fclose($pointeur);
+	}
-else
+else	{
-	echo "$l_error_open_file $dnsmasq_conf";
+	echo "$l_error_open_file $urlregex_file";
+	}
 echo "> $l_safe_searching";
-echo "<br></br>$l_safe_youtube";
+echo "<br>$l_safe_youtube";
 echo " $l_youtube_id<tr><td>";
-echo "<input type='submit' onClick=\"this.disabled=true; this.value='$l_load';\" value='$l_record'></form></td></tr>";
+echo "<input type='submit' onClick=\"this.disabled=true; this.value='$l_load';\" value='$l_record'></td></tr>";
 ?>
+</FORM>
-</TABLE><br/>
+</TABLE>
 </BODY>
 </HTML>

Subversion Repositories ALCASAR

(root)/web/acc/admin/wl_filter.php @ 2521 – Rev 1903 → 1954