[prev in list] [next in list] [prev in thread] [next in thread]
List: ipcop-svn
Subject: [Ipcop-svn] SF.net SVN: ipcop:[1605] ipcop/trunk
From: dotzball () users ! sourceforge ! net
Date: 2008-07-23 19:13:37
Message-ID: E1KLjmL-0007jN-CM () d5vjzd1 ! ch3 ! sourceforge ! com
[Download RAW message or body]
Revision: 1605
http://ipcop.svn.sourceforge.net/ipcop/?rev=1605&view=rev
Author: dotzball
Date: 2008-07-23 19:13:35 +0000 (Wed, 23 Jul 2008)
Log Message:
-----------
Remove colons ( : ) from lang texts. If there should be displayed a colon,
the colon has to be in the code.
Modified Paths:
--------------
ipcop/trunk/config/cfgroot/firewall-lib.pl
ipcop/trunk/html/cgi-bin/addresses.cgi
ipcop/trunk/html/cgi-bin/addressgrps.cgi
ipcop/trunk/html/cgi-bin/aliases.cgi
ipcop/trunk/html/cgi-bin/backup.cgi
ipcop/trunk/html/cgi-bin/base.cgi
ipcop/trunk/html/cgi-bin/changepw.cgi
ipcop/trunk/html/cgi-bin/ddns.cgi
ipcop/trunk/html/cgi-bin/dhcp.cgi
ipcop/trunk/html/cgi-bin/dmzholes.cgi
ipcop/trunk/html/cgi-bin/fwrules.cgi
ipcop/trunk/html/cgi-bin/fwrulesadm.cgi
ipcop/trunk/html/cgi-bin/graphs.cgi
ipcop/trunk/html/cgi-bin/gui.cgi
ipcop/trunk/html/cgi-bin/hosts.cgi
ipcop/trunk/html/cgi-bin/ids.cgi
ipcop/trunk/html/cgi-bin/ifaces.cgi
ipcop/trunk/html/cgi-bin/index.cgi
ipcop/trunk/html/cgi-bin/ipsec.cgi
ipcop/trunk/html/cgi-bin/logs.cgi/config.dat
ipcop/trunk/html/cgi-bin/logs.cgi/firewalllog.dat
ipcop/trunk/html/cgi-bin/logs.cgi/ids.dat
ipcop/trunk/html/cgi-bin/logs.cgi/log.dat
ipcop/trunk/html/cgi-bin/logs.cgi/proxylog.dat
ipcop/trunk/html/cgi-bin/logs.cgi/summary.dat
ipcop/trunk/html/cgi-bin/modem.cgi
ipcop/trunk/html/cgi-bin/netstatus.cgi
ipcop/trunk/html/cgi-bin/networks.cgi
ipcop/trunk/html/cgi-bin/ovpnmain.cgi
ipcop/trunk/html/cgi-bin/portfw.cgi
ipcop/trunk/html/cgi-bin/pppsetup.cgi
ipcop/trunk/html/cgi-bin/proxy.cgi
ipcop/trunk/html/cgi-bin/remote.cgi
ipcop/trunk/html/cgi-bin/servicegrps.cgi
ipcop/trunk/html/cgi-bin/services.cgi
ipcop/trunk/html/cgi-bin/shaping.cgi
ipcop/trunk/html/cgi-bin/shutdown.cgi
ipcop/trunk/html/cgi-bin/status.cgi
ipcop/trunk/html/cgi-bin/time.cgi
ipcop/trunk/html/cgi-bin/updates.cgi
ipcop/trunk/html/cgi-bin/upload.cgi
ipcop/trunk/html/cgi-bin/wireless.cgi
ipcop/trunk/html/cgi-bin/xtaccess.cgi
ipcop/trunk/langs/ipcop.new.en.pl
ipcop/trunk/tools/gen_strings.pl
Modified: ipcop/trunk/config/cfgroot/firewall-lib.pl
===================================================================
--- ipcop/trunk/config/cfgroot/firewall-lib.pl 2008-07-23 18:33:18 UTC (rev 1604)
+++ ipcop/trunk/config/cfgroot/firewall-lib.pl 2008-07-23 19:13:35 UTC (rev 1605)
@@ -65,7 +65,7 @@
my $currSelect = shift;
my %selected;
- &Header::openbox('100%', 'left', $Lang::tr{'block out traff'});
+ &Header::openbox('100%', 'left', "$Lang::tr{'block out traff'}:");
$selected{'ADV_CONFIG'}{'services'} = '';
$selected{'ADV_CONFIG'}{'serviceGrouping'} = '';
Modified: ipcop/trunk/html/cgi-bin/addresses.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/addresses.cgi 2008-07-23 18:33:18 UTC (rev 1604)
+++ ipcop/trunk/html/cgi-bin/addresses.cgi 2008-07-23 19:13:35 UTC (rev 1605)
@@ -194,7 +194,7 @@
#&Header::closebox();
if ($errormessage) {
- &Header::openbox('100%', 'left', $Lang::tr{'error messages'}, 'error');
+ &Header::openbox('100%', 'left', "$Lang::tr{'error messages'}:", 'error');
print "<class name='base'>$errormessage\n";
print " </class>\n";
&Header::closebox();
Modified: ipcop/trunk/html/cgi-bin/addressgrps.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/addressgrps.cgi 2008-07-23 18:33:18 UTC (rev 1604)
+++ ipcop/trunk/html/cgi-bin/addressgrps.cgi 2008-07-23 19:13:35 UTC (rev 1605)
@@ -313,7 +313,7 @@
#&Header::closebox();
if ($errormessage) {
- &Header::openbox('100%', 'left', $Lang::tr{'error messages'}, 'error');
+ &Header::openbox('100%', 'left', "$Lang::tr{'error messages'}:", 'error');
print "<class name='base'>$errormessage\n";
print " </class>\n";
&Header::closebox();
@@ -354,7 +354,7 @@
$hiddenGroupName
</td>
<td class='base'align="left">
- $Lang::tr{'remark title'}
+ $Lang::tr{'remark title'}:
<input type='text' name='REMARK' value='$cgiparams{'REMARK'}' size='55' \
maxlength='50' /> <img src='/blob.gif' alt='*' />
</td>
@@ -435,7 +435,7 @@
print <<END;
<tr>
<td class='base' colspan='2'>
- <font class='boldbase'>$Lang::tr{'enabled'}</font>
+ <font class='boldbase'>$Lang::tr{'enabled'}:</font>
<input type='checkbox' name='ENABLED' $checked{'ENABLED'}{'on'} $disabled />
</td>
</tr>
Modified: ipcop/trunk/html/cgi-bin/aliases.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/aliases.cgi 2008-07-23 18:33:18 UTC (rev 1604)
+++ ipcop/trunk/html/cgi-bin/aliases.cgi 2008-07-23 19:13:35 UTC (rev 1605)
@@ -225,7 +225,7 @@
my %checked =(); # Checkbox manipulations
if ($errormessage) {
- &Header::openbox('100%', 'left', $Lang::tr{'error messages'}, 'error');
+ &Header::openbox('100%', 'left', "$Lang::tr{'error messages'}:", 'error');
print "<font class='base'>$errormessage </font>";
&Header::closebox();
@@ -255,7 +255,7 @@
$buttontext = $Lang::tr{'update'};
&Header::openbox('100%', 'left', $Lang::tr{'edit an existing alias'}, $error);
} else {
- &Header::openbox('100%', 'left', $Lang::tr{'add new alias'}, $error);
+ &Header::openbox('100%', 'left', "$Lang::tr{'add new alias'}:", $error);
}
#Edited line number (KEY1) passed until cleared by 'save' or 'remove' or 'new sort \
order' @@ -268,7 +268,7 @@
<td><input type='text' name='NAME' value='$settings{'NAME'}' size='32' /></td>
<td class='base' align='right'><font color='${Header::colourred}'>$Lang::tr{'alias \
ip'}: </font></td> <td><input type='text' name='IP' value='$settings{'IP'}' \
size='16' /></td>
-<td class='base' align='right'>$Lang::tr{'enabled'} </td>
+<td class='base' align='right'>$Lang::tr{'enabled'}: </td>
<td><input type='checkbox' name='ENABLED' $checked{'ENABLED'}{'on'} /></td>
</tr>
</table>
@@ -306,7 +306,7 @@
#
# Columns headers may content a link. In this case it must be named in $sortstring
#
-&Header::openbox('100%', 'left', $Lang::tr{'current aliases'});
+&Header::openbox('100%', 'left', "$Lang::tr{'current aliases'}:");
print <<END
<table width='100%'>
<tr>
Modified: ipcop/trunk/html/cgi-bin/backup.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/backup.cgi 2008-07-23 18:33:18 UTC (rev 1604)
+++ ipcop/trunk/html/cgi-bin/backup.cgi 2008-07-23 19:13:35 UTC (rev 1605)
@@ -378,7 +378,7 @@
&Header::openbigbox('100%', 'left', '');
if ($errormessage) {
- &Header::openbox('100%', 'left', $Lang::tr{'error messages'}, 'error');
+ &Header::openbox('100%', 'left', "$Lang::tr{'error messages'}:", 'error');
print "<font class='base'>$errormessage </font>";
&Header::closebox();
}
Modified: ipcop/trunk/html/cgi-bin/base.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/base.cgi 2008-07-23 18:33:18 UTC (rev 1604)
+++ ipcop/trunk/html/cgi-bin/base.cgi 2008-07-23 19:13:35 UTC (rev 1605)
@@ -191,10 +191,10 @@
}
# save changes
$f->savedata || die "$msg_datafileerror";
-
+
# Rebuild configuration file
&BuildConfiguration;
-
+
# if entering data line is a repetitive task, choose here to not erase fields \
between each addition map ($settings{$_}='' ,@nosaved);
}
@@ -260,7 +260,7 @@
my %checked =(); # Checkbox manipulations
if ($errormessage) {
- &Header::openbox('100%', 'left', $Lang::tr{'error messages'});
+ &Header::openbox('100%', 'left', "$Lang::tr{'error messages'}:");
print "<font class='base'>$errormessage </font>";
&Header::closebox();
}
@@ -340,7 +340,7 @@
<tr>
<td class='base'>$Lang::tr{'ip address'}:</td>
<td><input type='text' name='IP' value='$settings{'IP'}' /></td>
- <td class='base'>$Lang::tr{'enabled'}</td>
+ <td class='base'>$Lang::tr{'enabled'}:</td>
<td><input type='checkbox' name='CB' $checked{'CB'} /></td>
<td class='base'>$Lang::tr{'remark'}: <img src='/blob.gif' alt='*' /></td>
<td><input type 'text' name='COMMENT' value='$settings{'COMMENT'}' /></td>
@@ -398,7 +398,7 @@
} elsif ($key % 2) {
print "<tr bgcolor='${Header::table2colour}'>";
} else {
- print "<tr bgcolor='${Header::table1colour}'>";
+ print "<tr bgcolor='${Header::table1colour}'>";
}
print <<END
<td align='center'>$ip</td>
@@ -556,7 +556,7 @@
{
&Header::openbox('100%', 'left', 'Interface summary');
$ITFS->readreset;
- while (my ($DEV, $ACTIVE, $CLASSCOLOR, $IP, $DH, $TI, $NAME, $COMMENT ) =
+ while (my ($DEV, $ACTIVE, $CLASSCOLOR, $IP, $DH, $TI, $NAME, $COMMENT ) =
$ITFS->readbyfieldsseq ('DEVICE',
'ACTIVE',
'CLASSCOLOR',
Modified: ipcop/trunk/html/cgi-bin/changepw.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/changepw.cgi 2008-07-23 18:33:18 UTC (rev 1604)
+++ ipcop/trunk/html/cgi-bin/changepw.cgi 2008-07-23 19:13:35 UTC (rev 1605)
@@ -88,7 +88,7 @@
&Header::openbigbox('100%', 'left', '');
if ($errormessage) {
- &Header::openbox('100%', 'left', $Lang::tr{'error messages'}, 'error');
+ &Header::openbox('100%', 'left', "$Lang::tr{'error messages'}:", 'error');
print "<class name='base'>$errormessage\n";
print " </class>\n";
&Header::closebox();
@@ -96,16 +96,16 @@
print "<form method='post' action='$ENV{'SCRIPT_NAME'}'>\n";
-&Header::openbox('100%', 'left', $Lang::tr{'administrator user password'}, \
$error_admin); +&Header::openbox('100%', 'left', "$Lang::tr{'administrator user \
password'}:", $error_admin); print <<END
<table width='100%'>
<tr>
- <td width='20%' class='base'>$Lang::tr{'username'} 'admin'</td>
- <td width='15%' class='base' align='right'>$Lang::tr{'password'} </td>
+ <td width='20%' class='base'>$Lang::tr{'username'}: 'admin'</td>
+ <td width='15%' class='base' align='right'>$Lang::tr{'password'}: </td>
<td><input type='password' name='ADMIN_PASSWORD1' size='20' maxlength='40'/></td>
</tr><tr>
<td width='20%' class='base'> </td>
- <td width='15%' class='base' align='right'>$Lang::tr{'again'} </td>
+ <td width='15%' class='base' align='right'>$Lang::tr{'again'}: </td>
<td><input type='password' name='ADMIN_PASSWORD2' size='20' maxlength='40'/></td>
</tr>
</table>
@@ -123,16 +123,16 @@
;
&Header::closebox();
-&Header::openbox('100%', 'left', $Lang::tr{'dial user password'}, $error_dial);
+&Header::openbox('100%', 'left', "$Lang::tr{'dial user password'}:", $error_dial);
print <<END
<table width='100%'>
<tr>
- <td width='20%' class='base'>$Lang::tr{'username'} 'dial'</td>
- <td width='15%' class='base' align='right'>$Lang::tr{'password'} </td>
+ <td width='20%' class='base'>$Lang::tr{'username'}: 'dial'</td>
+ <td width='15%' class='base' align='right'>$Lang::tr{'password'}: </td>
<td><input type='password' name='DIAL_PASSWORD1' size='20' maxlength='40'/></td>
</tr><tr>
<td width='20%' class='base'> </td>
- <td width='15%' class='base' align='right'>$Lang::tr{'again'} </td>
+ <td width='15%' class='base' align='right'>$Lang::tr{'again'}: </td>
<td><input type='password' name='DIAL_PASSWORD2' size='20' maxlength='40'/></td>
</tr>
</table>
Modified: ipcop/trunk/html/cgi-bin/ddns.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/ddns.cgi 2008-07-23 18:33:18 UTC (rev 1604)
+++ ipcop/trunk/html/cgi-bin/ddns.cgi 2008-07-23 19:13:35 UTC (rev 1605)
@@ -231,7 +231,7 @@
$checked{'ENABLED'}{'on'} = ($settings{'ENABLED'} eq '' ) ? '' : \
"checked='checked'";
if ($errormessage) {
- &Header::openbox('100%', 'left', $Lang::tr{'error messages'}, 'error');
+ &Header::openbox('100%', 'left', "$Lang::tr{'error messages'}:", 'error');
print "<font class='base'>$errormessage </font>";
&Header::closebox();
@@ -247,7 +247,7 @@
print <<END
<table width='100%'>
<tr>
- <td class='base'>$Lang::tr{'dyn dns source choice'}</td>
+ <td class='base'>$Lang::tr{'dyn dns source choice'}:</td>
</tr><tr>
<td class='base'><input type='radio' name='BEHINDROUTER' value='RED_IP' \
$checked{'BEHINDROUTER'}{'RED_IP'} /> $Lang::tr{'use ipcop red ip'}</td>
@@ -283,7 +283,7 @@
$buttontext = $Lang::tr{'update'};
&Header::openbox('100%', 'left', $Lang::tr{'edit an existing host'}, $error);
} else {
- &Header::openbox('100%', 'left', $Lang::tr{'add a host'}, $error);
+ &Header::openbox('100%', 'left', "$Lang::tr{'add a host'}:", $error);
}
# based selected service, prepare an icon for signaling mandatory fields
@@ -314,28 +314,28 @@
<td width='20%'><input type='text' name='HOSTNAME' value='$settings{'HOSTNAME'}' \
/></td> <td width='5%'>$f1</td>
</tr><tr>
- <td class='base'>$Lang::tr{'behind a proxy'}</td>
+ <td class='base'>$Lang::tr{'behind a proxy'}:</td>
<td><input type='checkbox' name='PROXY' value='on' $checked{'PROXY'}{'on'} /></td>
<td></td>
<td class='base'>$Lang::tr{'domain'}:</td>
<td><input type='text' name='DOMAIN' value='$settings{'DOMAIN'}' /></td>
<td>$f2</td>
</tr><tr>
- <td class='base'>$Lang::tr{'enable wildcards'}</td>
+ <td class='base'>$Lang::tr{'enable wildcards'}:</td>
<td><input type='checkbox' name='WILDCARDS' value='on' $checked{'WILDCARDS'}{'on'} \
/></td> <td></td>
- <td class='base'>$Lang::tr{'username'}</td>
+ <td class='base'>$Lang::tr{'username'}:</td>
<td><input type='text' name='LOGIN' value='$settings{'LOGIN'}' /></td>
<td>$f3</td>
</tr><tr>
<td></td>
<td></td>
<td></td>
- <td class='base'>$Lang::tr{'password'}</td>
+ <td class='base'>$Lang::tr{'password'}:</td>
<td><input type='password' name='PASSWORD' value='$settings{'PASSWORD'}' /></td>
<td>$f4</td>
</tr><tr>
- <td class='base'>$Lang::tr{'enabled'}</td>
+ <td class='base'>$Lang::tr{'enabled'}:</td>
<td><input type='checkbox' name='ENABLED' value='on' $checked{'ENABLED'}{'on'} \
/></td> <td colspan='4'></td>
</tr>
@@ -358,7 +358,7 @@
#
# Third box shows the list, in columns
#
-&Header::openbox('100%', 'left', $Lang::tr{'current hosts'});
+&Header::openbox('100%', 'left', "$Lang::tr{'current hosts'}:");
print <<END
<table width='100%'>
<tr>
Modified: ipcop/trunk/html/cgi-bin/dhcp.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/dhcp.cgi 2008-07-23 18:33:18 UTC (rev 1604)
+++ ipcop/trunk/html/cgi-bin/dhcp.cgi 2008-07-23 19:13:35 UTC (rev 1605)
@@ -50,7 +50,7 @@
my $warnNTPmessage = '';
my @nosaved=();
# $Lang::tr{'green interface'} # Dummy string variables included here
-# $Lang::tr{'blue interface'} # otherwise lang scripts will miss them
+# $Lang::tr{'blue interface'} # otherwise lang scripts will miss them
our $OptionTypes = 'boolean|((un)?signed )?integer \
(8|16|32)|ip-address|text|string|encapsulate \w+|'
.'array of (boolean|((un)?signed )?integer (8|16|32)|ip-address)|'
@@ -596,7 +596,7 @@
&Header::openbigbox('100%', 'left', '', $errormessage);
if ($errormessage) {
- &Header::openbox('100%', 'left', $Lang::tr{'error messages'}, 'error');
+ &Header::openbox('100%', 'left', "$Lang::tr{'error messages'}:", 'error');
print "<font class='base'>$errormessage </font>\n";
&Header::closebox();
}
@@ -619,24 +619,24 @@
<table width='100%'>
<tr>
<td width='25%' class='boldbase'><b><font color='${lc_itf}'>$Lang::tr{"$lc_itf \
interface"}</font></b></td>
- <td class='base'>$Lang::tr{'enabled'}
+ <td class='base'>$Lang::tr{'enabled'}:
<input type='checkbox' name='ENABLE_${itf}' $checked{'ENABLE'}{'on'} /></td>
<td width='25%' class='base'>$Lang::tr{'ip \
address'}/$Lang::tr{'netmask'}:</td><td><b>$netsettings{"${itf}_ADDRESS"}/$netsettings{"${itf}_NETMASK"}</b></td>
</tr><tr>
- <td width='25%' class='base'>$Lang::tr{'start address'} <img \
src='/blob.gif' alt='*' /></td> + <td width='25%' class='base'>$Lang::tr{'start \
address'}: <img src='/blob.gif' alt='*' /></td>
<td width='25%'><input type='text' name='START_ADDR_${itf}' \
value='$dhcpsettings{"START_ADDR_${itf}"}' /></td>
- <td width='25%' class='base'>$Lang::tr{'end address'} <img src='/blob.gif' \
alt='*' /></td> + <td width='25%' class='base'>$Lang::tr{'end address'}: <img \
src='/blob.gif' alt='*' /></td>
<td width='25%'><input type='text' name='END_ADDR_${itf}' \
value='$dhcpsettings{"END_ADDR_${itf}"}' /></td> </tr><tr>
- <td class='base'>$Lang::tr{'default lease time'}</td>
+ <td class='base'>$Lang::tr{'default lease time'}:</td>
<td><input type='text' name='DEFAULT_LEASE_TIME_${itf}' \
value='$dhcpsettings{"DEFAULT_LEASE_TIME_${itf}"}' size='5' /></td>
- <td class='base'>$Lang::tr{'max lease time'}</td>
+ <td class='base'>$Lang::tr{'max lease time'}:</td>
<td><input type='text' name='MAX_LEASE_TIME_${itf}' \
value='$dhcpsettings{"MAX_LEASE_TIME_${itf}"}' size='5' /></td> </tr><tr>
<td class='base'>$Lang::tr{'dhcp base ip fixed lease'}: <img \
src='/blob.gif' alt='*' /></td>
<td><input type='text' name='BASE_IP_FIXED_LEASE_${itf}' \
value='$dhcpsettings{"BASE_IP_FIXED_LEASE_${itf}"}' /></td> </tr><tr>
- <td class='base'>$Lang::tr{'domain name suffix'} <img src='/blob.gif' \
alt='*' /></td> + <td class='base'>$Lang::tr{'domain name suffix'}: <img \
src='/blob.gif' alt='*' /></td>
<td><input type='text' name='DOMAIN_NAME_${itf}' \
value='$dhcpsettings{"DOMAIN_NAME_${itf}"}' /></td> <td>$Lang::tr{'dhcp allow \
bootp'}:</td>
<td><input type='checkbox' name='ENABLEBOOTP_${itf}' \
$checked{'ENABLEBOOTP'}{'on'} /></td> @@ -646,9 +646,9 @@
<td class='base'>$Lang::tr{'nis domain'}</td>
<td><input type='text' name='NIS_${itf}' value='$dhcpsettings{"NIS_${itf}"}' \
/></td> </tr><tr>
- <td class='base'>$Lang::tr{'primary dns'}</td>
+ <td class='base'>$Lang::tr{'primary dns'}:</td>
<td><input type='text' name='DNS1_${itf}' value='$dhcpsettings{"DNS1_${itf}"}' \
/></td>
- <td class='base'>$Lang::tr{'secondary dns'} <img src='/blob.gif' alt='*' \
/></td> + <td class='base'>$Lang::tr{'secondary dns'}: <img src='/blob.gif' \
alt='*' /></td>
<td><input type='text' name='DNS2_${itf}' value='$dhcpsettings{"DNS2_${itf}"}' \
/></td> </tr><tr>
<td class='base'>$Lang::tr{'primary ntp server'}: <img src='/blob.gif' \
alt='*' /></td> @@ -689,7 +689,7 @@
}
$errormessage = &DhcpCheckSyntax;
if ($errormessage) {
- &Header::openbox('100%', 'left', $Lang::tr{'error messages'});
+ &Header::openbox('100%', 'left', "$Lang::tr{'error messages'}:");
print "<font class='base'>$errormessage </font>\n";
&Header::closebox();
}
@@ -724,7 +724,7 @@
<td class='base'>$Lang::tr{'dhcp advopt value'}:</td>
<td><input type='text' name='ADVOPT_DATA' value='$dhcpsettings{'ADVOPT_DATA'}' \
size='60' /> $opt</td> </tr><tr>
- <td class='base'>$Lang::tr{'enabled'}<input type='checkbox' \
name='ADVOPT_ENABLED' $checked{'ADVOPT_ENABLED'}{'on'} /></td> + <td \
class='base'>$Lang::tr{'enabled'}:<input type='checkbox' name='ADVOPT_ENABLED' \
$checked{'ADVOPT_ENABLED'}{'on'} /></td>
<td class='base'>$Lang::tr{'dhcp advopt scope'}: <img src='/blob.gif' \
alt='*' />
END
@@ -927,9 +927,9 @@
if ($dhcpsettings{'KEY2'} ne '') {
$buttontext = $Lang::tr{'update'};
- print "<tr><td class='boldbase'><b>$Lang::tr{'edit an existing \
lease'}</b></td><td class='base'>$Lang::tr{'enabled'}<input type='checkbox' \
name='FIX_ENABLED' $checked{'FIX_ENABLED'}{'on'} /></td></tr>"; + print "<tr><td \
class='boldbase'><b>$Lang::tr{'edit an existing lease'}</b></td><td \
class='base'>$Lang::tr{'enabled'}:<input type='checkbox' name='FIX_ENABLED' \
$checked{'FIX_ENABLED'}{'on'} /></td></tr>"; } else {
- print "<tr><td class='boldbase'><b>$Lang::tr{'add new lease'}</b></td><td \
class='base'>$Lang::tr{'enabled'}<input type='checkbox' name='FIX_ENABLED' \
$checked{'FIX_ENABLED'}{'on'} /></td></td></tr>" + print "<tr><td \
class='boldbase'><b>$Lang::tr{'add new lease'}</b></td><td \
class='base'>$Lang::tr{'enabled'}:<input type='checkbox' name='FIX_ENABLED' \
$checked{'FIX_ENABLED'}{'on'} /></td></td></tr>" }
print <<END
<tr>
@@ -943,7 +943,7 @@
<td class='base'>$Lang::tr{'hostname'} $Lang::tr{'or'} FQDN: <img \
src='/blob.gif' alt='*' /></td>
<td><input type='text' name='FIX_HOSTNAME' value='$dhcpsettings{'FIX_HOSTNAME'}' \
size='18' /></td>
- <td class='base'>$Lang::tr{'router ip'} <img src='/blob.gif' alt='*' \
/></td> + <td class='base'>$Lang::tr{'router ip'}: <img src='/blob.gif' \
alt='*' /></td>
<td><input type='text' name='FIX_ROUTER' value='$dhcpsettings{'FIX_ROUTER'}' \
size='18' /></td>
<td class='base'>$Lang::tr{'dns server'}: <img src='/blob.gif' alt='*' \
/></td>
Modified: ipcop/trunk/html/cgi-bin/dmzholes.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/dmzholes.cgi 2008-07-23 18:33:18 UTC (rev 1604)
+++ ipcop/trunk/html/cgi-bin/dmzholes.cgi 2008-07-23 19:13:35 UTC (rev 1605)
@@ -179,7 +179,7 @@
&Header::openbigbox('100%', 'left', '', $errormessage);
if ($errormessage) {
- &Header::openbox('100%', 'left', $Lang::tr{'error messages'});
+ &Header::openbox('100%', 'left', "$Lang::tr{'error messages'}:");
print "<class name='base'>$errormessage\n";
print " </class>\n";
&Header::closebox();
@@ -189,10 +189,10 @@
my $buttonText = $Lang::tr{'add'};
if ($cgiparams{'ACTION'} eq $Lang::tr{'edit'}) {
- &Header::openbox('100%', 'left', $Lang::tr{'edit a rule'});
+ &Header::openbox('100%', 'left', "$Lang::tr{'edit a rule'}:");
$buttonText = $Lang::tr{'update'};
} else {
- &Header::openbox('100%', 'left', $Lang::tr{'add a new rule'});
+ &Header::openbox('100%', 'left', "$Lang::tr{'add a new rule'}:");
}
print <<END
<table width='100%'>
@@ -251,13 +251,13 @@
</tr>
<tr>
<td class='base'>
- <font class='boldbase'>$Lang::tr{'remark title'} <img src='/blob.gif' alt='*' \
/></font> + <font class='boldbase'>$Lang::tr{'remark title'}: <img \
src='/blob.gif' alt='*' /></font> </td>
<td colspan='4'>
<input type='text' name='REMARK' value='$cgiparams{'REMARK'}' size='55' \
maxlength='50' /> </td>
<td class='base'>
- $Lang::tr{'enabled'}
+ $Lang::tr{'enabled'}:
</td>
<td>
<input type='checkbox' name='ENABLED' $checked{'ENABLED'}{'on'} />
@@ -291,7 +291,7 @@
&Header::closebox();
print "</form>\n";
-&Header::openbox('100%', 'left', $Lang::tr{'current rules'});
+&Header::openbox('100%', 'left', "$Lang::tr{'current rules'}:");
print <<END
<table width='100%'>
<tr>
Modified: ipcop/trunk/html/cgi-bin/fwrules.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/fwrules.cgi 2008-07-23 18:33:18 UTC (rev 1604)
+++ ipcop/trunk/html/cgi-bin/fwrules.cgi 2008-07-23 19:13:35 UTC (rev 1605)
@@ -366,7 +366,7 @@
###############
if ($errormessage) {
- &Header::openbox('100%', 'left', $Lang::tr{'error messages'}, 'error');
+ &Header::openbox('100%', 'left', "$Lang::tr{'error messages'}:", 'error');
print "$errormessage\n";
&Header::closebox();
@@ -411,7 +411,7 @@
sub printCurrentRulesBox
{
my $printMode = shift;
- &Header::openbox('100%', 'left', $Lang::tr{'current rules'});
+ &Header::openbox('100%', 'left', "$Lang::tr{'current rules'}:");
if ($printMode eq 'all' || $cgiparams{'RULETYPE'} eq 'FORWARD') {
&printCurrentRules('FORWARD', $printMode);
@@ -530,7 +530,7 @@
<td width='1%' class='boldbase' align='center'><b>#</b></td>
<td width='4%' class='boldbase' align='center'><b>$Lang::tr{'net br \
iface'}</b></td> <td width='24%' class='boldbase' \
align='center'><b>$Lang::tr{'source'}</b></td>
- <td width='2%' class='boldbase' align='center'><b>$Lang::tr{'log'}</b></td>
+ <td width='2%' class='boldbase' align='center'><b>$Lang::tr{'log'}:</b></td>
<td width='2%' class='boldbase' align='center'><b></b> </td>
END
if (($type eq 'INPUT' || $type eq 'EXTERNAL' || $FW::fwSettings{'ADV_MODE_ENABLE'} \
ne 'on') @@ -1672,14 +1672,14 @@
sub printSelectNewRuleBox
{
- &Header::openbox('100%', 'left', $Lang::tr{'add a new rule'}, $error);
+ &Header::openbox('100%', 'left', "$Lang::tr{'add a new rule'}:", $error);
print <<END;
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
<table width='100%'>
<tr>
<td align='left' width='100%'>
- $Lang::tr{'rule actionc'}
+ $Lang::tr{'rule action'}:
<select name='RULEACTION'>
<option value='accept' selected='selected'>$Lang::tr{'fw accept'}</option>
<option value='drop'>$Lang::tr{'fw drop'}</option>
@@ -1747,9 +1747,9 @@
}
if ($cgiparams{'ACTION'} eq $Lang::tr{'edit'}){
- &Header::openbox('100%', 'left', "$Lang::tr{'edit a rule'} $title", $error);
+ &Header::openbox('100%', 'left', "$Lang::tr{'edit a rule'}: $title", $error);
} else {
- &Header::openbox('100%', 'left', "$Lang::tr{'add a new rule'} $title", $error);
+ &Header::openbox('100%', 'left', "$Lang::tr{'add a new rule'}: $title", $error);
}
}
@@ -1926,14 +1926,14 @@
<input type='radio' name='SRC_ADR_TYPE' value='textSrcAdr' \
$radio{'SRC_ADR_TYPE'}{'textSrcAdr'} /> </td>
<td class='base' width='25%'>
- $Lang::tr{'addressformatc'}
+ $Lang::tr{'addressformat'}:
<select name='SRC_ADRESSFORMAT'>
<option value='ip' $selected{'SRC_ADRESSFORMAT'}{'ip'}>IP</option>
<option value='mac' $selected{'SRC_ADRESSFORMAT'}{'mac'}>MAC</option>
</select>
</td>
<td class='base' width='70%' align='left' >
- $Lang::tr{'source addressc'}
+ $Lang::tr{'source address'}:
<input type='text' name='SRC_ADRESS_TXT' value='$cgiparams{'SRC_ADRESS_TXT'}' \
size='20' maxlength='18' /> </td>
</tr>
@@ -2072,7 +2072,7 @@
<input type='checkbox' name='SRC_PORT_ON' $checked{'SRC_PORT_ON'}{'on'} />
</td>
<td colspan='2' class='base'>
- $Lang::tr{'use src portc'}
+ $Lang::tr{'use src port'}:
</td>
</tr>
<tr>
@@ -2080,7 +2080,7 @@
<td class='base'>
</td>
<td colspan='2' class='base' >
- $Lang::tr{'fw source portc'}
+ $Lang::tr{'source port'}:
<input type='text' name='SRC_PORT' value='$cgiparams{'SRC_PORT'}' size='14' \
maxlength='12' /> </td>
</tr>
@@ -2426,7 +2426,7 @@
<td class='base'></td>
<td class='base'>
<input type='radio' name='DST_IP_TYPE' value='ipDestTxt' \
$radio{'DST_IP_TYPE'}{'ipDestTxt'} />
- $Lang::tr{'destinationc'}
+ $Lang::tr{'destination ip or net'}:
<input type='text' name='DEST_IP_TXT' value='$cgiparams{'DEST_IP_TXT'}' \
size='21' maxlength='19' /> </td>
</tr>
@@ -2470,7 +2470,7 @@
<input type='checkbox' name='SERVICE_ON' $checked{'SERVICE_ON'}{'on'} />
</td>
<td class='base'>
- $Lang::tr{'use Servicec'}
+ $Lang::tr{'use Service'}
</td>
</tr>
END
@@ -2654,7 +2654,7 @@
<tr>
<td width='4%' class='base' ></td>
<td class='base'>
- $Lang::tr{'rule actionc'}
+ $Lang::tr{'rule action'}:
<select name='RULEACTION'>
<option value='accept' $selected{'RULEACTION'}{'accept'}>$Lang::tr{'fw \
accept'}</option>
<option value='drop' $selected{'RULEACTION'}{'drop'}>$Lang::tr{'fw \
drop'}</option> @@ -2669,7 +2669,7 @@
<tr>
<td width='4%' class='base' ></td>
<td class='base'>
- <font class='boldbase'>$Lang::tr{'remark title'}</font>
+ <font class='boldbase'>$Lang::tr{'remark title'}:</font>
<input type='text' name='REMARK' value='$cgiparams{'REMARK'}' size='55' \
maxlength='50' /> <img src='/blob.gif' alt='*' />
</td>
@@ -3333,9 +3333,9 @@
sub printOverviewBox
{
if ($cgiparams{'ACTION'} eq $Lang::tr{'edit'}){
- &Header::openbox('100%', 'left', "$Lang::tr{'edit a rule'} \
$Lang::tr{'overview'}"); + &Header::openbox('100%', 'left', "$Lang::tr{'edit a \
rule'}: $Lang::tr{'overview'}"); } else {
- &Header::openbox('100%', 'left', "$Lang::tr{'add a new rule'} \
$Lang::tr{'overview'}"); + &Header::openbox('100%', 'left', "$Lang::tr{'add a new \
rule'}: $Lang::tr{'overview'}"); }
my $src_net_inv = "";
@@ -3529,7 +3529,7 @@
</tr>
<tr>
<td colspan='2' class='base'>
- <font class='boldbase'>$Lang::tr{'rule actionc'}</font>
+ <font class='boldbase'>$Lang::tr{'rule action'}:</font>
</td>
<td class='base' ><b>$ruleAction</b></td>
</tr>
@@ -3551,7 +3551,7 @@
</tr>
<tr>
<td colspan='2' class='base'>
- <font class='boldbase'>$Lang::tr{'remark title'} </font>
+ <font class='boldbase'>$Lang::tr{'remark title'}: </font>
</td>
<td class='base' ><b>$cgiparams{'REMARK'}</b></td>
</tr>
Modified: ipcop/trunk/html/cgi-bin/fwrulesadm.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/fwrulesadm.cgi 2008-07-23 18:33:18 UTC (rev 1604)
+++ ipcop/trunk/html/cgi-bin/fwrulesadm.cgi 2008-07-23 19:13:35 UTC (rev 1605)
@@ -178,7 +178,7 @@
&Header::openbigbox('100%', 'left');
if ($errormessage) {
- &Header::openbox('100%', 'left', $Lang::tr{'error messages'}, 'error');
+ &Header::openbox('100%', 'left', "$Lang::tr{'error messages'}:", 'error');
print "<class name='base'>$errormessage\n";
print " </class>\n";
&Header::closebox();
@@ -187,12 +187,12 @@
}
unless( $cgiparams{'ACTION'} eq $Lang::tr{'edit'}){
- &Header::openbox('100%', 'left', $Lang::tr{'blockouttraffic configurationc'});
+ &Header::openbox('100%', 'left', "$Lang::tr{'blockouttraffic configuration'}:");
print <<END;
<table width='100%'>
<tr>
- <td class='base' width='25%'>$Lang::tr{'blockouttraffic enabledc'}</td>
+ <td class='base' width='25%'>$Lang::tr{'blockouttraffic enabled'}:</td>
<td align='left' width='10%'>
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
<input type='image' name='$Lang::tr{'toggle enable disable'}' \
src='/images/$gif' alt='$Lang::tr{'toggle enable disable'}' title='$Lang::tr{'toggle \
enable disable'}' /> @@ -226,7 +226,7 @@
<table width='100%' cellpadding='0' cellspacing='5' border='0'>
<tr>
<td align='left' class='base' width='15%' nowrap='nowrap'>
- $Lang::tr{'admin macc'}
+ $Lang::tr{'admin mac'}:
</td>
<td align='left' class='base' width='70%'>
<input type='text' name='ADMIN_MAC' value='$cgiparams{'ADMIN_MAC'}' size='20' \
maxlength='17' /> @@ -250,7 +250,7 @@
</tr>
<tr>
<td align='left' class='base' nowrap='nowrap'>
- $Lang::tr{'https port default 445c'}
+ $Lang::tr{'https port default 445'}:
</td>
<td align='left' class='base'>
<input type='text' name='HTTPS_PORT' value='$cgiparams{'HTTPS_PORT'}' size='7' \
maxlength='5' /> <img src='/blob.gif' alt='*' /> @@ -262,7 +262,7 @@
<table width='100%' cellpadding='0' cellspacing='5' border='0'>
<tr>
<td class='base' colspan="2">
- <br/>$Lang::tr{'connection statec'}
+ <br/>$Lang::tr{'connection state'}:
</td>
</tr>
<tr>
@@ -273,7 +273,7 @@
</td>
</tr>
<tr>
- <td class='base' colspan="2"><br/>$Lang::tr{'loggingc'}</td>
+ <td class='base' colspan="2"><br/>$Lang::tr{'logging'}:</td>
</tr>
<tr>
<td></td>
@@ -283,7 +283,7 @@
</td>
</tr>
<tr>
- <td class='base' colspan="2"><br/>$Lang::tr{'default actionc'}</td>
+ <td class='base' colspan="2"><br/>$Lang::tr{'default action'}:</td>
</tr>
<tr>
<td></td>
@@ -297,7 +297,7 @@
</tr>
<tr>
<td class='base' colspan="2">
- <br/>$Lang::tr{'adv modec'}
+ <br/>$Lang::tr{'adv mode'}:
</td>
</tr>
<tr>
@@ -341,7 +341,7 @@
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
<table width='100%' cellpadding='0' cellspacing='5' border='0'>
<tr>
- <td class='base' width='15%' nowrap='nowrap'>$Lang::tr{'admin macc'}</td>
+ <td class='base' width='15%' nowrap='nowrap'>$Lang::tr{'admin mac'}:</td>
<td class='base' width='75%'>
<b>$cgiparams{'ADMIN_MAC'}</b> <img src='/blob.gif' alt='*' />
</td>
@@ -350,7 +350,7 @@
</td>
</tr>
<tr>
- <td class='base' nowrap='nowrap'>$Lang::tr{'https portc'}</td>
+ <td class='base' nowrap='nowrap'>$Lang::tr{'https port'}:</td>
<td class='base'>
<b>$cgiparams{'HTTPS_PORT'}</b> <img src='/blob.gif' alt='*' />
</td>
@@ -360,7 +360,7 @@
<table width='100%' cellpadding='0' cellspacing='5' border='0'>
<tr>
- <td class='base' colspan="2">$Lang::tr{'connection statec'}</td>
+ <td class='base' colspan="2">$Lang::tr{'connection state'}:</td>
</tr>
<tr>
<td width='3%'></td>
@@ -370,7 +370,7 @@
</td>
</tr>
<tr>
- <td class='base' colspan="2"><br/>$Lang::tr{'loggingc'}</td>
+ <td class='base' colspan="2"><br/>$Lang::tr{'logging'}:</td>
</tr>
<tr>
<td></td>
@@ -380,14 +380,14 @@
</td>
</tr>
<tr>
- <td class='base' colspan="2"><br/>$Lang::tr{'default actionc'}</td>
+ <td class='base' colspan="2"><br/>$Lang::tr{'default action'}:</td>
</tr>
<tr>
<td></td>
<td align='left'><b>$defaultAction</b> $Lang::tr{'default action not matched \
packets'}</td> </tr>
<tr>
- <td class='base' colspan="2"><br/>$Lang::tr{'adv modec'}</td>
+ <td class='base' colspan="2"><br/>$Lang::tr{'adv mode'}:</td>
</tr>
<tr>
<td></td>
Modified: ipcop/trunk/html/cgi-bin/graphs.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/graphs.cgi 2008-07-23 18:33:18 UTC (rev 1604)
+++ ipcop/trunk/html/cgi-bin/graphs.cgi 2008-07-23 19:13:35 UTC (rev 1605)
@@ -111,9 +111,9 @@
}
} else {
&disp_graph("CPU $Lang::tr{'graph'}", "cpu", "cpu-$Lang::tr{'day'}");
- &disp_graph("Memory $Lang::tr{'graph'}", "memory", \
"$Lang::tr{'memory'}-$Lang::tr{'day'}"); + &disp_graph("Memory $Lang::tr{'graph'}", \
"memory", "$Lang::tr{'memory'}:-$Lang::tr{'day'}"); &disp_graph("Swap \
$Lang::tr{'graph'}", "swap", "$Lang::tr{'swap'}-$Lang::tr{'day'}") unless ( -e \
"/etc/FLASH" );
- &disp_graph("Diskuse $Lang::tr{'graph'}", "diskuse", "$Lang::tr{'disk \
usage'}-$Lang::tr{'day'}"); + &disp_graph("Diskuse $Lang::tr{'graph'}", "diskuse", \
"$Lang::tr{'disk usage'}:-$Lang::tr{'day'}"); &disp_graph("Disk $Lang::tr{'graph'}", \
"disk", "disk-$Lang::tr{'day'}"); }
Modified: ipcop/trunk/html/cgi-bin/gui.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/gui.cgi 2008-07-23 18:33:18 UTC (rev 1604)
+++ ipcop/trunk/html/cgi-bin/gui.cgi 2008-07-23 19:13:35 UTC (rev 1605)
@@ -162,7 +162,7 @@
&Header::openbigbox('100%', 'left', '');
if ($errormessage) {
- &Header::openbox('100%','left',$Lang::tr{'error messages'}, "error");
+ &Header::openbox('100%','left', "$Lang::tr{'error messages'}:", "error");
print "<font class='base'>${errormessage} </font>\n";
&Header::closebox();
}
@@ -185,7 +185,7 @@
<td>$Lang::tr{'refresh index page while connected'}</td>
</tr><tr>
<td> </td>
- <td>$Lang::tr{'languagepurpose'}</td>
+ <td>$Lang::tr{'languagepurpose'}:</td>
</tr><tr>
<td> </td>
<td><select name='LANGUAGE'>\n$optionlist\t</select></td>
Modified: ipcop/trunk/html/cgi-bin/hosts.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/hosts.cgi 2008-07-23 18:33:18 UTC (rev 1604)
+++ ipcop/trunk/html/cgi-bin/hosts.cgi 2008-07-23 19:13:35 UTC (rev 1605)
@@ -184,7 +184,7 @@
my %checked=(); # Checkbox manipulations
if ($errormessage) {
- &Header::openbox('100%', 'left', $Lang::tr{'error messages'}, 'error');
+ &Header::openbox('100%', 'left', "$Lang::tr{'error messages'}:", 'error');
print "<font class='base'>$errormessage </font>";
&Header::closebox();
}
@@ -231,7 +231,7 @@
$buttontext = $Lang::tr{'update'};
&Header::openbox('100%', 'left', $Lang::tr{'edit an existing host'});
} else {
- &Header::openbox('100%', 'left', $Lang::tr{'add a host'});
+ &Header::openbox('100%', 'left', "$Lang::tr{'add a host'}:");
}
#Edited line number (KEY1) passed until cleared by 'save' or 'remove' or 'new sort \
order' @@ -247,7 +247,7 @@
</tr><tr>
<td class='base'>$Lang::tr{'domain name'}: <img src='/blob.gif' alt='*' \
/></td> <td><input type='text' name='DOM' value='$settings{'DOM'}' /></td>
- <td class='base'>$Lang::tr{'enabled'}</td>
+ <td class='base'>$Lang::tr{'enabled'}:</td>
<td><input type='checkbox' name='EN' $checked{'EN'}{'on'} /></td>
</tr>
</table>
@@ -290,7 +290,7 @@
#
# Columns headers may content a link. In this case it must be named in $sortstring
#
-&Header::openbox('100%', 'left', $Lang::tr{'current hosts'});
+&Header::openbox('100%', 'left', "$Lang::tr{'current hosts'}:");
print <<END
<table width='100%'>
<tr>
Modified: ipcop/trunk/html/cgi-bin/ids.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/ids.cgi 2008-07-23 18:33:18 UTC (rev 1604)
+++ ipcop/trunk/html/cgi-bin/ids.cgi 2008-07-23 19:13:35 UTC (rev 1605)
@@ -70,7 +70,7 @@
&General::readhash($datafile, \%snortsettings);
# form is empty on first display so check after settings has been read
-if ( $snortsettings{'RULESTYPE'} ne 'nothing' &&
+if ( $snortsettings{'RULESTYPE'} ne 'nothing' &&
( length($snortsettings{'OINKCODE'})!=40 || $snortsettings{'OINKCODE'} !~ \
/^[a-z0-9]+$/ ) ) { $errormessage = $Lang::tr{'invalid input for oink code'};
}
@@ -172,7 +172,7 @@
&Header::openbigbox('100%', 'left', '');
if ($errormessage) {
- &Header::openbox('100%', 'left', $Lang::tr{'error messages'}, 'error');
+ &Header::openbox('100%', 'left', "$Lang::tr{'error messages'}:", 'error');
print "<class name='base'>$errormessage\n";
print " </class>\n";
&Header::closebox();
@@ -193,8 +193,8 @@
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
<table border='0' width='100%'>
<tr>
- <th align='left'>$Lang::tr{'interfaces'}</th>
- <th align='center'>$Lang::tr{'memory'}</th>
+ <th align='left'>$Lang::tr{'interfaces'}:</th>
+ <th align='center'>$Lang::tr{'memory'}:</th>
<th align='center'>$Lang::tr{'status'}:</th>
</tr>
<tr>
@@ -290,7 +290,7 @@
# display update log
if ($snortsettings{'ACTION'} eq $Lang::tr{'read last rules installation log'} || \
$snortsettings{'ACTION'} eq $Lang::tr{'apply'} ) {
- print "<b>$Lang::tr{'installed updates'}</b>\n<pre>";
+ print "<b>$Lang::tr{'installed updates'}:</b>\n<pre>";
open(FILE,$logfile) or die "Unable to open $logfile";
my @log=<FILE>;
close FILE;
Modified: ipcop/trunk/html/cgi-bin/ifaces.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/ifaces.cgi 2008-07-23 18:33:18 UTC (rev 1604)
+++ ipcop/trunk/html/cgi-bin/ifaces.cgi 2008-07-23 19:13:35 UTC (rev 1605)
@@ -185,7 +185,7 @@
#&Header::closebox();
if ($errormessage) {
- &Header::openbox('100%', 'left', $Lang::tr{'error messages'}, 'error');
+ &Header::openbox('100%', 'left', "$Lang::tr{'error messages'}:", 'error');
print "<class name='base'>$errormessage\n";
print " </class>\n";
&Header::closebox();
Modified: ipcop/trunk/html/cgi-bin/index.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/index.cgi 2008-07-23 18:33:18 UTC (rev 1604)
+++ ipcop/trunk/html/cgi-bin/index.cgi 2008-07-23 19:13:35 UTC (rev 1605)
@@ -76,7 +76,7 @@
print "<font face='Helvetica' size='4'><b>";
if ( !( ($netsettings{'RED_COUNT'} >= 1) && $netsettings{'RED_1_TYPE'} =~ \
/^(DHCP|STATIC)$/ ) ) {
- print "<u>$Lang::tr{'current profile'} $pppsettings{'PROFILENAME'}</u><br />\n";
+ print "<u>$Lang::tr{'current profile'}: $pppsettings{'PROFILENAME'}</u><br />\n";
}
if ( ( $pppsettings{'VALID'} eq 'yes'&& $modemsettings{'VALID'} eq 'yes' ) ||
Modified: ipcop/trunk/html/cgi-bin/ipsec.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/ipsec.cgi 2008-07-23 18:33:18 UTC (rev 1604)
+++ ipcop/trunk/html/cgi-bin/ipsec.cgi 2008-07-23 19:13:35 UTC (rev 1605)
@@ -40,9 +40,9 @@
undef (@dummy);
# $Lang::tr{'host'} # Dummy string variables included here
-# $Lang::tr{'psk'} # otherwise lang scripts will miss them
+# $Lang::tr{'psk'} # otherwise lang scripts will miss them
# $Lang::tr{'cert'}
-# $Lang::tr{'net'}
+# $Lang::tr{'net'}
###
### Initialize variables
@@ -1064,7 +1064,7 @@
&Header::openpage($Lang::tr{'vpn configuration main'}, 1, '');
&Header::openbigbox('100%', 'left', '', $errormessage);
if ($errormessage) {
- &Header::openbox('100%', 'left', $Lang::tr{'error messages'}, 'error');
+ &Header::openbox('100%', 'left', "$Lang::tr{'error messages'}:", 'error');
print "<class name='base'>$errormessage";
print " </class>";
&Header::closebox();
@@ -1909,7 +1909,7 @@
&Header::openpage($Lang::tr{'vpn configuration main'}, 1, '');
&Header::openbigbox('100%', 'left', '', $errormessage);
if ($errormessage) {
- &Header::openbox('100%', 'left', $Lang::tr{'error messages'}, 'error');
+ &Header::openbox('100%', 'left', "$Lang::tr{'error messages'}:", 'error');
print "<class name='base'>$errormessage";
print " </class>";
&Header::closebox();
@@ -1953,7 +1953,7 @@
} else {
print "<td width='25%'><input type='text' name='NAME' value='$cgiparams{'NAME'}' \
size='30' /></td>"; }
- print "<td>$Lang::tr{'enabled'}</td><td><input type='checkbox' name='ENABLED' \
$checked{'ENABLED'}{'on'} /></td></tr>"; + print \
"<td>$Lang::tr{'enabled'}:</td><td><input type='checkbox' name='ENABLED' \
$checked{'ENABLED'}{'on'} /></td></tr>"; print '</tr><td><br /></td><tr>';
my $disabled;
@@ -1974,13 +1974,13 @@
<td class='base'>$Lang::tr{'remote host/ip'}: $blob</td>
<td><input type='text' name='REMOTE' value='$cgiparams{'REMOTE'}' size='30' \
/></td> </tr><tr>
- <td class='base' nowrap='nowrap'>$Lang::tr{'local subnet'}</td>
+ <td class='base' nowrap='nowrap'>$Lang::tr{'local subnet'}:</td>
<td><input type='text' name='LOCAL_SUBNET' value='$cgiparams{'LOCAL_SUBNET'}' \
size='30' /></td>
- <td class='base' nowrap='nowrap'>$Lang::tr{'remote subnet'}</td>
+ <td class='base' nowrap='nowrap'>$Lang::tr{'remote subnet'}:</td>
<td><input $disabled type='text' name='REMOTE_SUBNET' \
value='$cgiparams{'REMOTE_SUBNET'}' size='30' /></td> </tr><tr>
<td class='base'>$Lang::tr{'vpn local id'}: <img src='/blob.gif' alt='*' \
/>
- <br />($Lang::tr{'eg'} <tt>@xy.example.com</tt>)</td>
+ <br />($Lang::tr{'eg'}: <tt>@xy.example.com</tt>)</td>
<td><input type='text' name='LOCAL_ID' value='$cgiparams{'LOCAL_ID'}' /></td>
<td class='base'>$Lang::tr{'vpn remote id'}: <img src='/blob.gif' alt='*' \
/></td>
<td><input type='text' name='REMOTE_ID' value='$cgiparams{'REMOTE_ID'}' /></td>
@@ -1998,7 +1998,7 @@
http://bugs.xelerance.com/view.php?id=156
restart = clear + reinitiate connection
-->
- <td class='base'>$Lang::tr{'remark title'} <img src='/blob.gif' alt='*' \
/></td> + <td class='base'>$Lang::tr{'remark title'}: <img src='/blob.gif' \
alt='*' /></td>
<td colspan='3'><input type='text' name='REMARK' value='$cgiparams{'REMARK'}' \
size='55' maxlength='50' /></td> </tr>
END
@@ -2010,10 +2010,10 @@
&Header::closebox();
if ($cgiparams{'KEY'} && $cgiparams{'AUTH'} eq 'psk') {
- &Header::openbox('100%', 'left', $Lang::tr{'authentication'}, $error_auth);
+ &Header::openbox('100%', 'left', "$Lang::tr{'authentication'}:", $error_auth);
print <<END
<table width='100%' cellpadding='0' cellspacing='5' border='0'>
- <tr><td class='base' width='50%'>$Lang::tr{'use a pre-shared key'}</td>
+ <tr><td class='base' width='50%'>$Lang::tr{'use a pre-shared key'}:</td>
<td class='base' width='50%'><input type='text' name='PSK' size='30' \
value='$cgiparams{'PSK'}' /></td> </tr>
</table>
@@ -2027,25 +2027,25 @@
$cgiparams{'CERT_NAME'} = $Lang::tr{'vpn no full pki'} if ($cakeydisabled);
my $cacrtdisabled = ( ! -f "${General::swroot}/ca/cacert.pem" ) ? \
"disabled='disabled'" : '';
- &Header::openbox('100%', 'left', $Lang::tr{'authentication'}, $error_auth);
+ &Header::openbox('100%', 'left', "$Lang::tr{'authentication'}:", $error_auth);
print <<END
<table width='100%' cellpadding='0' cellspacing='5' border='0'>
<tr><td width='5%'><input type='radio' name='AUTH' value='psk' \
$checked{'AUTH'}{'psk'} $pskdisabled/></td>
- <td class='base' width='55%'>$Lang::tr{'use a pre-shared key'}</td>
+ <td class='base' width='55%'>$Lang::tr{'use a pre-shared key'}:</td>
<td class='base' width='40%'><input type='text' name='PSK' size='30' \
value='$cgiparams{'PSK'}' $pskdisabled/></td></tr> <tr><td colspan='3' \
bgcolor='#000000'></td></tr> <tr><td><input type='radio' name='AUTH' value='certreq' \
$checked{'AUTH'}{'certreq'} $cakeydisabled /></td>
- <td class='base'><hr />$Lang::tr{'upload a certificate request'}</td>
+ <td class='base'><hr />$Lang::tr{'upload a certificate request'}:</td>
<td class='base' rowspan='3' valign='middle'><input type='file' name='FH' \
size='30' $cacrtdisabled /></td></tr> <tr><td><input type='radio' name='AUTH' \
value='certfile' $checked{'AUTH'}{'certfile'} $cacrtdisabled /></td>
- <td class='base'>$Lang::tr{'upload a certificate'}</td></tr>
+ <td class='base'>$Lang::tr{'upload a certificate'}:</td></tr>
<tr><td><input type='radio' name='AUTH' value='pkcs12' $cacrtdisabled /></td>
<td class='base'>$Lang::tr{'upload p12 file'} $Lang::tr{'pkcs12 file \
password'}:<input type='password' name='P12_PASS'/></td></tr> <tr><td><input \
type='radio' name='AUTH' value='auth-dn' $checked{'AUTH'}{'auth-dn'} $cacrtdisabled \
/></td> <td class='base'><hr />$Lang::tr{'vpn auth-dn'}</td></tr>
<tr><td colspan='3' bgcolor='#000000'></td></tr>
<tr><td><input type='radio' name='AUTH' value='certgen' $checked{'AUTH'}{'certgen'} \
$cakeydisabled /></td>
- <td class='base'><hr />$Lang::tr{'generate a \
certificate'}</td><td> </td></tr> + <td class='base'><hr \
/>$Lang::tr{'generate a certificate'}:</td><td> </td></tr> <tr><td> </td>
<td class='base'>$Lang::tr{'users fullname or system hostname'}:</td>
<td class='base' nowrap='nowrap'><input type='text' name='CERT_NAME' \
value='$cgiparams{'CERT_NAME'}' size='32' $cakeydisabled /></td></tr> @@ -2323,7 \
+2323,7 @@ &Header::openbigbox('100%', 'left', '', $errormessage);
if ($errormessage) {
- &Header::openbox('100%', 'left', $Lang::tr{'error messages'}, 'error');
+ &Header::openbox('100%', 'left', "$Lang::tr{'error messages'}:", 'error');
print "<class name='base'>$errormessage";
print " </class>";
&Header::closebox();
@@ -2343,7 +2343,7 @@
<input type='hidden' name='KEY' value='$cgiparams{'KEY'}' />
<table width='100%' border='0'>
- <tr><td class='base' align='right' valign='top'>$Lang::tr{'ike encryption'}</td><td \
class='base' valign='top'> + <tr><td class='base' align='right' \
valign='top'>$Lang::tr{'ike encryption'}:</td><td class='base' valign='top'> <select \
name='IKE_ENCRYPTION' multiple='multiple' size='4'> <option value='aes256' \
$checked{'IKE_ENCRYPTION'}{'aes256'}>AES (256 bit)</option> <option value='aes128' \
$checked{'IKE_ENCRYPTION'}{'aes128'}>AES (128 bit)</option> @@ -2357,7 +2357,7 @@
<option value='cast128' $checked{'IKE_ENCRYPTION'}{'cast128'}>Cast (128 \
bit)</option> </select></td>
- <td class='base' align='right' valign='top'>$Lang::tr{'ike integrity'}</td><td \
class='base' valign='top'> + <td class='base' align='right' \
valign='top'>$Lang::tr{'ike integrity'}:</td><td class='base' valign='top'> <select \
name='IKE_INTEGRITY' multiple='multiple' size='4'> <option value='sha2_512' \
$checked{'IKE_INTEGRITY'}{'sha2_512'}>SHA2 (512)</option> <option value='sha2_256' \
$checked{'IKE_INTEGRITY'}{'sha2_256'}>SHA2 (256)</option> @@ -2365,7 +2365,7 @@
<option value='md5' $checked{'IKE_INTEGRITY'}{'md5'}>MD5</option>
</select></td>
- <td class='base' align='right' valign='top'>$Lang::tr{'ike grouptype'}</td><td \
class='base' valign='top'> + <td class='base' align='right' \
valign='top'>$Lang::tr{'ike grouptype'}:</td><td class='base' valign='top'> <select \
name='IKE_GROUPTYPE' multiple='multiple' size='4'> <option value='8192' \
$checked{'IKE_GROUPTYPE'}{'8192'}>MODP-8192</option> <option value='6144' \
$checked{'IKE_GROUPTYPE'}{'6144'}>MODP-6144</option> @@ -2377,13 +2377,13 @@
<option value='768' $checked{'IKE_GROUPTYPE'}{'768'}>MODP-768</option>
</select></td>
</tr><tr>
- <td class='base' align='right'>$Lang::tr{'ike lifetime'}</td><td class='base'>
+ <td class='base' align='right'>$Lang::tr{'ike lifetime'}:</td><td class='base'>
<input type='text' name='IKE_LIFETIME' value='$cgiparams{'IKE_LIFETIME'}' \
size='5' /> $Lang::tr{'hours'}</td>
</tr><tr>
<td colspan='6'><hr /></td>
</tr><tr>
- <td class='base' align='right' valign='top'>$Lang::tr{'esp encryption'}</td><td \
class='base' valign='top'> + <td class='base' align='right' \
valign='top'>$Lang::tr{'esp encryption'}:</td><td class='base' valign='top'> <select \
name='ESP_ENCRYPTION' multiple='multiple' size='4'> <option value='aes256' \
$checked{'ESP_ENCRYPTION'}{'aes256'}>AES (256 bit)</option> <option value='aes128' \
$checked{'ESP_ENCRYPTION'}{'aes128'}>AES (128 bit)</option> @@ -2395,14 +2395,14 @@
<option value='blowfish256' $checked{'ESP_ENCRYPTION'}{'blowfish256'}>Blowfish \
(256 bit)</option> <option value='blowfish128' \
$checked{'ESP_ENCRYPTION'}{'blowfish128'}>Blowfish (128 bit)</option></select></td>
- <td class='base' align='right' valign='top'>$Lang::tr{'esp integrity'}</td><td \
class='base' valign='top'> + <td class='base' align='right' \
valign='top'>$Lang::tr{'esp integrity'}:</td><td class='base' valign='top'> <select \
name='ESP_INTEGRITY' multiple='multiple' size='4'> <option value='sha2_512' \
$checked{'ESP_INTEGRITY'}{'sha2_512'}>SHA2 (512)</option> <option value='sha2_256' \
$checked{'ESP_INTEGRITY'}{'sha2_256'}>SHA2 (256)</option> <option value='sha1' \
$checked{'ESP_INTEGRITY'}{'sha1'}>SHA1</option> <option value='md5' \
$checked{'ESP_INTEGRITY'}{'md5'}>MD5</option></select></td>
- <td class='base' align='right' valign='top'>$Lang::tr{'esp grouptype'}</td><td \
class='base' valign='top'> + <td class='base' align='right' \
valign='top'>$Lang::tr{'esp grouptype'}:</td><td class='base' valign='top'> <select \
name='ESP_GROUPTYPE'> <option value=''>$Lang::tr{'phase1 group'}</option>
<option value='modp4096' $checked{'ESP_GROUPTYPE'}{'modp4096'}>MODP-4096</option>
@@ -2412,7 +2412,7 @@
<option value='modp1024' $checked{'ESP_GROUPTYPE'}{'modp1024'}>MODP-1024</option>
<option value='modp768' \
$checked{'ESP_GROUPTYPE'}{'modp768'}>MODP-768</option></select></td> </tr><tr>
- <td class='base' align='right'>$Lang::tr{'esp keylife'}</td><td class='base'>
+ <td class='base' align='right'>$Lang::tr{'esp keylife'}:</td><td class='base'>
<input type='text' name='ESP_KEYLIFE' value='$cgiparams{'ESP_KEYLIFE'}' size='5' \
/> $Lang::tr{'hours'}</td> </tr><tr>
<td colspan='6'><hr /></td>
@@ -2492,7 +2492,7 @@
&Header::openbigbox('100%', 'left', '', $errormessage);
if ($errormessage) {
- &Header::openbox('100%', 'left', $Lang::tr{'error messages'}, 'error');
+ &Header::openbox('100%', 'left', "$Lang::tr{'error messages'}:", 'error');
print "<class name='base'>$errormessage\n";
print " </class>\n";
&Header::closebox();
@@ -2505,7 +2505,7 @@
<tr>
<td width='20%' class='base' nowrap='nowrap'>$Lang::tr{'vpn red name'}:</td>
<td width='20%'><input type='text' name='VPN_IP' value='$cgiparams{'VPN_IP'}' \
/></td>
- <td width='20%' class='base'>$Lang::tr{'enabled'}<input type='checkbox' \
name='ENABLED' $checked{'ENABLED'} /></td> + <td width='20%' \
class='base'>$Lang::tr{'enabled'}:<input type='checkbox' name='ENABLED' \
$checked{'ENABLED'} /></td> </tr>
END
;
@@ -2549,7 +2549,7 @@
print "</form>";
&Header::closebox();
- &Header::openbox('100%', 'left', $Lang::tr{'connection status and controlc'});
+ &Header::openbox('100%', 'left', "$Lang::tr{'connection status and \
controlc'}:"); print <<END
<table width='100%' border='0' cellspacing='1' cellpadding='0'>
<tr>
Modified: ipcop/trunk/html/cgi-bin/logs.cgi/config.dat
===================================================================
--- ipcop/trunk/html/cgi-bin/logs.cgi/config.dat 2008-07-23 18:33:18 UTC (rev 1604)
+++ ipcop/trunk/html/cgi-bin/logs.cgi/config.dat 2008-07-23 19:13:35 UTC (rev 1605)
@@ -87,7 +87,7 @@
&Header::openbigbox('100%', 'left', '');
if ($errormessage) {
- &Header::openbox('100%', 'left', $Lang::tr{'error messages'}, 'error');
+ &Header::openbox('100%', 'left', "$Lang::tr{'error messages'}:", 'error');
print "<font class='base'>$errormessage </font>\n";
&Header::closebox();
@@ -129,7 +129,7 @@
</tr><tr>
<td colspan='4'><hr /><b>$Lang::tr{'remote logging'}</b></td>
</tr><tr>
- <td width='25%' class='base'>$Lang::tr{'enabled'}</td>
+ <td width='25%' class='base'>$Lang::tr{'enabled'}:</td>
<td width='25%'><input type='checkbox' name='ENABLE_REMOTELOG' \
$checked{'ENABLE_REMOTELOG'}{'on'} /></td> <td width='25%' \
class='base'>$Lang::tr{'log server address'}:</td> <td width='25%'><input \
type='text' name='REMOTELOG_ADDR' value='$logsettings{'REMOTELOG_ADDR'}' /></td>
Modified: ipcop/trunk/html/cgi-bin/logs.cgi/firewalllog.dat
===================================================================
--- ipcop/trunk/html/cgi-bin/logs.cgi/firewalllog.dat 2008-07-23 18:33:18 UTC (rev \
1604)
+++ ipcop/trunk/html/cgi-bin/logs.cgi/firewalllog.dat 2008-07-23 19:13:35 UTC (rev \
1605) @@ -221,7 +221,7 @@
&Header::openbigbox('100%', 'left', '');
if ($errormessage) {
- &Header::openbox('100%', 'left', $Lang::tr{'error messages'}, 'error');
+ &Header::openbox('100%', 'left', "$Lang::tr{'error messages'}:", 'error');
print "<font class='base'>$errormessage </font>\n";
&Header::closebox();
}
@@ -277,7 +277,7 @@
&Header::closebox();
-&Header::openbox('100%', 'left', $Lang::tr{'log'});
+&Header::openbox('100%', 'left', "$Lang::tr{'log'}:");
print "<p><b>$Lang::tr{'firewall hits'} $date: $lines</b></p>";
$start = $lines - ${Header::viewsize} if ($start >= $lines - ${Header::viewsize});
Modified: ipcop/trunk/html/cgi-bin/logs.cgi/ids.dat
===================================================================
--- ipcop/trunk/html/cgi-bin/logs.cgi/ids.dat 2008-07-23 18:33:18 UTC (rev 1604)
+++ ipcop/trunk/html/cgi-bin/logs.cgi/ids.dat 2008-07-23 19:13:35 UTC (rev 1605)
@@ -191,7 +191,7 @@
&Header::openbigbox('100%', 'left', '');
if ($errormessage) {
- &Header::openbox('100%', 'left', $Lang::tr{'error messages'}, 'error');
+ &Header::openbox('100%', 'left', "$Lang::tr{'error messages'}:", 'error');
print "<font class='base'>$errormessage </font>\n";
&Header::closebox();
}
@@ -246,7 +246,7 @@
&Header::closebox();
-&Header::openbox('100%', 'left', $Lang::tr{'log'});
+&Header::openbox('100%', 'left', "$Lang::tr{'log'}:");
print "<p><b>$Lang::tr{'snort hits'} $longmonthstr $daystr: $lines</b></p>";
if ($start == -1) {
Modified: ipcop/trunk/html/cgi-bin/logs.cgi/log.dat
===================================================================
--- ipcop/trunk/html/cgi-bin/logs.cgi/log.dat 2008-07-23 18:33:18 UTC (rev 1604)
+++ ipcop/trunk/html/cgi-bin/logs.cgi/log.dat 2008-07-23 19:13:35 UTC (rev 1605)
@@ -253,7 +253,7 @@
&Header::openbigbox('100%', 'left', '');
if ($errormessage) {
- &Header::openbox('100%', 'left', $Lang::tr{'error messages'}, 'error');
+ &Header::openbox('100%', 'left', "$Lang::tr{'error messages'}:", 'error');
print "<font class='base'>$errormessage </font>\n";
&Header::closebox();
}
@@ -322,7 +322,7 @@
&Header::closebox();
-&Header::openbox('100%', 'left', $Lang::tr{'log'});
+&Header::openbox('100%', 'left', "$Lang::tr{'log'}:");
print "<p><b>$Lang::tr{'total hits for log section'} $cgiparams{'SECTION'} $date: \
$lines</b></p>";
$start = $lines - ${Header::viewsize} if ($start >= $lines - ${Header::viewsize});
Modified: ipcop/trunk/html/cgi-bin/logs.cgi/proxylog.dat
===================================================================
--- ipcop/trunk/html/cgi-bin/logs.cgi/proxylog.dat 2008-07-23 18:33:18 UTC (rev 1604)
+++ ipcop/trunk/html/cgi-bin/logs.cgi/proxylog.dat 2008-07-23 19:13:35 UTC (rev 1605)
@@ -181,7 +181,7 @@
eval($thiscode);
if ($@ ne '')
{
- $errormessage = "$Lang::tr{'bad ignore filter'}.$@<P>";
+ $errormessage = "$Lang::tr{'bad ignore filter'}:.$@<P>";
$filter = '';
} else {
my $loop = 1;
@@ -312,7 +312,7 @@
&Header::openbigbox('100%', 'left', '');
if ($errormessage) {
- &Header::openbox('100%', 'left', $Lang::tr{'error messages'}, 'error');
+ &Header::openbox('100%', 'left', "$Lang::tr{'error messages'}:", 'error');
print "<font class='base'>$errormessage </font>\n";
&Header::closebox();
}
@@ -396,7 +396,7 @@
;
&Header::closebox();
-&Header::openbox('100%', 'left', $Lang::tr{'log'});
+&Header::openbox('100%', 'left', "$Lang::tr{'log'}:");
$start = $lines - ${Header::viewsize} if ($start >= $lines - ${Header::viewsize});
Modified: ipcop/trunk/html/cgi-bin/logs.cgi/summary.dat
===================================================================
--- ipcop/trunk/html/cgi-bin/logs.cgi/summary.dat 2008-07-23 18:33:18 UTC (rev 1604)
+++ ipcop/trunk/html/cgi-bin/logs.cgi/summary.dat 2008-07-23 19:13:35 UTC (rev 1605)
@@ -20,7 +20,7 @@
require '/var/ipcop/header.pl';
# $Lang::tr{'ls_dhcpd'} # Dummy string variables included here
-# $Lang::tr{'ls_disk space'} # or gen_strings script will miss them
+# $Lang::tr{'ls_disk space'} # or gen_strings script will miss them
# $Lang::tr{'ls_free/swan'}
# $Lang::tr{'ls_httpd'}
# $Lang::tr{'ls_init'}
@@ -132,7 +132,7 @@
&Header::openbigbox('100%', 'left', '');
if ($errormessage) {
- &Header::openbox('100%', 'left', $Lang::tr{'error messages'}, 'error');
+ &Header::openbox('100%', 'left', "$Lang::tr{'error messages'}:", 'error');
print "<font class='base'>$errormessage </font>\n";
&Header::closebox();
}
@@ -196,7 +196,7 @@
if (/^\s*--+ ([^-]+) Begin --+\s*$/) {
# New Section. open box
@content = ();
- &Header::openbox('100%', 'left', $Lang::tr{"ls_\L$1"} ? $Lang::tr{"ls_\L$1"} : \
$1); + &Header::openbox('100%', 'left', $Lang::tr{"ls_\L$1"} ? \
"$Lang::tr{"ls_\L$1"}:" : "$1:"); print "<pre>";
} elsif (/^\s*--+ ([^-]+) End --+\s*$/) {
# End of Section, kill leading and trailing blanks, print info, close
Modified: ipcop/trunk/html/cgi-bin/modem.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/modem.cgi 2008-07-23 18:33:18 UTC (rev 1604)
+++ ipcop/trunk/html/cgi-bin/modem.cgi 2008-07-23 19:13:35 UTC (rev 1605)
@@ -39,7 +39,7 @@
}
ERROR:
if ($errormessage) {
- $modemsettings{'VALID'} = 'no';
+ $modemsettings{'VALID'} = 'no';
$error_modem = 'error';
} else {
$modemsettings{'VALID'} = 'yes';
@@ -60,7 +60,7 @@
&Header::openbigbox('100%', 'left', '');
if ($errormessage) {
- &Header::openbox('100%', 'left', $Lang::tr{'error messages'}, 'error');
+ &Header::openbox('100%', 'left', "$Lang::tr{'error messages'}:", 'error');
print "<font class='base'>$errormessage </font>\n";
&Header::closebox();
}
@@ -71,25 +71,25 @@
print <<END
<table width='100%'>
<tr>
- <td width='25%' class='base'>$Lang::tr{'init string'} <img src='/blob.gif' \
alt='*' /></td> + <td width='25%' class='base'>$Lang::tr{'init string'}: <img \
src='/blob.gif' alt='*' /></td> <td width='25%'><input type='text' name='INIT' \
value='$modemsettings{'INIT'}' /></td>
- <td width='25%' class='base'>$Lang::tr{'hangup string'} <img src='/blob.gif' \
alt='*' /></td> + <td width='25%' class='base'>$Lang::tr{'hangup string'}: <img \
src='/blob.gif' alt='*' /></td> <td width='25%'><input type='text' name='HANGUP' \
value='$modemsettings{'HANGUP'}' /></td> </tr>
<tr>
- <td class='base'>$Lang::tr{'speaker on'} <img src='/blob.gif' alt='*' /></td>
+ <td class='base'>$Lang::tr{'speaker on'}: <img src='/blob.gif' alt='*' /></td>
<td><input type='text' name='SPEAKER_ON' value='$modemsettings{'SPEAKER_ON'}' \
/></td>
- <td class='base'>$Lang::tr{'speaker off'} <img src='/blob.gif' alt='*' /></td>
+ <td class='base'>$Lang::tr{'speaker off'}: <img src='/blob.gif' alt='*' \
/></td> <td><input type='text' name='SPEAKER_OFF' \
value='$modemsettings{'SPEAKER_OFF'}' /></td> </tr>
<tr>
- <td class='base'>$Lang::tr{'tone dial'} <img src='/blob.gif' alt='*' /></td>
+ <td class='base'>$Lang::tr{'tone dial'}: <img src='/blob.gif' alt='*' /></td>
<td><input type='text' name='TONE_DIAL' value='$modemsettings{'TONE_DIAL'}' /></td>
- <td class='base'>$Lang::tr{'pulse dial'} <img src='/blob.gif' alt='*' /></td>
+ <td class='base'>$Lang::tr{'pulse dial'}: <img src='/blob.gif' alt='*' /></td>
<td><input type='text' name='PULSE_DIAL' value='$modemsettings{'PULSE_DIAL'}' \
/></td> </tr>
<tr>
- <td class='base'>$Lang::tr{'connect timeout'}</td>
+ <td class='base'>$Lang::tr{'connect timeout'}:</td>
<td><input type='text' name='TIMEOUT' value='$modemsettings{'TIMEOUT'}' /></td>
<td class='base'> </td>
<td> </td>
Modified: ipcop/trunk/html/cgi-bin/netstatus.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/netstatus.cgi 2008-07-23 18:33:18 UTC (rev 1604)
+++ ipcop/trunk/html/cgi-bin/netstatus.cgi 2008-07-23 19:13:35 UTC (rev 1605)
@@ -36,7 +36,7 @@
print "<table width='100%' cellspacing='0' cellpadding='5'border='0'>\n";
print "<tr><td style='background-color: #FFFFFF;' align='left'>\n";
-print "<a href='#interfaces'>$Lang::tr{'interfaces'}</a> |\n";
+print "<a href='#interfaces'>$Lang::tr{'interfaces'}:</a> |\n";
if ( ($netsettings{'RED_COUNT'} >= 1) && $netsettings{'RED_1_TYPE'} eq "DHCP") {
print "<a href='#reddhcp'>RED $Lang::tr{'dhcp configuration'}</a> |\n";
}
@@ -46,12 +46,12 @@
if ($pppsettings{'TYPE'} =~ \
/^(bewanadsl|alcatelusbk|conexantpciadsl|eagleusbadsl|wanpipe)$/) { print "<a \
href='#adsl'>$Lang::tr{'adsl settings'}</a> |\n"; }
-print "<a href='#routing'>$Lang::tr{'routing table entries'}</a> |\n";
-print "<a href='#arp'> $Lang::tr{'arp table entries'}</a>\n";
+print "<a href='#routing'>$Lang::tr{'routing table entries'}:</a> |\n";
+print "<a href='#arp'> $Lang::tr{'arp table entries'}:</a>\n";
print "</td></tr></table>\n";
print "<a name='interfaces'/>\n";
-&Header::openbox('100%', 'left', $Lang::tr{'interfaces'});
+&Header::openbox('100%', 'left', "$Lang::tr{'interfaces'}:");
$output = `/sbin/ifconfig -a`;
$output = &Header::cleanhtml($output,"y");
@@ -111,8 +111,8 @@
}
print <<END
<tr><td>$Lang::tr{'gateway'}:</td><td>$dhcpinfo{'DHCLIENT_GATEWAY'}</td></tr>
- <tr><td>$Lang::tr{'primary dns'}</td><td>$dhcpinfo{'DHCLIENT_DNS1'}</td></tr>
- <tr><td>$Lang::tr{'secondary dns'}</td><td>$dhcpinfo{'DHCLIENT_DNS2'}</td></tr>
+ <tr><td>$Lang::tr{'primary dns'}:</td><td>$dhcpinfo{'DHCLIENT_DNS1'}</td></tr>
+ <tr><td>$Lang::tr{'secondary dns'}:</td><td>$dhcpinfo{'DHCLIENT_DNS2'}</td></tr>
<tr><td>$Lang::tr{'dhcp server'}:</td><td>$dhcpinfo{'DHCLIENT_SIADDR'}</td></tr>
<tr><td>$Lang::tr{'def lease time'}:</td><td>$leasetime</td></tr>
<tr><td>$Lang::tr{'lease expires'}:</td><td>$leaseexpires</td></tr>
@@ -184,14 +184,14 @@
}
print "<a name='routing'/>\n";
-&Header::openbox('100%', 'left', $Lang::tr{'routing table entries'});
+&Header::openbox('100%', 'left', "$Lang::tr{'routing table entries'}:");
$output = `/sbin/route -n`;
$output = &Header::cleanhtml($output,"y");
print "<pre>$output</pre>\n";
&Header::closebox();
print "<a name='arp'/>\n";
-&Header::openbox('100%', 'left', $Lang::tr{'arp table entries'});
+&Header::openbox('100%', 'left', "$Lang::tr{'arp table entries'}:");
$output = `/sbin/arp -n`;
$output = &Header::cleanhtml($output,"y");
print "<pre>$output</pre>\n";
Modified: ipcop/trunk/html/cgi-bin/networks.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/networks.cgi 2008-07-23 18:33:18 UTC (rev 1604)
+++ ipcop/trunk/html/cgi-bin/networks.cgi 2008-07-23 19:13:35 UTC (rev 1605)
@@ -153,7 +153,7 @@
#&Header::closebox();
if ($errormessage) {
- &Header::openbox('100%', 'LEFT', $Lang::tr{'error messages'});
+ &Header::openbox('100%', 'LEFT', "$Lang::tr{'error messages'}:");
print "<CLASS NAME='base'><FONT \
COLOR='${Header::colourred}'>$errormessage\n</FONT>"; print " </CLASS>\n";
&Header::closebox();
Modified: ipcop/trunk/html/cgi-bin/ovpnmain.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/ovpnmain.cgi 2008-07-23 18:33:18 UTC (rev 1604)
+++ ipcop/trunk/html/cgi-bin/ovpnmain.cgi 2008-07-23 19:13:35 UTC (rev 1605)
@@ -1,6 +1,6 @@
#!/usr/bin/perl
# based on SmoothWall and IPCop CGIs
-#
+#
# This code is distributed under the terms of the GPL
# Main idea from zeroconcept
# ZERNINA-VERSION:0.9.5b
@@ -166,7 +166,7 @@
open(FILE, $pfwfilename) or die 'Unable to open config file.';
my @pfwcurrent = <FILE>;
close(FILE);
- my $pfwkey1 = 0; # used for finding last sequence number used
+ my $pfwkey1 = 0; # used for finding last sequence number used
foreach my $pfwline (@pfwcurrent)
{
my @pfwtemp = split(/\,/,$pfwline);
@@ -177,19 +177,19 @@
$PROTOCOL eq $pfwtemp[2] &&
$SRC_IP eq $pfwtemp[7])
{
- $errormessage = "$Lang::tr{'source port in use'} $SRC_PORT";
+ $errormessage = "$Lang::tr{'source port in use'}: $SRC_PORT";
}
# Check if key2 = 0, if it is then it is a port forward entry and we want the \
sequence number if ( $pfwtemp[1] eq "0") {
$pfwkey1=$pfwtemp[0];
}
# Darren Critchley - Duplicate or overlapping Port range check
- if ($pfwtemp[1] eq "0" &&
+ if ($pfwtemp[1] eq "0" &&
$PROTOCOL eq $pfwtemp[2] &&
$SRC_IP eq $pfwtemp[7] &&
- $errormessage eq '')
+ $errormessage eq '')
{
- &portchecks($SRC_PORT, $pfwtemp[5]);
+ &portchecks($SRC_PORT, $pfwtemp[5]);
}
}
}
@@ -205,7 +205,7 @@
unless (&checkportinc($tempr1[0], $portrange2)){ return 0;}
unless (&checkportinc($tempr1[1], $portrange2)){ return 0;}
-
+
unless (&checkportinc($tempr2[0], $portrange1)){ return 0;}
unless (&checkportinc($tempr2[1], $portrange1)){ return 0;}
@@ -220,9 +220,9 @@
my @tempr1 = split(/\:/,$portrange2);
if ($port1 < $tempr1[0] || $port1 > $tempr1[1]) {
- return 1;
+ return 1;
} else {
- return 0;
+ return 0;
}
}
# Darren Critchley - Duplicate or overlapping Port range check
@@ -252,7 +252,7 @@
return;
}
-# Darren Critchley - certain ports are reserved for Ipcop
+# Darren Critchley - certain ports are reserved for Ipcop
# TCP 67,68,81,222,445
# UDP 67,68
# Params passed in -> port, rangeyn, protocol
@@ -267,9 +267,9 @@
my $srcdst = $_[3]; # source or destination
if ($ryn) { # disect port range
if ($srcdst eq "src") {
- $msg = "$Lang::tr{'rsvd src port overlap'}";
+ $msg = "$Lang::tr{'rsvd src port overlap'}:";
} else {
- $msg = "$Lang::tr{'rsvd dst port overlap'}";
+ $msg = "$Lang::tr{'rsvd dst port overlap'}:";
}
my @tmprng = split(/\:/,$prt);
unless (67 < $tmprng[0] || 67 > $tmprng[1]) { $errormessage="$msg 67"; return; }
@@ -281,9 +281,9 @@
}
} else {
if ($srcdst eq "src") {
- $msg = "$Lang::tr{'reserved src port'}";
+ $msg = "$Lang::tr{'reserved src port'}:";
} else {
- $msg = "$Lang::tr{'reserved dst port'}";
+ $msg = "$Lang::tr{'reserved dst port'}:";
}
if ($prt == 67) { $errormessage="$msg 67"; return; }
if ($prt == 68) { $errormessage="$msg 68"; return; }
@@ -297,7 +297,7 @@
}
sub writeserverconf {
- my %sovpnsettings = ();
+ my %sovpnsettings = ();
&General::readhash("${General::swroot}/ovpn/settings", \%sovpnsettings);
open(CONF, ">${General::swroot}/ovpn/server.conf") or die "Unable to open \
${General::swroot}/ovpn/server.conf: $!"; @@ -306,7 +306,7 @@
print CONF "\n";
if ($sovpnsettings{RADIUS_ENABLED} eq 'on') {
print CONF "plugin /var/ipcop/ovpn/radiusplugin.so \
/var/ipcop/ovpn/radiusplugin.cnf\n";
- }
+ }
print CONF "daemon openvpnserver\n";
print CONF "writepid /var/run/openvpn.pid\n";
print CONF "#DAN prepare ZERINA for listening on blue and orange\n";
@@ -326,9 +326,9 @@
if ($sovpnsettings{CLIENT2CLIENT} eq 'on') {
print CONF "client-to-client\n";
}
- if ($sovpnsettings{KEEPALIVE_1} > 0 && $sovpnsettings{KEEPALIVE_2} > 0) {
+ if ($sovpnsettings{KEEPALIVE_1} > 0 && $sovpnsettings{KEEPALIVE_2} > 0) {
print CONF "keepalive $sovpnsettings{'KEEPALIVE_1'} \
$sovpnsettings{'KEEPALIVE_2'}\n";
- }
+ }
print CONF "status-version 1\n";
print CONF "status /var/log/ovpnserver.log 30\n";
print CONF "cipher $sovpnsettings{DCIPHER}\n";
@@ -349,14 +349,14 @@
if ($sovpnsettings{DHCP_WINS} ne '') {
print CONF "push \"dhcp-option WINS $sovpnsettings{DHCP_WINS}\"\n";
}
-
+
if ($sovpnsettings{DHCP_WINS} eq '') {
print CONF "max-clients 100\n";
- }
-
+ }
+
if ($sovpnsettings{DHCP_WINS} ne '') {
print CONF "max-clients $sovpnsettings{MAX_CLIENTS}\n";
- }
+ }
print CONF "tls-verify /var/ipcop/ovpn/verify\n";
print CONF "crl-verify /var/ipcop/ovpn/crls/cacrl.pem\n";
print CONF "user nobody\n";
@@ -367,11 +367,11 @@
print CONF "verb $sovpnsettings{LOG_VERB}\n";
} else {
print CONF "verb 3\n";
- }
+ }
print CONF "\n";
-
+
close(CONF);
-}
+}
#
sub emptyserverlog{
if (open(FILE, ">/var/log/ovpnserver.log")) {
@@ -384,7 +384,7 @@
sub writeradiusconf {
my %radiussettings = ();
- my %netsettings=();
+ my %netsettings=();
&General::readhash("${General::swroot}/ovpn/settings", \%radiussettings);
&General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
open(CONF, ">${General::swroot}/ovpn/radiusplugin.cnf") or die "Unable to \
open ${General::swroot}/ovpn/radiusplugin.cnf: $!"; @@ -411,8 +411,8 @@
print CONF " retry=$radiussettings{RADIUS_RETRY}\n";
print CONF " wait=$radiussettings{RADIUS_TIMEOUT}\n";
print CONF " sharedsecret=$radiussettings{RADIUS_PASS1}\n";
- print CONF "}\n";
- print CONF "\n";
+ print CONF "}\n";
+ print CONF "\n";
close(CONF);
}
@@ -426,18 +426,18 @@
if ($cgiparams{'ACTION'} eq $Lang::tr{'start ovpn server'}){
&emptyserverlog();
system('/usr/local/bin/openvpnctrl', '-s');
- }
+ }
#stop openvpn server
if ($cgiparams{'ACTION'} eq $Lang::tr{'stop ovpn server'}){
system('/usr/local/bin/openvpnctrl', '-k');
- &emptyserverlog();
- }
+ &emptyserverlog();
+ }
# #restart openvpn server
if ($cgiparams{'ACTION'} eq $Lang::tr{'restart ovpn server'}){
-#workarund, till SIGHUP also works when running as nobody
- system('/usr/local/bin/openvpnctrl', '-r');
- &emptyserverlog();
- }
+#workarund, till SIGHUP also works when running as nobody
+ system('/usr/local/bin/openvpnctrl', '-r');
+ &emptyserverlog();
+ }
}
###
@@ -458,14 +458,14 @@
$vpnsettings{'DHCP_DNS'} = $cgiparams{'DHCP_DNS'};
$vpnsettings{'DHCP_WINS'} = $cgiparams{'DHCP_WINS'};
$vpnsettings{'NOBIND'} = $cgiparams{'NOBIND'};
-
+
$vpnsettings{'RADIUS_ENABLED'} = $cgiparams{'RADIUS_ENABLED'};
$vpnsettings{'RADIUS_HOST'} = $cgiparams{'RADIUS_HOST'};
$vpnsettings{'RADIUS_AUTHPORT'} = $cgiparams{'RADIUS_AUTHPORT'};
$vpnsettings{'RADIUS_ACCTPORT'} = $cgiparams{'RADIUS_ACCTPORT'};
$vpnsettings{'RADIUS_RETRY'} = $cgiparams{'RADIUS_RETRY'};
$vpnsettings{'RADIUS_TIMEOUT'} = $cgiparams{'RADIUS_TIMEOUT'};
- $vpnsettings{'RADIUS_PASS1'} = $cgiparams{'RADIUS_PASS1'};
+ $vpnsettings{'RADIUS_PASS1'} = $cgiparams{'RADIUS_PASS1'};
if ($cgiparams{'DHCP_DOMAIN'} ne ''){
unless (&General::validfqdn($cgiparams{'DHCP_DOMAIN'}) || \
&General::validip($cgiparams{'DHCP_DOMAIN'})) { @@ -490,20 +490,20 @@
goto ADV_ERROR;
}
if ($cgiparams{'KEEPALIVE_1'} ne '') {
- if ($cgiparams{'KEEPALIVE_1'} !~ /^[0-9]+$/) {
+ if ($cgiparams{'KEEPALIVE_1'} !~ /^[0-9]+$/) {
$errormessage = $Lang::tr{'invalid input for keepalive 1'};
goto ADV_ERROR;
}
}
if ($cgiparams{'KEEPALIVE_2'} ne ''){
- if ($cgiparams{'KEEPALIVE_2'} !~ /^[0-9]+$/) {
+ if ($cgiparams{'KEEPALIVE_2'} !~ /^[0-9]+$/) {
$errormessage = $Lang::tr{'invalid input for keepalive 2'};
goto ADV_ERROR;
}
}
if ($cgiparams{'KEEPALIVE_2'} < ($cgiparams{'KEEPALIVE_1'} * 2)){
$errormessage = $Lang::tr{'invalid input for keepalive 1:2'};
- goto ADV_ERROR;
+ goto ADV_ERROR;
}
if ($cgiparams{'RADIUS_ENABLED'} eq 'on'){
if ($cgiparams{'RADIUS_HOST'} ne ''){
@@ -522,20 +522,20 @@
unless (&General::validport($cgiparams{'RADIUS_ACCTPORT'})) {
$errormessage = $Lang::tr{'invalid input for radius acctport'};
goto ADV_ERROR;
- }
+ }
}
if ($cgiparams{'RADIUS_AUTHPORT'} eq ($cgiparams{'RADIUS_ACCTPORT'})){
$errormessage = $Lang::tr{'invalid input for radius auth acct'};
- goto ADV_ERROR;
+ goto ADV_ERROR;
}
if ($cgiparams{'RADIUS_RETRY'} ne '') {
- if ($cgiparams{'RADIUS_RETRY'} !~ /^[0-9]+$/) {
+ if ($cgiparams{'RADIUS_RETRY'} !~ /^[0-9]+$/) {
$errormessage = $Lang::tr{'invalid input for radius retry'};
goto ADV_ERROR;
}
}
if ($cgiparams{'RADIUS_TIMEOUT'} ne ''){
- if ($cgiparams{'RADIUS_TIMEOUT'} !~ /^[0-9]+$/) {
+ if ($cgiparams{'RADIUS_TIMEOUT'} !~ /^[0-9]+$/) {
$errormessage = $Lang::tr{'invalid input for radius timeout'};
goto ADV_ERROR;
}
@@ -549,7 +549,7 @@
&writeserverconf();#hier ok
if ($cgiparams{'RADIUS_ENABLED'} eq 'on'){
&writeradiusconf();
- }
+ }
}
@@ -570,43 +570,43 @@
}
if ($cgiparams{'ENABLED'} eq 'on'){
&disallowreserved($cgiparams{'DDEST_PORT'},0,$cgiparams{'DPROTOCOL'},"dest");
- }
+ }
if ($errormessage) { goto SETTINGS_ERROR; }
-
-
+
+
if ($cgiparams{'ENABLED'} eq 'on'){
&checkportfw(0,$cgiparams{'DDEST_PORT'},$cgiparams{'DPROTOCOL'},'0.0.0.0');
}
-
+
if ($errormessage) { goto SETTINGS_ERROR; }
-
+
if (! &General::validipandmask($cgiparams{'DOVPN_SUBNET'})) {
$errormessage = $Lang::tr{'ovpn subnet is invalid'};
goto SETTINGS_ERROR;
}
my @tmpovpnsubnet = split("\/",$cgiparams{'DOVPN_SUBNET'});
-
- if (&General::IpInSubnet ( $netsettings{'RED_1_ADDRESS'},
+
+ if (&General::IpInSubnet ( $netsettings{'RED_1_ADDRESS'},
$tmpovpnsubnet[0], $tmpovpnsubnet[1])) {
- $errormessage = "$Lang::tr{'ovpn subnet overlap'} IPCop RED Network \
$netsettings{'RED_1_ADDRESS'}"; + $errormessage = "$Lang::tr{'ovpn subnet overlap'}: \
IPCop RED Network $netsettings{'RED_1_ADDRESS'}"; goto SETTINGS_ERROR;
}
-
- if (&General::IpInSubnet ( $netsettings{'GREEN_1_ADDRESS'},
+
+ if (&General::IpInSubnet ( $netsettings{'GREEN_1_ADDRESS'},
$tmpovpnsubnet[0], $tmpovpnsubnet[1])) {
- $errormessage = "$Lang::tr{'ovpn subnet overlap'} IPCop Green Network \
$netsettings{'GREEN_1_ADDRESS'}"; + $errormessage = "$Lang::tr{'ovpn subnet \
overlap'}: IPCop Green Network $netsettings{'GREEN_1_ADDRESS'}"; goto \
SETTINGS_ERROR; }
- if (&General::IpInSubnet ( $netsettings{'BLUE_1_ADDRESS'},
+ if (&General::IpInSubnet ( $netsettings{'BLUE_1_ADDRESS'},
$tmpovpnsubnet[0], $tmpovpnsubnet[1])) {
- $errormessage = "$Lang::tr{'ovpn subnet overlap'} IPCop Blue Network \
$netsettings{'BLUE_1_ADDRESS'}"; + $errormessage = "$Lang::tr{'ovpn subnet overlap'}: \
IPCop Blue Network $netsettings{'BLUE_1_ADDRESS'}"; goto SETTINGS_ERROR;
}
-
- if (&General::IpInSubnet ( $netsettings{'ORANGE_1_ADDRESS'},
+
+ if (&General::IpInSubnet ( $netsettings{'ORANGE_1_ADDRESS'},
$tmpovpnsubnet[0], $tmpovpnsubnet[1])) {
- $errormessage = "$Lang::tr{'ovpn subnet overlap'} IPCop Orange Network \
$netsettings{'ORANGE_1_ADDRESS'}"; + $errormessage = "$Lang::tr{'ovpn subnet \
overlap'}: IPCop Orange Network $netsettings{'ORANGE_1_ADDRESS'}"; goto \
SETTINGS_ERROR; }
open(ALIASES, "${General::swroot}/ethernet/aliases") or die 'Unable to open \
aliases file.'; @@ -615,10 +615,10 @@
chomp($_);
my @tempalias = split(/\,/,$_);
if ($tempalias[1] eq 'on') {
- if (&General::IpInSubnet ($tempalias[0] ,
+ if (&General::IpInSubnet ($tempalias[0] ,
$tmpovpnsubnet[0], $tmpovpnsubnet[1])) {
- $errormessage = "$Lang::tr{'ovpn subnet overlap'} IPCop alias entry \
$tempalias[0]";
- }
+ $errormessage = "$Lang::tr{'ovpn subnet overlap'}: IPCop alias entry \
$tempalias[0]"; + }
}
}
close(ALIASES);
@@ -633,7 +633,7 @@
$errormessage = $Lang::tr{'invalid mtu input'};
goto SETTINGS_ERROR;
}
-
+
unless (&General::validport($cgiparams{'DDEST_PORT'})) {
$errormessage = $Lang::tr{'invalid port'};
goto SETTINGS_ERROR;
@@ -689,8 +689,8 @@
&Header::openbox('100%', 'LEFT', $Lang::tr{'are you sure'});
print <<END
<table><form method='post'><input type='hidden' name='AREUSURE' value='yes' />
- <tr><td align='center'>
- <b><font color='${Header::colourred}'>$Lang::tr{'capswarning'}</font></b>:
+ <tr><td align='center'>
+ <b><font color='${Header::colourred}'>$Lang::tr{'capswarning'}</font></b>:
$Lang::tr{'resetting the vpn configuration will remove the root ca, the host \
certificate and all certificate based connections'}
<tr><td align='center'><input type='submit' name='ACTION' \
value='$Lang::tr{'reset'}' /> <input type='submit' name='ACTION' \
value='$Lang::tr{'cancel'}' /></td></tr> @@ -907,7 +907,7 @@
print `/usr/bin/openssl x509 -in ${General::swroot}/ovpn/ca/cacert.pem`;
exit(0);
}
-
+
###
### Download host certificate
###
@@ -1187,7 +1187,7 @@
goto ROOTCERT_ERROR;
}
}
-
+
# Sign the host certificate request
system('/usr/bin/openssl', 'ca', '-days', '999999',
'-batch', '-notext',
@@ -1218,7 +1218,7 @@
unlink ("${General::swroot}/ovpn/certs/serverkey.pem");
unlink ("${General::swroot}/ovpn/certs/servercert.pem");
unlink ("${General::swroot}/ovpn/ca/cacert.pem");
- unlink ("${General::swroot}/ovpn/crls/cacrl.pem");
+ unlink ("${General::swroot}/ovpn/crls/cacrl.pem");
&cleanssldatabase();
goto ROOTCERT_ERROR;
}
@@ -1235,7 +1235,7 @@
unlink ("${General::swroot}/ovpn/ca/dh1024.pem");
&cleanssldatabase();
goto ROOTCERT_ERROR;
- }
+ }
goto ROOTCERT_SUCCESS;
}
ROOTCERT_ERROR:
@@ -1244,7 +1244,7 @@
&Header::openpage($Lang::tr{'vpn configuration main'}, 1, '');
&Header::openbigbox('100%', 'LEFT', '', '');
if ($errormessage) {
- &Header::openbox('100%', 'LEFT', $Lang::tr{'error messages'});
+ &Header::openbox('100%', 'LEFT', "$Lang::tr{'error messages'}:");
print "<class name='base'>$errormessage";
print " </class>";
&Header::closebox();
@@ -1272,7 +1272,7 @@
<td class='base' nowrap='nowrap'><input type='text' name='ROOTCERT_STATE' \
value='$cgiparams{'ROOTCERT_STATE'}' size='32' /></td> <td \
colspan='2'> </td></tr> <tr><td class='base'>$Lang::tr{'country'}:</td>
- <td class='base'><select name='ROOTCERT_COUNTRY'>
+ <td class='base'><select name='ROOTCERT_COUNTRY'>
END
;
@@ -1288,11 +1288,11 @@
<td colspan='2'> </td></tr>
<tr><td> </td>
<td><input type='submit' name='ACTION' value='$Lang::tr{'generate root/host \
certificates'}' /></td>
- <td> </td><td> </td></tr>
+ <td> </td><td> </td></tr>
<tr><td class='base' colspan='4' align='left'>
<img src='/blob.gif' valign='top' alt='*' /> $Lang::tr{'this field may be \
blank'}</td></tr> <tr><td class='base' colspan='4' align='left'>
- <b><font color='${Header::colourred}'>$Lang::tr{'capswarning'}</font></b>:
+ <b><font color='${Header::colourred}'>$Lang::tr{'capswarning'}</font></b>:
$Lang::tr{'generating the root and host certificates may take a long time. it \
can take up to several minutes on older hardware. please be patient'} </td></tr>
<tr><td colspan='4' bgcolor='#000000'><img src='/images/null.gif' width='1' \
height='1' border='0' /></td></tr> @@ -1324,7 +1324,7 @@
### Enable/Disable connection
###
}elsif ($cgiparams{'ACTION'} eq $Lang::tr{'toggle enable disable'}) {
-
+
&General::readhash("${General::swroot}/ovpn/settings", \%vpnsettings);
&General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash);
@@ -1356,41 +1356,41 @@
$clientovpn = "$confighash{$cgiparams{'KEY'}}[1]-TO-IPCop.ovpn";
open(CLIENTCONF, ">$tempdir/$clientovpn") or die "Unable to open tempfile: $!";
flock CLIENTCONF, 2;
-
+
my $zip = Archive::Zip->new();
-
+
print CLIENTCONF "#OpenVPN Server conf\r\n";
if ( $vpnsettings{'RADIUS_ENABLED'} eq 'on'){
print CLIENTCONF "auth-user-pass\r\n";
- }
+ }
print CLIENTCONF "tls-client\r\n";
print CLIENTCONF "client\r\n";
print CLIENTCONF "dev $vpnsettings{'DDEVICE'}\r\n";
print CLIENTCONF "proto $vpnsettings{'DPROTOCOL'}\r\n";
print CLIENTCONF "$vpnsettings{'DDEVICE'}-mtu $vpnsettings{'DMTU'}\r\n";
if ( $vpnsettings{'NOBIND'} eq 'on'){
- print CLIENTCONF "nobind\r\n";}
+ print CLIENTCONF "nobind\r\n";}
if ( $vpnsettings{'ENABLED'} eq 'on'){
print CLIENTCONF "remote $vpnsettings{'VPN_IP'} \
$vpnsettings{'DDEST_PORT'}\r\n";
- if ( $vpnsettings{'ENABLED_BLUE'} eq 'on' && (&haveBlueNet())){
- print CLIENTCONF "#Coment the above line and uncoment the next line, if you \
want to connect on the Blue interface\r\n"; + if ( $vpnsettings{'ENABLED_BLUE'} eq \
'on' && (&haveBlueNet())){ + print CLIENTCONF "#Coment the above line and \
uncoment the next line, if you want to connect on the Blue \
interface\r\n";
print CLIENTCONF ";remote $netsettings{'BLUE_1_ADDRESS'} \
$vpnsettings{'DDEST_PORT'}\r\n"; }
if ( $vpnsettings{'ENABLED_ORANGE'} eq 'on' && (&haveOrangeNet())){
- print CLIENTCONF "#Coment the above line and uncoment the next line, if you \
want to connect on the Orange interface\r\n"; + print CLIENTCONF "#Coment the \
above line and uncoment the next line, if you want to connect on the Orange \
interface\r\n";
print CLIENTCONF ";remote $netsettings{'ORANGE_1_ADDRESS'} \
$vpnsettings{'DDEST_PORT'}\r\n"; }
} elsif ( $vpnsettings{'ENABLED_BLUE'} eq 'on' && (&haveBlueNet())){
print CLIENTCONF "remote $netsettings{'BLUE_1_ADDRESS'} \
$vpnsettings{'DDEST_PORT'}\r\n"; if ( $vpnsettings{'ENABLED_ORANGE'} eq 'on' && \
(&haveOrangeNet())){
- print CLIENTCONF "#Coment the above line and uncoment the next line, if you \
want to connect on the Orange interface\r\n"; + print CLIENTCONF "#Coment the \
above line and uncoment the next line, if you want to connect on the Orange \
interface\r\n";
print CLIENTCONF ";remote $netsettings{'ORANGE_1_ADDRESS'} \
$vpnsettings{'DDEST_PORT'}\r\n"; }
} elsif ( $vpnsettings{'ENABLED_ORANGE'} eq 'on' && (&haveOrangeNet())){
print CLIENTCONF "remote $netsettings{'ORANGE_1_ADDRESS'} \
$vpnsettings{'DDEST_PORT'}\r\n"; }
-
- if ($confighash{$cgiparams{'KEY'}}[4] eq 'cert' && -f \
"${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1].p12") { +
+ if ($confighash{$cgiparams{'KEY'}}[4] eq 'cert' && -f \
"${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1].p12") { print \
CLIENTCONF "pkcs12 $confighash{$cgiparams{'KEY'}}[1].p12\r\n"; $zip->addFile( \
"${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1].p12", \
"$confighash{$cgiparams{'KEY'}}[1].p12") or die "Can't add file \
$confighash{$cgiparams{'KEY'}}[1].p12\n"; } else {
@@ -1398,7 +1398,7 @@
print CLIENTCONF "cert $confighash{$cgiparams{'KEY'}}[1]cert.pem\r\n";
print CLIENTCONF "key $confighash{$cgiparams{'KEY'}}[1].key\r\n";
$zip->addFile( "${General::swroot}/ovpn/ca/cacert.pem", "cacert.pem") or die \
"Can't add file cacert.pem\n";
- $zip->addFile( "${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1]cert.pem", \
"$confighash{$cgiparams{'KEY'}}[1]cert.pem") or die "Can't add file \
$confighash{$cgiparams{'KEY'}}[1]cert.pem\n"; + $zip->addFile( \
"${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1]cert.pem", \
"$confighash{$cgiparams{'KEY'}}[1]cert.pem") or die "Can't add file \
$confighash{$cgiparams{'KEY'}}[1]cert.pem\n"; }
print CLIENTCONF "cipher $vpnsettings{DCIPHER}\r\n";
if ($vpnsettings{DCOMPLZO} eq 'on') {
@@ -1497,17 +1497,17 @@
ADV_ERROR:
if ($cgiparams{'MAX_CLIENTS'} eq '') {
- $cgiparams{'MAX_CLIENTS'} = '100';
+ $cgiparams{'MAX_CLIENTS'} = '100';
}
-
+
if ($cgiparams{'KEEPALIVE_1'} eq '') {
- $cgiparams{'KEEPALIVE_1'} = '10';
+ $cgiparams{'KEEPALIVE_1'} = '10';
}
if ($cgiparams{'KEEPALIVE_2'} eq '') {
- $cgiparams{'KEEPALIVE_2'} = '60';
+ $cgiparams{'KEEPALIVE_2'} = '60';
}
if ($cgiparams{'LOG_VERB'} eq '') {
- $cgiparams{'LOG_VERB'} = '3';
+ $cgiparams{'LOG_VERB'} = '3';
}
$checked{'CLIENT2CLIENT'}{'off'} = '';
$checked{'CLIENT2CLIENT'}{'on'} = '';
@@ -1531,16 +1531,16 @@
$selected{'LOG_VERB'}{'11'} = '';
$selected{'LOG_VERB'}{'0'} = '';
$selected{'LOG_VERB'}{$cgiparams{'LOG_VERB'}} = 'SELECTED';
-
+
$checked{'RADIUS_ENABLED'}{'off'} = '';
$checked{'RADIUS_ENABLED'}{'on'} = '';
$checked{'RADIUS_ENABLED'}{$cgiparams{'RADIUS_ENABLED'}} = 'CHECKED';
-
+
&Header::showhttpheaders();
&Header::openpage($Lang::tr{'status ovpn'}, 1, '');
- &Header::openbigbox('100%', 'LEFT', '', $errormessage);
+ &Header::openbigbox('100%', 'LEFT', '', $errormessage);
if ($errormessage) {
- &Header::openbox('100%', 'LEFT', $Lang::tr{'error messages'});
+ &Header::openbox('100%', 'LEFT', "$Lang::tr{'error messages'}:");
print "<class name='base'>$errormessage\n";
print " </class>\n";
&Header::closebox();
@@ -1554,16 +1554,16 @@
</tr>
<tr>
<td width='25%'></td> <td width='20%'> </td><td width='25%'> </td><td \
width='30%'></td>
- </tr>
- <tr>
+ </tr>
+ <tr>
<td class='base'>Domain</td>
<td><input type='TEXT' name='DHCP_DOMAIN' value='$cgiparams{'DHCP_DOMAIN'}' \
size='30' /></td> </tr>
- <tr>
+ <tr>
<td class='base'>DNS</td>
<td><input type='TEXT' name='DHCP_DNS' value='$cgiparams{'DHCP_DNS'}' size='30' \
/></td>
- </tr>
- <tr>
+ </tr>
+ <tr>
<td class='base'>WINS</td>
<td><input type='TEXT' name='DHCP_WINS' value='$cgiparams{'DHCP_WINS'}' size='30' \
/></td> </tr>
@@ -1580,22 +1580,22 @@
<td class='base'>Client-To-Client</td>
<td><input type='checkbox' name='CLIENT2CLIENT' $checked{'CLIENT2CLIENT'}{'on'} \
/></td> </tr>
- <tr>
+ <tr>
<td class='base'>Redirect-Gateway def1</td>
<td><input type='checkbox' name='REDIRECT_GW_DEF1' \
$checked{'REDIRECT_GW_DEF1'}{'on'} /></td> </tr>
- <tr>
+ <tr>
<td class='base'>Nobind</td>
<td><input type='checkbox' name='NOBIND' $checked{'NOBIND'}{'on'} /></td>
</tr>
- <tr>
+ <tr>
<td class='base'>Max-Clients</td>
<td><input type='text' name='MAX_CLIENTS' value='$cgiparams{'MAX_CLIENTS'}' \
size='30' /></td>
- </tr>
- <td class='base'>Keppalive (ping/ping-restart)</td>
+ </tr>
+ <td class='base'>Keppalive (ping/ping-restart)</td>
<td><input type='TEXT' name='KEEPALIVE_1' value='$cgiparams{'KEEPALIVE_1'}' \
size='30' /></td> <td><input type='TEXT' name='KEEPALIVE_2' \
value='$cgiparams{'KEEPALIVE_2'}' size='30' /></td>
- </tr>
+ </tr>
</table>
<hr size='1'>
<table width='100%'>
@@ -1604,21 +1604,21 @@
</tr>
<tr>
<td width='25%'></td> <td width='20%'> </td><td width='25%'> </td><td \
width='30%'></td>
- </tr>
-
- <tr><td class='base'>VERB</td>
+ </tr>
+
+ <tr><td class='base'>VERB</td>
<td><select name='LOG_VERB'><option value='1' \
$selected{'LOG_VERB'}{'1'}>1</option> <option value='2' \
$selected{'LOG_VERB'}{'2'}>2</option> <option value='3' \
$selected{'LOG_VERB'}{'3'}>3</option> <option value='4' \
$selected{'LOG_VERB'}{'4'}>4</option> <option value='5' \
$selected{'LOG_VERB'}{'5'}>5</option>
- <option value='6' $selected{'LOG_VERB'}{'6'}>6</option>
+ <option value='6' $selected{'LOG_VERB'}{'6'}>6</option>
<option value='7' $selected{'LOG_VERB'}{'7'}>7</option>
<option value='8' $selected{'LOG_VERB'}{'8'}>8</option>
<option value='9' $selected{'LOG_VERB'}{'9'}>9</option>
<option value='10' $selected{'LOG_VERB'}{'10'}>10</option>
<option value='11' $selected{'LOG_VERB'}{'11'}>11</option>
- <option value='0' $selected{'LOG_VERB'}{'0'}>0</option></select></td>
+ <option value='0' $selected{'LOG_VERB'}{'0'}>0</option></select></td>
</table>
<hr size='1'>
<table width='100%'>
@@ -1626,35 +1626,35 @@
<td class'base'><b>$Lang::tr{'radius server settings'}</b></td>
</tr>
<tr>
- <td width='25%'></td> <td width='20%'> </td><td width='25%'> </td><td \
width='30%'></td> + <td width='25%'></td> <td width='20%'> </td><td width='25%'> \
</td><td width='30%'></td> </tr>
<td class='base'>$Lang::tr{'radius enable'}</td>
<td><input type='checkbox' name='RADIUS_ENABLED' $checked{'RADIUS_ENABLED'}{'on'} \
/></td> </tr>
<tr>
<td width='25%'></td> <td width='20%'> </td><td width='25%'> </td><td \
width='30%'></td>
- </tr>
- <tr>
+ </tr>
+ <tr>
<td class='base'>$Lang::tr{'radius servername'}</td>
<td><input type='TEXT' name='RADIUS_HOST' value='$cgiparams{'RADIUS_HOST'}' \
size='30' /></td> </tr>
- <tr>
+ <tr>
<td class='base'>$Lang::tr{'radius authport'}</td>
<td><input type='TEXT' name='RADIUS_AUTHPORT' value='$cgiparams{'RADIUS_AUTHPORT'}' \
size='10' /></td>
- </tr>
- <tr>
+ </tr>
+ <tr>
<td class='base'>$Lang::tr{'radius acctport'}</td>
<td><input type='TEXT' name='RADIUS_ACCTPORT' value='$cgiparams{'RADIUS_ACCTPORT'}' \
size='10' /></td> </tr>
- <tr>
- <td class='base'>$Lang::tr{'maximum retries'}</td>
+ <tr>
+ <td class='base'>$Lang::tr{'maximum retries'}:</td>
<td><input type='TEXT' name='RADIUS_RETRY' value='$cgiparams{'RADIUS_RETRY'}' \
size='10' /></td> </tr>
- <tr>
+ <tr>
<td class='base'>$Lang::tr{'radius wait'}</td>
<td><input type='TEXT' name='RADIUS_TIMEOUT' value='$cgiparams{'RADIUS_TIMEOUT'}' \
size='10' /></td> </tr>
-
+
<tr>
<td class='base'>$Lang::tr{'radius sharedsecret'}:</td>
<td class='base' nowrap='nowrap'><input type='password' name='RADIUS_PASS1' \
value='$cgiparams{'RADIUS_PASS1'}' size='32' /></td> @@ -1666,18 +1666,18 @@
<td> </td>
<td allign='center'><input type='submit' name='ACTION' \
value='$Lang::tr{'save-adv-options'}' /></td>
<td allign='center'><input type='submit' name='ACTION' \
value='$Lang::tr{'cancel-adv-options'}' /></td>
- <td> </td>
+ <td> </td>
</tr>
-</table>
+</table>
</form>
END
-;
+;
&Header::closebox();
&Header::closebigbox();
&Header::closepage();
exit(0);
-
+
###
### Openvpn Connections Statistics
###
@@ -1716,7 +1716,7 @@
{
chomp($line);
if ( $line =~ /^Updated,(.+)/){
- @match = split( /^Updated,(.+)/, $line);
+ @match = split( /^Updated,(.+)/, $line);
$status = $match[1];
}
if ( $line =~ /^(.+),(\d+\.\d+\.\d+\.\d+\:\d+),(\d+),(\d+),(.+)/) {
@@ -1731,7 +1731,7 @@
$users[$uid]{'Since'} = $match[5];
$users[$uid]{'Proto'} = $proto;
$uid++;
- }
+ }
}
if ( $line =~ /^(\d+\.\d+\.\d+\.\d+),(.+),(\d+\.\d+\.\d+\.\d+\:\d+),(.+)/) {
@match = split(m/^(\d+\.\d+\.\d+\.\d+),(.+),(\d+\.\d+\.\d+\.\d+\:\d+),(.+)/, \
$line); @@ -1760,8 +1760,8 @@
print "<td align='left'>$users[$idx-1]{'BytesReceived'}</td>";
print "<td align='left'>$users[$idx-1]{'LastRef'}</td>";
}
- }
-
+ }
+
print "</table>";
print <<END
<table width='100%' border='0' cellpadding='2' cellspacing='0'>
@@ -1772,7 +1772,7 @@
<tr><td align='center' >$Lang::tr{'the statistics were last updated at'} \
<b>$status</b></td></tr> </table>
END
-;
+;
&Header::closebox();
print "<div align='center'><a \
href='/cgi-bin/ovpnmain.cgi'>$Lang::tr{'back'}</a></div>"; &Header::closebigbox();
@@ -1796,7 +1796,7 @@
### Enable/Disable connection
###
} elsif ($cgiparams{'ACTION'} eq $Lang::tr{'toggle enable disable'}) {
-
+
&General::readhash("${General::swroot}/ovpn/settings", \%vpnsettings);
&General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash);
@@ -1948,14 +1948,14 @@
}
if ($cgiparams{'TYPE'} ne 'host') {
unless (&General::validipandmask($cgiparams{'LOCAL_SUBNET'})) {
- $errormessage = $Lang::tr{'local subnet is invalid'};
+ $errormessage = $Lang::tr{'local subnet is invalid'};
goto VPNCONF_ERROR;}
}
# Check if there is no other entry without IP-address and PSK
if ($cgiparams{'REMOTE'} eq '') {
foreach my $key (keys %confighash) {
- if(($cgiparams{'KEY'} ne $key) &&
- ($confighash{$key}[4] eq 'psk' || $cgiparams{'AUTH'} eq 'psk') &&
+ if(($cgiparams{'KEY'} ne $key) &&
+ ($confighash{$key}[4] eq 'psk' || $cgiparams{'AUTH'} eq 'psk') &&
$confighash{$key}[10] eq '') {
$errormessage = $Lang::tr{'you can only define one roadwarrior connection when \
using pre-shared key authentication'}; goto VPNCONF_ERROR;
@@ -2130,7 +2130,7 @@
$errormessage = $Lang::tr{'password too short'};
goto VPNCONF_ERROR;
}
- }
+ }
if ($cgiparams{'CERT_PASS1'} ne $cgiparams{'CERT_PASS2'}) {
$errormessage = $Lang::tr{'passwords do not match'};
goto VPNCONF_ERROR;
@@ -2173,7 +2173,7 @@
goto VPNCONF_ERROR;
}
}
-
+
# Sign the host certificate request
system('/usr/bin/openssl', 'ca', '-days', '999999',
'-batch', '-notext',
@@ -2193,12 +2193,12 @@
}
# Create the pkcs12 file
- system('/usr/bin/openssl', 'pkcs12', '-export',
+ system('/usr/bin/openssl', 'pkcs12', '-export',
'-inkey', "${General::swroot}/ovpn/certs/$cgiparams{'NAME'}key.pem",
'-in', "${General::swroot}/ovpn/certs/$cgiparams{'NAME'}cert.pem",
'-name', $cgiparams{'NAME'},
'-passout', "pass:$cgiparams{'CERT_PASS1'}",
- '-certfile', "${General::swroot}/ovpn/ca/cacert.pem",
+ '-certfile', "${General::swroot}/ovpn/ca/cacert.pem",
'-caname', "$vpnsettings{'ROOTCERT_ORGANIZATION'} CA",
'-out', "${General::swroot}/ovpn/certs/$cgiparams{'NAME'}.p12");
if ($?) {
@@ -2308,7 +2308,7 @@
$checked{'AUTH'}{$cgiparams{'AUTH'}} = 'CHECKED';
$selected{'INTERFACE'}{$cgiparams{'INTERFACE'}} = 'SELECTED';
-
+
$checked{'COMPLZO'}{'off'} = '';
$checked{'COMPLZO'}{'on'} = '';
$checked{'COMPLZO'}{$cgiparams{'COMPLZO'}} = 'CHECKED';
@@ -2319,7 +2319,7 @@
&Header::openpage($Lang::tr{'vpn configuration main'}, 1, '');
&Header::openbigbox('100%', 'LEFT', '', $errormessage);
if ($errormessage) {
- &Header::openbox('100%', 'LEFT', $Lang::tr{'error messages'});
+ &Header::openbox('100%', 'LEFT', "$Lang::tr{'error messages'}:");
print "<class name='base'>$errormessage";
print " </class>";
&Header::closebox();
@@ -2351,15 +2351,15 @@
}
} else {
}
- print "<tr><td class='boldbase'>$Lang::tr{'remark title'} <img src='/blob.gif' \
/></td>"; + print "<tr><td class='boldbase'>$Lang::tr{'remark title'}: <img \
src='/blob.gif' /></td>"; print "<td colspan='3'><input type='text' name='REMARK' \
value='$cgiparams{'REMARK'}' size='55' maxlength='50' /></td></tr>";
- print "<tr><td>$Lang::tr{'enabled'} <input type='checkbox' name='ENABLED' \
$checked{'ENABLED'}{'on'} /></td>\n"; + print "<tr><td>$Lang::tr{'enabled'}: <input \
type='checkbox' name='ENABLED' $checked{'ENABLED'}{'on'} /></td>\n"; print "<td \
colspan='3'> </td></tr></table>";
-
-
+
+
&Header::closebox();
-
+
if ($cgiparams{'KEY'} && $cgiparams{'AUTH'} eq 'psk') {
END
} elsif (! $cgiparams{'KEY'}) {
@@ -2368,18 +2368,18 @@
my $cacrtdisabled='';
if ( ! -f "${General::swroot}/ovpn/ca/cakey.pem" ) { $cakeydisabled = \
"disabled='disabled'" } else { $cakeydisabled = "" };
if ( ! -f "${General::swroot}/ovpn/ca/cacert.pem" ) { $cacrtdisabled = \
"disabled='disabled'" } else { $cacrtdisabled = "" };
- &Header::openbox('100%', 'LEFT', $Lang::tr{'authentication'});
+ &Header::openbox('100%', 'LEFT', "$Lang::tr{'authentication'}:");
print <<END
<table width='100%' cellpadding='0' cellspacing='5' border='0'>
<tr><td colspan='3' bgcolor='#000000'><img src='/images/null.gif' width='1' \
height='1' border='0' /></td></tr>
<tr><td><input type='radio' name='AUTH' value='certreq' \
$checked{'AUTH'}{'certreq'} $cakeydisabled /></td>
- <td class='base'>$Lang::tr{'upload a certificate request'}</td>
+ <td class='base'>$Lang::tr{'upload a certificate request'}:</td>
<td class='base' rowspan='2'><input type='file' name='FH' size='30' \
$cacrtdisabled></td></tr>
<tr><td><input type='radio' name='AUTH' value='certfile' \
$checked{'AUTH'}{'certfile'} $cacrtdisabled /></td>
- <td class='base'>$Lang::tr{'upload a certificate'}</td></tr>
+ <td class='base'>$Lang::tr{'upload a certificate'}:</td></tr>
<tr><td colspan='3' bgcolor='#000000'><img src='/images/null.gif' width='1' \
height='1' BORDER='0' /></td></tr>
<tr><td><input type='radio' name='AUTH' value='certgen' \
$checked{'AUTH'}{'certgen'} $cakeydisabled /></td>
- <td class='base'>$Lang::tr{'generate a certificate'}</td><td> </td></tr>
+ <td class='base'>$Lang::tr{'generate a certificate'}:</td><td> </td></tr>
<tr><td> </td>
<td class='base'>$Lang::tr{'users fullname or system hostname'}:</td>
<td class='base' nowrap='nowrap'><input type='text' name='CERT_NAME' \
value='$cgiparams{'CERT_NAME'}' SIZE='32' $cakeydisabled /></td></tr> @@ -2459,18 \
+2459,18 @@ }
}
}
-
+
if ($cgiparams{'DCIPHER'} eq '') {
- $cgiparams{'DCIPHER'} = 'BF-CBC';
+ $cgiparams{'DCIPHER'} = 'BF-CBC';
}
# if ($cgiparams{'DCOMPLZO'} eq '') {
-# $cgiparams{'DCOMPLZO'} = 'on';
+# $cgiparams{'DCOMPLZO'} = 'on';
# }
if ($cgiparams{'DDEST_PORT'} eq '') {
- $cgiparams{'DDEST_PORT'} = '1194';
+ $cgiparams{'DDEST_PORT'} = '1194';
}
if ($cgiparams{'DMTU'} eq '') {
- $cgiparams{'DMTU'} = '1400';
+ $cgiparams{'DMTU'} = '1400';
}
if ($cgiparams{'DOVPN_SUBNET'} eq '') {
$cgiparams{'DOVPN_SUBNET'} = '10.' . int(rand(256)) . '.' . int(rand(256)) . \
'.0/255.255.255.0'; @@ -2492,7 +2492,7 @@
$selected{'DPROTOCOL'}{'udp'} = '';
$selected{'DPROTOCOL'}{'tcp'} = '';
$selected{'DPROTOCOL'}{$cgiparams{'DPROTOCOL'}} = 'SELECTED';
-
+
$selected{'DCIPHER'}{'DES-CBC'} = '';
$selected{'DCIPHER'}{'DES-EDE-CBC'} = '';
$selected{'DCIPHER'}{'DES-EDE3-CBC'} = '';
@@ -2501,7 +2501,7 @@
$selected{'DCIPHER'}{'RC2-40-CBC'} = '';
$selected{'DCIPHER'}{'RC2-64-CBC'} = '';
$selected{'DCIPHER'}{'BF-CBC'} = '';
- $selected{'DCIPHER'}{'CAST5-CBC'} = '';
+ $selected{'DCIPHER'}{'CAST5-CBC'} = '';
$selected{'DCIPHER'}{'AES-128-CBC'} = '';
$selected{'DCIPHER'}{'AES-192-CBC'} = '';
$selected{'DCIPHER'}{'AES-256-CBC'} = '';
@@ -2516,7 +2516,7 @@
&Header::openbigbox('100%', 'LEFT', '', $errormessage);
if ($errormessage) {
- &Header::openbox('100%', 'LEFT', $Lang::tr{'error messages'});
+ &Header::openbox('100%', 'LEFT', "$Lang::tr{'error messages'}:");
print "<class name='base'>$errormessage\n";
print " </class>\n";
&Header::closebox();
@@ -2531,16 +2531,16 @@
$activeonrun = "";
} else {
$activeonrun = "disabled='disabled'";
- }
+ }
&Header::openbox('100%', 'LEFT', $Lang::tr{'global settings'});
- print "<div align='center'><strong>ZERINA-0.9.5b</strong></div>";
- print <<END
+ print "<div align='center'><strong>ZERINA-0.9.5b</strong></div>";
+ print <<END
<table width='100%'>
<form method='post'>
<td width='25%'> </td>
<td width='25%'> </td>
<td width='25%'> </td></tr>
- <tr><td class='boldbase'>$Lang::tr{'ovpn server status'}</td>
+ <tr><td class='boldbase'>$Lang::tr{'ovpn server status'}:</td>
<td align='left'>$sactive</td>
<tr><td class='boldbase'>$Lang::tr{'ovpn on red'}</td>
<td><input type='checkbox' name='ENABLED' $checked{'ENABLED'}{'on'} /></td>
@@ -2550,33 +2550,33 @@
print "<tr><td class='boldbase'>$Lang::tr{'ovpn on blue'}</td>";
print "<td><input type='checkbox' name='ENABLED_BLUE' \
$checked{'ENABLED_BLUE'}{'on'} /></td>"; }
- if (&haveOrangeNet()) {
+ if (&haveOrangeNet()) {
print "<tr><td class='boldbase'>$Lang::tr{'ovpn on orange'}</td>";
print "<td><input type='checkbox' name='ENABLED_ORANGE' \
$checked{'ENABLED_ORANGE'}{'on'} /></td>";
- }
- print <<END
+ }
+ print <<END
<tr><td class='base' nowrap='nowrap'>$Lang::tr{'local vpn hostname/ip'}:</td>
<td><input type='text' name='VPN_IP' value='$cgiparams{'VPN_IP'}' size='30' \
/></td> <td class='boldbase' nowrap='nowrap'>$Lang::tr{'ovpn subnet'}</td>
<td><input type='TEXT' name='DOVPN_SUBNET' value='$cgiparams{'DOVPN_SUBNET'}' \
size='30' /></td></tr>
<tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'ovpn device'}</td>
<td><select name='DDEVICE' ><option value='tun' \
$selected{'DDEVICE'}{'tun'}>TUN</option>
- <option value='tap' \
$selected{'DDEVICE'}{'tap'}>TAP</option></select></td> + \
<option value='tap' $selected{'DDEVICE'}{'tap'}>TAP</option></select></td> <tr><td \
class='boldbase' nowrap='nowrap'>$Lang::tr{'protocol'}</td>
<td><select name='DPROTOCOL'><option value='udp' \
$selected{'DPROTOCOL'}{'udp'}>UDP</option>
- <option value='tcp' \
$selected{'DPROTOCOL'}{'tcp'}>TCP</option></select></td> + \
<option value='tcp' $selected{'DPROTOCOL'}{'tcp'}>TCP</option></select></td> <td \
class='boldbase'>$Lang::tr{'destination port'}:</td>
<td><input type='TEXT' name='DDEST_PORT' value='$cgiparams{'DDEST_PORT'}' \
size='5' /></td></tr>
- <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'MTU'} </td>
+ <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'MTU'}: </td>
<td> <input type='TEXT' name='DMTU' VALUE='$cgiparams{'DMTU'}'size='5' \
/></TD>
- <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'comp-lzo'}</td>
+ <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'comp-lzo'}:</td>
<td><input type='checkbox' name='DCOMPLZO' $checked{'DCOMPLZO'}{'on'} \
/></td>
- <td class='boldbase' nowrap='nowrap'>$Lang::tr{'cipher'}</td>
+ <td class='boldbase' nowrap='nowrap'>$Lang::tr{'cipher'}:</td>
<td><select name='DCIPHER'><option value='DES-CBC' \
$selected{'DCIPHER'}{'DES-CBC'}>DES-CBC</option>
<option value='DES-EDE-CBC' \
$selected{'DCIPHER'}{'DES-EDE-CBC'}>DES-EDE-CBC</option>
<option value='DES-EDE3-CBC' \
$selected{'DCIPHER'}{'DES-EDE3-CBC'}>DES-EDE3-CBC</option>
<option value='DESX-CBC' $selected{'DCIPHER'}{'DESX-CBC'}>DESX-CBC</option>
- <option value='RC2-CBC' $selected{'DCIPHER'}{'RC2-CBC'}>RC2-CBC</option> \
+ <option value='RC2-CBC' $selected{'DCIPHER'}{'RC2-CBC'}>RC2-CBC</option>
<option value='RC2-40-CBC' \
$selected{'DCIPHER'}{'RC2-40-CBC'}>RC2-40-CBC</option>
<option value='RC2-64-CBC' \
$selected{'DCIPHER'}{'RC2-64-CBC'}>RC2-64-CBC</option>
<option value='BF-CBC' $selected{'DCIPHER'}{'BF-CBC'}>BF-CBC</option>
@@ -2585,13 +2585,13 @@
<option value='AES-192-CBC' \
$selected{'DCIPHER'}{'AES-192-CBC'}>AES-192-CBC</option>
<option value='AES-256-CBC' \
$selected{'DCIPHER'}{'AES-256-CBC'}>AES-256-CBC</option></select></td> END
-;
-
+;
+
if ( $srunning eq "yes" ) {
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
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