| /CHANGELOG |
|---|
| 1,6 → 1,13 |
| # $Id$ |
| ********** ALCASAR CHANGELOG ********** |
| -------------------- 3.4.0 -------------------- |
| NEWS |
| - Add Qwant in safesearch option for whitelist and blacklist |
| BUGS |
| - Keep custom blacklists when upgrading from dansguardian to e2guardian |
| -------------------- 3.3.2 -------------------- |
| NEWS |
| - Add Bing and Youtube in safesearch option for whitelist and blacklist |
| /scripts/alcasar-url_filter_bl.sh |
|---|
| 89,11 → 89,17 |
| echo "address=/$yt_dnsname/$youtube_safe_server" >> $DNSMASQ_BL_CONF |
| done |
| # add 'SafeSearch' redirection for qwant searching |
| $SED "/qwant/d" $DNSMASQ_BL_CONF # remove old qwant declaration |
| qwant_safe_server=`host -ta safeapi.qwant.com | grep "address" | cut -d" " -f4` # retrieve qwant strict ip |
| echo "# SafeSearch redirect server for qwant" >> $DNSMASQ_BL_CONF |
| echo "address=/api.qwant.com/$qwant_safe_server" >> $DNSMASQ_BL_CONF |
| 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 |
| $SED "/qwant/d" $DNSMASQ_BL_CONF |
| fi |
| if [ $pureip == "On" ] |
| then |
| /scripts/alcasar-url_filter_wl.sh |
|---|
| 86,10 → 86,17 |
| echo "address=/$yt_dnsname/$youtube_safe_server" >> $DNSMASQ_WL_CONF |
| done |
| echo "add wl_ip_allowed $youtube_safe_server" >> $IP_WL |
| # add 'SafeSearch' redirection for qwant searching |
| $SED "/qwant/d" $DNSMASQ_WL_CONF # remove old qwant declaration |
| qwant_safe_server=`host -ta safeapi.qwant.com | grep "address" | cut -d" " -f4` # retrieve qwant strict ip |
| echo "# SafeSearch redirect server for qwant" >> $DNSMASQ_WL_CONF |
| echo "address=/api.qwant.com/$qwant_safe_server" >> $DNSMASQ_WL_CONF |
| else |
| $SED "/google/d" $DNSMASQ_WL_CONF |
| $SED "/bing/d" $DNSMASQ_WL_CONF |
| $SED "/youtube/d" $DNSMASQ_WL_CONF |
| $SED "/qwant/d" $DNSMASQ_WL_CONF |
| rm $IP_WL |
| fi |
| systemctl restart dnsmasq-whitelist |
| /web/acc/admin/bl_filter.php |
|---|
| 93,7 → 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 pour 'YouTube' et pour les moteurs de recherche 'Google' et 'Bing'."; |
| $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 noires' additionnels"; |
| $l_file_list="Liste des fichiers"; |
| 139,7 → 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 'YouTube' and for the search engines 'Google' and 'Bing'"; |
| $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 blacklist files"; |
| $l_file_list="Files list"; |
| /web/acc/admin/wl_filter.php |
|---|
| 79,7 → 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, Bing et Youtube."; |
| $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_file_list="Liste des fichiers"; |
| 110,7 → 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, Bind and Youtube"; |
| $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"; |
| $l_file_list="Files list"; |