From 28e7c4ba90fe44ed81a1f2626b0f363bf4882c95 Mon Sep 17 00:00:00 2001 From: jerome Date: Fri, 21 Mar 2014 20:23:47 +0100 Subject: [PATCH 1/4] Change to prevent javascript single line object definition to be removed by template.Display(). --- src/psm/Service/Template.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/psm/Service/Template.class.php b/src/psm/Service/Template.class.php index 86d51e45..7fe9c6f1 100755 --- a/src/psm/Service/Template.class.php +++ b/src/psm/Service/Template.class.php @@ -154,7 +154,7 @@ class Template { $result = preg_replace('{(.*?)}is', '', $this->templates[$id]); // check for tpl variables that have not been replaced. ie: {name}. ignore literal stuff, though. ie: {{name}} is {name} and should not be removed - preg_match_all('~{?{(.+?)}}?~', $result, $matches); + preg_match_all('~{?{(\w+?)}}?~', $result, $matches); foreach($matches[0] as $match) { if (substr($match, 0, 2) == '{{') { From ae2b4700a779c51d737c7046af06343d9e87d5eb Mon Sep 17 00:00:00 2001 From: jerome Date: Sat, 22 Mar 2014 03:48:26 +0100 Subject: [PATCH 2/4] Bad Status last online value. --- src/includes/functions.inc.php | 17 ++++++++++++++++- .../AbstractServerController.class.php | 4 ++-- .../Controller/ServerController.class.php | 1 + 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/includes/functions.inc.php b/src/includes/functions.inc.php index 2849b9b3..cac65528 100755 --- a/src/includes/functions.inc.php +++ b/src/includes/functions.inc.php @@ -248,11 +248,13 @@ function psm_curl_get($href, $header = false, $body = true, $timeout = 10, $add_ * Get a "nice" timespan message * * Source: http://www.interactivetools.com/forum/forum-posts.php?postNum=2208966 - * @param int $time + * @param string $time * @return string * @todo add translation to timespan messages */ function psm_timespan($time) { + if(empty($time) || $time == '0000-00-00 00:00:00') + return 'never'; if ($time !== intval($time)) { $time = strtotime($time); } $d = time() - $time; if ($time < strtotime(date('Y-m-d 00:00:00')) - 60*60*24*3) { @@ -276,6 +278,19 @@ function psm_timespan($time) { return "a few seconds ago"; } +/** + * Get a localised date from MySQL date format + * @param string $time + * @return string + * @todo add translation + */ +function psm_date($time) +{ + if(empty($time) || $time == '0000-00-00 00:00:00') + return 'never'; + return date('d/m/Y H:i:s', strtotime($time)); +} + /** * Check if an update is available for PHP Server Monitor * diff --git a/src/psm/Module/Server/Controller/AbstractServerController.class.php b/src/psm/Module/Server/Controller/AbstractServerController.class.php index 8eb4207e..55e94870 100644 --- a/src/psm/Module/Server/Controller/AbstractServerController.class.php +++ b/src/psm/Module/Server/Controller/AbstractServerController.class.php @@ -62,8 +62,8 @@ abstract class AbstractServerController extends AbstractController { `s`.`status`, `s`.`error`, `s`.`rtime`, - IF(`s`.`last_check`='0000-00-00 00:00:00', 'never', DATE_FORMAT(`s`.`last_check`, '%d-%m-%y %H:%i')) AS `last_check`, - IF(`s`.`last_online`='0000-00-00 00:00:00', 'never', DATE_FORMAT(`s`.`last_online`, '%d-%m-%y %H:%i')) AS `last_online`, + `s`.`last_check`, + `s`.`last_online`, `s`.`active`, `s`.`email`, `s`.`sms` diff --git a/src/psm/Module/Server/Controller/ServerController.class.php b/src/psm/Module/Server/Controller/ServerController.class.php index f79a127c..f7bdedca 100755 --- a/src/psm/Module/Server/Controller/ServerController.class.php +++ b/src/psm/Module/Server/Controller/ServerController.class.php @@ -79,6 +79,7 @@ class ServerController extends AbstractServerController { $servers[$x] = $html_actions + $servers[$x]; $servers[$x]['class'] = ($x & 1) ? 'odd' : 'even'; $servers[$x]['rtime'] = round((float) $servers[$x]['rtime'], 4); + $servers[$x]['last_online'] = psm_date($servers[$x]['last_online']); if($servers[$x]['type'] == 'website') { // add link to label From 640645ac68215cbdca096975d4c220d22f0ccc48 Mon Sep 17 00:00:00 2001 From: Pepijn Over Date: Sun, 23 Mar 2014 22:52:46 +0100 Subject: [PATCH 3/4] adding date format to last_check --- src/psm/Module/Server/Controller/ServerController.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/psm/Module/Server/Controller/ServerController.class.php b/src/psm/Module/Server/Controller/ServerController.class.php index f7bdedca..0ed3d585 100755 --- a/src/psm/Module/Server/Controller/ServerController.class.php +++ b/src/psm/Module/Server/Controller/ServerController.class.php @@ -80,6 +80,7 @@ class ServerController extends AbstractServerController { $servers[$x]['class'] = ($x & 1) ? 'odd' : 'even'; $servers[$x]['rtime'] = round((float) $servers[$x]['rtime'], 4); $servers[$x]['last_online'] = psm_date($servers[$x]['last_online']); + $servers[$x]['last_check'] = psm_date($servers[$x]['last_check']); if($servers[$x]['type'] == 'website') { // add link to label From e8e00c91d163c5cd8c754ff2a24c2e68c3cf477a Mon Sep 17 00:00:00 2001 From: Pepijn Over Date: Sun, 23 Mar 2014 23:33:54 +0100 Subject: [PATCH 4/4] issue #32: fixing padding on mobile and making top menu fixed --- static/css/style.css | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/static/css/style.css b/static/css/style.css index dee4e905..f14b7885 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -1,5 +1,13 @@ -body{ - padding-top:70px; +body { + padding-top: 70px; +} +.navbar-fixed-top { + position: fixed; + margin: 0; +} +.navbar-fixed-top .navbar-inner { + padding-left: 0; + padding-right: 0; } body.install{ padding-top:20px;