frodovdr
/
raspap-webgui
mirror of https://github.com/billz/raspap-webgui.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1355 from RaspAP/feat/system-time 

Adds system time to System > Basic tab
This commit is contained in:
Bill Zimmerman 2023-06-05 06:37:50 +00:00 committed by GitHub
parent 47cbd520d0 da091b9142
commit c3f7b17ef3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/lib/system.php
View File

@ -40,6 +40,12 @@ class Sysinfo
return $uptime; return $uptime;
} }
public function systime()
{
$systime = exec("date");
return $systime;
}
public function usedMemory() public function usedMemory()
{ {
$used = shell_exec("free -m | awk 'NR==2{ total=$2 ; used=$3 } END { print used/total*100}'"); $used = shell_exec("free -m | awk 'NR==2{ total=$2 ; used=$3 } END { print used/total*100}'");

2
includes/system.php
View File

@ -138,6 +138,7 @@ function DisplaySystem(&$extraFooterScripts)
$cores = $system->processorCount(); $cores = $system->processorCount();
$os = $system->operatingSystem(); $os = $system->operatingSystem();
$kernel = $system->kernelVersion(); $kernel = $system->kernelVersion();
$systime = $system->systime();
// mem used // mem used
$memused = $system->usedMemory(); $memused = $system->usedMemory();
@ -207,6 +208,7 @@ function DisplaySystem(&$extraFooterScripts)
"serverBind", "serverBind",
"hostname", "hostname",
"uptime", "uptime",
"systime",
"cores", "cores",
"os", "os",
"kernel", "kernel",

BIN
locale/en_US/LC_MESSAGES/messages.mo
View File

Binary file not shown.

3
locale/en_US/LC_MESSAGES/messages.po
View File

@ -737,6 +737,9 @@ msgstr "Pi Revision"
msgid "Uptime" msgid "Uptime"
msgstr "Uptime" msgstr "Uptime"
msgid "System Time"
msgstr "System Time"
msgid "Memory Used" msgid "Memory Used"
msgstr "Memory Used" msgstr "Memory Used"

3
templates/system/basic.php
View File

@ -24,6 +24,9 @@ include('includes/sysstats.php');
</div> </div>
<div class="row mb-1"> <div class="row mb-1">
<div class="info-item col-xs-3"><?php echo _("Uptime"); ?></div><div class="info-value col-xs-3"><?php echo htmlspecialchars($uptime, ENT_QUOTES); ?></div> <div class="info-item col-xs-3"><?php echo _("Uptime"); ?></div><div class="info-value col-xs-3"><?php echo htmlspecialchars($uptime, ENT_QUOTES); ?></div>
</div>
<div class="row mb-1">
<div class="info-item col-xs-3"><?php echo _("System Time"); ?></div><div class="info-value col-xs-3"><?php echo htmlspecialchars($systime, ENT_QUOTES); ?></div>
</div> </div>
</div> </div>
</div> </div>