Revision: 6358
http://ipcop.svn.sourceforge.net/ipcop/?rev=6358&view=rev
Author: owes
Date: 2012-02-18 09:03:43 +0000 (Sat, 18 Feb 2012)
Log Message:
-----------
Use the translated section names in GUI and exported log.
Modified Paths:
--------------
ipcop/trunk/html/cgi-bin/logsystem.cgi
Modified: ipcop/trunk/html/cgi-bin/logsystem.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/logsystem.cgi 2012-02-17 20:03:48 UTC (rev
6357)
+++ ipcop/trunk/html/cgi-bin/logsystem.cgi 2012-02-18 09:03:43 UTC (rev
6358)
@@ -67,7 +67,7 @@
'ipsec' => '(vpn|ipsec|ipsec_[\w_]+|pluto\[\d+\]|vpn-watch)',
'openvpn' => '(vpn|openvpn|OVPN_.*|openvpnserver\[\d+\])',
'squid' => '(squid\[\d+\])',
- 'squidGuard' => '(squidGuard\[\d+\])',
+ 'squidguard' => '(squidGuard\[\d+\])',
'installpackage' => '(installpackage|installpackage\[urlfilter\])',
'traffic' => '(accountingctrl|aggregate|vnstatd\[\d+\])',
);
@@ -86,7 +86,7 @@
'ipsec' => 'IPsec',
'openvpn' => 'OpenVPN',
'squid' => "$Lang::tr{'proxy'}",
- 'squidGuard' => "SquidGuard",
+ 'squidguard' => "SquidGuard",
'installpackage' => "$Lang::tr{'update transcript'}",
'traffic' => "$Lang::tr{'sstraffic'}",
);
@@ -211,10 +211,11 @@
if ($cgiparams{'ACTION'} eq $Lang::tr{'export'}) {
print "Content-type: text/plain\n";
+ # Use short identifier in filename instead of translation, so the filename
is not broken.
print "Content-Disposition: attachment;
filename=\"ipcop-$cgiparams{'SECTION'}-$date.log\";\n";
print "\n";
print "IPCop diagnostics\r\n";
- print "$Lang::tr{'section'}: $cgiparams{'SECTION'}\n";
+ print "$Lang::tr{'section'}: $trsections{$cgiparams{'SECTION'}}\n";
print "$Lang::tr{'date'}: $date\r\n\r\n";
# Do not reverse log when exporting
@@ -308,7 +309,7 @@
&Header::closebox();
&Header::openbox('100%', 'left', "$Lang::tr{'log'}:");
-print "<p><b>$Lang::tr{'total hits for log section'} $cgiparams{'SECTION'}
$date: $lines</b></p>";
+print "<p><b>$Lang::tr{'total hits for log section'}
$trsections{$cgiparams{'SECTION'}}, $date: $lines</b></p>";
$start = $lines - $logsettings{'LOGVIEW_VIEWSIZE'} if ($start >= $lines -
$logsettings{'LOGVIEW_VIEWSIZE'});
$start = 0 if ($start < 0);
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
