[PATCH 1/3] pppsetup.cgi: Fix typos.

[PATCH 1/3] pppsetup.cgi: Fix typos.

[Stefan Schantl]

[-- Attachment #1: Type: text/plain, Size: 1010 bytes --]

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
 html/cgi-bin/pppsetup.cgi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi
index 519a062bc..beb7fabc7 100644
--- a/html/cgi-bin/pppsetup.cgi
+++ b/html/cgi-bin/pppsetup.cgi
@@ -180,8 +180,8 @@ elsif ($pppsettings{'ACTION'} eq $Lang::tr{'save'})
                 goto ERROR; }
 
 	# Read-in ddns config file, to check if at least one provider is enabled.
-	open(FILE, "${General::swroot}/ddns/config)";
-	my @ddns_config = <FILE>
+	open(FILE, "${General::swroot}/ddns/config");
+	my @ddns_config = <FILE>;
 	close(FILE);
 
         if( $pppsettings{'RECONNECTION'} eq 'dialondemand' && grep(/on/, @ddns_config) ) {
@@ -529,7 +529,7 @@ END
 
 # Read-in atm devices from proc.
 open(PROC, "/proc/net/atm/devices");
-my @patm_devices = <PROC>;
+my @atm_devices = <PROC>;
 close(PROC);
 
 my $atmdev = grep(/0/, @atm_devices);
-- 
2.20.1

[PATCH 2/3] vpnmain.cgi: Fix typo.

[Stefan Schantl]

[-- Attachment #1: Type: text/plain, Size: 529 bytes --]

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
 html/cgi-bin/vpnmain.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
index 79a2943d4..8f13cf51f 100644
--- a/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.cgi
@@ -1260,7 +1260,7 @@ END
 	open(FILE, "${General::swroot}/certs/$confighash{$cgiparams{'KEY'}}[1].p12");
 	my @p12 = <FILE>;
 	close(FILE);
-	print "@file";
+	print "@p12";
 
 	exit (0);
 
-- 
2.20.1

[PATCH 3/3] ovpnmain.cgi: Fix typos.

[Stefan Schantl]

[-- Attachment #1: Type: text/plain, Size: 1841 bytes --]

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
 html/cgi-bin/ovpnmain.cgi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 077f5ab6c..023000dd5 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -1226,7 +1226,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'TYPE'} eq '' && $cg
   if ( $vpnsettings{'ENABLED_BLUE'} eq 'on' ) {
 	  &General::system("touch", "${General::swroot}/ovpn/enable_blue");
   } else {
-	  unlink(${General::swroot}/ovpn/enable_blue);
+	  unlink("${General::swroot}/ovpn/enable_blue");
   }
 
   if ( $vpnsettings{'ENABLED_ORANGE'} eq 'on' ) {
@@ -1488,7 +1488,7 @@ END
 	}
     }
 
-    @casubject = &General::system_output("/usr/bin/openssl", "x509", "-text", "-in", "${General::swroot}/ovpn/ca/$cgiparams{'CA_NAME'}cert.pem");
+    my @casubject = &General::system_output("/usr/bin/openssl", "x509", "-text", "-in", "${General::swroot}/ovpn/ca/$cgiparams{'CA_NAME'}cert.pem");
     my $casubject;
 
     foreach my $line (@casubject) {
@@ -2517,7 +2517,7 @@ else
 
 	if ($confighash{$cgiparams{'KEY'}}) {
 		# Revoke certificate if certificate was deleted and rewrite the CRL
-		&General::system("/usr/bin/openssl", "ca", "-revoke", "${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1]cert.pem", "-config", "${General::swroot}/ovpn/openssl/ovpn.cnf)";
+		&General::system("/usr/bin/openssl", "ca", "-revoke", "${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1]cert.pem", "-config", "${General::swroot}/ovpn/openssl/ovpn.cnf");
 		&General::system("/usr/bin/openssl", "ca", "-gencrl", "-out", "${General::swroot}/ovpn/crls/cacrl.pem", "-config", "${General::swroot}/ovpn/openssl/ovpn.cnf");
 
 ###
-- 
2.20.1