WebSVN – ALCASAR – Path Comparison – /

Regard whitespace Rev 2647 → Rev 2648

 /scripts/alcasar-url_filter_bl.sh
 ,6 → 18,11
 safesearch="Off"
 pureip="Off"
 usage="Usage: alcasar-url_filter_bl.sh { -safesearch_on or -safesearch_off } & { -pureip_on or --pureip_off }"
+googledomains="google.com. google.ad. google.ae. google.com.af. google.com.ag. google.com.ai. google.al. google.am. google.co.ao. google.com.ar. google.as. google.at. google.com.au. google.az. google.ba. google.com.bd. google.be. google.bf. google.bg. google.com.bh. google.bi. google.bj. google.com.bn. google.com.bo. google.com.br. google.bs. google.bt. google.co.bw. google.by. google.com.bz. google.ca. google.cd. google.cf. google.cg. google.ch. google.ci. google.co.ck. google.cl. google.cm. google.cn. google.com.co. google.co.cr. google.com.cu. google.cv. google.com.cy. google.cz. google.de. google.dj. google.dk. google.dm. google.com.do. google.dz. google.com.ec. google.ee. google.com.eg. google.es. google.com.et. google.fi. google.com.fj. google.fm. google.fr. google.ga. google.ge. google.gg. google.com.gh. google.com.gi. google.gl. google.gm. google.gp. google.gr. google.com.gt. google.gy. google.com.hk. google.hn. google.hr. google.ht. google.hu. google.co.id. google.ie. google.co.il. google.im. google.co.in. google.iq. google.is. google.it. google.je. google.com.jm. google.jo. google.co.jp. google.co.ke. google.com.kh. google.ki. google.kg. google.co.kr. google.com.kw. google.kz. google.la. google.com.lb. google.li. google.lk. google.co.ls. google.lt. google.lu. google.lv. google.com.ly. google.co.ma. google.md. google.me. google.mg. google.mk. google.ml. google.com.mm. google.mn. google.ms. google.com.mt. google.mu. google.mv. google.mw. google.com.mx. google.com.my. google.co.mz. google.com.na. google.com.nf. google.com.ng. google.com.ni. google.ne. google.nl. google.no. google.com.np. google.nr. google.nu. google.co.nz. google.com.om. google.com.pa. google.com.pe. google.com.pg. google.com.ph. google.com.pk. google.pl. google.pn. google.com.pr. google.ps. google.pt. google.com.py. google.com.qa. google.ro. google.ru. google.rw. google.com.sa. google.com.sb. google.sc. google.se. google.com.sg. google.sh. google.si. google.sk. google.com.sl. google.sn. google.so. google.sm. google.sr. google.st. google.com.sv. google.td. google.tg. google.co.th. google.com.tj. google.tk. google.tl. google.tm. google.tn. google.to. google.com.tr. google.tt. google.com.tw. google.co.tz. google.com.ua. google.co.ug. google.co.uk. google.com.uy. google.co.uz. google.com.vc. google.co.ve. google.vg. google.co.vi. google.com.vn. google.vu. google.ws. google.rs. google.co.za. google.co.zm. google.co.zw. google.cat."
+youtubedomains="www.youtube.com m.youtube.com youtubei.googleapis.com youtube.googleapis.com www.youtube-nocookie.com"
 nb_args=$#
 if [ $nb_args -le 1 ]
 then
 ,25 → 64,36
         if [ $safesearch == "On" ]
         then
                 $SED "s?^#\"?\"?g" $DIR_DG/urlregexplist # on décommente les lignes de regles
-# add 'nosslsearch' redirection for google searching
-#               $SED "/google/d" $DNSMASQ_BL_CONF # remove old google declaration
-#               nossl_server=`host -ta nosslsearch.google.com|cut -d" " -f4`    # retrieve google nosslsearch ip
-#               echo "# nosslsearch redirect server for google" >> $DNSMASQ_BL_CONF
-#               for gg_dnsname in .google.com .google.ad .google.ae .google.com.af .google.com.ag .google.com.ai .google.al .google.am .google.co.ao .google.com.ar .google.as .google.at .google.com.au .google.az .google.ba .google.com.bd .google.be .google.bf .google.bg .google.com.bh .google.bi .google.bj .google.com.bn .google.com.bo .google.com.br .google.bs .google.bt .google.co.bw .google.by .google.com.bz .google.ca .google.cd .google.cf .google.cg .google.ch .google.ci .google.co.ck .google.cl .google.cm .google.cn .google.com.co .google.co.cr .google.com.cu .google.cv .google.com.cy .google.cz .google.de .google.dj .google.dk .google.dm .google.com.do .google.dz .google.com.ec .google.ee .google.com.eg .google.es .google.com.et .google.fi .google.com.fj .google.fm .google.fr .google.ga .google.ge .google.gg .google.com.gh .google.com.gi .google.gl .google.gm .google.gp .google.gr .google.com.gt .google.gy .google.com.hk .google.hn .google.hr .google.ht .google.hu .google.co.id .google.ie .google.co.il .google.im .google.co.in .google.iq .google.is .google.it .google.je .google.com.jm .google.jo .google.co.jp .google.co.ke .google.com.kh .google.ki .google.kg .google.co.kr .google.com.kw .google.kz .google.la .google.com.lb .google.li .google.lk .google.co.ls .google.lt .google.lu .google.lv .google.com.ly .google.co.ma .google.md .google.me .google.mg .google.mk .google.ml .google.com.mm .google.mn .google.ms .google.com.mt .google.mu .google.mv .google.mw .google.com.mx .google.com.my .google.co.mz .google.com.na .google.com.nf .google.com.ng .google.com.ni .google.ne .google.nl .google.no .google.com.np .google.nr .google.nu .google.co.nz .google.com.om .google.com.pa .google.com.pe .google.com.pg .google.com.ph .google.com.pk .google.pl .google.pn .google.com.pr .google.ps .google.pt .google.com.py .google.com.qa .google.ro .google.ru .google.rw .google.com.sa .google.com.sb .google.sc .google.se .google.com.sg .google.sh .google.si .google.sk .google.com.sl .google.sn .google.so .google.sm .google.sr .google.st .google.com.sv .google.td .google.tg .google.co.th .google.com.tj .google.tk .google.tl .google.tm .google.tn .google.to .google.com.tr .google.tt .google.com.tw .google.co.tz .google.com.ua .google.co.ug .google.co.uk .google.com.uy .google.co.uz .google.com.vc .google.co.ve .google.vg .google.co.vi .google.com.vn .google.vu .google.ws .google.rs .google.co.za .google.co.zm .google.co.zw .google.cat
-#               do
-#                       echo "address=/$gg_dnsname/$nossl_server" >> $DNSMASQ_BL_CONF
-#               done
 # add 'SafeSearch' redirection for google searching
                 $SED "/google/d" $DNSMASQ_BL_CONF # remove old google declaration
-                forcesafesearch_server=`host -ta forcesafesearch.google.com|cut -d" " -f4`      # retrieve google forcesafesearch ip
+                google_safe_server=`host -ta forcesafesearch.google.com|cut -d" " -f4`  # retrieve google forcesafesearch ip
                 echo "# SafeSearch redirect server for google" >> $DNSMASQ_BL_CONF
-                for gg_dnsname in .google.com .google.ad .google.ae .google.com.af .google.com.ag .google.com.ai .google.al .google.am .google.co.ao .google.com.ar .google.as .google.at .google.com.au .google.az .google.ba .google.com.bd .google.be .google.bf .google.bg .google.com.bh .google.bi .google.bj .google.com.bn .google.com.bo .google.com.br .google.bs .google.bt .google.co.bw .google.by .google.com.bz .google.ca .google.cd .google.cf .google.cg .google.ch .google.ci .google.co.ck .google.cl .google.cm .google.cn .google.com.co .google.co.cr .google.com.cu .google.cv .google.com.cy .google.cz .google.de .google.dj .google.dk .google.dm .google.com.do .google.dz .google.com.ec .google.ee .google.com.eg .google.es .google.com.et .google.fi .google.com.fj .google.fm .google.fr .google.ga .google.ge .google.gg .google.com.gh .google.com.gi .google.gl .google.gm .google.gp .google.gr .google.com.gt .google.gy .google.com.hk .google.hn .google.hr .google.ht .google.hu .google.co.id .google.ie .google.co.il .google.im .google.co.in .google.iq .google.is .google.it .google.je .google.com.jm .google.jo .google.co.jp .google.co.ke .google.com.kh .google.ki .google.kg .google.co.kr .google.com.kw .google.kz .google.la .google.com.lb .google.li .google.lk .google.co.ls .google.lt .google.lu .google.lv .google.com.ly .google.co.ma .google.md .google.me .google.mg .google.mk .google.ml .google.com.mm .google.mn .google.ms .google.com.mt .google.mu .google.mv .google.mw .google.com.mx .google.com.my .google.co.mz .google.com.na .google.com.nf .google.com.ng .google.com.ni .google.ne .google.nl .google.no .google.com.np .google.nr .google.nu .google.co.nz .google.com.om .google.com.pa .google.com.pe .google.com.pg .google.com.ph .google.com.pk .google.pl .google.pn .google.com.pr .google.ps .google.pt .google.com.py .google.com.qa .google.ro .google.ru .google.rw .google.com.sa .google.com.sb .google.sc .google.se .google.com.sg .google.sh .google.si .google.sk .google.com.sl .google.sn .google.so .google.sm .google.sr .google.st .google.com.sv .google.td .google.tg .google.co.th .google.com.tj .google.tk .google.tl .google.tm .google.tn .google.to .google.com.tr .google.tt .google.com.tw .google.co.tz .google.com.ua .google.co.ug .google.co.uk .google.com.uy .google.co.uz .google.com.vc .google.co.ve .google.vg .google.co.vi .google.com.vn .google.vu .google.ws .google.rs .google.co.za .google.co.zm .google.co.zw .google.cat
+                for gg_dnsname in $googledomains
                 do
-                        echo "address=/$gg_dnsname/$forcesafesearch_server" >> $DNSMASQ_BL_CONF
+                        echo "address=/$gg_dnsname/$google_safe_server" >> $DNSMASQ_BL_CONF
                 done
+                # add 'SafeSearch' redirection for bing searching
+                $SED "/bing/d" $DNSMASQ_BL_CONF # remove old bing declaration
+                bing_safe_server=`host -ta strict.bing.com | grep "address" | cut -d" " -f4`    # retrieve bing strict ip
+                echo "# SafeSearch redirect server for bing" >> $DNSMASQ_BL_CONF
+                echo "address=/www.bing.com/$bing_safe_server" >> $DNSMASQ_BL_CONF
+                # add 'SafeSearch' redirection for youtube searching
+                $SED "/youtube/d" $DNSMASQ_BL_CONF # remove old youtube declaration
+                youtube_safe_server=`host -ta restrict.youtube.com | grep "address" | cut -d" " -f4`    # retrieve youtube restrict ip
+                echo "# SafeSearch redirect server for youtube" >> $DNSMASQ_BL_CONF
+                for yt_dnsname in $youtubedomains
+                do
+                        echo "address=/$yt_dnsname/$youtube_safe_server" >> $DNSMASQ_BL_CONF
+                done
         else
                 $SED "s?^[^#]?#&?g" $DIR_DG/urlregexplist
                 $SED "/google/d" $DNSMASQ_BL_CONF
+                $SED "/bing/d" $DNSMASQ_BL_CONF
+                $SED "/youtube/d" $DNSMASQ_BL_CONF
         fi
         if [ $pureip == "On" ]
         then

 /scripts/alcasar-url_filter_wl.sh
 ,6 → 18,11
 SED="/bin/sed -i"
 safesearch="Off"
 usage="Usage: alcasar-url_filter_wl.sh { -safesearch_on or -safesearch_off }"
+googledomains="google.com. google.ad. google.ae. google.com.af. google.com.ag. google.com.ai. google.al. google.am. google.co.ao. google.com.ar. google.as. google.at. google.com.au. google.az. google.ba. google.com.bd. google.be. google.bf. google.bg. google.com.bh. google.bi. google.bj. google.com.bn. google.com.bo. google.com.br. google.bs. google.bt. google.co.bw. google.by. google.com.bz. google.ca. google.cd. google.cf. google.cg. google.ch. google.ci. google.co.ck. google.cl. google.cm. google.cn. google.com.co. google.co.cr. google.com.cu. google.cv. google.com.cy. google.cz. google.de. google.dj. google.dk. google.dm. google.com.do. google.dz. google.com.ec. google.ee. google.com.eg. google.es. google.com.et. google.fi. google.com.fj. google.fm. google.fr. google.ga. google.ge. google.gg. google.com.gh. google.com.gi. google.gl. google.gm. google.gp. google.gr. google.com.gt. google.gy. google.com.hk. google.hn. google.hr. google.ht. google.hu. google.co.id. google.ie. google.co.il. google.im. google.co.in. google.iq. google.is. google.it. google.je. google.com.jm. google.jo. google.co.jp. google.co.ke. google.com.kh. google.ki. google.kg. google.co.kr. google.com.kw. google.kz. google.la. google.com.lb. google.li. google.lk. google.co.ls. google.lt. google.lu. google.lv. google.com.ly. google.co.ma. google.md. google.me. google.mg. google.mk. google.ml. google.com.mm. google.mn. google.ms. google.com.mt. google.mu. google.mv. google.mw. google.com.mx. google.com.my. google.co.mz. google.com.na. google.com.nf. google.com.ng. google.com.ni. google.ne. google.nl. google.no. google.com.np. google.nr. google.nu. google.co.nz. google.com.om. google.com.pa. google.com.pe. google.com.pg. google.com.ph. google.com.pk. google.pl. google.pn. google.com.pr. google.ps. google.pt. google.com.py. google.com.qa. google.ro. google.ru. google.rw. google.com.sa. google.com.sb. google.sc. google.se. google.com.sg. google.sh. google.si. google.sk. google.com.sl. google.sn. google.so. google.sm. google.sr. google.st. google.com.sv. google.td. google.tg. google.co.th. google.com.tj. google.tk. google.tl. google.tm. google.tn. google.to. google.com.tr. google.tt. google.com.tw. google.co.tz. google.com.ua. google.co.ug. google.co.uk. google.com.uy. google.co.uz. google.com.vc. google.co.ve. google.vg. google.co.vi. google.com.vn. google.vu. google.ws. google.rs. google.co.za. google.co.zm. google.co.zw. google.cat."
+youtubedomains="www.youtube.com m.youtube.com youtubei.googleapis.com youtube.googleapis.com www.youtube-nocookie.com"
 nb_args=$#
 if [ $nb_args -le 0 ]
 then
 ,25 → 53,44
                 esac
         nb_args=$(expr $nb_args - 1)
         done
-        forcesafesearch_server=`host -ta forcesafesearch.google.com|cut -d" " -f4`      # retrieve google forcesafesearch ip
         if [ $safesearch == "On" ]
         then
-# add 'SafeSearch' redirection for google searching
-                $SED "/google/d" $DNSMASQ_WL_CONF # remove old google declaration
                 if [ -e $IP_WL ]
                 then
                         rm $IP_WL # remove old google declaration
                 fi
+                # add 'SafeSearch' redirection for google searching
+                google_safe_server=`host -ta forcesafesearch.google.com | grep "address" | cut -d" " -f4`       # retrieve google forcesafesearch ip
+                $SED "/google/d" $DNSMASQ_WL_CONF # remove old google declaration
                 echo "# SafeSearch redirect server for google" >> $DNSMASQ_WL_CONF
-                for gg_dnsname in .google.com .google.ad .google.ae .google.com.af .google.com.ag .google.com.ai .google.al .google.am .google.co.ao .google.com.ar .google.as .google.at .google.com.au .google.az .google.ba .google.com.bd .google.be .google.bf .google.bg .google.com.bh .google.bi .google.bj .google.com.bn .google.com.bo .google.com.br .google.bs .google.bt .google.co.bw .google.by .google.com.bz .google.ca .google.cd .google.cf .google.cg .google.ch .google.ci .google.co.ck .google.cl .google.cm .google.cn .google.com.co .google.co.cr .google.com.cu .google.cv .google.com.cy .google.cz .google.de .google.dj .google.dk .google.dm .google.com.do .google.dz .google.com.ec .google.ee .google.com.eg .google.es .google.com.et .google.fi .google.com.fj .google.fm .google.fr .google.ga .google.ge .google.gg .google.com.gh .google.com.gi .google.gl .google.gm .google.gp .google.gr .google.com.gt .google.gy .google.com.hk .google.hn .google.hr .google.ht .google.hu .google.co.id .google.ie .google.co.il .google.im .google.co.in .google.iq .google.is .google.it .google.je .google.com.jm .google.jo .google.co.jp .google.co.ke .google.com.kh .google.ki .google.kg .google.co.kr .google.com.kw .google.kz .google.la .google.com.lb .google.li .google.lk .google.co.ls .google.lt .google.lu .google.lv .google.com.ly .google.co.ma .google.md .google.me .google.mg .google.mk .google.ml .google.com.mm .google.mn .google.ms .google.com.mt .google.mu .google.mv .google.mw .google.com.mx .google.com.my .google.co.mz .google.com.na .google.com.nf .google.com.ng .google.com.ni .google.ne .google.nl .google.no .google.com.np .google.nr .google.nu .google.co.nz .google.com.om .google.com.pa .google.com.pe .google.com.pg .google.com.ph .google.com.pk .google.pl .google.pn .google.com.pr .google.ps .google.pt .google.com.py .google.com.qa .google.ro .google.ru .google.rw .google.com.sa .google.com.sb .google.sc .google.se .google.com.sg .google.sh .google.si .google.sk .google.com.sl .google.sn .google.so .google.sm .google.sr .google.st .google.com.sv .google.td .google.tg .google.co.th .google.com.tj .google.tk .google.tl .google.tm .google.tn .google.to .google.com.tr .google.tt .google.com.tw .google.co.tz .google.com.ua .google.co.ug .google.co.uk .google.com.uy .google.co.uz .google.com.vc .google.co.ve .google.vg .google.co.vi .google.com.vn .google.vu .google.ws .google.rs .google.co.za .google.co.zm .google.co.zw .google.cat
+                for bing_dnsname in $googledomains
                 do
-                        echo "address=/$gg_dnsname/$forcesafesearch_server" >> $DNSMASQ_WL_CONF
+                        echo "address=/$bing_dnsname/$google_safe_server" >> $DNSMASQ_WL_CONF
                 done
-                echo "add wl_ip_allowed $forcesafesearch_server" >> $IP_WL
+                echo "add wl_ip_allowed $google_safe_server" >> $IP_WL
+                # add 'SafeSearch' redirection for bing searching
+                bing_safe_server=`host -ta strict.bing.com | grep "address" | cut -d" " -f4`    # retrieve bing strict ip
+                $SED "/bing/d" $DNSMASQ_WL_CONF # remove old bing declaration
+                echo "# SafeSearch redirect server for bing" >> $DNSMASQ_WL_CONF
+                echo "address=/www.bing.com/$bing_safe_server" >> $DNSMASQ_WL_CONF
+                echo "add wl_ip_allowed $bing_safe_server" >> $IP_WL
+                # add 'SafeSearch' redirection for youtube searching
+                youtube_safe_server=`host -ta restrict.youtube.com | grep "address" | cut -d" " -f4`    # retrieve youtube restrict ip
+                $SED "/youtube/d" $DNSMASQ_WL_CONF # remove old youtube declaration
+                echo "# SafeSearch redirect server for youtube" >> $DNSMASQ_WL_CONF
+                for yt_dnsname in $youtubedomains
+                do
+                        echo "address=/$yt_dnsname/$youtube_safe_server" >> $DNSMASQ_WL_CONF
+                done
+                echo "add wl_ip_allowed $youtube_safe_server" >> $IP_WL
         else
                 $SED "/google/d" $DNSMASQ_WL_CONF
+                $SED "/bing/d" $DNSMASQ_WL_CONF
+                $SED "/youtube/d" $DNSMASQ_WL_CONF
                 rm $IP_WL
         fi
 systemctl restart dnsmasq-whitelist
 fi

 /web/acc/admin/bl_filter.php
 ,9 → 93,7
         $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_safe_searching="Activer le contrôle scolaire/parental des moteurs de recherche Google, Bing et Youtube.";
         $l_error_open_file="Erreur d'ouverture du fichier";
         $l_additional_file_title="Fichiers de 'listes noires' additionnels";
         $l_file_list="Liste des fichiers";
 ,9 → 139,7
         $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_safe_searching="Enabling school/parental control for the search engines Google, Bing and Youtube";
         $l_error_open_file="Error opening file";
         $l_additional_file_title="Additional blacklist files";
         $l_file_list="Files list";
 ,9 → 501,7
 else    {
         echo "$l_error_open_file $urlregex_file";
         }
-echo "> $l_safe_searching";
-echo "<br>$l_safe_youtube";
-echo " $l_youtube_id<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>";
 ?>
 </table>
 ,5 → 508,3
 </form>
 </BODY>
 </HTML>

 /web/acc/admin/wl_filter.php
 ,9 → 79,7
         $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 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_safe_searching="Activer le contrôle scolaire/parental des moteurs de recherche Google, Bing et Youtube.";
         $l_error_open_file="Erreur d'ouverture du fichier";
         $l_additional_file_title="Fichiers de 'listes blanches' additionnels";
         $l_file_list="Liste des fichiers";
 ,9 → 110,7
         $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 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_safe_searching="Enabling school/parental control for the search engines Google, Bind and Youtube";
         $l_error_open_file="Error opening file";
         $l_additional_file_title="Additional WhiteList files";
         $l_file_list="Files list";
 ,9 → 357,7
 {
         echo " checked";
 }
-echo "> $l_safe_searching";
-echo "<br>$l_safe_youtube";
-echo " $l_youtube_id<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>";
 ?>
 </FORM>

Subversion Repositories ALCASAR

Compare Revisions

Regard whitespace Rev 2647 → Rev 2648