ovpnmain.cgi: Change status extraction for RW connection statistics page

- The format of the status file has changed in 2.7.0
- This patch changes the regex to extract requyired status to maintain the same status
   output

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 b0d950cbbe54c14cb74efbd2424ac8abb28590ae..def043d9b0513b991c7504af17c74c7ec9b41654 100644 (file)
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -3178,8 +3178,8 @@ END
                        @match = split(/^Updated,(.+)/, $line);
                        $status = $match[1];
 
-               } elsif ( $line =~ /^(.+),(\d+\.\d+\.\d+\.\d+\:\d+),(\d+),(\d+),(.+)/) {
-                       @match = split(m/^(.+),(\d+\.\d+\.\d+\.\d+\:\d+),(\d+),(\d+),(.+)/, $line);
+               } elsif ( $line =~ /^(.+),(.+\:\d+\.\d+\.\d+\.\d+\:\d+),(\d+),(\d+),(.+)/) {
+                       @match = split(m/^(.+),(.+\:\d+\.\d+\.\d+\.\d+\:\d+),(\d+),(\d+),(.+)/, $line);
 
                        # Skip the header
                        next if ($match[1] eq "Common Name");
@@ -3196,8 +3196,8 @@ END
                        $users[$uid]{'Country'} = &Location::Functions::lookup_country_code($address);
                        $uid++;
 
-               } elsif ($line =~ /^(\d+\.\d+\.\d+\.\d+),(.+),(\d+\.\d+\.\d+\.\d+\:\d+),(.+)/) {
-                       @match = split(m/^(\d+\.\d+\.\d+\.\d+),(.+),(\d+\.\d+\.\d+\.\d+\:\d+),(.+)/, $line);
+               } elsif ($line =~ /^(\d+\.\d+\.\d+\.\d+),(.+),(.+\:\d+\.\d+\.\d+\.\d+\:\d+),(.+)/) {
+                       @match = split(m/^(\d+\.\d+\.\d+\.\d+),(.+),(.+\:\d+\.\d+\.\d+\.\d+\:\d+),(.+)/, $line);
 
                        # Skip the header
                        next if ($match[1] eq "Virtual Address");