From 3d68df2658e8b458a54ec97dd22e76eb22597410 Mon Sep 17 00:00:00 2001 From: JonatanRek Date: Thu, 23 Jul 2020 17:58:46 +0200 Subject: [PATCH] Server Info basic layout --- app/Routes.php | 1 + app/views/Log.php | 28 --------------- app/views/Server.php | 51 +++++++++++++++++++++++++++ app/views/templates/log.phtml | 17 --------- app/views/templates/part/menu.phtml | 5 +++ app/views/templates/server.phtml | 53 +++++++++++++++++++++++++++++ 6 files changed, 110 insertions(+), 45 deletions(-) create mode 100644 app/views/Server.php create mode 100644 app/views/templates/server.phtml diff --git a/app/Routes.php b/app/Routes.php index 4693cd5..3860628 100644 --- a/app/Routes.php +++ b/app/Routes.php @@ -9,6 +9,7 @@ $router->setDefault(function(){ //Pages $router->any('/', 'Log'); $router->any('/log', 'Log'); +$router->any('/server', 'Server'); $router->any('/login', 'Login'); $router->any('/logout', 'Logout'); $router->any('/automation', 'Automation'); diff --git a/app/views/Log.php b/app/views/Log.php index 1b69b4c..081b646 100644 --- a/app/views/Log.php +++ b/app/views/Log.php @@ -3,19 +3,6 @@ class Log extends Template { - //TODO: to server manager - function getSystemMemInfo() - { - $data = explode("\n", file_get_contents("/proc/meminfo")); - $meminfo = array(); - foreach ($data as $line) { - $data = explode(":", $line); - if (count($data)!=2) continue; - $meminfo[$data[0]] = trim($data[1]); - } - return $meminfo; - } - function __construct() { $userManager = new UserManager(); @@ -45,22 +32,7 @@ class Log extends Template $template->prepare('title', 'Logy'); $template->prepare('logsFiles', $result); $template->prepare('langMng', $langMng); - $template->prepare('CPU', sys_getloadavg()[0]); - $template->prepare('UPTIME', shell_exec('uptime -p')); - $template->prepare('ramFree', $this->getSystemMemInfo()["MemFree"]); - $template->prepare('ramTotal', $this->getSystemMemInfo()["MemTotal"]); - - $template->prepare('diskFree', disk_free_space("/")); - $template->prepare('diskTotal', disk_total_space("/")); - $template->prepare('serverTime', date('m. d. Y H:i:s - e')); - - - - - - $template->render(); - } } diff --git a/app/views/Server.php b/app/views/Server.php new file mode 100644 index 0000000..c1482ff --- /dev/null +++ b/app/views/Server.php @@ -0,0 +1,51 @@ +isLogin()){ + header('Location: ' . BASEURL . 'login'); + } + + $template = new Template('server'); + $template->prepare('title', 'Server'); + + $template->prepare('baseDir', BASEDIR); + $template->prepare('debugMod', DEBUGMOD); + $template->prepare('langMng', $langMng); + + $template->prepare('UPTIME', shell_exec('uptime -p')); + $template->prepare('serverTime', date('m. d. Y H:i:s - e')); + $template->prepare('ip', $_SERVER['SERVER_ADDR']); + $template->prepare('name', $_SERVER['SERVER_NAME']); + + + + echo $_SERVER['SERVER_NAME']; + $template->prepare('CPU', sys_getloadavg()[0]); + $template->prepare('ramFree', $this->getSystemMemInfo()["MemFree"]); + $template->prepare('ramTotal', $this->getSystemMemInfo()["MemTotal"]); + $template->prepare('diskFree', disk_free_space("/")); + $template->prepare('diskTotal', disk_total_space("/")); + + $template->render(); + } +} diff --git a/app/views/templates/log.phtml b/app/views/templates/log.phtml index e651bbb..d200920 100644 --- a/app/views/templates/log.phtml +++ b/app/views/templates/log.phtml @@ -22,23 +22,6 @@
-

get('t_ServerStats'); ?>

-
-
-
-
-
-
-
-
-
- " max="">
-
-
-
- " max="">
-
-

get('t_Logs'); ?>


diff --git a/app/views/templates/part/menu.phtml b/app/views/templates/part/menu.phtml index ff4d7fb..f3a5e8e 100644 --- a/app/views/templates/part/menu.phtml +++ b/app/views/templates/part/menu.phtml @@ -16,6 +16,11 @@ 'lngKey' => 'log', 'path' => 'log', ], + 'fa-server' =>[ + 'slug' => 'server', + 'lngKey' => 'server', + 'path' => 'server', + ], ]; foreach ( $menuItems as $key => $value) { if ($DEBUGMOD == 0 && $value['path'] == 'log') { diff --git a/app/views/templates/server.phtml b/app/views/templates/server.phtml new file mode 100644 index 0000000..794f018 --- /dev/null +++ b/app/views/templates/server.phtml @@ -0,0 +1,53 @@ + + + + prepare('baseDir', $BASEDIR); + $partial->render(); + ?> + <?php echo $TITLE ?> + + +
+
+ +
+
+

get('t_ServerStats'); ?>

+
+
+
+
+
+
+
+
+
+
+
+ " max="">
+
+
+
+ " max="">
+
+
+
+ + prepare('baseDir', BASEDIR); + $partial->render(); + //TODO js do main.js + ?> + +