urlfilter: Make redirect.cgi template selectable.

diff --git a/doc/language_issues.es b/doc/language_issues.es
index fe4635527eca7db4f9f35e0197c55afb5e3238b6..88666b6181e63ae97f46916004c70cf21c1be201 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -672,6 +672,7 @@ WARNING: untranslated string: tor traffic limit soft
 WARNING: untranslated string: tor traffic read written
 WARNING: untranslated string: tor use exit nodes
 WARNING: untranslated string: uptime load average
+WARNING: untranslated string: urlfilter redirect template
 WARNING: untranslated string: visit us at
 WARNING: untranslated string: vpn keyexchange
 WARNING: untranslated string: wlan client

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index d5a10574f982fa987f1e102328523b8635bfd053..6c963aea4ce6fe0ab561fa08adbb0ef85238eff2 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -660,6 +660,7 @@ WARNING: untranslated string: upload new ruleset
 WARNING: untranslated string: uptime load average
 WARNING: untranslated string: urlfilter file ext block
 WARNING: untranslated string: urlfilter mode block
+WARNING: untranslated string: urlfilter redirect template
 WARNING: untranslated string: visit us at
 WARNING: untranslated string: vpn keyexchange
 WARNING: untranslated string: wlan client

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index c8249ff7aa506dfca8b6ff0e038fe83a407fa4b3..899940424145dbcbd220c7ace0acd780b7923ff1 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -574,6 +574,7 @@ WARNING: untranslated string: tor traffic limit soft
 WARNING: untranslated string: tor traffic read written
 WARNING: untranslated string: tor use exit nodes
 WARNING: untranslated string: uptime load average
+WARNING: untranslated string: urlfilter redirect template
 WARNING: untranslated string: wlan client
 WARNING: untranslated string: wlan client advanced settings
 WARNING: untranslated string: wlan client and

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index fe4635527eca7db4f9f35e0197c55afb5e3238b6..88666b6181e63ae97f46916004c70cf21c1be201 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -672,6 +672,7 @@ WARNING: untranslated string: tor traffic limit soft
 WARNING: untranslated string: tor traffic read written
 WARNING: untranslated string: tor use exit nodes
 WARNING: untranslated string: uptime load average
+WARNING: untranslated string: urlfilter redirect template
 WARNING: untranslated string: visit us at
 WARNING: untranslated string: vpn keyexchange
 WARNING: untranslated string: wlan client

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index ef7b31c2e37ff230fc5f900c0f411a34d0936432..768bc1294828cb78646d61e15c62680466a5dd5f 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -637,6 +637,7 @@ WARNING: untranslated string: tor traffic limit soft
 WARNING: untranslated string: tor traffic read written
 WARNING: untranslated string: tor use exit nodes
 WARNING: untranslated string: uptime load average
+WARNING: untranslated string: urlfilter redirect template
 WARNING: untranslated string: visit us at
 WARNING: untranslated string: vpn keyexchange
 WARNING: untranslated string: wlan client

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 1821fb45b8a55cd13f163370e87b895a80764735..af1af7b8cbb34ce38e54b3c7b774242ca26bb46e 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -569,6 +569,7 @@ WARNING: untranslated string: tor traffic limit hard
 WARNING: untranslated string: tor traffic limit soft
 WARNING: untranslated string: tor traffic read written
 WARNING: untranslated string: tor use exit nodes
+WARNING: untranslated string: urlfilter redirect template
 WARNING: untranslated string: wlan client
 WARNING: untranslated string: wlan client advanced settings
 WARNING: untranslated string: wlan client and

diff --git a/doc/language_missings b/doc/language_missings
index 865a42a56aeb9d5248aabbf86dd5987e7d2ed855..1550f479e68e8ec2a2a35a9a959f632f0a968755 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -173,6 +173,7 @@
 < uptime load average
 < urlfilter file ext block
 < urlfilter mode block
+< urlfilter redirect template
 < visit us at
 < vpn keyexchange
 < wlanap access point
@@ -407,6 +408,7 @@
 < updxlrtr standard view
 < uptime
 < uptime load average
+< urlfilter redirect template
 < visit us at
 < vpn keyexchange
 < wlanap country
@@ -596,6 +598,7 @@
 < updxlrtr standard view
 < uptime
 < uptime load average
+< urlfilter redirect template
 < visit us at
 < vpn keyexchange
 < wlanap country
@@ -790,6 +793,7 @@
 < updxlrtr standard view
 < uptime
 < uptime load average
+< urlfilter redirect template
 < visit us at
 < vpn keyexchange
 < week-graph

diff --git a/html/cgi-bin/urlfilter.cgi b/html/cgi-bin/urlfilter.cgi
index 1bfc0392cd6c788cf5115f48d99538c9dded0170..1b40a3cf036171f84ad533de036af3cd1a2e54ff 100644 (file)
--- a/html/cgi-bin/urlfilter.cgi
+++ b/html/cgi-bin/urlfilter.cgi
@@ -59,6 +59,7 @@ my $tcfile = "${General::swroot}/urlfilter/timeconst";
 my $uqfile = "${General::swroot}/urlfilter/userquota";
 my $dbdir = "${General::swroot}/urlfilter/blacklists";
 my $editdir = "${General::swroot}/urlfilter/editor";
+my $templatedir = "/srv/web/ipfire/html/redirect-templates";
 my $repository = "/var/urlrepo";
 my $hintcolour = '#FFFFCC';
 
@@ -142,6 +143,7 @@ $filtersettings{'ENABLE_LOG'} = 'off';
 $filtersettings{'ENABLE_USERNAME_LOG'} = 'off';
 $filtersettings{'ENABLE_CATEGORY_LOG'} = 'off';
 $filtersettings{'ENABLE_AUTOUPDATE'} = 'off';
+$filtersettings{'REDIRECT_TEMPLATE'} = 'legacy';
 
 $filtersettings{'ACTION'} = '';
 $filtersettings{'VALID'} = '';
@@ -1074,6 +1076,8 @@ foreach $category (@filtergroups) {
        $checked{$category}{$filtersettings{$category}} = "checked='checked'";
 }
 
+$selected{'REDIRECT_TEMPLATE'}{$filtersettings{'REDIRECT_TEMPLATE'}} = "selected='selected'";
+
 $selected{'DEFINITION'}{$tcsettings{'DEFINITION'}} = "selected='selected'";
 $selected{'FROM_HOUR'}{$tcsettings{'FROM_HOUR'}} = "selected='selected'";
 $selected{'FROM_MINUTE'}{$tcsettings{'FROM_MINUTE'}} = "selected='selected'";
@@ -1415,6 +1419,24 @@ print <<END
 <tr>
         <td colspan='4'><b>$Lang::tr{'urlfilter block settings'}</b></td>
 </tr>
+<tr>
+       <td width='25%' class='base'>$Lang::tr{'urlfilter redirect template'}</td>
+       <td width='75%' colspan='2'>
+               <select name='REDIRECT_TEMPLATE'>
+END
+;
+
+       foreach (<$templatedir/*>) {
+               if ((-d "$_") && (-e "$_/template.html")) {
+                       my $template = substr($_,rindex($_,"/")+1);
+                       print "<option value='$template' $selected{'REDIRECT_TEMPLATE'}{$template}>$template</option>\n";
+               }
+       }
+
+print <<END
+               </select>
+       </td>
+</tr>
 <tr>
        <td width='25%' class='base'>$Lang::tr{'urlfilter show category'}:</td>
        <td width='12%'><input type='checkbox' name='SHOW_CATEGORY' $checked{'SHOW_CATEGORY'}{'on'} /></td>

diff --git a/html/html/redirect.cgi b/html/html/redirect.cgi
index 17ea641e4eec801b74410ee389ffb0f79ba97460..4f9d2278e2ba5e3ce99dd28df1848b683c766b7d 100644 (file)
--- a/html/html/redirect.cgi
+++ b/html/html/redirect.cgi
@@ -33,7 +33,7 @@ my %filtersettings;
 &readhash("$swroot/urlfilter/settings", \%filtersettings);
 
 # Read the template file.
-my $template = $filtersettings{'ERROR_TEMPLATE'};
+my $template = $filtersettings{'REDIRECT_TEMPLATE'};
 if (($template eq '') || (! -e "$templateroot/$template")) {
        $template = "legacy";
 }

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index b55179f6d64d62a88f80f107e4f22f223435ffe8..4e005e1a88de39d1dca56d00a8180b191d44a2d0 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -2118,6 +2118,7 @@
 'urlfilter quota restart message' => 'Hinweis: Beim Neustart des URL-Filters werden die Zähler für alle Benutzer zurückgesetzt',
 'urlfilter quota time error' => 'Ungültiger Wert für Zeitkontingent',
 'urlfilter quota user error' => 'Mindestens ein Benutzername erforderlich',
+'urlfilter redirect template' => 'Sperrseitenvorlage',
 'urlfilter redirectpage' => 'Leite zu dieser URL um',
 'urlfilter remove file' => 'Datei aus der Ablage entfernen',
 'urlfilter renewal' => 'Erneuerung',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 43bd03d6de22c067b2e62e066360bb27fd77e01c..ba80985a8ef58c91aea30a1282d5db32e5e54f1a 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -2156,6 +2156,7 @@
 'urlfilter quota restart message' => 'Note: The counters will be reset for all users when restarting the URL filter',
 'urlfilter quota time error' => 'Invalid value for time quota',
 'urlfilter quota user error' => 'At least one username is required',
+'urlfilter redirect template' => 'Redirect page template',
 'urlfilter redirectpage' => 'Redirect to this URL',
 'urlfilter remove file' => 'Remove file from repository',
 'urlfilter renewal' => 'Renewal',