[Ipcop-svn] SF.net SVN: ipcop:[7257] ipcop/trunk

[owes]

Revision: 7257
          http://sourceforge.net/p/ipcop/svn/7257
Author:   owes
Date:     2014-02-28 09:18:56 +0000 (Fri, 28 Feb 2014)
Log Message:
-----------
Proxy was not restarted after modifying URL filter timeconstraints.

Modified Paths:
--------------
    ipcop/trunk/html/cgi-bin/urlfilter.cgi
    ipcop/trunk/updates/2.1.2/ROOTFILES.i486-2.1.2
    ipcop/trunk/updates/2.1.2/information.xml

Modified: ipcop/trunk/html/cgi-bin/urlfilter.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/urlfilter.cgi      2014-02-27 13:02:59 UTC (rev 
7256)
+++ ipcop/trunk/html/cgi-bin/urlfilter.cgi      2014-02-28 09:18:56 UTC (rev 
7257)
@@ -459,8 +459,9 @@
         &resetTcSettings();
 
         $tcsettings{'CHANGED'} = 'yes';
+        $tcsettings{'MODE'}    = 'TIMECONSTRAINT';
         $tcsettings{'TCMODE'}  = 'on';
-        $changed                = 'yes';
+        $changed               = 'yes';
     }
     else {
         if ($tcsettings{'EDITING'} ne 'no') {
@@ -519,6 +520,9 @@
 }
 
 if (($tcsettings{'MODE'} eq 'TIMECONSTRAINT') && ($tcsettings{'ACTION'} eq 
$Lang::tr{'restart urlfilter'})) {
+    if ($filtersettings{'ENABLED'} ne 'on') {
+        $errormessage .= "$Lang::tr{'urlfilter not enabled'}<br />";
+    }
     if ($proxysettings{'ENABLE_REDIRECTOR'} ne 'on') {
         $errormessage .= "$Lang::tr{'redirectors are disabled'}<br />";
     }
@@ -720,6 +724,9 @@
 }
 
 if (($uqsettings{'MODE'} eq 'USERQUOTA') && ($uqsettings{'ACTION'} eq 
$Lang::tr{'restart urlfilter'})) {
+    if ($filtersettings{'ENABLED'} ne 'on') {
+        $errormessage .= "$Lang::tr{'urlfilter not enabled'}<br />";
+    }
     if (!($proxysettings{'ENABLE_REDIRECTOR'} eq 'on')) {
         $errormessage .= "$Lang::tr{'redirectors are disabled'}<br />";
     }
@@ -1778,7 +1785,6 @@
     print <<END
        </select>
        <td> - </td>
-       </td>
        <td class='base'>
        <select name='TO_HOUR'>
 END
@@ -1914,8 +1920,6 @@
        </tr>
 </table>
 
-<p>
-
 <table width='100%'>
 <tr>
     <td class='comment2buttons'>

Modified: ipcop/trunk/updates/2.1.2/ROOTFILES.i486-2.1.2
===================================================================
--- ipcop/trunk/updates/2.1.2/ROOTFILES.i486-2.1.2      2014-02-27 13:02:59 UTC 
(rev 7256)
+++ ipcop/trunk/updates/2.1.2/ROOTFILES.i486-2.1.2      2014-02-28 09:18:56 UTC 
(rev 7257)
@@ -9,6 +9,7 @@
 /home/httpd/cgi-bin/servicegrps.cgi
 /home/httpd/cgi-bin/services.cgi
 /home/httpd/cgi-bin/trafficadm.cgi
+/home/httpd/cgi-bin/urlfilter.cgi
 /home/httpd/cgi-bin/wireless.cgi
 /usr/lib/ipcop/ddns-lib.pl
 /usr/local/bin/dhcpcd.sh

Modified: ipcop/trunk/updates/2.1.2/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.2/information.xml   2014-02-27 13:02:59 UTC (rev 
7256)
+++ ipcop/trunk/updates/2.1.2/information.xml   2014-02-28 09:18:56 UTC (rev 
7257)
@@ -4,7 +4,7 @@
         <releasedate>2014-mm-dd</releasedate>
         <size>0</size>
         <isoimages>no</isoimages>
-        <description>Fix transparent web proxy.&lt;br /&gt;
+        <description>Fix transparent web proxy. Fix modifying URL filter 
timeconstraints.&lt;br /&gt;
             Language updates.&lt;br /&gt;
             Upgrade acpid to 2.0.21, dhcpcd to 6.2.1, grep to 2.18,
             iptables to 1.4.21, iw to 3.14, libcap to 2.24, libpcap to 1.5.3,

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
Flow-based real-time traffic analytics software. Cisco certified tool.
Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer
Customize your own dashboards, set traffic alerts and generate reports.
Network behavioral analysis & security monitoring. All-in-one tool.
http://pubads.g.doubleclick.net/gampad/clk?id=126839071&iu=/4140/ostg.clktrk
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn