ovpnmain.cgi: Fixes bug13869 - shows values from vpnsettings in advanced server page

- In the previous version the cgiparams hash was filled from the ovpn/settings file.
   However with the new version of this file that is no longer done. For the values
   of protocol, redirect_gw, mssfix, dataciphers, route_push the hash file was changed
   from %cgiparams to %vpnsettings. This was not done for the values of dciphers, dauth
   or tlsauth. These values still got their entries from the %cgiparams hash but this
   hash is empty as it has not been filled.
- This patch replaces the use of $cgiparams with $vpnsettings.
- Tested this out on my vm testbed and confirmed that the saved values are now shown on
   the advanced settings wui page.

Fixes: bug13869
Tested-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index a2f95dc9a1eb6142a92306cf8fdafdde86715ec0..dfe7f8ad58da866cb57719fc179e46e36eaeec83 100644 (file)
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -2694,18 +2694,18 @@ ADV_ERROR:
     $selected{'DCIPHER'}{'CAST5-CBC'} = '';
     $selected{'DCIPHER'}{'BF-CBC'} = '';
     $selected{'DCIPHER'}{'DES-CBC'} = '';
     $selected{'DCIPHER'}{'CAST5-CBC'} = '';
     $selected{'DCIPHER'}{'BF-CBC'} = '';
     $selected{'DCIPHER'}{'DES-CBC'} = '';

-    $selected{'DCIPHER'}{$cgiparams{'DCIPHER'}} = 'SELECTED';
+    $selected{'DCIPHER'}{$vpnsettings{'DCIPHER'}} = 'SELECTED';

 
     $selected{'DAUTH'}{'whirlpool'} = '';
     $selected{'DAUTH'}{'SHA512'} = '';
     $selected{'DAUTH'}{'SHA384'} = '';
     $selected{'DAUTH'}{'SHA256'} = '';
     $selected{'DAUTH'}{'SHA1'} = '';
 
     $selected{'DAUTH'}{'whirlpool'} = '';
     $selected{'DAUTH'}{'SHA512'} = '';
     $selected{'DAUTH'}{'SHA384'} = '';
     $selected{'DAUTH'}{'SHA256'} = '';
     $selected{'DAUTH'}{'SHA1'} = '';

-    $selected{'DAUTH'}{$cgiparams{'DAUTH'}} = 'SELECTED';
+    $selected{'DAUTH'}{$vpnsettings{'DAUTH'}} = 'SELECTED';

 
     $checked{'TLSAUTH'}{'off'} = '';
     $checked{'TLSAUTH'}{'on'} = '';
 
     $checked{'TLSAUTH'}{'off'} = '';
     $checked{'TLSAUTH'}{'on'} = '';

-    $checked{'TLSAUTH'}{$cgiparams{'TLSAUTH'}} = 'CHECKED';
+    $checked{'TLSAUTH'}{$vpnsettings{'TLSAUTH'}} = 'CHECKED';

 
     &Header::showhttpheaders();
     &Header::openpage($Lang::tr{'status ovpn'}, 1, '');
 
     &Header::showhttpheaders();
     &Header::openpage($Lang::tr{'status ovpn'}, 1, '');