SH/PHP_SMART_HOME_V3
6
0
Fork 0
Code Issues Pull Requests Projects 1 Releases Wiki Activity

Merge branch 'remastering' of https://gitea.steelants.cz/SH/PHP_SMART_HOME_V3 into remastering

Browse Source
This commit is contained in:
haitem
2020-10-31 15:10:38 +01:00
parent fef8cb2ed9 f205df36ff
commit 38cc436f4d
2 changed files with 33 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/views/Server.php
View File

@@ -16,6 +16,13 @@ class Server extends Template
return $meminfo;
}
private function getProcessorUsage(){
$loads=sys_getloadavg();
$core_nums=trim(shell_exec("grep -P '^physical id' /proc/cpuinfo|wc -l"));
$load = round($loads[0]/($core_nums + 1)*100, 2);
return $load;
}
function __construct()
{
$userManager = new UserManager();
@@ -37,7 +44,7 @@ class Server extends Template
$template->prepare('ip', $_SERVER['SERVER_ADDR']);
$template->prepare('name', $_SERVER['SERVER_NAME']);
$template->prepare('CPU', sys_getloadavg()[0]);
$template->prepare('CPU', $this->getProcessorUsage());
$template->prepare('ramFree', $this->getSystemMemInfo()["MemFree"]);
$template->prepare('ramTotal', $this->getSystemMemInfo()["MemTotal"]);
$template->prepare('diskFree', disk_free_space("/"));

3
app/views/templates/server.phtml
View File

@@ -30,7 +30,7 @@
<label>SERVER ADDRESS: <?php echo $IP;?></label></br>
<hr>
<label>CPU: <?php echo $CPU;?></label></br>
<label>CPU Usage: </label><progress value="<?php echo $CPU;?>" max="1"> <?php echo $RAMFREE;?> </progress></br>
<label>CPU Usage: </label><progress value="<?php echo $CPU;?>" max="100"> <?php echo $RAMFREE;?> </progress></br>
<hr>
<label>RAM TOTAL: <?php echo $RAMTOTAL;?></label></br>
<label>RAM FREE: <?php echo $RAMFREE;?></label></br>
@@ -49,5 +49,6 @@
$partial->render();
//TODO js do main.js
?>
</body>
</html>