Quasi fast alle cgis von den fixen header farben befreit

[people/pmueller/ipfire-2.x.git] / html / cgi-bin / ovpnmain.cgi

diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 598351e7a5807ec9a35597817de1357ee13518c3..761041402065dfd23730083ec32dc71f773aefec 100644 (file)
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -30,7 +30,10 @@ require "${General::swroot}/countries.pl";
 my @dummy = ( ${Header::colourgreen} );
 undef (@dummy);
 
-
+my %color = ();
+my %mainsettings = ();
+&General::readhash("${General::swroot}/main/settings", \%mainsettings);
+&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
 
 ###
 ### Initialize variables
@@ -718,7 +721,7 @@ END
        (my $state = $cgiparams{'ROOTCERT_STATE'}) =~ s/^\s*$/\./;
 
        # refresh
-       #system ('/bin/touch', "${General::swroot}/ovpn/gencanow");
+       #system ('/usr/bin/touch', "${General::swroot}/ovpn/gencanow");
        
        # Create the CA certificate
        my $pid = open(OPENSSL, "|-");
@@ -1460,9 +1463,9 @@ END
        if ($user2 >= 1){
            for (my $idx = 1; $idx <= $user2; $idx++){
                                                if ($idx % 2) {
-                                       print "<tr bgcolor='${Header::table1colour}'>\n";
+                                       print "<tr bgcolor='$color{'color20'}'>\n";
                                } else {
-                                       print "<tr bgcolor='${Header::table2colour}'>\n";
+                                       print "<tr bgcolor='$color{'color22'}'>\n";
                                                }
                                                print "<td align='left'>$users[$idx-1]{'CommonName'}</td>";
                                                print "<td align='left'>$users[$idx-1]{'RealAddress'}</td>";
@@ -2875,7 +2878,7 @@ if (-f "${General::swroot}/ovpn/ca/cacert.pem") {
        $casubject    =~ s+/Email+, E+;
        $casubject    =~ s/ ST=/ S=/;
        print <<END
-       <tr bgcolor='${Header::table2colour}'>
+       <tr bgcolor='$color{'color22'}'>
            <td class='base'>$Lang::tr{'root certificate'}</td>
                <td class='base'>$casubject</td>
                <form method='post' name='frmrootcrta'><td width='3%' align='center'>
@@ -2892,7 +2895,7 @@ END
 } else {
        # display rootcert generation buttons
        print <<END
-       <tr bgcolor='${Header::table2colour}'>
+       <tr bgcolor='$color{'color22'}'>
        <td class='base'>$Lang::tr{'root certificate'}:</td>
        <td class='base'>$Lang::tr{'not present'}</td>
        <td colspan='3'>&nbsp;</td></tr>
@@ -2907,7 +2910,7 @@ if (-f "${General::swroot}/ovpn/certs/servercert.pem") {
        $hostsubject    =~ s+/Email+, E+;
        $hostsubject    =~ s/ ST=/ S=/;
        print <<END
-       <tr bgcolor='${Header::table1colour}'>
+       <tr bgcolor='$color{'color20'}'>
        <td class='base'>$Lang::tr{'host certificate'}</td>
        <td class='base'>$hostsubject</td>
        <form method='post' name='frmhostcrta'><td width='3%' align='center'>
@@ -2924,7 +2927,7 @@ END
 } else {
        # Nothing
        print <<END
-       <tr bgcolor='${Header::table1colour}'>
+       <tr bgcolor='$color{'color20'}'>
        <td width='25%' class='base'>$Lang::tr{'host certificate'}:</td>
        <td class='base'>$Lang::tr{'not present'}</td>
        </td><td colspan='3'>&nbsp;</td></tr>
@@ -2941,9 +2944,9 @@ if (! -f "${General::swroot}/ovpn/ca/cacert.pem") {
 if (keys %cahash > 0) {
        foreach my $key (keys %cahash) {
                if (($key + 1) % 2) {
-                       print "<tr bgcolor='${Header::table1colour}'>\n";
+                       print "<tr bgcolor='$color{'color20'}'>\n";
                } else {
-                       print "<tr bgcolor='${Header::table2colour}'>\n";
+                       print "<tr bgcolor='$color{'color22'}'>\n";
                }
                print "<td class='base'>$cahash{$key}[0]</td>\n";
                print "<td class='base'>$cahash{$key}[1]</td>\n";
@@ -2988,8 +2991,7 @@ print <<END
 <tr><td class='base' nowrap='nowrap'>$Lang::tr{'ca name'}:</td>
 <td nowrap='nowrap'><input type='text' name='CA_NAME' value='$cgiparams{'CA_NAME'}' size='15' />
 <td nowrap='nowrap'><input type='file' name='FH' size='30' /></td>
-<td nowrap='nowrap'><input type='submit' name='ACTION' value='$Lang::tr{'upload ca certificate'}' /></td>
-<td nowrap='nowrap'><input type='submit' name='ACTION' value='$Lang::tr{'show crl'}' /></td>    
+<td nowrap='nowrap'><input type='submit' name='ACTION' value='$Lang::tr{'upload ca certificate'}' /><br /><input type='submit' name='ACTION' value='$Lang::tr{'show crl'}' /></td>    
 </tr></table></form>
 END
     ;
@@ -3026,8 +3028,8 @@ if (&Ovpnfunc::haveOrangeNet()) {
 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>
+       <td class='boldbase' nowrap='nowrap'></td><td class='boldbase' nowrap='nowrap'>$Lang::tr{'ovpn subnet'}
+       <br /><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>                                 
@@ -3083,4 +3085,4 @@ print "</form></table>";
 #RWSERVER
 &Ovpnfunc::rwclientstatus($activeonrun);
 &Ovpnfunc::net2netstatus($activeonrun);
-&Header::closepage();
\ No newline at end of file
+&Header::closepage();