From 9969d3ca914ac28cb72e24fca076f94e1cce03c7 Mon Sep 17 00:00:00 2001
From: GamerClassN7 <gamerclassn7@gmail.com>
Date: Sat, 31 Oct 2020 14:53:12 +0100
Subject: [PATCH 1/3] CPU Usage

---
 app/views/Server.php             | 15 +++++++++++----
 app/views/templates/server.phtml |  2 +-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/app/views/Server.php b/app/views/Server.php
index 2caa834..fe0f698 100644
--- a/app/views/Server.php
+++ b/app/views/Server.php
@@ -16,9 +16,16 @@ class Server extends Template
 		return $meminfo;
 	}
 
-	function __construct()
-	{
-		$userManager = new UserManager();
+	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();
 		$langMng = new LanguageManager('en');
 
 		if (!$userManager->isLogin()){
@@ -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("/"));
diff --git a/app/views/templates/server.phtml b/app/views/templates/server.phtml
index d389093..b1553a5 100644
--- a/app/views/templates/server.phtml
+++ b/app/views/templates/server.phtml
@@ -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>

From c448f72095a9295f6ae5a9ac28b07271bce36a8e Mon Sep 17 00:00:00 2001
From: GamerClassN7 <gamerclassn7@gmail.com>
Date: Sat, 31 Oct 2020 14:54:31 +0100
Subject: [PATCH 2/3] Code Style

---
 app/views/templates/server.phtml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/views/templates/server.phtml b/app/views/templates/server.phtml
index b1553a5..478c242 100644
--- a/app/views/templates/server.phtml
+++ b/app/views/templates/server.phtml
@@ -24,21 +24,21 @@
             <div class="col-12 col-sm-9 mx-auto mt-4">
                 <h1><?php echo $LANGMNG->get('t_ServerStats'); ?></h1>
                 <hr> 
-                <label>UPTIME: <?php echo $UPTIME;?></label></br>
-                <label>SERVER TIME: <?php echo $SERVERTIME;?></label></br>
-                <label>SERVER NAME: <?php echo $NAME;?></label></br>
-                <label>SERVER ADDRESS: <?php echo $IP;?></label></br>
+                    <label>UPTIME: <?php echo $UPTIME;?></label></br>
+                    <label>SERVER TIME: <?php echo $SERVERTIME;?></label></br>
+                    <label>SERVER NAME: <?php echo $NAME;?></label></br>
+                    <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="100"> <?php echo $RAMFREE;?> </progress></br>
+                    <label>CPU: <?php echo $CPU;?></label></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>
-				<label>RAM Usage: </label><progress value="<?php echo explode(" ", $RAMTOTAL)[0] - explode(" ", $RAMFREE)[0];?>" max="<?php echo explode(" ", $RAMTOTAL)[0];?>"> <?php echo $RAMFREE;?> </progress></br>
+                    <label>RAM TOTAL: <?php echo $RAMTOTAL;?></label></br>
+                    <label>RAM FREE: <?php echo $RAMFREE;?></label></br>
+                    <label>RAM Usage: </label><progress value="<?php echo explode(" ", $RAMTOTAL)[0] - explode(" ", $RAMFREE)[0];?>" max="<?php echo explode(" ", $RAMTOTAL)[0];?>"> <?php echo $RAMFREE;?> </progress></br>
                 <hr> 
-                <label>DISK TOTAL: <?php echo $DISKTOTAL;?> bytes</label></br>
-                <label>DISK FREE: <?php echo $DISKFREE;?> bytes</label></br>
-                <label>DISK Usage: </label><progress value="<?php echo explode(" ", $DISKTOTAL)[0] - explode(" ", $DISKFREE)[0];?>" max="<?php echo explode(" ", $DISKTOTAL)[0];?>"> <?php echo $DISKFREE;?> </progress></br>
+                    <label>DISK TOTAL: <?php echo $DISKTOTAL;?> bytes</label></br>
+                    <label>DISK FREE: <?php echo $DISKFREE;?> bytes</label></br>
+                    <label>DISK Usage: </label><progress value="<?php echo explode(" ", $DISKTOTAL)[0] - explode(" ", $DISKFREE)[0];?>" max="<?php echo explode(" ", $DISKTOTAL)[0];?>"> <?php echo $DISKFREE;?> </progress></br>
                 <hr> 
             </div>
         </div>

From f205df36ffd5509be761aee67eae20ce945325bb Mon Sep 17 00:00:00 2001
From: GamerClassN7 <gamerclassn7@gmail.com>
Date: Sat, 31 Oct 2020 14:55:56 +0100
Subject: [PATCH 3/3] Code Style

---
 app/views/templates/server.phtml | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/views/templates/server.phtml b/app/views/templates/server.phtml
index 478c242..2fb4192 100644
--- a/app/views/templates/server.phtml
+++ b/app/views/templates/server.phtml
@@ -13,11 +13,11 @@
         <div class="col-md-3 d-sm-none"></div>
         <div class="col-md-3 nav-container">
             <?php
-            $partial = new Partial('menu');
-            $partial->prepare('item', 'log');
-            $partial->prepare('langMng',$LANGMNG);
-            $partial->prepare('debugMod',$DEBUGMOD);
-            $partial->render();
+                $partial = new Partial('menu');
+                $partial->prepare('item', 'log');
+                $partial->prepare('langMng',$LANGMNG);
+                $partial->prepare('debugMod',$DEBUGMOD);
+                $partial->render();
             ?>
         </div>
         <div class="col-md-9 main-body">
@@ -44,10 +44,11 @@
         </div>
 
         <?php
-		  $partial = new Partial('footer');
-		  $partial->prepare('baseDir', BASEDIR);
-        $partial->render();
-        //TODO js do main.js
+            $partial = new Partial('footer');
+            $partial->prepare('baseDir', BASEDIR);
+            $partial->render();
+            //TODO js do main.js
         ?>
+        
     </body>
     </html>