Revision: 7040
http://ipcop.svn.sourceforge.net/ipcop/?rev=7040&view=rev
Author: dotzball
Date: 2013-05-21 10:36:08 +0000 (Tue, 21 May 2013)
Log Message:
-----------
Remove trailing spaces. Prepare for the "Certificate file move failed" fix.
Modified Paths:
--------------
ipcop/trunk/html/cgi-bin/ipsec.cgi
Modified: ipcop/trunk/html/cgi-bin/ipsec.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/ipsec.cgi 2013-05-20 17:47:43 UTC (rev 7039)
+++ ipcop/trunk/html/cgi-bin/ipsec.cgi 2013-05-21 10:36:08 UTC (rev 7040)
@@ -143,7 +143,7 @@
$ip >>= 1;
$mm >>= 1;
}
- }
+ }
else {
$ip >>= (32 - $2);
}
@@ -210,7 +210,7 @@
print "Content-Disposition: attachment;
filename=$cahash{$cgiparams{'KEY'}}[0]cert.pem\r\n\r\n";
print `/usr/bin/openssl x509 -in
/var/ipcop/ca/$cahash{$cgiparams{'KEY'}}[0]cert.pem`;
exit(0);
- }
+ }
else {
$errormessage = $Lang::tr{'invalid key'};
}
@@ -218,7 +218,7 @@
###
### Export PKCS12 file to browser
###
-}
+}
elsif ($cgiparams{'ACTION'} eq $Lang::tr{'download pkcs12 file'}) {
&General::readhasharray("/var/ipcop/ipsec/config", \%confighash);
print "Content-Type: application/force-download\n";
@@ -264,7 +264,7 @@
###
### Export Certificate to browser
###
-}
+}
elsif ($cgiparams{'ACTION'} eq $Lang::tr{'download certificate'}) {
&General::readhasharray("/var/ipcop/ipsec/config", \%confighash);
@@ -278,7 +278,7 @@
###
### Enable/Disable connection
###
-}
+}
elsif ($cgiparams{'ACTION'} eq $Lang::tr{'toggle enable disable'}) {
&General::readhash("/var/ipcop/ipsec/settings", \%vpnsettings);
@@ -293,7 +293,7 @@
&General::log("ipsec", "Activate connection
#$cgiparams{'KEY'}");
system("/usr/local/bin/ipsecctrl --start=$cgiparams{'KEY'}")
}
- }
+ }
else {
if (&VPN::ipsecenabled(\%vpnsettings)) {
&General::log("ipsec", "Deactivate connection
#$cgiparams{'KEY'}");
@@ -304,7 +304,7 @@
&VPN::writeipsecfiles();
}
sleep $sleepDelay;
- }
+ }
else {
$errormessage = $Lang::tr{'invalid key'};
}
@@ -312,7 +312,7 @@
###
### Restart connection
###
-}
+}
elsif ($cgiparams{'ACTION'} eq $Lang::tr{'restart'}) {
&General::readhash("/var/ipcop/ipsec/settings", \%vpnsettings);
&General::readhasharray("/var/ipcop/ipsec/config", \%confighash);
@@ -323,7 +323,7 @@
system("/usr/local/bin/ipsecctrl --start=$cgiparams{'KEY'}");
sleep $sleepDelay;
}
- }
+ }
else {
$errormessage = $Lang::tr{'invalid key'};
}
@@ -345,7 +345,7 @@
delete $confighash{$cgiparams{'KEY'}};
&General::writehasharray("/var/ipcop/ipsec/config", \%confighash);
&VPN::writeipsecfiles();
- }
+ }
else {
$errormessage = $Lang::tr{'invalid key'};
}
@@ -387,7 +387,7 @@
###
### Adding/Editing/Saving a connection
###
-}
+}
elsif (($cgiparams{'ACTION'} eq $Lang::tr{'add'}) ||
($cgiparams{'ACTION'} eq $Lang::tr{'edit'}) ||
($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'ADVANCED'} eq
'')) {
@@ -428,7 +428,7 @@
$cgiparams{'ONLY_PROPOSED'} = $confighash{$cgiparams{'KEY'}}[24];
$cgiparams{'PFS'} = $confighash{$cgiparams{'KEY'}}[28];
$cgiparams{'VHOST'} = $confighash{$cgiparams{'KEY'}}[14];
- }
+ }
elsif ($cgiparams{'ACTION'} eq $Lang::tr{'save'}) {
$cgiparams{'REMARK'} = &Header::cleanhtml($cgiparams{'REMARK'});
if ($cgiparams{'TYPE'} !~ /^(host|net)$/) {
@@ -475,7 +475,7 @@
if (! &General::validfqdn ($cgiparams{'REMOTE'})) {
$errormessage = $Lang::tr{'invalid input for remote
host/ip'};
goto VPNCONF_ERROR;
- }
+ }
else {
if (&General::validdnshost($cgiparams{'REMOTE'})) {
$warnmessage = "$Lang::tr{'check vpn lr'}
$cgiparams{'REMOTE'}. $Lang::tr{'dns check failed'}";
@@ -608,7 +608,7 @@
$opt .= " -in $filename";
$opt .= " -out /tmp/newcacert";
$errormessage = &VPN::callssl ($opt);
- }
+ }
else { #child
print "$cgiparams{'P12_PASS'}\n";
exit (0);
@@ -798,7 +798,7 @@
goto VPNCONF_ERROR;
}
- if (($cgiparams{'YEAR'} < $this_year)
+ if (($cgiparams{'YEAR'} < $this_year)
|| (($cgiparams{'YEAR'} == $this_year) && ($cgiparams{'MONTH'}
< $now[4]))
|| (($cgiparams{'YEAR'} == $this_year) && ($cgiparams{'MONTH'}
== $now[4]) && ($cgiparams{'DAY'} < $now[3])) ) {
$errormessage = $Lang::tr{'invalid date entered'};
@@ -870,7 +870,7 @@
unlink ("/var/ipcop/certs/$cgiparams{'NAME'}cert.pem");
&VPN::cleanssldatabase();
goto VPNCONF_ERROR;
- }
+ }
else {
unlink ($v3extname);
unlink ("/var/ipcop/certs/$cgiparams{'NAME'}req.pem");
@@ -893,7 +893,7 @@
unlink ("/var/ipcop/certs/$cgiparams{'NAME'}cert.pem");
unlink ("/var/ipcop/certs/$cgiparams{'NAME'}.p12");
goto VPNCONF_ERROR;
- }
+ }
else {
unlink ("/var/ipcop/certs/$cgiparams{'NAME'}key.pem");
}
@@ -903,7 +903,7 @@
}
elsif ($cgiparams{'AUTH'} eq 'auth-dn') {
$cgiparams{'CERT_NAME'} = '%auth-dn'; # a special value saying
'no cert file'
- }
+ }
else {
$errormessage = $Lang::tr{'invalid input for authentication
method'};
goto VPNCONF_ERROR;
@@ -937,7 +937,7 @@
if ($cgiparams{'AUTH'} eq 'psk') {
$confighash{$key}[4] = 'psk';
$confighash{$key}[5] = $cgiparams{'PSK'};
- }
+ }
else {
$confighash{$key}[4] = 'cert';
}
@@ -988,10 +988,10 @@
$cgiparams{'ENABLED'} = 'on';
if ( ! -f "/var/ipcop/private/cakey.pem" ) {
$cgiparams{'AUTH'} = 'psk';
- }
+ }
elsif ( ! -f "/var/ipcop/ca/cacert.pem") {
$cgiparams{'AUTH'} = 'certfile';
- }
+ }
else {
$cgiparams{'AUTH'} = 'certgen';
}
@@ -1007,14 +1007,14 @@
# choose appropriate dpd action
if ($cgiparams{'TYPE'} eq 'host') {
$cgiparams{'DPD_ACTION'} = 'clear';
- }
+ }
else {
$cgiparams{'DPD_ACTION'} = 'restart';
}
# choose appropriate tunnel start action
if ($cgiparams{'TYPE'} eq 'host') {
$cgiparams{'TUNNELSTART'} = 'add';
- }
+ }
else {
$cgiparams{'TUNNELSTART'} = 'start';
}
@@ -1219,7 +1219,7 @@
<hr />
END
;
- }
+ }
elsif (! $cgiparams{'KEY'}) {
# Using %defaultroute in ipsec.secrets produces an error during
openswan start
# strangely a roadwarrior using PSK can still connect, so we'll allow
%defaultroute for RW with PSK for now.
@@ -1876,10 +1876,10 @@
{
if ($confighash{$a}[1] lt $confighash{$b}[1]) {
return -1;
- }
+ }
elsif ($confighash{$a}[1] gt $confighash{$b}[1]) {
return 1;
- }
+ }
else {
return 0;
}
@@ -1894,10 +1894,10 @@
print "<td align='center' nowrap='nowrap'>" .
$Lang::tr{"$confighash{$key}[3]"} . " (" . $Lang::tr{"$confighash{$key}[4]"} .
")</td>";
if ($confighash{$key}[2] eq '%auth-dn') {
print "<td align='center' nowrap='nowrap'>$confighash{$key}[9]</td>";
- }
+ }
elsif ($confighash{$key}[4] eq 'cert') {
print "<td align='center' nowrap='nowrap'>$confighash{$key}[2]</td>";
- }
+ }
else {
print "<td align='center'>$confighash{$key}[8]";
print "<br />[$confighash{$key}[10]]" if ($confighash{$key}[10] ne '');
@@ -1954,7 +1954,7 @@
</td>
END
;
- }
+ }
else {
print "<td width='2%'> </td>";
}
@@ -1968,8 +1968,8 @@
</form>
</td>
END
- ;
- }
+ ;
+ }
elsif (($confighash{$key}[4] eq 'cert') && ($confighash{$key}[2] ne
'%auth-dn')) {
print <<END
<td align='center'>
@@ -1981,7 +1981,7 @@
</td>
END
;
- }
+ }
else {
print "<td width='2%'> </td>";
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Try New Relic Now & We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service
that delivers powerful full stack analytics. Optimize and monitor your
browser, app, & servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
