Change redirector children settings to proxy cgi

diff --git a/config/rootfiles/core/12/files b/config/rootfiles/core/12/files
index ff52c1481f7ecf8d8c5e91d6df508412b54c450a..bfafdec3ff46bce329c35d681d412407358d619c 100644 (file)
--- a/config/rootfiles/core/12/files
+++ b/config/rootfiles/core/12/files
@@ -131,3 +131,7 @@ etc/udev/rules.d/10-dvb.rules
 srv/web/ipfire/cgi-bin/services.cgi
 lib/modules/2.6.16.57-ipfire/kernel/drivers/usb/net/dm9601.ko
 lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/usb/net/dm9601.ko
+srv/web/ipfire/cgi-bin/proxy.cgi
+srv/web/ipfire/cgi-bin/urlfilter.cgi
+srv/web/ipfire/cgi-bin/updatexlrator.cgi
+var/ipfire/langs

diff --git a/config/rootfiles/core/12/update.sh b/config/rootfiles/core/12/update.sh
index 3423b62f94244eb36a684c7c3767b5bf3da9b0eb..3e4c5db7887485ca2fb39b0e52c5ddb0688b3aa8 100644 (file)
--- a/config/rootfiles/core/12/update.sh
+++ b/config/rootfiles/core/12/update.sh
@@ -2,4 +2,5 @@
 . /opt/pakfire/lib/functions.sh
 /usr/local/bin/backupctrl exclude >/dev/null 2>&1
 extract_files
+perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
 depmod -a

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index aa4092206bed52692ac2163154aa70d777c5bfe2..cd00b6de2766d14ed1194f33ad3fea2fb7c4e373 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -57,7 +57,6 @@
 * ccache-2.4
 * cdrtools-2.01
 * centerim-4.22.1
-* clamav-0.92.1
 * clamav-0.93
 * cmake-2.4.8
 * collectd-4.3.0
@@ -100,7 +99,6 @@
 * gd-2.0.33
 * gdbm-1.8.3
 * gettext-0.14.5
-* git-1.5.4.5
 * git-1.5.5
 * glib-2.9.6
 * glibc-2.3.6
@@ -174,7 +172,6 @@
 * lzo-2.02
 * m4-1.4.4
 * mISDNuser-1_1_5
-* make-3.80
 * make-3.81
 * man-db-2.4.3
 * man-pages-2.34

diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index bfb7585d55d53dd4b552b5202803ab5342dcef58..e349dfd1428c55a5fd3a5c494a24d3eadae361c9 100644 (file)
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -161,16 +161,6 @@ close(FILE);
 &General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
 &General::readhash("${General::swroot}/main/settings", \%mainsettings);
 
-$filtersettings{'CHILDREN'} = '5';
-if (-e "${General::swroot}/urlfilter/settings") {
-       &General::readhash("${General::swroot}/urlfilter/settings", \%filtersettings);
-}
-
-$xlratorsettings{'CHILDREN'} = '5';
-if (-e "${General::swroot}/updatexlrator/settings") {
-       &General::readhash("${General::swroot}/updatexlrator/settings", \%xlratorsettings);
-}
-
 &Header::showhttpheaders();
 
 $proxysettings{'ACTION'} = '';
@@ -263,6 +253,7 @@ $proxysettings{'IDENT_USER_ACL'} = 'positive';
 $proxysettings{'ENABLE_FILTER'} = 'off';
 $proxysettings{'ENABLE_UPDXLRATOR'} = 'off';
 $proxysettings{'ENABLE_CLAMAV'} = 'off';
+$proxysettings{'CHILDREN'} = '5';
 
 $ncsa_buttontext = $Lang::tr{'advproxy NCSA create user'};
 
@@ -377,6 +368,11 @@ if (($proxysettings{'ACTION'} eq $Lang::tr{'save'}) || ($proxysettings{'ACTION'}
        {
                $errormessage = $Lang::tr{'invalid maximum incoming size'};
                goto ERROR;
+       }
+               if (!($proxysettings{'CHILDREN'} =~ /^\d+$/) || ($proxysettings{'CHILDREN'} < 1))
+       {
+               $errormessage = $Lang::tr{'advproxy invalid num of children'};
+               goto ERROR;
        }
        if ($proxysettings{'ENABLE_BROWSER_CHECK'} eq 'on')
        {
@@ -936,20 +932,20 @@ print <<END
 </table>
 <hr size='1'>
 <table width='100%'>
+<tr><td class='base' width='50%' ><b>$Lang::tr{'advproxy redirector children'}</b><input type='text' name='CHILDREN' value='$proxysettings{'CHILDREN'}' size='5' /></td>
 END
 ;
 if ( -e "/usr/bin/squidclamav" ) {
-        print "<td class='base' width='33%'><b>$Lang::tr{'advproxy url filter'}</b> $Lang::tr{'advproxy enabled'}<input type='checkbox' name='ENABLE_FILTER' $checked{'ENABLE_FILTER'}{'on'} /></td>";
-        print "<td class='base' width='33%'><b>$Lang::tr{'advproxy update accelerator'}</b> $Lang::tr{'advproxy enabled'}<input type='checkbox' name='ENABLE_UPDXLRATOR' $checked{'ENABLE_UPDXLRATOR'}{'on'} /></td>";
-        print "<td class='base' width='33%'><b>$Lang::tr{'advproxy squidclamav'}</b> $Lang::tr{'advproxy enabled'}<input type='checkbox' name='ENABLE_CLAMAV' $checked{'ENABLE_CLAMAV'}{'on'} /></td>";
+        print "<td class='base' width='33%'><b>$Lang::tr{'advproxy squidclamav'}</b> $Lang::tr{'advproxy enabled'}<input type='checkbox' name='ENABLE_CLAMAV' $checked{'ENABLE_CLAMAV'}{'on'} /></td></tr>";
 }
 else
 {
- print "<td class='base' width='50%'><b>$Lang::tr{'advproxy url filter'}</b> $Lang::tr{'advproxy enabled'}<input type='checkbox' name='ENABLE_FILTER' $checked{'ENABLE_FILTER'}{'on'} /></td>";
- print "<td class='base' width='50%'><b>$Lang::tr{'advproxy update accelerator'}</b> $Lang::tr{'advproxy enabled'}<input type='checkbox' name='ENABLE_UPDXLRATOR' $checked{'ENABLE_UPDXLRATOR'}{'on'} /></td>";
+        print "<td class='base' width='33%'></td></tr>";
 }
 print <<END
 </tr>
+<tr><td class='base' width='50%'><b>$Lang::tr{'advproxy url filter'}</b> $Lang::tr{'advproxy enabled'}<input type='checkbox' name='ENABLE_FILTER' $checked{'ENABLE_FILTER'}{'on'} /></td>
+<td class='base' width='50%'><b>$Lang::tr{'advproxy update accelerator'}</b> $Lang::tr{'advproxy enabled'}<input type='checkbox' name='ENABLE_UPDXLRATOR' $checked{'ENABLE_UPDXLRATOR'}{'on'} /></td></tr>
 </table>
 <hr size='1'>
 <table width='100%'>
@@ -3688,12 +3684,7 @@ END
        if (($proxysettings{'ENABLE_FILTER'} eq 'on') || ($proxysettings{'ENABLE_UPDXLRATOR'} eq 'on') || ($proxysettings{'ENABLE_CLAMAV'} eq 'on'))
        {
                print FILE "url_rewrite_program /usr/sbin/redirect_wrapper\n";
-               if ($filtersettings{'CHILDREN'} > $xlratorsettings{'CHILDREN'})
-               {
-                       print FILE "url_rewrite_children $filtersettings{'CHILDREN'}\n\n";
-               } else {
-                       print FILE "url_rewrite_children $xlratorsettings{'CHILDREN'}\n\n";
-               }
+               print FILE "url_rewrite_children $proxysettings{'CHILDREN'}\n\n";
        }
        close FILE;
 }

diff --git a/html/cgi-bin/updatexlrator.cgi b/html/cgi-bin/updatexlrator.cgi
index 5c282f3bd287495b895838cb6160d1ccabb23e6b..261b32a30de97006914552b4455a459f122fb72e 100644 (file)
--- a/html/cgi-bin/updatexlrator.cgi
+++ b/html/cgi-bin/updatexlrator.cgi
@@ -75,7 +75,6 @@ my $chk_cron_mly = "${General::swroot}/updatexlrator/autocheck/cron.monthly";
 
 $xlratorsettings{'ACTION'} = '';
 $xlratorsettings{'ENABLE_LOG'} = 'off';
-$xlratorsettings{'CHILDREN'} = '5';
 $xlratorsettings{'PASSIVE_MODE'} = 'off';
 $xlratorsettings{'MAX_DISK_USAGE'} = '95';
 $xlratorsettings{'LOW_DOWNLOAD_PRIORITY'} = 'off';
@@ -148,11 +147,6 @@ if ($xlratorsettings{'ACTION'} eq $Lang::tr{'updxlrtr purge'})
 
 if ($xlratorsettings{'ACTION'} eq $Lang::tr{'save'})
 {
-       if (!($xlratorsettings{'CHILDREN'} =~ /^\d+$/) || ($xlratorsettings{'CHILDREN'} < 1))
-       {
-               $errormessage = $Lang::tr{'updxlrtr invalid num of children'};
-               goto ERROR;
-       }
        if (!($xlratorsettings{'MAX_DISK_USAGE'} =~ /^\d+$/) || ($xlratorsettings{'MAX_DISK_USAGE'} < 1) || ($xlratorsettings{'MAX_DISK_USAGE'} > 100))
        {
                $errormessage = $Lang::tr{'updxlrtr invalid disk usage'};
@@ -164,11 +158,6 @@ if ($xlratorsettings{'ACTION'} eq $Lang::tr{'save'})
 
 if ($xlratorsettings{'ACTION'} eq $Lang::tr{'updxlrtr save and restart'})
 {
-       if (!($xlratorsettings{'CHILDREN'} =~ /^\d+$/) || ($xlratorsettings{'CHILDREN'} < 1))
-       {
-               $errormessage = $Lang::tr{'updxlrtr invalid num of children'};
-               goto ERROR;
-       }
        if (!($xlratorsettings{'MAX_DISK_USAGE'} =~ /^\d+$/) || ($xlratorsettings{'MAX_DISK_USAGE'} < 1) || ($xlratorsettings{'MAX_DISK_USAGE'} > 100))
        {
                $errormessage = $Lang::tr{'updxlrtr invalid disk usage'};
@@ -255,8 +244,6 @@ print <<END
 <tr>
        <td class='base' width='25%'>$Lang::tr{'updxlrtr enable log'}:</td>
        <td class='base' width='20%'><input type='checkbox' name='ENABLE_LOG' $checked{'ENABLE_LOG'}{'on'} /></td>
-       <td class='base' width='25%'>$Lang::tr{'updxlrtr children'}:</td>
-       <td class='base' width='30%'><input type='text' name='CHILDREN' value='$xlratorsettings{'CHILDREN'}' size='5' /></td>
 </tr>
 <tr>
        <td class='base'>$Lang::tr{'updxlrtr passive mode'}:</td>

diff --git a/html/cgi-bin/urlfilter.cgi b/html/cgi-bin/urlfilter.cgi
index 20390372cb945e50aae18d5929af2012cdcd1567..23410835dc7c5e3aa391604136d56236200fa23a 100644 (file)
--- a/html/cgi-bin/urlfilter.cgi
+++ b/html/cgi-bin/urlfilter.cgi
@@ -144,7 +144,6 @@ $filtersettings{'ENABLE_SAFESEARCH'} = 'off';
 $filtersettings{'ENABLE_LOG'} = 'off';
 $filtersettings{'ENABLE_USERNAME_LOG'} = 'off';
 $filtersettings{'ENABLE_CATEGORY_LOG'} = 'off';
-$filtersettings{'CHILDREN'} = '5';
 $filtersettings{'ENABLE_AUTOUPDATE'} = 'off';
 
 $filtersettings{'ACTION'} = '';
@@ -182,12 +181,6 @@ if (($filtersettings{'ACTION'} eq $Lang::tr{'save'}) ||
        }
        if ($errormessage) { goto ERROR; }
 
-       if (!($filtersettings{'CHILDREN'} =~ /^\d+$/) || ($filtersettings{'CHILDREN'} < 1))
-       {
-               $errormessage = $Lang::tr{'urlfilter invalid num of children'};
-               goto ERROR;
-       }
-
        if ((!($filtersettings{'REDIRECT_PAGE'} eq '')) && (!($filtersettings{'REDIRECT_PAGE'} =~ /^https?:\/\//)))
        {
                $filtersettings{'REDIRECT_PAGE'} = "http://".$filtersettings{'REDIRECT_PAGE'};
@@ -1492,8 +1485,6 @@ print <<END
 <tr>
        <td class='base'>$Lang::tr{'urlfilter block ip'}:</td>
        <td><input type='checkbox' name='BLOCK_IP_ADDR' $checked{'BLOCK_IP_ADDR'}{'on'} /></td>
-       <td class='base'>$Lang::tr{'urlfilter children'}:</td>
-       <td><input type='text' name='CHILDREN' value='$filtersettings{'CHILDREN'}' size='5' /></td>
 </tr>
 <tr>
        <td class='base'>$Lang::tr{'urlfilter block all'}:</td>

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 67a92356abb81bda27acac268f89bc6e13274c32..afbae1e8dd66a1139c6845c76c3899205916ace6 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -26,6 +26,8 @@
 'Existing Files' => 'Dateien in der Datenbank',
 'HDD temperature' => 'HDD-Temperatur',
 'Level7 Protocol' => 'Level7-Protokoll',
+'advproxy redirector children' => 'Anzahl der Filterprozesse',
+'advproxy invalid num of children' => 'Ungültige Anzahl der Filter-Prozesse',
 'Level7 Rule' => 'Level7-Regel',
 'Local VPN IP' => 'Internes Netzwerk (GREEN)',
 'MTU' => 'MTU Size',
@@ -1633,7 +1635,6 @@
 'updxlrtr 6 months' => 'sechs Monaten',
 'updxlrtr all files' => 'alle Dateien ...',
 'updxlrtr cache dir' => 'Cache-Verzeichnis',
-'updxlrtr children' => 'Anzahl der Accelerator-Prozesse',
 'updxlrtr common settings' => 'Allgemeine Einstellungen',
 'updxlrtr condition download' => 'Beim Download',
 'updxlrtr condition nosource' => 'Keine Quelle',
@@ -1650,7 +1651,6 @@
 'updxlrtr filesize' => 'Größe',
 'updxlrtr full autosync' => 'Ersetze veraltete Dateien während der Prüfung',
 'updxlrtr invalid disk usage' => 'Ungülter Wert für max. Festplattennutzung',
-'updxlrtr invalid num of children' => 'Ungültige Anzahl der Accelerator-Prozesse',
 'updxlrtr last access' => 'Letzer Cache-Zugriff',
 'updxlrtr last checkup' => 'Letzte Quellenprüfung',
 'updxlrtr low download priority' => 'Geringere CPU-Priorität für Downloads',
@@ -1737,7 +1737,6 @@
 'urlfilter category data error' => 'Blacklist ist leer',
 'urlfilter category log' => 'Protokoll in Kategorien aufteilen',
 'urlfilter category name error' => 'Blacklist Kategoriename erforderlich',
-'urlfilter children' => 'Anzahl der Filterprozesse',
 'urlfilter client' => 'Client',
 'urlfilter configuration' => 'URL-Filter Konfiguration',
 'urlfilter constraint definition' => 'Definition',
@@ -1789,7 +1788,6 @@
 'urlfilter invalid content' => 'Datei ist keine squidGuard-kompatible Blacklist',
 'urlfilter invalid import file' => 'Datei ist keine gültige URL-Filter Blacklist-Editor Datei',
 'urlfilter invalid ip or mask error' => 'Ungültige IP-Adresse oder Subnetzmaske',
-'urlfilter invalid num of children' => 'Ungültige Anzahl Filterprozesse',
 'urlfilter invalid restore file' => 'Datei ist keine gültige URL-Filter Sicherungsdatei',
 'urlfilter invalid user error' => 'Ungültiger Benutzername',
 'urlfilter load blacklist' => 'Blacklist laden',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 0ef071cc90bfae2e6e674a7cbe731609b13c38da..b99b0c3e141661b0f8c7467bab505dd14289e56b 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -28,6 +28,8 @@
 'Level7 Protocol' => 'Level7-Protocol',
 'Level7 Rule' => 'Level7-Rule',
 'Local VPN IP' => 'Internal Network (GREEN):',
+'advproxy redirector children' => 'Number of filter processes',
+'advproxy invalid num of children' => 'Invalid number of filter processes',
 'MTU' => 'MTU Size:',
 'Number of IPs for the pie chart' => 'Number of IPs for the pie chart',
 'Number of Ports for the pie chart' => 'Number of ports for the pie chart',
@@ -1665,7 +1667,6 @@
 'updxlrtr 6 months' => 'six  months',
 'updxlrtr all files' => 'all files ...',
 'updxlrtr cache dir' => 'Cache directory',
-'updxlrtr children' => 'Number of accelerator processes',
 'updxlrtr common settings' => 'Common settings',
 'updxlrtr condition download' => 'Downloading',
 'updxlrtr condition nosource' => 'No source',
@@ -1682,7 +1683,6 @@
 'updxlrtr filesize' => 'Size',
 'updxlrtr full autosync' => 'Replace outdated files during checkup',
 'updxlrtr invalid disk usage' => 'Invalid value for max. disk usage',
-'updxlrtr invalid num of children' => 'Invalid number of accelerator processes',
 'updxlrtr last access' => 'Last cache access',
 'updxlrtr last checkup' => 'Last source checkup',
 'updxlrtr low download priority' => 'Lower CPU priority for downloads',
@@ -1770,7 +1770,6 @@
 'urlfilter category data error' => 'Blacklist is empty',
 'urlfilter category log' => 'Split log by categories',
 'urlfilter category name error' => 'Blacklist category name required',
-'urlfilter children' => 'Number of filter processes',
 'urlfilter client' => 'Client',
 'urlfilter configuration' => 'URL filter configuration',
 'urlfilter constraint definition' => 'Definition',
@@ -1822,7 +1821,6 @@
 'urlfilter invalid content' => 'File is not a squidGuard compatible blacklist',
 'urlfilter invalid import file' => 'File is not a valid URL filter blacklist editor file',
 'urlfilter invalid ip or mask error' => 'Invalid IP address or network mask',
-'urlfilter invalid num of children' => 'Invalid number of filter processes',
 'urlfilter invalid restore file' => 'File is not a valid URL filter backup file',
 'urlfilter invalid user error' => 'Invalid username',
 'urlfilter load blacklist' => 'Load blacklist',