From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephan Mending To: development@lists.ipfire.org Subject: [PATCH 1/2] Current system time in WebUI Footer Date: Mon, 23 Mar 2020 22:27:45 +0100 Message-ID: <20200323212746.4424-1-list@md5collisions.eu> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7190389224780959253==" List-Id: --===============7190389224780959253== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable These changes add the current system time to the footer of the webinterface. Because of differing themes one has to differentiate between legacy themes (ipfire-legacy, darkdos, maniac) and the current standa= rd (ipfire, ipfire-rounded). --- html/html/themes/darkdos/include/functions.pl | 4 ++ .../themes/ipfire-legacy/include/functions.pl | 36 ++++++++------- html/html/themes/ipfire/include/functions.pl | 33 +++++++------ html/html/themes/maniac/include/functions.pl | 46 ++++++++++--------- 4 files changed, 67 insertions(+), 52 deletions(-) diff --git a/html/html/themes/darkdos/include/functions.pl b/html/html/themes= /darkdos/include/functions.pl index ed3f546b0..9f3547237 100644 --- a/html/html/themes/darkdos/include/functions.pl +++ b/html/html/themes/darkdos/include/functions.pl @@ -19,6 +19,8 @@ # = # ############################################################################= ### =20 +use POSIX; + sub showmenu() { print < @@ -322,6 +324,7 @@ END =20 sub closepage () { my $status =3D &connectionstatus(); + my $localtime_now =3D strftime "%H:%M:%S", localtime; my $uptime =3D `/usr/bin/uptime|cut -d \" \" -f 4-`; $uptime =3D~ s/year(s|)/$Lang::tr{'year'}/; $uptime =3D~ s/month(s|)/$Lang::tr{'month'}/; @@ -354,6 +357,7 @@ print < $Lang::tr{'bandwidth usage'}: $Lang::tr{'incoming'}:  $Lang::tr{'outgo= ing'}: + time: $localtime_now =20 END ; diff --git a/html/html/themes/ipfire-legacy/include/functions.pl b/html/html/= themes/ipfire-legacy/include/functions.pl index 26a8763c1..3ce62ea41 100644 --- a/html/html/themes/ipfire-legacy/include/functions.pl +++ b/html/html/themes/ipfire-legacy/include/functions.pl @@ -19,6 +19,8 @@ # = # ############################################################################= ### =20 +use POSIX; + sub showmenu() { print < @@ -321,14 +323,15 @@ END } =20 sub closepage () { - my $status =3D &connectionstatus(); - my $uptime =3D `/usr/bin/uptime|cut -d \" \" -f 4-`; - $uptime =3D~ s/year(s|)/$Lang::tr{'year'}/; - $uptime =3D~ s/month(s|)/$Lang::tr{'month'}/; - $uptime =3D~ s/day(s|)/$Lang::tr{'day'}/; - $uptime =3D~ s/user(s|)/$Lang::tr{'user'}/; - $uptime =3D~ s/load average/$Lang::tr{'uptime load average'}/; =20 - =09 + my $status =3D &connectionstatus(); + my $localtime_now =3D strftime "%H:%M:%S", localtime; + my $uptime =3D `/usr/bin/uptime|cut -d \" \" -f 4-`; + $uptime =3D~ s/year(s|)/$Lang::tr{'year'}/; + $uptime =3D~ s/month(s|)/$Lang::tr{'month'}/; + $uptime =3D~ s/day(s|)/$Lang::tr{'day'}/; + $uptime =3D~ s/user(s|)/$Lang::tr{'user'}/; + $uptime =3D~ s/load average/$Lang::tr{'uptime load average'}/; + print < @@ -341,19 +344,20 @@ END &showsubsection($menu); &showsubsubsection($menu); =20 - print < - -
=20 -
- Status: $status Uptime: $uptime + print < +
+
=20 +
+ Status: $status Uptime: $uptime END ; if ($settings{'SPEED'} ne 'off') { -print < $Lang::tr{'bandwidth usage'}: - $Lang::tr{'incoming'}:  $Lang::tr{'outgo= ing'}: + $Lang::tr{'incoming'}: <= /span> $Lang::tr{'outgoing'}: = =20 + time: $localtime_now =20 END ; diff --git a/html/html/themes/ipfire/include/functions.pl b/html/html/themes/= ipfire/include/functions.pl index 9aec77497..9e3063476 100644 --- a/html/html/themes/ipfire/include/functions.pl +++ b/html/html/themes/ipfire/include/functions.pl @@ -32,6 +32,7 @@ ############################################################################= ### =20 require "${General::swroot}/lang.pl"; +use POSIX; =20 ############################################################################= ### # @@ -194,29 +195,31 @@ sub openpagewithoutmenu { # print page closing html layout =20 sub closepage () { - open(FILE, "; - $system_release =3D~ s/core/Core Update /; - close(FILE); + open(FILE, "; + $system_release =3D~ s/core/Core Update /; + close(FILE); + $localtime_now =3D strftime "%H:%M:%S", localtime; =20 print < -
- -
- - IPFire.org<= /strong> • - $Lang::tr{'su= pport donation'} - - - $system_release -
+ + + +
+ + IPFire.org • + $Lang::tr{'support donation'} + + $system_release + - $localtime_now +
END ; } =20 + ############################################################################= ### # # print big box opening html layout diff --git a/html/html/themes/maniac/include/functions.pl b/html/html/themes/= maniac/include/functions.pl index 1c0aea1c4..c50357070 100644 --- a/html/html/themes/maniac/include/functions.pl +++ b/html/html/themes/maniac/include/functions.pl @@ -19,6 +19,8 @@ # = # ############################################################################= ### =20 +use POSIX; + sub showmenu() { print < @@ -321,39 +323,41 @@ END } =20 sub closepage () { - my $status =3D &connectionstatus(); - my $uptime =3D `/usr/bin/uptime|cut -d \" \" -f 4-`; - $uptime =3D~ s/year(s|)/$Lang::tr{'year'}/; - $uptime =3D~ s/month(s|)/$Lang::tr{'month'}/; - $uptime =3D~ s/day(s|)/$Lang::tr{'day'}/; - $uptime =3D~ s/user(s|)/$Lang::tr{'user'}/; - $uptime =3D~ s/load average/$Lang::tr{'uptime load average'}/; =20 - =09 + my $status =3D &connectionstatus(); + my $localtime_now =3D strftime "%H:%M:%S", localtime; + my $uptime =3D `/usr/bin/uptime|cut -d \" \" -f 4-`; + $uptime =3D~ s/year(s|)/$Lang::tr{'year'}/; + $uptime =3D~ s/month(s|)/$Lang::tr{'month'}/; + $uptime =3D~ s/day(s|)/$Lang::tr{'day'}/; + $uptime =3D~ s/user(s|)/$Lang::tr{'user'}/; + $uptime =3D~ s/load average/$Lang::tr{'uptime load average'}/; + print < - + + =20 -
- =09 -
+
+ =20 +
END ; &showsubsection($menu); &showsubsubsection($menu); =20 - print < -
-
=09 -
- Status: $status Uptime: $uptime + print < +
+
=20 +
+ Status: $status Uptime: $uptime END ; if ($settings{'SPEED'} ne 'off') { -print < $Lang::tr{'bandwidth usage'}: - $Lang::tr{'incoming'}:  $Lang::tr{'outgo= ing'}: + $Lang::tr{'incoming'}: <= /span> $Lang::tr{'outgoing'}: = =20 + time: $localtime_now =20 END ; --=20 2.20.1 --===============7190389224780959253==--