Merge pull request #2038 from stambetto/development

Minor fixes

public/include/classes/monitoring.class.php

@@ -70,9 +70,8 @@ class Monitoring extends Base {
     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;
   }
 
   /**

public/index.php

@@ -46,7 +46,7 @@ $hts = ($config['https_only'] && (!empty($_SERVER['QUERY_STRING']))) ? "https://
 // 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();

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 {