From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCH 10/19] ovpnclients.dat: Display error when the to date is not later than the from date. Date: Mon, 13 Apr 2020 09:45:41 +0200 Message-ID: <20200413074550.2735-10-stefan.schantl@ipfire.org> In-Reply-To: <20200413074550.2735-1-stefan.schantl@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8770612495426978790==" List-Id: --===============8770612495426978790== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Signed-off-by: Stefan Schantl --- html/cgi-bin/logs.cgi/ovpnclients.dat | 5 +++++ langs/en/cgi-bin/en.pl | 1 + 2 files changed, 6 insertions(+) diff --git a/html/cgi-bin/logs.cgi/ovpnclients.dat b/html/cgi-bin/logs.cgi/ov= pnclients.dat index b84c2b8d7..a83a0bca9 100755 --- a/html/cgi-bin/logs.cgi/ovpnclients.dat +++ b/html/cgi-bin/logs.cgi/ovpnclients.dat @@ -90,6 +90,11 @@ my $database_handle =3D DBI->connect("DBI:SQLite:dbname=3D= $database", "", "", { Rais my $from_datestring =3D sprintf '%04d-%02d-%02d', ($cgiparams{"FROM_YEAR"}, = $cgiparams{"FROM_MONTH"}, $cgiparams{"FROM_DAY"}); my $to_datestring =3D sprintf '%04d-%02d-%02d', ($cgiparams{"TO_YEAR"}, $cgi= params{"TO_MONTH"}, $cgiparams{"TO_DAY"}); =20 +# Check if the to datestring is later than the from datestring. +unless ($to_datestring ge $from_datestring) { + $errormessage =3D "$Lang::tr{'error the to date has to be later than the fr= om date'}"; +} + my $database_query =3D qq( SELECT common_name, SUM( diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 171d24937..3d07473e7 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1012,6 +1012,7 @@ 'error config' =3D> 'Could not open /var/ipfire/ovpn/config/ZERINA.ovpn !', 'error external access' =3D> 'Could not open /var/ipfire/xtaccess/config (ex= ternal acccess could not be granted)!', 'error messages' =3D> 'Error messages', +'error the to date has to be later than the from date' =3D> 'The to date has= to be later than the from date!', 'esp encryption' =3D> 'ESP Encryption:', 'esp grouptype' =3D> 'ESP Grouptype:', 'esp integrity' =3D> 'ESP Integrity:', --=20 2.26.0 --===============8770612495426978790==--