[prev in list] [next in list] [prev in thread] [next in thread]
List: ipcop-svn
Subject: [Ipcop-svn] SF.net SVN: ipcop:[5634] ipcop/trunk
From: owes () users ! sourceforge ! net
Date: 2011-04-21 20:52:38
Message-ID: E1QD0re-00005g-3F () sfp-svn-2 ! v30 ! ch3 ! sourceforge ! com
[Download RAW message or body]
Revision: 5634
http://ipcop.svn.sourceforge.net/ipcop/?rev=5634&view=rev
Author: owes
Date: 2011-04-21 20:52:37 +0000 (Thu, 21 Apr 2011)
Log Message:
-----------
Use shortmonths and longmonths from general-functions.pl
Modified Paths:
--------------
ipcop/trunk/html/cgi-bin/logfirewall.cgi
ipcop/trunk/html/cgi-bin/logproxy.cgi
ipcop/trunk/html/cgi-bin/logsummary.cgi
ipcop/trunk/html/cgi-bin/logsystem.cgi
ipcop/trunk/updates/1.9.20/ROOTFILES.i486-1.9.20
Modified: ipcop/trunk/html/cgi-bin/logfirewall.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/logfirewall.cgi 2011-04-20 20:54:59 UTC (rev 5633)
+++ ipcop/trunk/html/cgi-bin/logfirewall.cgi 2011-04-21 20:52:37 UTC (rev 5634)
@@ -1,10 +1,14 @@
#!/usr/bin/perl
#
-# SmoothWall CGIs
-#
-# This code is distributed under the terms of the GPL
-#
+# This file is part of the IPCop Firewall.
+#
+# 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.
+#
# (c) The SmoothWall Team
+# Copyright (c) 2001-2011 The IPCop Team
#
# $Id$
#
@@ -33,13 +37,6 @@
my %logsettings = ();
my $errormessage = '';
-my @shortmonths = ('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', \
'Oct', 'Nov', 'Dec');
-my @longmonths = (
- $Lang::tr{'january'}, $Lang::tr{'february'}, $Lang::tr{'march'}, \
$Lang::tr{'april'},
- $Lang::tr{'may'}, $Lang::tr{'june'}, $Lang::tr{'july'}, \
$Lang::tr{'august'},
- $Lang::tr{'september'}, $Lang::tr{'october'}, $Lang::tr{'november'}, \
$Lang::tr{'december'}
-);
-
my @now = localtime();
my $dow = $now[6];
my $doy = $now[7];
@@ -53,7 +50,7 @@
&General::getcgihash(\%cgiparams);
$logsettings{'LOGVIEW_REVERSE'} = 'off';
$logsettings{'LOGVIEW_VIEWSIZE'} = 150;
-&General::readhash("${General::swroot}/logging/settings", \%logsettings);
+&General::readhash('/var/ipcop/logging/settings', \%logsettings);
my $start = ($logsettings{'LOGVIEW_REVERSE'} eq 'on') ? 0x7FFFF000 : 0; #index of \
firts line number to display
@@ -122,7 +119,7 @@
# Calculate time. If future date, calculate for past year !!!
if ( ($cgiparams{'MONTH'} eq $now[4]) && ($cgiparams{'DAY'} > $now[3])
|| ($cgiparams{'MONTH'} > $now[4])) {
- $year--;
+ $year--;
}
$xday = POSIX::mktime(0, 0, 0, $cgiparams{'DAY'}, $cgiparams{'MONTH'}, $year - \
1900); $date = "$year-$month-$date";
@@ -137,7 +134,7 @@
$gzindex = int(($sunday - $xday) / 604800);
}
-my $monthstr = $shortmonths[ $cgiparams{'MONTH'} ];
+my $monthstr = $General::shortMonths[ $cgiparams{'MONTH'} ];
my $daystr = $cgiparams{'DAY'} == 0 ? '..' : $cgiparams{'DAY'} <= 9 ? " \
$cgiparams{'DAY'}" : "$cgiparams{'DAY'}";
my $lines = 0;
@@ -251,7 +248,7 @@
if ($month == $cgiparams{'MONTH'}) {
print "selected='selected' ";
}
- print "value='$month'>$longmonths[$month]</option>\n";
+ print "value='$month'>$Lang::tr{$General::longMonths[$month]}</option>\n";
}
print <<END
</select>
Modified: ipcop/trunk/html/cgi-bin/logproxy.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/logproxy.cgi 2011-04-20 20:54:59 UTC (rev 5633)
+++ ipcop/trunk/html/cgi-bin/logproxy.cgi 2011-04-21 20:52:37 UTC (rev 5634)
@@ -1,10 +1,14 @@
#!/usr/bin/perl
#
-# SmoothWall CGIs
-#
-# This code is distributed under the terms of the GPL
-#
+# This file is part of the IPCop Firewall.
+#
+# 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.
+#
# (c) The SmoothWall Team
+# Copyright (c) 2001-2011 The IPCop Team
#
# $Id$
#
@@ -34,13 +38,6 @@
my @log = ();
my $errormessage = '';
-my @shortmonths = ('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', \
'Oct', 'Nov', 'Dec');
-my @longmonths = (
- $Lang::tr{'january'}, $Lang::tr{'february'}, $Lang::tr{'march'}, \
$Lang::tr{'april'},
- $Lang::tr{'may'}, $Lang::tr{'june'}, $Lang::tr{'july'}, \
$Lang::tr{'august'},
- $Lang::tr{'september'}, $Lang::tr{'october'}, $Lang::tr{'november'}, \
$Lang::tr{'december'}
-);
-
my @now = localtime();
my $dow = $now[6]; # day of week
my $doy = $now[7]; # day of year (0..364)
@@ -57,12 +54,12 @@
&General::getcgihash(\%cgiparams);
$logsettings{'LOGVIEW_REVERSE'} = 'off';
$logsettings{'LOGVIEW_VIEWSIZE'} = 150;
-&General::readhash("${General::swroot}/logging/settings", \%logsettings);
+&General::readhash('/var/ipcop/logging/settings', \%logsettings);
if ($cgiparams{'ACTION'} eq '') {
my %save = ();
- &General::readhash("${General::swroot}/proxy/viewersettings", \%save)
- if (-e "${General::swroot}/proxy/viewersettings");
+ &General::readhash('/var/ipcop/proxy/viewersettings', \%save)
+ if (-e '/var/ipcop/proxy/viewersettings');
$cgiparams{'FILTER'} = $save{'FILTER'} if \
(exists($save{'FILTER'}));
$cgiparams{'ENABLE_FILTER'} = $save{'ENABLE_FILTER'} if \
(exists($save{'ENABLE_FILTER'})); }
@@ -77,7 +74,7 @@
my %save = ();
$save{'FILTER'} = $cgiparams{'FILTER'};
$save{'ENABLE_FILTER'} = $cgiparams{'ENABLE_FILTER'};
- &General::writehash("${General::swroot}/proxy/viewersettings", \%save);
+ &General::writehash('/var/ipcop/proxy/viewersettings', \%save);
}
my $start = ($logsettings{'LOGVIEW_REVERSE'} eq 'on') ? 0x7FFFF000 : 0; #index of \
first line number to display @@ -342,7 +339,7 @@
if ($month == $cgiparams{'MONTH'}) {
print "selected='selected' ";
}
- print "value='$month'>$longmonths[$month]</option>\n";
+ print "value='$month'>$Lang::tr{$General::longMonths[$month]}</option>\n";
}
print <<END
</select>
Modified: ipcop/trunk/html/cgi-bin/logsummary.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/logsummary.cgi 2011-04-20 20:54:59 UTC (rev 5633)
+++ ipcop/trunk/html/cgi-bin/logsummary.cgi 2011-04-21 20:52:37 UTC (rev 5634)
@@ -1,10 +1,14 @@
#!/usr/bin/perl
#
-# SmoothWall CGIs
-#
-# This code is distributed under the terms of the GPL
-#
+# This file is part of the IPCop Firewall.
+#
+# 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.
+#
# (c) The SmoothWall Team
+# Copyright (c) 2001-2011 The IPCop Team
#
# $Id$
#
@@ -38,12 +42,6 @@
my %cgiparams = ();
my $errormessage = '';
-my @longmonths = (
- $Lang::tr{'january'}, $Lang::tr{'february'}, $Lang::tr{'march'}, \
$Lang::tr{'april'},
- $Lang::tr{'may'}, $Lang::tr{'june'}, $Lang::tr{'july'}, \
$Lang::tr{'august'},
- $Lang::tr{'september'}, $Lang::tr{'october'}, $Lang::tr{'november'}, \
$Lang::tr{'december'}
-);
-
my @now = localtime();
my $year = $now[5] + 1900;
@@ -111,7 +109,7 @@
my $monthnum = $cgiparams{'MONTH'} + 1;
my $monthstr = $monthnum <= 9 ? "0$monthnum" : "$monthnum";
-my $longmonthstr = $longmonths[ $cgiparams{'MONTH'} ];
+my $longmonthstr = $Lang::tr{$General::longMonths[$cgiparams{'MONTH'}]};
my $daystr = $cgiparams{'DAY'} <= 9 ? "0$cgiparams{'DAY'}" : \
"$cgiparams{'DAY'}";
my $skip = 0;
@@ -161,7 +159,7 @@
if ($month == $cgiparams{'MONTH'}) {
print "selected='selected' ";
}
- print "value='$month'>$longmonths[$month]</option>\n";
+ print "value='$month'>$Lang::tr{$General::longMonths[$month]}</option>\n";
}
print <<END
</select>
Modified: ipcop/trunk/html/cgi-bin/logsystem.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/logsystem.cgi 2011-04-20 20:54:59 UTC (rev 5633)
+++ ipcop/trunk/html/cgi-bin/logsystem.cgi 2011-04-21 20:52:37 UTC (rev 5634)
@@ -1,10 +1,14 @@
#!/usr/bin/perl
#
-# SmoothWall CGIs
-#
-# This code is distributed under the terms of the GPL
-#
+# This file is part of the IPCop Firewall.
+#
+# 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.
+#
# (c) The SmoothWall Team
+# Copyright (c) 2001-2011 The IPCop Team
#
# $Id$
#
@@ -30,13 +34,6 @@
my %logsettings = ();
my $errormessage = '';
-my @shortmonths = ('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', \
'Oct', 'Nov', 'Dec');
-my @longmonths = (
- $Lang::tr{'january'}, $Lang::tr{'february'}, $Lang::tr{'march'}, \
$Lang::tr{'april'},
- $Lang::tr{'may'}, $Lang::tr{'june'}, $Lang::tr{'july'}, \
$Lang::tr{'august'},
- $Lang::tr{'september'}, $Lang::tr{'october'}, $Lang::tr{'november'}, \
$Lang::tr{'december'}
-);
-
my @now = localtime();
my $dow = $now[6];
my $doy = $now[7];
@@ -87,7 +84,7 @@
&General::getcgihash(\%cgiparams);
$logsettings{'LOGVIEW_REVERSE'} = 'off';
$logsettings{'LOGVIEW_VIEWSIZE'} = 150;
-&General::readhash("${General::swroot}/logging/settings", \%logsettings);
+&General::readhash('/var/ipcop/logging/settings', \%logsettings);
my $start = ($logsettings{'LOGVIEW_REVERSE'} eq 'on') ? 0x7FFFF000 : 0; #index of \
firts line number to display
@@ -172,7 +169,7 @@
$gzindex = int(($sunday - $xday) / 604800);
}
-my $monthstr = $shortmonths[ $cgiparams{'MONTH'} ];
+my $monthstr = $General::shortMonths[ $cgiparams{'MONTH'} ];
my $daystr = $cgiparams{'DAY'} == 0 ? '..' : $cgiparams{'DAY'} <= 9 ? " \
$cgiparams{'DAY'}" : "$cgiparams{'DAY'}"; my $section = \
$sections{$cgiparams{'SECTION'}};
@@ -300,7 +297,7 @@
if ($month == $cgiparams{'MONTH'}) {
print "selected='selected' ";
}
- print "value='$month'>$longmonths[$month]</option>\n";
+ print "value='$month'>$Lang::tr{$General::longMonths[$month]}</option>\n";
}
print <<END
</select>
Modified: ipcop/trunk/updates/1.9.20/ROOTFILES.i486-1.9.20
===================================================================
--- ipcop/trunk/updates/1.9.20/ROOTFILES.i486-1.9.20 2011-04-20 20:54:59 UTC (rev \
5633)
+++ ipcop/trunk/updates/1.9.20/ROOTFILES.i486-1.9.20 2011-04-21 20:52:37 UTC (rev \
5634) @@ -1,5 +1,9 @@
## please place IPCop files first, then packages sorted by alphabetical order
/home/httpd/cgi-bin/email.cgi
+/home/httpd/cgi-bin/logfirewall.cgi
+/home/httpd/cgi-bin/logproxy.cgi
+/home/httpd/cgi-bin/logsummary.cgi
+/home/httpd/cgi-bin/logsystem.cgi
/home/httpd/cgi-bin/proxy.cgi
/usr/lib/ipcop/general-functions.pl
/usr/local/bin/emailhelper
This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.
------------------------------------------------------------------------------
Fulfilling the Lean Software Promise
Lean software platforms are now widely adopted and the benefits have been
demonstrated beyond question. Learn why your peers are replacing JEE
containers with lightweight application servers - and what you can gain
from the move. http://p.sf.net/sfu/vmware-sfemails
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic