From patchwork Mon Mar 23 21:27:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Mending X-Patchwork-Id: 2854 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 48mSCz3LHgz3yBf for ; Mon, 23 Mar 2020 21:28:15 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 48mSCx6j9nzhW; Mon, 23 Mar 2020 21:28:13 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 48mSCx4J8sz2yxK; Mon, 23 Mar 2020 21:28:13 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 48mSCv34GJz2xcW for ; Mon, 23 Mar 2020 21:28:11 +0000 (UTC) Received: from mx-00.md5collisions.eu (mx-00.md5collisions.eu [94.16.120.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mx-00.md5collisions.eu", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 48mSCt5RTQzhW for ; Mon, 23 Mar 2020 21:28:10 +0000 (UTC) From: Stephan Mending DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=md5collisions.eu; s=072019ed25519; t=1584998889; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=zRd+I1/HwAfOAShgeNNtaOXLk130zXviOxveFxhXOY8=; b=r9UR3LYTMyl/Ns2PWV41GFm37EzEOlYJ2Rfxd4U673bV0bSgXThsEcjJ9XAC1MlMOi8OVk p82/lz/et8ptWzDQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=md5collisions.eu; s=072019rsa; t=1584998889; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=zRd+I1/HwAfOAShgeNNtaOXLk130zXviOxveFxhXOY8=; b=xYJ9Y3eoK9G2YLWC+uE47+ew+ly9O66K8CRwHcar1eQkjwnGYEjOX9feK88aRJjX5WH2or LTCRPwZE7pxYEuTR2O09N0hxzYAq/bZFCArmVqHRYeR2sThGStCXMbco/4k5KnijR8WjeZ be9TbNaorxyc6CcvRX/SaH1QSthapRu+g4UM788OC17lymYnqL2J0TkomjTaDhL1hixBtr GVjsOjPWa4LO4O06tBm2nsZ2kJBU1GOc1S8f9V84Q/NA2QmTgetuAWkRd2zTVhqFlCWkch bODWDDC0XKY2dojRrM8Lpe/EPsyn7Xa0hjKO7nDcGl6TZmBOkq8t16CPHfFYig== 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 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=lists.ipfire.org; s=202003rsa; t=1584998890; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:dkim-signature; bh=zRd+I1/HwAfOAShgeNNtaOXLk130zXviOxveFxhXOY8=; b=fE7o+p/4lJLnHF2jjM3N+K0RgYWYFTCg0RDdpUMZJgpD6j0yFhhSNiTG7iyegv789iyeL4 BmguCn7dSWYG6XB9OlMzV4nIu4YB9kjTww4mwewEinc+6ZgtKqZyuqFapVHBY2yS27O6rk ydbQkEaBHxn6EWkYe8jLzEzMpblXDNFrDfw1Jlj0x8TMSf1PffULX8McorxMVGXX15yrTI oSEa9BCfHFBSh+mRdusXUW9LClnigCM+IkrUxIy11Kdxy8J44v0VIQOjiWlBAVOXO5liYp PjPkh6+0kml04n3KJXfzpVnztT5rmZEfE9zh0EEUrGmYBjSYIYozkcXWDseitA== ARC-Seal: i=1; s=202003rsa; d=lists.ipfire.org; t=1584998890; a=rsa-sha256; cv=none; b=O3Sk2PItiNwSll3Npwp64JapYEKNiHES4l4vYvMS6FL7XdzOmoTlpmZYjSBu5kzdOlCQQx brfZd5aaH4B10sylk26bjXCKhioVJQ+7B374WwBLW714GsGJ5S4cVoauFG/c74UFkpOCOt RzBpejZo+sJRPXk1AZ/vkKSxzwU+X0V9ItLZ+HdT8M8NWfl8EXWmFQ5Vnk/pjthm7G2n/l EnWNoKnvkV1v89ntY5uJq6OsHRyReygopzsQtBpprnSBpV38hoQfbqHePFIxdhTYWlO/Zx zaQJ3SWCw21SxNPCrCaJVSb9C4Pl0LNgn/0CymvNXZuvSZc9rXYUHFIhHMf+QQ== ARC-Authentication-Results: i=1; mail01.ipfire.org; dkim=pass header.d=md5collisions.eu header.s=072019ed25519 header.b=r9UR3LYT; dkim=pass header.d=md5collisions.eu header.s=072019rsa header.b=xYJ9Y3eo; dmarc=none; spf=pass (mail01.ipfire.org: domain of list@md5collisions.eu designates 94.16.120.200 as permitted sender) smtp.mailfrom=list@md5collisions.eu Authentication-Results: mail01.ipfire.org; dkim=pass header.d=md5collisions.eu header.s=072019ed25519 header.b=r9UR3LYT; dkim=pass header.d=md5collisions.eu header.s=072019rsa header.b=xYJ9Y3eo; dmarc=none; spf=pass (mail01.ipfire.org: domain of list@md5collisions.eu designates 94.16.120.200 as permitted sender) smtp.mailfrom=list@md5collisions.eu X-Rspamd-Queue-Id: 48mSCt5RTQzhW X-Spamd-Result: default: False [-1.41 / 11.00]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[md5collisions.eu:s=072019ed25519,md5collisions.eu:s=072019rsa]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:94.16.120.200:c]; R_MISSING_CHARSET(2.50)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[md5collisions.eu]; BROKEN_CONTENT_TYPE(1.50)[]; DWL_DNSWL_MED(-2.00)[md5collisions.eu:dkim]; ARC_SIGNED(0.00)[i=1]; RCVD_DKIM_ARC_DNSWL_MED(-0.50)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; IP_REPUTATION_HAM(-0.34)[asn: 197540(-0.34), country: DE(-0.00), ip: 94.16.120.200(0.00)]; DKIM_TRACE(0.00)[md5collisions.eu:+]; RCPT_COUNT_TWO(0.00)[2]; MID_CONTAINS_FROM(1.00)[]; RCVD_IN_DNSWL_MED(-0.20)[94.16.120.200:from]; MX_GOOD(-0.01)[]; RCVD_COUNT_ZERO(0.00)[0]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:197540, ipnet:94.16.120.0/22, country:DE]; BAYES_HAM(-2.86)[99.39%] X-Rspamd-Server: mail01.haj.ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" 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 standard (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 @@ # # ############################################################################### +use POSIX; + sub showmenu() { print < @@ -322,6 +324,7 @@ END sub closepage () { my $status = &connectionstatus(); + my $localtime_now = strftime "%H:%M:%S", localtime; my $uptime = `/usr/bin/uptime|cut -d \" \" -f 4-`; $uptime =~ s/year(s|)/$Lang::tr{'year'}/; $uptime =~ s/month(s|)/$Lang::tr{'month'}/; @@ -354,6 +357,7 @@ print < $Lang::tr{'bandwidth usage'}: $Lang::tr{'incoming'}:  $Lang::tr{'outgoing'}: + time: $localtime_now 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 @@ # # ############################################################################### +use POSIX; + sub showmenu() { print < @@ -321,14 +323,15 @@ END } sub closepage () { - my $status = &connectionstatus(); - my $uptime = `/usr/bin/uptime|cut -d \" \" -f 4-`; - $uptime =~ s/year(s|)/$Lang::tr{'year'}/; - $uptime =~ s/month(s|)/$Lang::tr{'month'}/; - $uptime =~ s/day(s|)/$Lang::tr{'day'}/; - $uptime =~ s/user(s|)/$Lang::tr{'user'}/; - $uptime =~ s/load average/$Lang::tr{'uptime load average'}/; - + my $status = &connectionstatus(); + my $localtime_now = strftime "%H:%M:%S", localtime; + my $uptime = `/usr/bin/uptime|cut -d \" \" -f 4-`; + $uptime =~ s/year(s|)/$Lang::tr{'year'}/; + $uptime =~ s/month(s|)/$Lang::tr{'month'}/; + $uptime =~ s/day(s|)/$Lang::tr{'day'}/; + $uptime =~ s/user(s|)/$Lang::tr{'user'}/; + $uptime =~ s/load average/$Lang::tr{'uptime load average'}/; + print < @@ -341,19 +344,20 @@ END &showsubsection($menu); &showsubsubsection($menu); - print < - -
- +
+ - - + + + + END ; } + ############################################################################### # # 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 @@ # # ############################################################################### +use POSIX; + sub showmenu() { print < @@ -321,39 +323,41 @@ END } sub closepage () { - my $status = &connectionstatus(); - my $uptime = `/usr/bin/uptime|cut -d \" \" -f 4-`; - $uptime =~ s/year(s|)/$Lang::tr{'year'}/; - $uptime =~ s/month(s|)/$Lang::tr{'month'}/; - $uptime =~ s/day(s|)/$Lang::tr{'day'}/; - $uptime =~ s/user(s|)/$Lang::tr{'user'}/; - $uptime =~ s/load average/$Lang::tr{'uptime load average'}/; - + my $status = &connectionstatus(); + my $localtime_now = strftime "%H:%M:%S", localtime; + my $uptime = `/usr/bin/uptime|cut -d \" \" -f 4-`; + $uptime =~ s/year(s|)/$Lang::tr{'year'}/; + $uptime =~ s/month(s|)/$Lang::tr{'month'}/; + $uptime =~ s/day(s|)/$Lang::tr{'day'}/; + $uptime =~ s/user(s|)/$Lang::tr{'user'}/; + $uptime =~ s/load average/$Lang::tr{'uptime load average'}/; + print < - + + -
- -
+
+ +
END ; &showsubsection($menu); &showsubsubsection($menu); - print < -
-
- +
+ EOF -; +; } sub getselected($) { @@ -141,7 +141,7 @@ sub openpage { $title = "-= IPFire - $title =-"; if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') { - $title = "$settings{'HOSTNAME'}.$settings{'DOMAINNAME'} - $title"; + $title = "$settings{'HOSTNAME'}.$settings{'DOMAINNAME'} - $title"; } print <