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

Compare commits

base: SH:ff2c51d5052beb44c64e3f5b1d57d7fe7af70f07
Branches Tags
SH:master
SH:remastering
SH:3.0
SH:feature/configurations
SH:dev
SH:v0.0.1
SH:alfa
..
compare: SH:74f6779c63bf7d79eebc7090344b58fe44747d7c
Branches Tags
SH:remastering
SH:3.0
SH:feature/configurations
SH:master
SH:dev
SH:v0.0.1
SH:alfa

2 Commits
ff2c51d505 ... 74f6779c63

Author SHA1 Message Date
JonatanRek
74f6779c63 Fix 2020-12-09 12:28:31 +01:00
JonatanRek
181a65a99b Bug Fixes 2020-12-09 12:19:19 +01:00
10 changed files with 29 additions and 15 deletions
Show Stats Expand all files Collapse all files

14
app/models/managers/SettingsManager.php
View File

@ -22,11 +22,15 @@ class SettingsManager{
} }
public static function update ($name, $value) { public static function update ($name, $value) {
try { if ($this.getByName($name)){
Db::edit ('settings', ['value' => $value], 'WHERE name = ?', array($name)); $this->create($name, $value);
} catch(PDOException $error) { } else {
echo $error->getMessage(); try {
die(); Db::edit ('settings', ['value' => $value], 'WHERE name = ?', array($name));
} catch(PDOException $error) {
echo $error->getMessage();
die();
}
} }
} }
} }

1
app/views/Automation.php
View File

@ -53,6 +53,7 @@ class Automation extends Template
$template = new Template('automation'); $template = new Template('automation');
$template->prepare('baseDir', BASEDIR); $template->prepare('baseDir', BASEDIR);
$template->prepare('baseUrl', BASEURL);
$template->prepare('debugMod', DEBUGMOD); $template->prepare('debugMod', DEBUGMOD);
$template->prepare('title', 'Automation'); $template->prepare('title', 'Automation');
$template->prepare('langMng', $langMng); $template->prepare('langMng', $langMng);

1
app/views/Log.php
View File

@ -19,6 +19,7 @@ class Log extends Template
$result = $this->logFinder ('../logs/', $result); $result = $this->logFinder ('../logs/', $result);
$template->prepare('baseDir', BASEDIR); $template->prepare('baseDir', BASEDIR);
$template->prepare('baseUrl', BASEURL);
$template->prepare('debugMod', DEBUGMOD); $template->prepare('debugMod', DEBUGMOD);
$template->prepare('logToLiveTime', LOGTIMOUT); $template->prepare('logToLiveTime', LOGTIMOUT);
$template->prepare('title', 'Logy'); $template->prepare('title', 'Logy');

3
app/views/Login.php
View File

@ -4,7 +4,7 @@ class Login extends Template
function __construct() function __construct()
{ {
$userManager = new UserManager(); $userManager = new UserManager();
if ($userManager->isLogin()){ if ($userManager->isLogin()){
header('Location: ' . BASEURL); header('Location: ' . BASEURL);
@ -12,6 +12,7 @@ class Login extends Template
$template = new Template('login'); $template = new Template('login');
$template->prepare('baseDir', BASEDIR); $template->prepare('baseDir', BASEDIR);
$template->prepare('baseUrl', BASEURL);
$template->prepare('title', 'Home'); $template->prepare('title', 'Home');

1
app/views/Oauth.php
View File

@ -8,6 +8,7 @@ class Oauth extends Template
$template = new Template('oauth'); $template = new Template('oauth');
$template->prepare('baseDir', BASEDIR); $template->prepare('baseDir', BASEDIR);
$template->prepare('baseUrl', BASEURL);
$template->prepare('title', 'Simple Home - Oauth'); $template->prepare('title', 'Simple Home - Oauth');
if (isset($_GET['redirect_uri'])) { if (isset($_GET['redirect_uri'])) {

3
app/views/Plugins.php
View File

@ -22,9 +22,10 @@ class Plugins extends Template
} }
$plugins = Utilities::sortArrayByKey($plugins, 'status', "desc"); $plugins = Utilities::sortArrayByKey($plugins, 'status', "desc");
$template = new Template('plugins'); $template = new Template('plugins');
$template->prepare('baseDir', BASEDIR); $template->prepare('baseDir', BASEDIR);
$template->prepare('baseUrl', BASEURL);
$template->prepare('debugMod', DEBUGMOD); $template->prepare('debugMod', DEBUGMOD);
$template->prepare('title', 'Plugins'); $template->prepare('title', 'Plugins');
$template->prepare('langMng', $langMng); $template->prepare('langMng', $langMng);

3
app/views/Server.php
View File

@ -22,7 +22,7 @@ class Server extends Template
$load = round($loads[0]/($core_nums + 1)*100, 2); $load = round($loads[0]/($core_nums + 1)*100, 2);
return $load; return $load;
} }
function __construct() function __construct()
{ {
$userManager = new UserManager(); $userManager = new UserManager();
@ -36,6 +36,7 @@ class Server extends Template
$template->prepare('title', 'Server'); $template->prepare('title', 'Server');
$template->prepare('baseDir', BASEDIR); $template->prepare('baseDir', BASEDIR);
$template->prepare('baseUrl', BASEURL);
$template->prepare('debugMod', DEBUGMOD); $template->prepare('debugMod', DEBUGMOD);
$template->prepare('langMng', $langMng); $template->prepare('langMng', $langMng);

1
app/views/Setting.php
View File

@ -23,6 +23,7 @@ class Setting extends Template
$template = new Template('setting'); $template = new Template('setting');
$template->prepare('baseDir', BASEDIR); $template->prepare('baseDir', BASEDIR);
$template->prepare('baseUrl', BASEURL);
$template->prepare('debugMod', DEBUGMOD); $template->prepare('debugMod', DEBUGMOD);
$template->prepare('title', 'Automation'); $template->prepare('title', 'Automation');
$template->prepare('langMng', $langMng); $template->prepare('langMng', $langMng);

2
app/views/templates/login.phtml
View File

@ -4,6 +4,8 @@
<?php <?php
$partial = new Partial('head'); $partial = new Partial('head');
$partial->prepare('baseDir',$BASEDIR); $partial->prepare('baseDir',$BASEDIR);
$partial->prepare('baseUrl',$BASEURL);
$partial->render(); $partial->render();
?> ?>
<title><?php echo $TITLE ?></title> <title><?php echo $TITLE ?></title>

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

@ -3,7 +3,8 @@
<head> <head>
<?php <?php
$partial = new Partial('head'); $partial = new Partial('head');
$partial->prepare('baseDir', $BASEDIR); $partial->prepare('baseDir', $BASEDIR);
$partial->prepare('baseUrl', $BASEURL);
$partial->render(); $partial->render();
?> ?>
<title><?php echo $TITLE ?></title> <title><?php echo $TITLE ?></title>
@ -23,23 +24,23 @@
<div class="col-md-9 main-body"> <div class="col-md-9 main-body">
<div class="col-12 col-sm-9 mx-auto mt-4"> <div class="col-12 col-sm-9 mx-auto mt-4">
<h1><?php echo $LANGMNG->get('t_ServerStats'); ?></h1> <h1><?php echo $LANGMNG->get('t_ServerStats'); ?></h1>
<hr> <hr>
<label>UPTIME: <?php echo $UPTIME;?></label></br> <label>UPTIME: <?php echo $UPTIME;?></label></br>
<label>SERVER TIME: <?php echo $SERVERTIME;?></label></br> <label>SERVER TIME: <?php echo $SERVERTIME;?></label></br>
<label>SERVER NAME: <?php echo $NAME;?></label></br> <label>SERVER NAME: <?php echo $NAME;?></label></br>
<label>SERVER ADDRESS: <?php echo $IP;?></label></br> <label>SERVER ADDRESS: <?php echo $IP;?></label></br>
<hr> <hr>
<label>CPU: <?php echo $CPU;?></label></br> <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 Usage: </label><progress value="<?php echo $CPU;?>" max="100"> <?php echo $RAMFREE;?> </progress></br>
<hr> <hr>
<label>RAM TOTAL: <?php echo $RAMTOTAL;?></label></br> <label>RAM TOTAL: <?php echo $RAMTOTAL;?></label></br>
<label>RAM FREE: <?php echo $RAMFREE;?></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 Usage: </label><progress value="<?php echo explode(" ", $RAMTOTAL)[0] - explode(" ", $RAMFREE)[0];?>" max="<?php echo explode(" ", $RAMTOTAL)[0];?>"> <?php echo $RAMFREE;?> </progress></br>
<hr> <hr>
<label>DISK TOTAL: <?php echo $DISKTOTAL;?> bytes</label></br> <label>DISK TOTAL: <?php echo $DISKTOTAL;?> bytes</label></br>
<label>DISK FREE: <?php echo $DISKFREE;?> 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 Usage: </label><progress value="<?php echo explode(" ", $DISKTOTAL)[0] - explode(" ", $DISKFREE)[0];?>" max="<?php echo explode(" ", $DISKTOTAL)[0];?>"> <?php echo $DISKFREE;?> </progress></br>
<hr> <hr>
</div> </div>
</div> </div>
@ -49,6 +50,6 @@
$partial->render(); $partial->render();
//TODO js do main.js //TODO js do main.js
?> ?>
</body> </body>
</html> </html>