diff options
author | Simon Rettberg | 2014-06-06 20:31:42 +0200 |
---|---|---|
committer | Simon Rettberg | 2014-06-06 20:31:42 +0200 |
commit | b9f67a0ac4dcdc745e14dd4f4097c5560e90a1e1 (patch) | |
tree | 08e85b79bbc024d5497f2d65b744822ff8abf35e /inc | |
parent | More stuff for system status page (diff) | |
download | slx-admin-b9f67a0ac4dcdc745e14dd4f4097c5560e90a1e1.tar.gz slx-admin-b9f67a0ac4dcdc745e14dd4f4097c5560e90a1e1.tar.xz slx-admin-b9f67a0ac4dcdc745e14dd4f4097c5560e90a1e1.zip |
Reboot functionality on system status page
Diffstat (limited to 'inc')
-rw-r--r-- | inc/message.inc.php | 7 | ||||
-rw-r--r-- | inc/render.inc.php | 2 | ||||
-rw-r--r-- | inc/taskmanager.inc.php | 2 | ||||
-rw-r--r-- | inc/trigger.inc.php | 4 | ||||
-rw-r--r-- | inc/util.inc.php | 2 |
5 files changed, 11 insertions, 6 deletions
diff --git a/inc/message.inc.php b/inc/message.inc.php index 11735e1b..2ae04779 100644 --- a/inc/message.inc.php +++ b/inc/message.inc.php @@ -36,9 +36,10 @@ $error_text = array( 'taskmanager-format' => 'Taskmanager hat ungültige Daten zurückgeliefert', 'task-error' => 'Ausführung fehlgeschlagen: {{0}}', 'invalid-ip' => 'Kein Interface ist auf die Adresse {{0}} konfiguriert', - 'news-set-success' => 'News erfolgreich aktualisiert.', - 'news-empty' => 'Es wurde keine News in der Datenbank gefunden.', - 'news-del-success' => 'News gelöscht.', + 'news-set-success' => 'News erfolgreich aktualisiert', + 'news-empty' => 'Es wurde keine News in der Datenbank gefunden', + 'news-del-success' => 'News gelöscht', + 'reboot-unconfirmed' => 'Sicherheitsabfrage zum Reboot nicht bestätigt', ); class Message diff --git a/inc/render.inc.php b/inc/render.inc.php index 9bea4639..2d69c322 100644 --- a/inc/render.inc.php +++ b/inc/render.inc.php @@ -164,7 +164,7 @@ class Render */ public static function parse($template, $params = false) { - if (is_array($params)) + if (is_array($params) || $params === false) $params['token'] = Session::get('token'); return self::$mustache->render(self::getTemplate($template), $params); } diff --git a/inc/taskmanager.inc.php b/inc/taskmanager.inc.php index 308d7136..b61714ec 100644 --- a/inc/taskmanager.inc.php +++ b/inc/taskmanager.inc.php @@ -96,7 +96,7 @@ class Taskmanager public static function isFailed($task) { - if (!isset($task['statusCode']) || !isset($task['id'])) + if (!is_array($task) || !isset($task['statusCode']) || !isset($task['id'])) return true; if ($task['statusCode'] !== TASK_WAITING && $task['statusCode'] !== TASK_PROCESSING && $task['statusCode'] !== TASK_FINISHED) return true; diff --git a/inc/trigger.inc.php b/inc/trigger.inc.php index c22f8c5b..f483bfc0 100644 --- a/inc/trigger.inc.php +++ b/inc/trigger.inc.php @@ -37,6 +37,10 @@ class Trigger return $task['id']; } + /** + * + * @return boolean|string false on error, id of task otherwise + */ public static function ldadp() { $res = Database::simpleQuery("SELECT moduleid, configtgz.filepath FROM configtgz_module" diff --git a/inc/util.inc.php b/inc/util.inc.php index 63680023..8b5a14e4 100644 --- a/inc/util.inc.php +++ b/inc/util.inc.php @@ -15,7 +15,7 @@ class Util echo "--------------------\nFlagrant system error:\n$message\n--------------------\n\n"; if (defined('CONFIG_DEBUG') && CONFIG_DEBUG) { debug_print_backtrace(); - echo "\n\n"; + echo "\n\nSome variables for your entertainment:\n"; print_r($GLOBALS); } exit(0); |