Revision: 6698
http://ipcop.svn.sourceforge.net/ipcop/?rev=6698&view=rev
Author: dotzball
Date: 2012-07-09 14:38:20 +0000 (Mon, 09 Jul 2012)
Log Message:
-----------
Show Proxy-Log etc. also if proxy is only enabled on openvpn.
Modified Paths:
--------------
ipcop/trunk/src/libs/header.pl
ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
Modified: ipcop/trunk/src/libs/header.pl
===================================================================
--- ipcop/trunk/src/libs/header.pl 2012-07-09 06:28:49 UTC (rev 6697)
+++ ipcop/trunk/src/libs/header.pl 2012-07-09 14:38:20 UTC (rev 6698)
@@ -74,7 +74,7 @@
&General::readhash('/var/ipcop/ethernet/settings', \%ethsettings);
my %proxysettings = ();
&General::readhash('/var/ipcop/proxy/settings', \%proxysettings);
-
+
$menuconfig{'haveBlue'} = $ethsettings{'BLUE_COUNT'};
$menuconfig{'haveProxy'} = 0;
@@ -84,7 +84,9 @@
for (my $i = 1; $i <= $ethsettings{'BLUE_COUNT'}; $i++) {
$menuconfig{'haveProxy'}++ if ($proxysettings{"ENABLED_BLUE_${i}"} eq
'on');
}
+ $menuconfig{'haveProxy'}++ if ($proxysettings{"ENABLED_OVPN"} eq 'on');
+
&Menu::buildmenu(\%menuconfig);
%menu = %Menu::menu;
}
Modified: ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
===================================================================
--- ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-07-09 06:28:49 UTC
(rev 6697)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-07-09 14:38:20 UTC
(rev 6698)
@@ -23,6 +23,7 @@
/home/httpd/html/images/redirect-background.png
/sbin/mkinitramfs
/usr/lib/ipcop/general-functions.pl
+/usr/lib/ipcop/header.pl
/usr/lib/ipcop/library.sh
/usr/lib/ipcop/scheduler-lib.pl
/usr/lib/ipcop/vpn-functions.pl
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
