From 129f2ba09bca9d5086d5b2a6f5acb10dbcba8372 Mon Sep 17 00:00:00 2001
From: SamuelNZ <SamuelNZ@users.noreply.github.com>
Date: Tue, 18 Mar 2014 17:54:34 +1300
Subject: [PATCH 1/4] Update layout.css

min-width to stop distortion of Graphs when not in full screen, or on a smaller monitor.
---
 public/site_assets/mpos/css/layout.css | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/public/site_assets/mpos/css/layout.css b/public/site_assets/mpos/css/layout.css
index ceb6ce400..15f357d5e 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: 1269px;
+/* Allows resizing without distortion of graphs and the like, some older browsers will ingnore this */
 }
 
 .clear {

From 29594859db9e2df6a5830e54755815487a72bfff Mon Sep 17 00:00:00 2001
From: SamuelNZ <SamuelNZ@users.noreply.github.com>
Date: Tue, 18 Mar 2014 18:34:43 +1300
Subject: [PATCH 2/4] Update layout.css

Adjusted to work with other proposed pull
---
 public/site_assets/mpos/css/layout.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/site_assets/mpos/css/layout.css b/public/site_assets/mpos/css/layout.css
index 15f357d5e..60ffe2023 100644
--- a/public/site_assets/mpos/css/layout.css
+++ b/public/site_assets/mpos/css/layout.css
@@ -11,7 +11,7 @@ padding: 0;
 font-family: "Helvetica Neue", Helvetica, Arial, Verdana, sans-serif;
 background: #F8F8F8;
 font-size: 12px;
-min-width: 1269px;
+min-width: 1323px;
 /* Allows resizing without distortion of graphs and the like, some older browsers will ingnore this */
 }
 

From 256d43886158400551b62733a8a0cc63b6f9298a Mon Sep 17 00:00:00 2001
From: Stan Statev <stan@netsey.com>
Date: Thu, 27 Mar 2014 21:06:37 +0200
Subject: [PATCH 3/4] [FIX] In case of SQL error function should return it

---
 public/include/classes/monitoring.class.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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;
   }
 
   /**

From 59f490d9d61a88c54f6a7ed8e6fd9032990a0faa Mon Sep 17 00:00:00 2001
From: Stan Statev <stan@netsey.com>
Date: Thu, 27 Mar 2014 21:07:53 +0200
Subject: [PATCH 4/4] [FIX] Wrong Memcache file path for Windows based systems

---
 public/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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();