Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x

[people/mfischer/ipfire-2.x.git] / html / cgi-bin / logs.cgi / ovpnclients.dat

diff --git a/html/cgi-bin/logs.cgi/ovpnclients.dat b/html/cgi-bin/logs.cgi/ovpnclients.dat
index 5e2c1ff49e09687feaf8529dfe64cf4a539230a9..8fbf4f8fab7f277d336be52cc79353be10f7aaac 100755 (executable)
--- a/html/cgi-bin/logs.cgi/ovpnclients.dat
+++ b/html/cgi-bin/logs.cgi/ovpnclients.dat
@@ -115,16 +115,16 @@ my $database_query = qq(
         common_name, SUM(
                 STRFTIME('%s', (
                         CASE
-                                WHEN DATETIME(COALESCE(disconnected_at, CURRENT_TIMESTAMP), 'localtime') < DATETIME('$to_datestring', 'localtime', 'start of day', '+86399 seconds')
+                                WHEN DATETIME(COALESCE(disconnected_at, CURRENT_TIMESTAMP), 'localtime') < DATETIME('$to_datestring', 'start of day', '+86399 seconds')
                                         THEN DATETIME(COALESCE(disconnected_at, CURRENT_TIMESTAMP), 'localtime')
-                                        ELSE DATETIME('$to_datestring', 'localtime', 'start of day', '+86399 seconds')
+                                        ELSE DATETIME('$to_datestring', 'start of day', '+86399 seconds')
                         END
                 ), 'utc') -
                 STRFTIME('%s', (
                         CASE
-                                WHEN DATETIME(connected_at, 'localtime') > DATETIME('$from_datestring', 'localtime', 'start of day')
+                                WHEN DATETIME(connected_at, 'localtime') > DATETIME('$from_datestring', 'start of day')
                                         THEN DATETIME(connected_at, 'localtime')
-                                        ELSE DATETIME('$from_datestring', 'localtime', 'start of day')
+                                        ELSE DATETIME('$from_datestring', 'start of day')
                         END
                 ), 'utc')
         ) AS duration
@@ -133,10 +133,10 @@ my $database_query = qq(
                 (
                        disconnected_at IS NULL
                        OR
-                       DATETIME(disconnected_at, 'localtime') > DATETIME('$from_datestring', 'localtime', 'start of day')
+                       DATETIME(disconnected_at, 'localtime') > DATETIME('$from_datestring', 'start of day')
                )
                 AND
-                DATETIME(connected_at, 'localtime') < DATETIME('$to_datestring', 'localtime', 'start of day', '+86399 seconds')
+                DATETIME(connected_at, 'localtime') < DATETIME('$to_datestring', 'start of day', '+86399 seconds')
         GROUP BY common_name
         ORDER BY common_name, duration DESC;
 );
@@ -148,9 +148,9 @@ if ($cgiparams{'CONNECTION_NAME'}) {
                WHERE
                        common_name = '$cgiparams{"CONNECTION_NAME"}'
                        AND (
-                               DATETIME(disconnected_at, 'localtime') > DATETIME('$from_datestring', 'localtime', 'start of day')
+                               DATETIME(disconnected_at, 'localtime') > DATETIME('$from_datestring', 'start of day')
                                AND
-                               DATETIME(connected_at, 'localtime') < DATETIME('$to_datestring', 'localtime', 'start of day', '+86399 seconds')
+                               DATETIME(connected_at, 'localtime') < DATETIME('$to_datestring', 'start of day', '+86399 seconds')
                        )
                ORDER BY connected_at;
        );
@@ -329,7 +329,7 @@ unless ($errormessage) {
 }
 
 # If nothing has been fetched, the amount of lines is still zero.
-# In this case display a hint about no data.   
+# In this case display a hint about no data.
 unless ($lines) {
        print "<tr><td bgcolor='$color{'color22'}' colspan='6' align='center'>$Lang::tr{'no entries'}</td></tr>\n";
 }