Subversion Repositories ALCASAR

Compare Revisions

No changes between revisions

Ignore whitespace Rev 878 → Rev 879

/web/acc/admin/dns_filter2.php
117,11 → 117,34
<TABLE width="100%" border=1 cellspacing=0 cellpadding=1>
<FORM action='dns_filter.php' method='POST'>
<input type='hidden' name='choix' value='Specific_filtering'>
<tr><td>
<input type='checkbox' name='chk-ip'
<?php
//on vérifie l'état du filtrage "pureip"
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";
echo "</td></tr>";
?>
<tr><td>
<input type='checkbox' name='chk-ip'> <?php echo "$l_ip_filtering"?>
<tr><td>
<input type='checkbox' name='chk-safe-search'> <?php echo "$l_safe_searching"?>
<br><?php echo "$l_safe_youtube"?><input type='text' name='Youtube-ID' size='30'>
<tr><td>
/web/acc/admin/dns_filter.php
92,6 → 92,8
$bl_categories_enabled="/usr/local/etc/alcasar-bl-categories-enabled";
$dir_blacklist="/etc/dansguardian/lists/blacklist/";
$conf_file="/usr/local/etc/alcasar.conf";
$urlregex_file="/etc/dansguardian/lists/urlregexplist";
$bannedsite_file="/etc/dansguardian/lists/bannedsitelist";
if (isset($_POST['choix'])){ $choix=$_POST['choix']; } else { $choix=""; }
switch ($choix)
{
/web/acc/admin/net_filter.php
96,10 → 96,8
$conf[$tmp[0]] = $tmp[1];
}
}
}else{
exit("Erreur d'ouverture du fichier ".CONF_FILE);
fclose($ouvre);
}
fclose($ouvre);
 
if (isset($_POST['choix'])){$choix=$_POST['choix'];} else {$choix="";}
switch ($choix)
/scripts/alcasar-conf.sh
65,6 → 65,7
cp -f $DIR_WEB/images/organisme.png $DIR_UPDATE
# Sauvegarde des fichiers exploités par dansguardian
cp -f /etc/dansguardian/lists/exceptioniplist $DIR_UPDATE
cp -f /etc/dansguardian/lists/urlregexplist $DIR_UPDATE
cp -f /etc/dansguardian/lists/exceptionsitelist $DIR_UPDATE
cp -f /etc/dansguardian/lists/bannedsitelist $DIR_UPDATE
cp -f /etc/dansguardian/lists/exceptionurllist $DIR_UPDATE
210,6 → 211,7
# Récupération des fichiers de Dansguardian
[ -e $DIR_UPDATE/exceptioniplist ] && cp -f $DIR_UPDATE/exceptioniplist /etc/dansguardian/lists/
[ -e $DIR_UPDATE/exceptionsitelist ] && cp -f $DIR_UPDATE/exceptionsitelist /etc/dansguardian/lists/
[ -e $DIR_UPDATE/urlregexplist ] && cp -f $DIR_UPDATE/urlregexplist /etc/dansguardian/lists/
[ -e $DIR_UPDATE/bannedsitelist ] && cp -f $DIR_UPDATE/bannedsitelist /etc/dansguardian/lists/
[ -e $DIR_UPDATE/exceptionurllist ] && cp -f $DIR_UPDATE/exceptionurllist /etc/dansguardian/lists/
[ -e $DIR_UPDATE/bannedurllist ] && cp -f $DIR_UPDATE/bannedurllist /etc/dansguardian/lists/
/scripts/sbin/alcasar-dg-pureip.sh
File deleted
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
Deleted: svn:executable
-*
\ No newline at end of property
Deleted: svn:keywords
-Date Author Id
\ No newline at end of property
/scripts/sbin/alcasar-dg-safesearch.sh
File deleted
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
Deleted: svn:executable
-*
\ No newline at end of property
/scripts/sbin/alcasar-urlfilter.sh
0,0 → 1,61
#/bin/bash
# $Id: alcasar-bl.sh 412 2011-01-03 21:40:09Z richard $
 
# alcasar-safesearch.sh
# by Richard REY
# This script is distributed under the Gnu General Public License (GPL)
 
# Active / désactive la fonction safesearch sur DG
# Enable / disable safesearch filter on DG
function ip_disable (){
$SED "s/^\*ip$/#*ip/g" /etc/dansguardian/lists/bannedsitelist
service dansguardian reload
}
function ip_enable (){
$SED "s/^\#\*ip$/*ip/g" /etc/dansguardian/lists/bannedsitelist
service dansguardian reload
}
 
DIR_DG="/etc/dansguardian/lists"
SED="/bin/sed -i"
safesearch="Off"
pureip="Off"
usage="Usage: alcasar-safesearch.sh {-on or --on} | { -off or --off }"
nb_args=$#
if [ $nb_args -eq 0 ]
then
nb_args=1
args="-h"
fi
while [ $nb_args -ge 1 ]
do
arg=${!nb_args}
case $arg in
-\? | -h* | --h*)
echo "$usage"
exit 0
;;
# Safe search activation
-safesearch | --safesearch)
safesearch="On"
;;
# safesearch desactivation
-pureip | --pureip)
pureip="On"
;;
*)
echo "Argument inconnu :$arg";
echo "$usage"
exit 1
;;
esac
nb_args=$(expr $nb_args - 1)
done
if [ $pureip -eq "On" ]
then
$SED "s?^#\"?\"?g" $DIR_DG/urlregexplist
else
$SED "s?^[^#]?#&?g" $DIR_DG/urlregexplist
fi
#service dansguardian restart
 
Property changes:
Added: svn:eol-style
+native
\ No newline at end of property
Added: svn:executable
+*
\ No newline at end of property
/scripts/sbin/alcasar-safesearch.sh
10,34 → 10,44
 
DIR_DG="/etc/dansguardian/lists"
SED="/bin/sed -i"
 
safesearch="Off"
pureip="Off"
usage="Usage: alcasar-safesearch.sh {-on or --on} | { -off or --off }"
nb_args=$#
args=$1
if [ $nb_args -eq 0 ]
then
nb_args=1
args="-h"
fi
case $args in
while [ $nb_args -ge 1 ]
do
arg=${!nb_args}
case $arg in
-\? | -h* | --h*)
echo "$usage"
exit 0
;;
# Safe search activation
-on | --on)
$SED "s?^#\"?\"?g" $DIR_DG/urlregexplist
service dansguardian restart
-safesearch | --safesearch)
safesearch="On"
;;
# safesearch desactivation
-off | --off)
$SED "s?^[^#]?#&?g" $DIR_DG/urlregexplist
service dansguardian restart
-pureip | --pureip)
pureip="On"
;;
*)
echo "Argument inconnu :$1";
echo "Argument inconnu :$arg";
echo "$usage"
exit 1
;;
esac
esac
nb_args=$(expr $nb_args - 1)
done
if [ $pureip -eq "On" ]
then
$SED "s?^#\"?\"?g" $DIR_DG/urlregexplist
else
$SED "s?^[^#]?#&?g" $DIR_DG/urlregexplist
fi
#service dansguardian restart