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

 </HEAD>
 <body>
 <?
 function form_filter ($form_content)
+{
-// réencodage iso + format unix + rc fin de ligne (ouf...)
+	// réencodage iso + format unix + rc fin de ligne (ouf...)
 	$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;
+}
+	{
 		return preg_replace("/(.*)\n/", "add bl_ip_blocked $1\n", $new_list);
+	}
+}
 function echo_file ($filename)
-	{
+{
 	if (file_exists($filename))
-		{
+	{
 		if (filesize($filename) != 0)
-			{
+		{
 			$pointeur=fopen($filename,"r");
 			$tampon = fread($pointeur, filesize($filename));
 			fclose($pointeur);
 			echo $tampon;
-			}
+		}
+	}
 	else
-		{
+	{
 		echo "$filename doesn't exist";
-		}
+	}
+}
 function echo_ip_file ($filename)
+{
 	$filename = escapeshellarg($filename);
 	exec("cat $filename | cut -d ' ' -f3", $resultat);
 	for($i=0; $i<exec("wc -l $filename"); $i++)
 # 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));
-	}
+}
 if($Language == 'fr'){
 	$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 à autoriser";
 	$l_specific_filtering="Filtrage special";
 	$l_add_to_wl="Noms de domaine ou adresses IP à ajouter à la liste blanche";
-	$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_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_record="Enregistrer les modifications";
 	$l_wait="Une fois validées, 10 secondes sont nécessaires pour traiter vos modifications";
 	$l_safe_searching="Activer le contrôle scolaire/parental pour 'YouTube' et pour les moteurs de recherche 'Google', 'Bing' et 'Qwant'.";
 	$l_error_open_file="Erreur d'ouverture du fichier";
 	$l_additional_file_title="Fichiers de 'listes blanches' additionnels";
 	$l_list_version="List version : ";
 	$l_wl_categories="Select the allowed categories";
 	$l_specific_filtering="Specific filtering";
 	$l_allowed_dns="Allowed domain names";
 	$l_add_to_wl="Domain names or IP addresses to add to the whitelist";
-	$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_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_record="Save changes";
 	$l_wait="Once validated, 10 seconds are necessary to compute your modifications";
 	$l_safe_searching="Enabling school/parental control for 'YouTube' and for the search engines 'Google', 'Bing' and 'Qwant'";
 	$l_error_open_file="Error opening file";
 	$l_additional_file_title="Additional WhiteList files";
 $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_domain_names= "/usr/local/share/dnsmasq-wl/";
+$dir_wl_domain_names= "/usr/local/share/unbound-wl/";
-$dir_wl_domain_names_enabled= "/usr/local/share/dnsmasq-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";
-$iptables_safesearch_file=$dir_wl_ip_enabled."ossi-ip-safesearch";
+$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))
-	{
+{
 	$tab=file($conf_file);
 	if ($tab)
-		{
+	{
 		foreach ($tab as $line)
-			{
+		{
 			$field=explode("=", $line);
-			if ($field[0] == "PRIVATE_IP")
+			switch ($field[0]) {
-				{
+				case 'PRIVATE_IP':
-				$PRIVATE_IP_MASK=trim($field[1]);
+					$PRIVATE_IP_MASK=trim($field[1]);
-				$tmp = explode("/",$PRIVATE_IP_MASK);
+					$tmp = explode("/",$PRIVATE_IP_MASK);
-				$PRIVATE_IP=$tmp[0];
+					$PRIVATE_IP=$tmp[0];
+					break;
+				case 'WL_SAFESEARCH':
+					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)
+{
-case 'Download_list' :
+	case 'Download_list' :
-	exec ("sudo /usr/local/bin/alcasar-bl.sh --download");
+		exec ("sudo /usr/local/bin/alcasar-bl.sh --download");
-	break;
+		break;
-case 'Active_list' :
+	case 'Active_list' :
-	exec ("sudo /usr/local/bin/alcasar-bl.sh --adapt");
+		exec ("sudo /usr/local/bin/alcasar-bl.sh --adapt");
-	exec ("sudo /usr/local/bin/alcasar-bl.sh --reload");
+		exec ("sudo /usr/local/bin/alcasar-bl.sh --reload");
-	break;
+		break;
-case 'Reject_list' :
+	case 'Reject_list' :
-	unlink ("$dir_tmp/blacklists.tar.gz"); unlink ("$dir_tmp/md5sum");
+		unlink ("$dir_tmp/blacklists.tar.gz"); unlink ("$dir_tmp/md5sum");
-	break;
+		break;
-case 'MAJ_cat_wl' :
+	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)
+		{
+			exec("/bin/sed -i \"/^ossi-/!d\" $wl_categories_enabled"); // keep ossi custom categories
+			$pointeur=fopen($wl_categories_enabled, "a+");
-			if (strstr($key,'chk-'))
+			foreach ($_POST as $key => $value)
+			{
+				if (strstr($key,'chk-'))
+				{
-				$line=str_replace('chk-','',$key)."\n";
+					$line=str_replace('chk-','',$key)."\n";
-				fwrite($pointeur,$line);
+					fwrite($pointeur,$line);
+				}
+			}
-		}
-		fclose($pointeur);
+			fclose($pointeur);
-	}
+		}
-	else {echo "$l_error_open_file $wl_categories_enabled";}
+		else {echo "$l_error_open_file $wl_categories_enabled";}
-	$fichier=fopen($dir_blacklist."ossi-wl/domains","w+");
+		$fichier=fopen($dir_blacklist."ossi-wl/domains","w+");
-	fputs($fichier, form_filter($_POST['OSSI_wl']));
+		fputs($fichier, form_filter($_POST['OSSI_wl']));
-	fclose($fichier);
+		fclose($fichier);
-	unset($_POST['OSSI_wl']);
+		unset($_POST['OSSI_wl']);
-	exec ("sudo /usr/local/bin/alcasar-bl.sh --reload");
+		exec ("sudo /usr/local/bin/alcasar-bl.sh --reload");
-	break;
+		break;
-case 'Specific_filtering' :
+	case 'Specific_filtering' :
-	$safesearch="-safesearch_off"; ;
+		$wl_safesearch='off';
-	foreach ($_POST as $key => $value)
+		foreach ($_POST as $key => $value)
-	{
+		{
-		if (strstr($key,'chk-safesearch')) $safesearch="-safesearch_on";
+			if (strstr($key,'chk-safesearch')) {
+				$wl_safesearch='on';
+			}
-	}
+		}
-	exec ("sudo /usr/local/bin/alcasar-url_filter_wl.sh $safesearch");
+		exec ("sudo /usr/local/bin/alcasar-url_filter_wl.sh -safesearch_$wl_safesearch");
-	break;
+		break;
-case 'MAJ_ossi_file' :
+	case 'MAJ_ossi_file' :
-	foreach($_POST as $fichier => $value)
+		foreach($_POST as $fichier => $value)
-	{
-		if($fichier != "choix")
+		{
-			$action=$_POST[$fichier];
-			if($action == $l_remove) //delete
+			if($fichier != "choix")
+			{
+				$action=$_POST[$fichier];
+				if($action == $l_remove) //delete
+				{
-				exec("/bin/sed -i ".escapeshellarg("/^$fichier\$/d")." $wl_categories_enabled");
+					exec("/bin/sed -i ".escapeshellarg("/^$fichier\$/d")." $wl_categories_enabled");
-				exec("/bin/sed -i ".escapeshellarg("/^$fichier\$/d")." $wl_categories");
+					exec("/bin/sed -i ".escapeshellarg("/^$fichier\$/d")." $wl_categories");
-				exec("rm -rf ".escapeshellarg("$dir_blacklist$fichier"));
+					exec("rm -rf ".escapeshellarg("$dir_blacklist$fichier"));
+					exec("sudo /usr/local/bin/alcasar-bl.sh --reload");
+				}
+				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
+				{
+					file_put_contents($wl_categories_enabled, $fichier."\n", FILE_APPEND);
-				exec("sudo /usr/local/bin/alcasar-bl.sh --reload");
+					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))
+		{
+			$dest_dir = $dir_blacklist."ossi-wl-".$file_name;
-			if($action == $l_disable) //disable
+			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"))
+			{
-				exec("/bin/sed -i ".escapeshellarg("/^$fichier\$/d")." $wl_categories_enabled");
+				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");
+				exec ("sudo /usr/local/bin/alcasar-bl.sh --reload");
+			}
-			if($action == $l_enable) //enable
+			else
+			{
-				file_put_contents($wl_categories_enabled, $fichier."\n", FILE_APPEND);
+				exec("rm -rf ".escapeshellarg($dest_dir));
-				exec("sudo /usr/local/bin/alcasar-bl.sh --reload");
+				echo $l_error_upload;
+			}
+		}
-	}
-	break;
+		break;
-case 'MAJ_ossi_file_upload' :
-	$file_name = str_replace (".", "_",basename($_FILES['fichier_ip']['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"))
-		{
-			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
-		{
-			exec("rm -rf ".escapeshellarg($dest_dir));
-			echo $l_error_upload;
-		}
-	}
-	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>
 <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}'");
+$nbDomainNames = exec("wc -l $dir_wl_domain_names* | tail -n 1 | awk '{print $1}'");
 $nbUrl = "0";
-$nbIp = exec("wc -l /usr/local/share/iptables-wl/* | tail -n 1 | awk '{print $1}'");
+$nbIp = exec("wc -l $dir_wl_ip* | 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>";
 //read & display all WL categories (checked or not)
 $cols=1;
 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)
-		{
+	{
 		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 "<input type='checkbox' name='chk-$categorie'";
 		// if the line is commented, the category is disable
 		else { echo "checked>"; }
 		echo "</td>";
 		$cols++;
 		if ($cols > 10) {
 			echo "</tr>";
-			$cols=1; }
+			$cols=1;
+		}
+	}
+}
-else	{
+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=100% colspan=10 align=center>";
 </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-safesearch'
+<input type='checkbox' name='chk-safesearch' <?= $wl_safesearch == 'on' ? 'checked' : ''; ?>><?= $l_safe_searching; ?>
-<?php
+</tr></td>
-// verify "safesearch" filtering state
-if (file_exists($iptables_safesearch_file))
-{
-	echo " checked";
+<tr><td>
-}
-echo "> $l_safe_searching<tr><td>";
-echo "<input type='submit' onClick=\"this.disabled=true; this.value='$l_load';submit();\" value='$l_record'></td></tr>";
+<?= "<input type='submit' onClick=\"this.disabled=true; this.value='$l_load';submit();\" value='$l_record'>"; ?>
-?>
-</FORM>
+</td></tr></FORM>
 </TABLE>
 </BODY>
 </HTML>

Subversion Repositories ALCASAR

(root)//web/acc/admin/wl_filter.php – Rev 2662 → 2688