diff --git a/public/include/classes/monitoring.class.php b/public/include/classes/monitoring.class.php index d5b99a7b1..f6f4e14db 100644 --- a/public/include/classes/monitoring.class.php +++ b/public/include/classes/monitoring.class.php @@ -70,9 +70,8 @@ public function getStatus($name) { if ($query && $query->bind_param('s', $name) && $query->execute() && $result = $query->get_result()) { return $result->fetch_assoc(); } else { - $this->sqlError(); + return $this->sqlError(); } - return $value; } /** diff --git a/public/index.php b/public/index.php index 1ec49fff4..b1d1d60ac 100644 --- a/public/index.php +++ b/public/index.php @@ -46,7 +46,7 @@ function cfip() { return (@defined('SECURITY')) ? 1 : 0; } // Rate limiting if ($config['memcache']['enabled'] && $config['mc_antidos']['enabled']) { if (PHP_OS == 'WINNT') { - require_once(CLASS_DIR . 'memcached.class.php'); + require_once(CLASS_DIR . '/memcached.class.php'); } // memcache antidos needs a memcache handle $memcache = new Memcached(); diff --git a/public/site_assets/mpos/css/layout.css b/public/site_assets/mpos/css/layout.css index acdf7c0b1..a89eee77b 100644 --- a/public/site_assets/mpos/css/layout.css +++ b/public/site_assets/mpos/css/layout.css @@ -11,6 +11,8 @@ padding: 0; font-family: "Helvetica Neue", Helvetica, Arial, Verdana, sans-serif; background: #F8F8F8; font-size: 12px; +min-width: 1323px; +/* Allows resizing without distortion of graphs and the like, some older browsers will ingnore this */ } .clear {