X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=html%2Fcgi-bin%2Fovpnmain.cgi;h=7b1654fb937cfc0c211f753f3934784c4a14577a;hp=5dd943f19610fdfe585c0be631b4c43b08866c05;hb=3932f02ba33e0f0b7686db4bd6f4609ae7e3d370;hpb=9063a04e94587fc38f410ec2234275417de201ad
diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 5dd943f19..7b1654fb9 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -4663,7 +4663,7 @@ END
-
|
+
|
END
;
@@ -4690,7 +4690,7 @@ END
}
print "";
&Header::closebox();
- &Header::openbox('100%', 'LEFT', "$Lang::tr{'certificate authorities'}:");
+ &Header::openbox('100%', 'LEFT', "$Lang::tr{'certificate authorities'}");
print <
@@ -4825,7 +4825,7 @@ print <
END
@@ -4862,6 +4862,7 @@ END
;
my $id = 0;
my $gif;
+ my $col1="";
foreach my $key (sort { ncmp ($confighash{$a}[1],$confighash{$b}[1]) } keys %confighash) {
if ($confighash{$key}[0] eq 'on') { $gif = 'on.gif'; } else { $gif = 'off.gif'; }
if ($id % 2) {
@@ -4885,17 +4886,18 @@ END
if ($confighash{$key}[32] eq "" && $confighash{$key}[3] eq 'host' ){$confighash{$key}[32]="dynamic";}
print "$confighash{$key}[32] | ";
print "$confighash{$key}[25] | ";
-
- my $active = "";
+ $col1="bgcolor='${Header::colourred}'";
+ my $active = "$Lang::tr{'capsclosed'}";
if ($confighash{$key}[0] eq 'off') {
- $active = "";
+ $col1="bgcolor='${Header::colourblue}'";
+ $active = "$Lang::tr{'capsclosed'}";
} else {
###
# m.a.d net2net
-###
-
+###
+
if ($confighash{$key}[3] eq 'net') {
if (-e "/var/run/$confighash{$key}[1]n2n.pid") {
@@ -4919,37 +4921,39 @@ END
#EXITING -- A graceful exit is in progress.
####
- if ( $tustate[1] eq 'CONNECTED') {
- $active = "";
- } else {
- $active = "";
+ if ( $tustate[1] eq 'CONNECTED') {
+ $col1="bgcolor='${Header::colourgreen}'";
+ $active = "$Lang::tr{'capsopen'}";
+ }else {
+ $col1="bgcolor='${Header::colourred}'";
+ $active = "$tustate[1]";
+ }
}
- }
}
- } else {
-
- my $cn;
- my @match = ();
- foreach my $line (@status) {
- chomp($line);
- if ( $line =~ /^(.+),(\d+\.\d+\.\d+\.\d+\:\d+),(\d+),(\d+),(.+)/) {
- @match = split(m/^(.+),(\d+\.\d+\.\d+\.\d+\:\d+),(\d+),(\d+),(.+)/, $line);
- if ($match[1] ne "Common Name") {
- $cn = $match[1];
- }
- $cn =~ s/[_]/ /g;
- if ($cn eq "$confighash{$key}[2]") {
- $active = "";
- }
- }
-
+ }else {
+
+ my $cn;
+ my @match = ();
+ foreach my $line (@status) {
+ chomp($line);
+ if ( $line =~ /^(.+),(\d+\.\d+\.\d+\.\d+\:\d+),(\d+),(\d+),(.+)/) {
+ @match = split(m/^(.+),(\d+\.\d+\.\d+\.\d+\:\d+),(\d+),(\d+),(.+)/, $line);
+ if ($match[1] ne "Common Name") {
+ $cn = $match[1];
+ }
+ $cn =~ s/[_]/ /g;
+ if ($cn eq "$confighash{$key}[2]") {
+ $col1="bgcolor='${Header::colourgreen}'";
+ $active = "$Lang::tr{'capsopen'}";
+ }
+ }
+ }
}
}
-}
print <$active
+ $active |
-
+
END
;
}