Revision: 6354
http://ipcop.svn.sourceforge.net/ipcop/?rev=6354&view=rev
Author: dotzball
Date: 2012-02-17 13:03:11 +0000 (Fri, 17 Feb 2012)
Log Message:
-----------
Show URLfilter in menu.
Modified Paths:
--------------
ipcop/trunk/html/cgi-bin/ddns.cgi
ipcop/trunk/html/cgi-bin/dhcp.cgi
ipcop/trunk/html/cgi-bin/hosts.cgi
ipcop/trunk/html/cgi-bin/logurlfilter.cgi
ipcop/trunk/html/cgi-bin/time.cgi
ipcop/trunk/html/cgi-bin/urlfilter.cgi
Modified: ipcop/trunk/html/cgi-bin/ddns.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/ddns.cgi 2012-02-17 13:01:03 UTC (rev 6353)
+++ ipcop/trunk/html/cgi-bin/ddns.cgi 2012-02-17 13:03:11 UTC (rev 6354)
@@ -24,7 +24,7 @@
#
# Add entry in menu
-# MENUENTRY services 030 "dynamic dns" "dynamic dns client"
+# MENUENTRY services 040 "dynamic dns" "dynamic dns client"
#
# Make sure translation exists $Lang::tr{'dynamic dns client'}
Modified: ipcop/trunk/html/cgi-bin/dhcp.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/dhcp.cgi 2012-02-17 13:01:03 UTC (rev 6353)
+++ ipcop/trunk/html/cgi-bin/dhcp.cgi 2012-02-17 13:03:11 UTC (rev 6354)
@@ -24,7 +24,7 @@
#
# Add entry in menu
-# MENUENTRY services 020 "dhcp server" "dhcp configuration"
+# MENUENTRY services 030 "dhcp server" "dhcp configuration"
use strict;
use NetAddr::IP;
@@ -85,7 +85,7 @@
$dhcpsettings{"WINS2_${ic}"} = '';
$dhcpsettings{"NTP1_${ic}"} = '';
$dhcpsettings{"NTP2_${ic}"} = '';
-
+
$netaddressip{"${ic}"} =
NetAddr::IP->new($netsettings{"${ic}_ADDRESS"}, $netsettings{"${ic}_NETMASK"});
}
}
@@ -147,7 +147,7 @@
# Limit to 1 interface for now
for ($counter = 1; $counter <= $netsettings{"${interface}_COUNT"};
$counter++) {
$ic = "${interface}_${counter}";
-
+
if ($dhcpsettings{"ENABLED_${ic}"} eq 'on') {
my $ipstart = 0;
my $ipend = 0;
@@ -162,7 +162,7 @@
$errormessage = "DHCP on ${interface}: " .
$Lang::tr{'invalid end address'};
goto ERROR_SAVE_MAIN;
}
-
+
$ipstart =
NetAddr::IP->new($dhcpsettings{"START_ADDR_${ic}"});
unless ($netaddressip{"${ic}"}->contains($ipstart)) {
$errormessage = "DHCP on ${interface}: " .
$Lang::tr{'invalid start address'};
@@ -191,7 +191,7 @@
if ( $ipend < $ipstart ) {
($dhcpsettings{"START_ADDR_${ic}"},$dhcpsettings{"END_ADDR_${ic}"}) =
($dhcpsettings{"END_ADDR_${ic}"},$dhcpsettings{"START_ADDR_${ic}"});
-
+
($ipstart,$ipend) = ($ipend,$ipstart);
}
@@ -205,7 +205,7 @@
}
# Verify DNS1 and DNS2
- # DNS1 is required
+ # DNS1 is required
if (!&General::validip($dhcpsettings{"DNS1_${ic}"})) {
$errormessage = "DHCP on ${interface}: " .
$Lang::tr{'invalid primary dns'};
goto ERROR_SAVE_MAIN;
@@ -889,7 +889,7 @@
$savesettings{"WINS2_${ic}"} =
$dhcpsettings{"WINS2_${ic}"};
$savesettings{"NTP1_${ic}"} =
$dhcpsettings{"NTP1_${ic}"};
$savesettings{"NTP2_${ic}"} =
$dhcpsettings{"NTP2_${ic}"};
-
+
if ($savesettings{"ENABLED_${ic}"} eq 'on') {
$leasemax += $netaddressip{"${ic}"}->num();
}
@@ -908,8 +908,8 @@
print FILE <<END
# Do not modify '/var/ipcop/dhcp/dnsmasq.conf' directly since any changes
# you make will be overwritten whenever you resave dhcp settings using the
-# web interface!
-# Instead modify the file '/var/ipcop/dhcp/dnsmasq.local' and then restart
+# web interface!
+# Instead modify the file '/var/ipcop/dhcp/dnsmasq.local' and then restart
# the DHCP server using the web interface or restartdhcp.
# Changes made to the 'local' file will then propagate to the DHCP server.
Modified: ipcop/trunk/html/cgi-bin/hosts.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/hosts.cgi 2012-02-17 13:01:03 UTC (rev 6353)
+++ ipcop/trunk/html/cgi-bin/hosts.cgi 2012-02-17 13:03:11 UTC (rev 6354)
@@ -13,8 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with IPCop; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with IPCop. If not, see <http://www.gnu.org/licenses/>.
#
# (c) Alan Hourihane <al...@fairlite.demon.co.uk>
#
@@ -24,7 +23,7 @@
# use dhcp.cgi model to rewrite this code
# Add entry in menu
-# MENUENTRY services 040 "edit hosts" "host configuration"
+# MENUENTRY services 050 "edit hosts" "host configuration"
#
# Make sure translation exists $Lang::tr{'edit hosts'} $Lang::tr{'host
configuration'}
Modified: ipcop/trunk/html/cgi-bin/logurlfilter.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/logurlfilter.cgi 2012-02-17 13:01:03 UTC (rev
6353)
+++ ipcop/trunk/html/cgi-bin/logurlfilter.cgi 2012-02-17 13:03:11 UTC (rev
6354)
@@ -22,7 +22,7 @@
#
# Add entry in menu
-# MENU ENTRY logs 050 "urlfilter logs" "urlfilter log viewer"
+# MENUENTRY logs 050 "urlfilter logs" "urlfilter log viewer" haveProxy
#
# Make sure translation exists $Lang::tr{'urlfilter logs'}
Modified: ipcop/trunk/html/cgi-bin/time.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/time.cgi 2012-02-17 13:01:03 UTC (rev 6353)
+++ ipcop/trunk/html/cgi-bin/time.cgi 2012-02-17 13:03:11 UTC (rev 6354)
@@ -1,11 +1,20 @@
#!/usr/bin/perl
#
-# IPCop CGIs
+# This file is part of the IPCop Firewall.
#
-# This file is part of the IPCop Project
+# IPCop is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
-# This code is distributed under the terms of the GPL
+# IPCop is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
+# You should have received a copy of the GNU General Public License
+# along with IPCop. If not, see <http://www.gnu.org/licenses/>.
+#
# (c) Darren Critchley June 2003 - added real time clock setting, etc
# (c) The IPCop Team January 2008 - redesigned for ntp-4.2.4
#
@@ -13,7 +22,7 @@
#
# Add entry in menu
-# MENUENTRY services 050 "time server" "time server"
+# MENUENTRY services 060 "time server" "time server"
#
# Make sure translation exists $Lang::tr{'time server'}
@@ -104,7 +113,7 @@
}
if ($timesettings{'ACTION'} eq $Lang::tr{'save'}) {
- if ($timesettings{'ENABLED_NTP'} eq "on") {
+ if ($timesettings{'ENABLED_NTP'} eq "on") {
# only do validation if NTP daemon is enabled
if (!($timesettings{'NTP_ADDR_1'})) {
@@ -140,10 +149,10 @@
ERROR:
if ($errormessage) {
- $timesettings{'NTP_VALID'} = 'no';
+ $timesettings{'NTP_VALID'} = 'no';
}
else {
- $timesettings{'NTP_VALID'} = 'yes';
+ $timesettings{'NTP_VALID'} = 'yes';
}
&General::writehash('/var/ipcop/time/settings', \%timesettings);
Modified: ipcop/trunk/html/cgi-bin/urlfilter.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/urlfilter.cgi 2012-02-17 13:01:03 UTC (rev
6353)
+++ ipcop/trunk/html/cgi-bin/urlfilter.cgi 2012-02-17 13:03:11 UTC (rev
6354)
@@ -22,7 +22,7 @@
#
# Add entry in menu (not yet ;-))
-# MENU ENTRY services 020 "url filter" "url filter configuration"
+# MENUENTRY services 020 "url filter" "url filter configuration"
#
# Make sure translation exists $Lang::tr{'url filter'}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Virtualization & Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
