WebSVN – ALCASAR – Path Comparison – / – /web/ Rev 1898 and /web/ Rev 1899

Regard whitespace Rev 1898 → Rev 1899

 /web/acc/admin/bl_categories_help.php
 ,8 → 65,16
 {
         if(isset($ossi))
         {
+        if(isset($_GET['state']) && $_GET['state']=='disable')
+        {
+                $bl_categorie_domain_file = "/usr/local/share/dnsmasq-bl/".$categorie;
+                $bl_categorie_ip_file = "/usr/local/share/iptables-bl/".$categorie;
+        }
+        else
+        {
         $bl_categorie_domain_file = "/usr/local/share/dnsmasq-bl-enabled/".$categorie;
         $bl_categorie_ip_file = "/usr/local/share/iptables-bl-enabled/".$categorie;
+        }
         if(isset($_GET['nb_domains']) && isset($_GET['nb_urls']) && isset($_GET['nb_ip']))
         {
                 $nb_domains = $_GET['nb_domains'];
 ,8 → 127,16
         if(isset($ossi))
         {
+        if(isset($_GET['state']) && $_GET['state']=='disable')
+        {
+                $wl_categorie_domain_file = "/usr/local/share/dnsmasq-wl/".$categorie;
+                $wl_categorie_ip_file = "/usr/local/share/iptables-wl/".$categorie;
+        }
+        else
+        {
         $wl_categorie_domain_file = "/usr/local/share/dnsmasq-wl-enabled/".$categorie;
         $wl_categorie_ip_file = "/usr/local/share/iptables-wl-enabled/".$categorie;
+        }
         if(isset($_GET['nb_domains']) && isset($_GET['nb_urls']) && isset($_GET['nb_ip']))
         {
                 $nb_domains = $_GET['nb_domains'];
 ,3 → 280,4
 <center><a href="javascript:window.close();"><b><?php echo "$l_close"; ?></b></a></center>
 </BODY>
 </HTML>

 /web/acc/admin/bl_filter.php
 ,7 → 87,8
 $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_bl="Liste noire générale";
   $l_load="Chargement...";
 ,6 → 136,9
   $l_update_cat="Mise a jour des catégories automatiquement?";
         $l_no_update_cat = "Désactiver";
   $l_yes_update_cat = "Activer (Toutes les 12 heures)";
+        $l_disable="Désactiver";
+        $l_enable="Activer";
+        $l_file_state="Etat";
 }
 else {
   $l_bl="BlackList";
 ,6 → 188,9
   $l_update_cat="Mise a jour des catégories automatiquement?";
   $l_no_update_cat = "Disable";
   $l_yes_update_cat = "Enable (Every 12 hours)";
+        $l_disable="Disable";
+        $l_enable="Enable";
+        $l_file_state="State";
 }
 $dir_etc="/usr/local/etc/";
 $dir_dg="/etc/dansguardian/lists/";
 ,6 → 204,8
 $dir_tmp="/tmp/blacklists";
 $upload_dir_ip = "/usr/local/share/iptables-bl-enabled/";
 $upload_dir_domain_names = "/usr/local/share/dnsmasq-bl-enabled/";
+$dir_ip = "/usr/local/share/iptables-bl/";
+$dir_domain_names = "/usr/local/share/dnsmasq-bl/";
 $update_file_cat="/usr/local/etc/update_cat.conf";
 ,16 → 289,32
         }
         exec ("sudo /usr/local/bin/alcasar-url_filter_bl.sh $safesearch $pureip");
         break;
-case 'MAJ_ip_file_delete' :
+case 'MAJ_ip_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 ("sudo /usr/local/bin/alcasar-bl.sh --reload");
                 }
+                        if($action == $l_disable) //disable
+                        {
+                                exec("mv -f $upload_dir_ip$fichier $dir_ip$fichier");
+                                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");
+                                exec ("sudo /usr/local/bin/alcasar-bl.sh --reload");
+                        }
+                }
+        }
         break;
 case 'MAJ_ip_file_upload' :
         $nom = str_replace (".", "_",basename($_FILES['fichier_ip']['name']));
 ,18 → 487,27
 </table>
 <table width="100%" border=1 cellspacing=0 cellpadding=1>
 <form action='bl_filter.php' method='POST'>
-<input type='hidden' name='choix' value='MAJ_ip_file_delete'>
+<input type='hidden' name='choix' value='MAJ_ip_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_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>$l_file_state<th>$l_file_remove</tr>";
+//liste des fichiers activés
 $fichiersIp = array_diff(scandir($upload_dir_ip), array('ossi','ossi-ip-safesearch','..','.'));
 $fichiersIp = preg_grep("/^ossi-/",$fichiersIp);
 foreach($fichiersIp as $fichier => $value)
 {
-        echo "<tr><td><center><a href='bl_categories_help.php?liste=bl&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_remove'></center></td></tr>";
+        echo "<tr><td><center><a href='bl_categories_help.php?liste=bl&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>";
 }
+//liste des fichiers desactivés
+$fichiersIp = array_diff(scandir($dir_ip), array('ossi','ossi-ip-safesearch','..','.'));
+$fichiersIp = preg_grep("/^ossi-/",$fichiersIp);
+foreach($fichiersIp as $fichier => $value)
+{
+        echo "<tr><td bgcolor='BEBEBE'><center><a href='bl_categories_help.php?liste=bl&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 $upload_dir_ip$value | awk '{print $1}'")."</center></td><td bgcolor='BEBEBE'><center>".exec("wc -l $upload_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 "</table><br/></td></form><form action='bl_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 "<H3>$l_add_file</H3>";

 /web/acc/admin/wl_filter.php
 ,7 → 125,9
   $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";
 ,7 → 161,9
   $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/";
 ,6 → 177,8
 $dir_tmp="/tmp/";
 $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))
         {
 ,11 → 238,27
         {
                 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 ("sudo /usr/local/bin/alcasar-bl.sh --reload");
                 }
+                        if($action == $l_disable) //disable
+                        {
+                                exec("mv -f $upload_dir_ip$fichier $dir_ip$fichier");
+                                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");
+                                exec ("sudo /usr/local/bin/alcasar-bl.sh --reload");
+                        }
+                }
+        }
         break;
 case 'MAJ_ip_file_upload' :
         $nom = str_replace (".", "_",basename($_FILES['fichier_ip']['name']));
 ,14 → 375,24
 <?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_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>$l_file_state<th>$l_file_remove</tr>";
+//liste des fichiers activés
 $fichiersIp = array_diff(scandir($upload_dir_ip), array('ossi','ossi-ip-safesearch','..','.'));
 $fichiersIp = preg_grep("/^ossi-/",$fichiersIp);
 foreach($fichiersIp 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_remove'></center></td></tr>";
+        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>";
 }
+//liste des fichiers desactivés
+$fichiersIp = array_diff(scandir($dir_ip), array('ossi','ossi-ip-safesearch','..','.'));
+$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 $upload_dir_ip$value | awk '{print $1}'")."</center></td><td bgcolor='BEBEBE'><center>".exec("wc -l $upload_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 "</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 "<H3>$l_add_file</H3>";

Subversion Repositories ALCASAR

Compare Revisions

Regard whitespace Rev 1898 → Rev 1899