ovpnmain.cgi: Make checkboxes unselectable

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index b85bc0d63610f8982a4a6d8e9ba8dfe8ea11e081..2b4e2a4256a36eb3971ce66b8be267caf1885c92 100644 (file)
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -97,6 +97,7 @@ my %checked=();
 my %confighash=();
 my %cahash=();
 my %selected=();
+my %cgiparams = ();
 my $warnmessage = '';
 my $errormessage = '';
 my %settings=();
@@ -111,6 +112,7 @@ my $col="";
 &General::readhash("${General::swroot}/ovpn/settings", \%vpnsettings);
 &read_routepushfile(\%vpnsettings);
 
+
 # Configure any defaults
 &General::set_defaults(\%vpnsettings, {
        # The RW Server is disabled by default
@@ -132,9 +134,6 @@ my $col="";
        "TLSAUTH"      => "on",
 });
 
-# Set default CGI parameters
-my %cgiparams = %{ \%vpnsettings };
-
 # Load CGI parameters
 &Header::getcgihash(\%cgiparams, {'wantfile' => 1, 'filevar' => 'FH'});
 
@@ -2652,17 +2651,17 @@ END
 ADV_ERROR:
     $selected{'DPROTOCOL'}{'udp'} = '';
     $selected{'DPROTOCOL'}{'tcp'} = '';
-    $selected{'DPROTOCOL'}{$cgiparams{'DPROTOCOL'}} = 'SELECTED';
+    $selected{'DPROTOCOL'}{$vpnsettings{'DPROTOCOL'}} = 'SELECTED';
 
     $checked{'REDIRECT_GW_DEF1'}{'off'} = '';
     $checked{'REDIRECT_GW_DEF1'}{'on'} = '';
-    $checked{'REDIRECT_GW_DEF1'}{$cgiparams{'REDIRECT_GW_DEF1'}} = 'CHECKED';
+    $checked{'REDIRECT_GW_DEF1'}{$vpnsettings{'REDIRECT_GW_DEF1'}} = 'CHECKED';
     $checked{'MSSFIX'}{'off'} = '';
     $checked{'MSSFIX'}{'on'} = '';
-    $checked{'MSSFIX'}{$cgiparams{'MSSFIX'}} = 'CHECKED';
+    $checked{'MSSFIX'}{$vpnsettings{'MSSFIX'}} = 'CHECKED';
 
        # Split data ciphers
-       my @data_ciphers = split(/\|/, $cgiparams{'DATACIPHERS'});
+       my @data_ciphers = split(/\|/, $vpnsettings{'DATACIPHERS'});
 
        # Select the correct ones
        $selected{'DATACIPHERS'} = ();
@@ -2671,7 +2670,7 @@ ADV_ERROR:
        }
 
        # Routes
-       $cgiparams{'ROUTES_PUSH'} =~ s/\|/\n/g;
+       $vpnsettings{'ROUTES_PUSH'} =~ s/\|/\n/g;
 
     $selected{'DCIPHER'}{'AES-256-GCM'} = '';
     $selected{'DCIPHER'}{'AES-192-GCM'} = '';
@@ -2729,14 +2728,14 @@ ADV_ERROR:
                                <tr>
                                        <td>$Lang::tr{'destination port'}</td>
                                        <td>
-                                               <input type='number' name='DDEST_PORT' value='$cgiparams{'DDEST_PORT'}' />
+                                               <input type='number' name='DDEST_PORT' value='$vpnsettings{'DDEST_PORT'}' />
                                        </td>
                                </tr>
 
                                <tr>
                                        <td>$Lang::tr{'mtu'}</td>
                                        <td>
-                                               <input type='number' name='DMTU' value='$cgiparams{'DMTU'}' min="1280" max="9000" />
+                                               <input type='number' name='DMTU' value='$vpnsettings{'DMTU'}' min="1280" max="9000" />
                                        </td>
                                </tr>
 
@@ -2750,7 +2749,7 @@ ADV_ERROR:
                                <tr>
                                        <td>fragment</td>
                                        <td>
-                                               <input type='TEXT' name='FRAGMENT' value='$cgiparams{'FRAGMENT'}' />
+                                               <input type='TEXT' name='FRAGMENT' value='$vpnsettings{'FRAGMENT'}' />
                                        </td>
                                </tr>
                        </table>
@@ -2849,19 +2848,19 @@ END
                                <tr>
                                        <td>Domain</td>
                                        <td>
-                                               <input type='TEXT' name='DHCP_DOMAIN' value='$cgiparams{'DHCP_DOMAIN'}' size='30' />
+                                               <input type='TEXT' name='DHCP_DOMAIN' value='$vpnsettings{'DHCP_DOMAIN'}' size='30' />
                                        </td>
                                </tr>
                                <tr>
                                        <td>DNS</td>
                                        <td>
-                                               <input type='TEXT' name='DHCP_DNS' value='$cgiparams{'DHCP_DNS'}' size='30' />
+                                               <input type='TEXT' name='DHCP_DNS' value='$vpnsettings{'DHCP_DNS'}' size='30' />
                                        </td>
                                </tr>
                                <tr>
                                        <td>WINS</td>
                                        <td>
-                                               <input type='TEXT' name='DHCP_WINS' value='$cgiparams{'DHCP_WINS'}' size='30' />
+                                               <input type='TEXT' name='DHCP_WINS' value='$vpnsettings{'DHCP_WINS'}' size='30' />
                                        </td>
                                </tr>
                        </table>
@@ -2879,7 +2878,7 @@ END
                                <tr>
                                        <td>$Lang::tr{'ovpn routes push'}</td>
                                        <td>
-                                               <textarea name='ROUTES_PUSH' cols='26' rows='6' wrap='off'>$cgiparams{'ROUTES_PUSH'}</textarea>
+                                               <textarea name='ROUTES_PUSH' cols='26' rows='6' wrap='off'>$vpnsettings{'ROUTES_PUSH'}</textarea>
                                        </td>
                                </tr>
                        </table>
@@ -2890,7 +2889,7 @@ END
                                <tr>
                                        <td>Max-Clients</td>
                                        <td>
-                                               <input type='text' name='MAX_CLIENTS' value='$cgiparams{'MAX_CLIENTS'}' />
+                                               <input type='text' name='MAX_CLIENTS' value='$vpnsettings{'MAX_CLIENTS'}' />
                                        </td>
                                </tr>
 
@@ -5031,7 +5030,7 @@ END
 
     $checked{'ENABLED'}{'off'} = '';
     $checked{'ENABLED'}{'on'} = '';
-    $checked{'ENABLED'}{$cgiparams{'ENABLED'}} = 'CHECKED';
+    $checked{'ENABLED'}{$vpnsettings{'ENABLED'}} = 'CHECKED';
 
     &Header::showhttpheaders();
     &Header::openpage($Lang::tr{'status ovpn'}, 1, '');
@@ -5081,7 +5080,7 @@ END
                                                $Lang::tr{'ovpn fqdn'}
                                        </td>
                                        <td>
-                                               <input type='text' name='VPN_IP' value='$cgiparams{'VPN_IP'}' />
+                                               <input type='text' name='VPN_IP' value='$vpnsettings{'VPN_IP'}' />
                                        </td>
                                </tr>
 
@@ -5090,7 +5089,7 @@ END
                                                $Lang::tr{'ovpn dynamic client subnet'}
                                        </td>
                                        <td>
-                                               <input type='TEXT' name='DOVPN_SUBNET' value='$cgiparams{'DOVPN_SUBNET'}' />
+                                               <input type='TEXT' name='DOVPN_SUBNET' value='$vpnsettings{'DOVPN_SUBNET'}' />
                                        </td>
                                </tr>