From 55505848eaf681e378e0a34af204da10566254e9 Mon Sep 17 00:00:00 2001
From: Ian Gilfillan <ian@greenman.co.za>
Date: Mon, 11 Jul 2016 16:21:35 +0000
Subject: Add Qbex, increase timeout to match h-node, sort by compatibility by
 default

---
 h-source/Application/Include/hardware.php    | 1 +
 h-source/Application/Include/myFunctions.php | 8 ++++----
 h-source/Config/Restricted.php               | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/h-source/Application/Include/hardware.php b/h-source/Application/Include/hardware.php
index 69ad2ab..ccd23ae 100644
--- a/h-source/Application/Include/hardware.php
+++ b/h-source/Application/Include/hardware.php
@@ -344,6 +344,7 @@ class Notebooks extends Hardware
 		"Philips"				=>	"Philips",
 		"Positivo"				=>	"Positivo",
 		"Purism"				=>	"Purism",
+		"Qbex"					=>	"Qbex",
 		"SAMSUNG"				=>	"SAMSUNG",
 		"Sony"					=>	"Sony",
 		"System76"				=>	"System76",
diff --git a/h-source/Application/Include/myFunctions.php b/h-source/Application/Include/myFunctions.php
index 5cb1036..903c013 100644
--- a/h-source/Application/Include/myFunctions.php
+++ b/h-source/Application/Include/myFunctions.php
@@ -122,13 +122,13 @@ function getOrderByClause($string)
 			$orderBy = 'model desc';
 			break;
 		case 'compatibility':
-			$orderBy = 'compatibility';
+			$orderBy = 'compatibility, hardware.id_hard desc';
 			break;
 		case 'undef':
-			$orderBy = 'hardware.id_hard desc';
+			$orderBy = 'compatibility, hardware.id_hard desc';
 			break;
 		default:
-			$orderBy = 'hardware.id_hard desc';
+			$orderBy = 'compatibility, hardware.id_hard desc';
 	}
 	
 	return $orderBy;
@@ -458,4 +458,4 @@ function getTranslationFunction($fieldName)
 	}
 
 	return "gtext";
-}
\ No newline at end of file
+}
diff --git a/h-source/Config/Restricted.php b/h-source/Config/Restricted.php
index d8baffa..ce4bdb1 100755
--- a/h-source/Config/Restricted.php
+++ b/h-source/Config/Restricted.php
@@ -88,7 +88,7 @@ define('REG_USERS_LOGIN_ACTION', 'login');
 //registered cookie:
 //NB: REG_COOKIE_NAME must be different from ADMIN_COOKIE_NAME!!!
 define('REG_COOKIE_NAME','uidr');
-define('REG_SESSION_EXPIRE', '3600');
+define('REG_SESSION_EXPIRE', '86400');
 define('REG_COOKIE_PATH', '/');
 define('REG_COOKIE_DOMAIN', '');
 define('REG_COOKIE_SECURE', false);
-- 
cgit v1.2.3