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

[owes]

Revision: 5967
          http://ipcop.svn.sourceforge.net/ipcop/?rev=5967&view=rev
Author:   owes
Date:     2011-10-19 15:08:04 +0000 (Wed, 19 Oct 2011)
Log Message:
-----------
'classroom extension' to proxy no longer optional, can be enabled if required.

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

Modified: ipcop/trunk/html/cgi-bin/proxy.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/proxy.cgi  2011-10-19 12:13:40 UTC (rev 5966)
+++ ipcop/trunk/html/cgi-bin/proxy.cgi  2011-10-19 15:08:04 UTC (rev 5967)
@@ -151,7 +151,6 @@
 my $mimetypes = "/var/ipcop/proxy/mimetypes";
 my $throttled_urls = "/var/ipcop/proxy/throttle";
 
-my $cre_enabled = "/var/ipcop/proxy/cre/enable";
 my $cre_groups  = "/var/ipcop/proxy/cre/classrooms";
 my $cre_svhosts = "/var/ipcop/proxy/cre/supervisors";
 
@@ -1365,10 +1364,10 @@
 END
 ;
 # -------------------------------------------------------------------
-#  CRE GUI - optional
+#  CRE GUI
 # -------------------------------------------------------------------
 
-if (-e $cre_enabled) { print <<END
+print <<END
 <table width='100%'>
 
 <tr>
@@ -1388,21 +1387,8 @@
     <td colspan='2' class='base'>$Lang::tr{'cre supervisors'}:&nbsp;<img 
src='/blob.gif' alt='*' /></td>
 </tr>
 <tr>
-    <td colspan='2'><textarea name='CRE_GROUPS' cols='32' rows='6' wrap='off'>
-END
-;
-
-    print $proxysettings{'CRE_GROUPS'};
-
-print <<END
-</textarea></td>
-    <td colspan='2'><textarea name='CRE_SVHOSTS' cols='32' rows='6' wrap='off'>
-END
-;
-    print $proxysettings{'CRE_SVHOSTS'};
-
-print <<END
-</textarea></td>
+    <td colspan='2'><textarea name='CRE_GROUPS' cols='32' rows='6' 
wrap='off'>$proxysettings{'CRE_GROUPS'}</textarea></td>
+    <td colspan='2'><textarea name='CRE_SVHOSTS' cols='32' rows='6' 
wrap='off'>$proxysettings{'CRE_SVHOSTS'}</textarea></td>
 </tr>
 
 </table>
@@ -1410,14 +1396,6 @@
 <hr size='1'/>
 END
 ;
-} else {
-    print <<END
-    <input type='hidden' name='SUPERVISOR_PASSWORD' 
value='$proxysettings{'SUPERVISOR_PASSWORD'}' />
-    <input type='hidden' name='CRE_GROUPS'          
value='$proxysettings{'CRE_GROUPS'}' />
-    <input type='hidden' name='CRE_SVHOSTS'         
value='$proxysettings{'CRE_SVHOSTS'}' />
-END
-;
-}
 
 # -------------------------------------------------------------------
 

Modified: ipcop/trunk/updates/2.0.1/ROOTFILES.i486-2.0.1
===================================================================
--- ipcop/trunk/updates/2.0.1/ROOTFILES.i486-2.0.1      2011-10-19 12:13:40 UTC 
(rev 5966)
+++ ipcop/trunk/updates/2.0.1/ROOTFILES.i486-2.0.1      2011-10-19 15:08:04 UTC 
(rev 5967)
@@ -6,6 +6,7 @@
 /home/httpd/cgi-bin/email.cgi
 /home/httpd/cgi-bin/index.cgi
 /home/httpd/cgi-bin/logsummary.cgi
+/home/httpd/cgi-bin/proxy.cgi
 /home/httpd/cgi-bin/status.cgi
 /home/httpd/cgi-bin/urlfilter.cgi
 /home/httpd/html/images/led-green.gif

Modified: ipcop/trunk/updates/2.0.1/information.xml
===================================================================
--- ipcop/trunk/updates/2.0.1/information.xml   2011-10-19 12:13:40 UTC (rev 
5966)
+++ ipcop/trunk/updates/2.0.1/information.xml   2011-10-19 15:08:04 UTC (rev 
5967)
@@ -5,6 +5,7 @@
         <size>0</size>
         <description>Language updates.&lt;br /&gt;
             Add firewall logging to logsummary.&lt;br /&gt;
+            Add 'classroom extension' to proxy.&lt;br /&gt;
             Upgrade acpid to 2.0.12, bind to 9.8.1, coreutils-8.14, dnsmasq to 
2.59,
             iptables to 1.4.12.1, iw to 3.1, krb5 to 1.9.1, libpng to 1.5.5, 
ntp to 4.2.6p4,
             openssh to 5.9, openssl to 1.0.0e, openswan to 2.6.36,

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


------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure contains a
definitive record of customers, application performance, security
threats, fraudulent activity and more. Splunk takes this data and makes
sense of it. Business sense. IT sense. Common sense.
http://p.sf.net/sfu/splunk-d2d-oct
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn