Merge lp:~dangarner/xibo/server-170-alpha2 into lp:xibo/1.7

[Dan Garner]

=== modified file 'example_oauth/index.php'
--- example_oauth/index.php	2014-07-12 13:54:51 +0000
+++ example_oauth/index.php	2014-10-21 16:06:16 +0000
@@ -1,4 +1,7 @@
 <?php
+error_reporting(E_ALL);
+ini_set('display_errors', 1);
+
 require_once('oauth-php/library/OAuthStore.php');
 require_once('oauth-php/library/OAuthRequester.php');
 require_once('oauth-php/library/OAuthRequestLogger.php');
@@ -6,16 +9,16 @@
 
 DEFINE('OAUTH_LOG_REQUEST', true);
 
-$connection = array('server' => 'localhost', 
-    'username' => 'root', 
-    'password' => '', 
-    'database' => 'oauth_consumer');
-
-OAuthStore::instance('MySQL', $connection);
-
-DEFINE('SERVER_BASE', 'http://localhost/xibo/1.6/server-162/server/');
-DEFINE('CONSUMER_KEY', 'e982575d2ab70546923b92e50c5b96ca053b407a8');
-DEFINE('CONSUMER_SECRET', 'a891f97e69985230a2e0e869b9f875e3');
+$connection = new PDO('mysql:host=localhost;dbname=oauth_consumer', 'root', 'root');
+$connection->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+$connection->query("SET NAMES 'utf8'");
+
+OAuthStore::instance('PDO', array('conn' => $connection));
+
+DEFINE('LOCAL_BASE', 'http://172.28.128.3/example_oauth/index.php');
+DEFINE('SERVER_BASE', 'http://unittest.xibo.co.uk/');
+DEFINE('CONSUMER_KEY', '9beeb94ea11bfa15da1ab7b2b0fb543205436b27b');
+DEFINE('CONSUMER_SECRET', 'fba59ef57d3331032a099cf04b1ebb2d');
 //DEFINE('SERVER_BASE', 'http://unittest2.xibo.org.uk/api/');
 //DEFINE('CONSUMER_KEY', '201798cda77e4e82e0488d0c8c2e43ae0519d180f');
 //DEFINE('CONSUMER_SECRET', '9eb4aa8a51e4a393b3fb5ad6f1a75bae');
@@ -92,7 +95,7 @@
     }
 
     // Callback to our (consumer) site, will be called when the user finished the authorization at the server
-    $callback_uri = '?action=Exchange&consumer_key='.rawurlencode(CONSUMER_KEY).'&usr_id='.intval($user_id);
+    $callback_uri = LOCAL_BASE . '?action=Exchange&consumer_key='.rawurlencode(CONSUMER_KEY).'&usr_id='.intval($user_id);
 
     // Now redirect to the autorization uri and get us authorized
     if (!empty($token['authorize_uri']))

=== modified file 'server/config/client.config.php'
--- server/config/client.config.php	2014-09-16 16:41:43 +0000
+++ server/config/client.config.php	2014-10-21 16:06:16 +0000
@@ -272,7 +272,7 @@
                         'title' => __('Use CEF as the Web Browser'),
                         'type' => _CHECKBOX,
                         'fieldType' => 'checkbox',
-                        'default' => 1,
+                        'default' => 0,
                         'helpText' => __('CEF is Chrome Embedded and offers up to date web rendering. If unselected the default Internet Explorer control will be used.'),
                         'enabled' => true,
                         'groupClass' => NULL

=== modified file 'server/config/config.class.php'
--- server/config/config.class.php	2014-08-16 12:51:07 +0000
+++ server/config/config.class.php	2014-10-21 16:06:16 +0000
@@ -56,7 +56,7 @@
 	 * @return 
 	 * @param $setting Object[optional]
 	 */
-	static function GetSetting($setting) 
+	static function GetSetting($setting, $default = NULL) 
 	{	
 		try {
 			$dbh = PDOConnect::init();
@@ -65,12 +65,14 @@
 			$sth->execute(array('setting' => $setting));
 
 			if (!$result = $sth->fetch())
-				return false;
+				return $default;
 
 			//Debug::LogEntry('audit', 'Retrieved setting ' . $result['value'] . ' for ' . $setting, 'Config', 'GetSetting');
-
+			
 			// Validate as a string and return
-			return Kit::ValidateParam($result['value'], _STRING);
+			$result = Kit::ValidateParam($result['value'], _STRING);
+			
+			return ($result == '') ? $default : $result;
 		}
 		catch (Exception $e) {
 			trigger_error($e->getMessage());

=== modified file 'server/install/database/80.sql'
--- server/install/database/80.sql	2014-09-19 14:08:28 +0000
+++ server/install/database/80.sql	2014-10-21 16:06:16 +0000
@@ -41,11 +41,6 @@
   PRIMARY KEY (`displayprofileid`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
 
-INSERT INTO `displayprofile` (`displayprofileid`, `name`, `type`, `config`, `isdefault`, `userid`) VALUES
-(1, 'Production', 'windows', '[{"name":"CollectInterval","value":"900","type":"int"},{"name":"PowerpointEnabled","value":0,"type":"checkbox"},{"name":"StatsEnabled","value":1,"type":"checkbox"},{"name":"SizeX","value":0,"type":"double"},{"name":"SizeY","value":0,"type":"double"},{"name":"OffsetX","value":0,"type":"double"},{"name":"OffsetY","value":0,"type":"double"},{"name":"ShowInTaskbar","value":1,"type":"checkbox"},{"name":"ClientInfomationCtrlKey","value":0,"type":"checkbox"},{"name":"ClientInformationKeyCode","value":"I","type":"word"},{"name":"CursorStartPosition","value":"Bottom Right","type":"string"},{"name":"DoubleBuffering","value":1,"type":"checkbox"},{"name":"EmptyLayoutDuration","value":"10","type":"int"},{"name":"EnableMouse","value":0,"type":"checkbox"},{"name":"EnableShellCommands","value":0,"type":"checkbox"},{"name":"ExpireModifiedLayouts","value":0,"type":"checkbox"},{"name":"LogLevel","value":"off","type":"word"},{"name":"LogToDiskLocation","value":"","type":"string"},{"name":"MaxConcurrentDownloads","value":"2","type":"int"},{"name":"ShellCommandAllowList","value":"","type":"string"},{"name":"UseCefWebBrowser","value":1,"type":"checkbox"},{"name":"SendCurrentLayoutAsStatusUpdate","value":0,"type":"checkbox"},{"name":"ScreenShotRequestInterval","value":0,"type":"int"}]', 1, 1),
-(2, 'Production', 'android', '[{"name":"emailAddress","value":"","type":"string"},{"name":"settingsPassword","value":"","type":"string"},{"name":"collectInterval","value":"600","type":"int"},{"name":"orientation","value":0,"type":"int"},{"name":"startOnBoot","value":1,"type":"checkbox"},{"name":"actionBarMode","value":"1","type":"int"},{"name":"actionBarDisplayDuration","value":"60","type":"int"},{"name":"screenDimensions","value":"","type":"string"},{"name":"autoRestart","value":1,"type":"checkbox"},{"name":"startOnBootDelay","value":"60","type":"int"},{"name":"blacklistVideo","value":1,"type":"checkbox"},{"name":"storeHtmlOnInternal","value":0,"type":"checkbox"}]', 1, 1);
-
-
 UPDATE layout SET background = SUBSTRING_INDEX(background, '.', 1) WHERE IFNULL(background, '') <> '';
 ALTER TABLE  `layout` CHANGE  `background`  `backgroundImageId` INT( 11 ) NULL DEFAULT NULL;
 
@@ -178,6 +173,6 @@
 ('DisplayProfile', 'Delete', 'manual/single.php?p=admin/displayprofiles#delete');
 
 
-UPDATE `version` SET `app_ver` = '1.7.0-alpha', `XmdsVersion` = 4;
+UPDATE `version` SET `app_ver` = '1.7.0-alpha', `XmdsVersion` = 4, `XlfVersion` = 2 ;
 UPDATE `setting` SET `value` = 0 WHERE `setting` = 'PHONE_HOME_DATE';
 UPDATE `version` SET `DBVersion` = '80';

=== added file 'server/install/database/81.sql'
--- server/install/database/81.sql	1970-01-01 00:00:00 +0000
+++ server/install/database/81.sql	2014-10-21 16:06:16 +0000
@@ -0,0 +1,23 @@
+INSERT INTO  `setting` (`setting` ,`value` ,`fieldType` ,`helptext` ,`options` ,`cat` ,`userChange` ,`title` ,`validation` ,`ordering` ,`default` ,`userSee` ,`type`)
+VALUES (
+ 'DATE_FORMAT',  'Y-m-d',  'text',  'The Date Format to use when displaying dates in the CMS.', NULL ,  'regional',  '1',  'Date Format',  'required',  '30',  'Y-m-d',  '1',  'string'
+);
+
+INSERT INTO  `setting` (`setting` ,`value` ,`fieldType` ,`helptext` ,`options` ,`cat` ,`userChange` ,`title` ,`validation` ,`ordering` ,`default` ,`userSee` ,`type`)
+VALUES (
+ 'DETECT_LANGUAGE',  '1',  'checkbox',  'Detect the browser language?', NULL ,  'regional',  '1',  'Detect Language',  '',  '40',  '1',  '1',  'checkbox'
+);
+
+ALTER TABLE  `media` ADD  `is_module` TINYINT NOT NULL DEFAULT  '0';
+
+INSERT INTO `module` (`ModuleID`, `Module`, `Name`, `Enabled`, `RegionSpecific`, `Description`, `ImageUri`, `SchemaVersion`, `ValidExtensions`, `PreviewEnabled`, `assignable`) VALUES 
+(NULL, 'font', 'Font', '1', '0', 'A font to use in other Modules', 'forms/library.gif', '1', 'ttf,otf,eot,svg,woff', '0', '0');
+
+ALTER TABLE  `stat` ADD INDEX (  `statDate` );
+
+ALTER TABLE  `stat` CHANGE  `layoutID`  `layoutID` INT( 8 ) NULL;
+ALTER TABLE  `stat` CHANGE  `end`  `end` DATETIME NULL;
+
+UPDATE `version` SET `app_ver` = '1.7.0-alpha2', `XmdsVersion` = 4, `XlfVersion` = 2;
+UPDATE `setting` SET `value` = 0 WHERE `setting` = 'PHONE_HOME_DATE';
+UPDATE `version` SET `DBVersion` = '81';
\ No newline at end of file

=== modified file 'server/install/master/data.sql'
--- server/install/master/data.sql	2014-09-19 12:55:15 +0000
+++ server/install/master/data.sql	2014-10-21 16:06:16 +0000
@@ -1,5 +1,5 @@
 INSERT INTO `version` (`app_ver`, `XmdsVersion`, `XlfVersion`, `DBVersion`) VALUES
-('1.7.0-alpha', 4, 1, 80);
+('1.7.0-alpha2', 4, 2, 81);
 
 INSERT INTO `group` (`groupID`, `group`, `IsUserSpecific`, `IsEveryone`) VALUES
 (1, 'Users', 0, 0),
@@ -113,7 +113,8 @@
 (12, 'shellcommand', 'Shell Command', 1, 1, 'Execute a shell command on the client', 'forms/shellcommand.gif', 1, NULL, 1, 1, NULL, NULL),
 (13, 'localvideo', 'Local Video', 1, 1, 'Play a video locally stored on the client', 'forms/video.gif', 1, NULL, 1, 1, NULL, NULL),
 (14, 'genericfile', 'Generic File', 1, 0, 'A generic file to be stored in the library', 'forms/library.gif', 1, 'apk,js,html,htm', 0, 0, NULL, NULL),
-(15, 'clock', 'Clock', 1, 1, 'Display a Clock', 'forms/library.gif', 1, NULL, 1, 1, 'html', '[]');
+(15, 'clock', 'Clock', 1, 1, 'Display a Clock', 'forms/library.gif', 1, NULL, 1, 1, 'html', '[]'),
+(16, 'font', 'Font', 1, 0, 'A font to use in other Modules', 'forms/library.gif', 1, 'ttf,otf,eot,svg,woff', 0, 0, NULL, NULL);
 
 INSERT INTO `pagegroup` (`pagegroupID`, `pagegroup`) VALUES
 (1, 'Schedule'),
@@ -263,7 +264,9 @@
 (70, 'EMBEDDED_STATUS_WIDGET', '', 'text', 'HTML to embed in an iframe on the Status Dashboard', NULL, 'general', 0, 'Status Dashboard Widget', '', 70, '', 1, 'htmlstring'),
 (71, 'PROXY_HOST', '', 'text', 'The Proxy URL', NULL, 'network', 1, 'Proxy URL', '', 10, '', 1, 'string'),
 (72, 'PROXY_PORT', '0', 'number', 'The Proxy Port', NULL, 'network', 1, 'Proxy Port', '', 20, '0', 1, 'int'),
-(73, 'PROXY_AUTH', '', 'text', 'The Authentication information for this proxy. username:password', NULL, 'network', 1, 'Proxy Credentials', '', 30, '', 1, 'string');
+(73, 'PROXY_AUTH', '', 'text', 'The Authentication information for this proxy. username:password', NULL, 'network', 1, 'Proxy Credentials', '', 30, '', 1, 'string'),
+(74, 'DATE_FORMAT',  'Y-m-d',  'text',  'The Date Format to use when displaying dates in the CMS.', NULL ,  'regional',  '1',  'Date Format',  'required',  30,  'Y-m-d',  '1',  'string'),
+(75, 'DETECT_LANGUAGE',  '1',  'checkbox',  'Detect the browser language?', NULL ,  'regional',  '1',  'Detect Language',  '',  40,  '1',  1,  'checkbox');
 
 INSERT INTO `usertype` (`usertypeid`, `usertype`) VALUES
 (1, 'Super Admin'),
@@ -339,10 +342,6 @@
 (1, 'Value'),
 (2, 'Formula');
 
-INSERT INTO `displayprofile` (`displayprofileid`, `name`, `type`, `config`, `isdefault`, `userid`) VALUES
-(1, 'Production', 'windows', '[{"name":"CollectInterval","value":"900","type":"int"},{"name":"PowerpointEnabled","value":0,"type":"checkbox"},{"name":"StatsEnabled","value":1,"type":"checkbox"},{"name":"SizeX","value":0,"type":"double"},{"name":"SizeY","value":0,"type":"double"},{"name":"OffsetX","value":0,"type":"double"},{"name":"OffsetY","value":0,"type":"double"},{"name":"ShowInTaskbar","value":1,"type":"checkbox"},{"name":"ClientInfomationCtrlKey","value":0,"type":"checkbox"},{"name":"ClientInformationKeyCode","value":"I","type":"word"},{"name":"CursorStartPosition","value":"Bottom Right","type":"string"},{"name":"DoubleBuffering","value":1,"type":"checkbox"},{"name":"EmptyLayoutDuration","value":"10","type":"int"},{"name":"EnableMouse","value":0,"type":"checkbox"},{"name":"EnableShellCommands","value":0,"type":"checkbox"},{"name":"ExpireModifiedLayouts","value":0,"type":"checkbox"},{"name":"LogLevel","value":"off","type":"word"},{"name":"LogToDiskLocation","value":"","type":"string"},{"name":"MaxConcurrentDownloads","value":"2","type":"int"},{"name":"ShellCommandAllowList","value":"","type":"string"},{"name":"UseCefWebBrowser","value":1,"type":"checkbox"},{"name":"SendCurrentLayoutAsStatusUpdate","value":0,"type":"checkbox"},{"name":"ScreenShotRequestInterval","value":0,"type":"int"}]', 1, 1),
-(2, 'Production', 'android', '[{"name":"emailAddress","value":"","type":"string"},{"name":"settingsPassword","value":"","type":"string"},{"name":"collectInterval","value":"600","type":"int"},{"name":"orientation","value":0,"type":"int"},{"name":"startOnBoot","value":1,"type":"checkbox"},{"name":"actionBarMode","value":"1","type":"int"},{"name":"actionBarDisplayDuration","value":"60","type":"int"},{"name":"screenDimensions","value":"","type":"string"},{"name":"autoRestart","value":1,"type":"checkbox"},{"name":"startOnBootDelay","value":"60","type":"int"},{"name":"blacklistVideo","value":1,"type":"checkbox"},{"name":"storeHtmlOnInternal","value":0,"type":"checkbox"}]', 1, 1);
-
 INSERT INTO `bandwidthtype` (`bandwidthtypeid`, `name`) VALUES
 (1, 'Register'),
 (2, 'Required Files'),

=== modified file 'server/install/master/structure.sql'
--- server/install/master/structure.sql	2014-09-16 10:59:55 +0000
+++ server/install/master/structure.sql	2014-10-21 16:06:16 +0000
@@ -321,6 +321,7 @@
   `retired` tinyint(4) NOT NULL DEFAULT '0' COMMENT 'Is retired?',
   `isEdited` tinyint(4) NOT NULL DEFAULT '0' COMMENT 'Is this the current record',
   `editedMediaID` int(11) DEFAULT NULL COMMENT 'The Parent ID',
+  `is_module` tinyint(4) NOT NULL DEFAULT  '0',
   PRIMARY KEY (`mediaID`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=9 ;
 
@@ -530,12 +531,13 @@
   `statDate` datetime NOT NULL COMMENT 'State entry date',
   `scheduleID` int(8) NOT NULL,
   `displayID` int(4) NOT NULL,
-  `layoutID` int(8) NOT NULL,
+  `layoutID` int(8) NULL,
   `mediaID` varchar(50) DEFAULT NULL,
   `start` datetime NOT NULL,
-  `end` datetime NOT NULL,
+  `end` datetime NULL,
   `Tag` varchar(254) DEFAULT NULL,
-  PRIMARY KEY (`statID`)
+  PRIMARY KEY (`statID`),
+  KEY `statDate` (`statDate`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 
 CREATE TABLE IF NOT EXISTS `template` (

=== added file 'server/lib/app/cache.class.php'
--- server/lib/app/cache.class.php	1970-01-01 00:00:00 +0000
+++ server/lib/app/cache.class.php	2014-10-21 16:06:16 +0000
@@ -0,0 +1,82 @@
+<?php
+/*
+ * Xibo - Digital Signage - http://www.xibo.org.uk
+ * Copyright (C) 2009-2013 Daniel Garner
+ *
+ * This file is part of Xibo.
+ *
+ * Xibo is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version. 
+ *
+ * Xibo is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * A very simple file cache
+ */
+defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
+
+class Cache {
+    
+    private static $_data;
+    private static $_location;
+
+    private function __construct() {}
+
+    public static function put($key, $value, $expires) {
+        if (!self::$_data)
+            self::load();
+
+        $expires = time() + $expires;
+
+        self::$_data[$key] = array('value' => $value, 'expires' => $expires);
+
+        self::save();
+    }
+
+    public static function get($key, $default = NULL) {
+        if (!self::$_data)
+            self::load();
+
+        if (!Cache::has($key))
+            return $default;
+
+        $data = self::$_data[$key];
+
+        if ($data['expires'] < time()) {
+            unset(self::$_data['key']);
+            return $default;
+        }
+        else
+            return $data['value'];
+    }
+
+    public static function has($key) {
+        if (!self::$_data)
+            self::load();
+
+        return (isset(self::$_data[$key]) && self::$_data[$key] != null && self::$_data[$key]['expires'] >= time());
+    }
+
+    private static function load() {
+        self::$_location = Config::GetSetting('LIBRARY_LOCATION') . 'cache/cache';
+
+        if (!file_exists(self::$_location))
+            self::$_data = array();
+        else
+            self::$_data = unserialize(file_get_contents(self::$_location));
+    }
+
+    private static function save() {
+        self::$_location = Config::GetSetting('LIBRARY_LOCATION') . 'cache/cache';
+
+        file_put_contents(self::$_location, serialize(self::$_data));
+    }
+}
+?>

=== modified file 'server/lib/app/debug.class.php'
--- server/lib/app/debug.class.php	2014-01-18 09:47:41 +0000
+++ server/lib/app/debug.class.php	2014-10-21 16:06:16 +0000
@@ -22,174 +22,185 @@
 
 class Debug
 {
-	public function __construct()
-	{
-		if (!defined('AUDIT'))
-		{
-			// Get the setting from the DB and define it
-			if (Config::GetSetting('audit') != 'On')
-			{
-				define('AUDIT', false);
-			}
-			else
-			{
-				define('AUDIT', true);
-			}
-		}
-	}
-	
-	public function ErrorHandler($errno, $errmsg, $filename, $linenum, $vars) {
-
-		// timestamp for the error entry
-		$dt = date("Y-m-d H:i:s (T)");
-
-		// define an assoc array of error string
-		// in reality the only entries we should
-		// consider are E_WARNING, E_NOTICE, E_USER_ERROR,
-		// E_USER_WARNING and E_USER_NOTICE
-		$errortype = array(E_ERROR => 'Error', E_WARNING => 'Warning', E_PARSE =>
-				'Parsing Error', E_NOTICE => 'Notice', E_CORE_ERROR => 'Core Error',
-				E_CORE_WARNING => 'Core Warning', E_COMPILE_ERROR => 'Compile Error',
-				E_COMPILE_WARNING => 'Compile Warning', E_USER_ERROR => 'User Error',
-				E_USER_WARNING => 'User Warning', E_USER_NOTICE => 'User Notice', E_STRICT =>
-				'Runtime Notice', E_RECOVERABLE_ERROR => 'Recoverable Error', 8192 => 'Deprecated Call');
-
-		// set of errors for which a var trace will be saved
-		$user_errors_halt = array(E_USER_ERROR);
-		$user_errors_inline = array(E_USER_WARNING);
-
-		$err = "<errormsg>" . $errmsg . "</errormsg>\n";
-		$err .= "<errornum>" . $errno . "</errornum>\n";
-		$err .= "<errortype>" . $errortype[$errno] . "</errortype>\n";
-		$err .= "<scriptname>" . $filename . "</scriptname>\n";
-		$err .= "<scriptlinenum>" . $linenum . "</scriptlinenum>\n";
-
-		// Log everything
-		Debug::LogEntry("error", $err);
-		
-		// Test to see if this is a HALT error or not (we do the same if we are in production or not!)
-		if (in_array($errno, $user_errors_halt)) 
-		{
-			// We have a halt error
-			Debug::LogEntry('audit', 'Creating a Response Manager to deal with the HALT Error.');
-
-			$response = new ResponseManager();
-			
-			$response->SetError($errmsg);
-			$response->Respond();
-		}
-		
-		// Is Debug Enabled? (i.e. Development or Support)
-		if (error_reporting() != 0) 
-		{
-			if (in_array($errno, $user_errors_inline)) 
-			{
-				// This is an inline error - therefore we really want to pop up a message box with this in it - so we know?
-				// For now we treat this like a halt error? Or do we just try and output some javascript to pop up an error
-				// surely the javascript idea wont work in ajax?
-				// or prehaps we add this to the session errormessage so we see it at a later date?
-				echo $errmsg;
-				die();
-			}
-		}
-		
-		// Must return false
-		return false;
-	}
-	
-	/**
-	 * Mail an error - currently disabled
-	 * @return 
-	 * @param $errmsg Object
-	 * @param $err Object
-	 */
-	function MailError($errmsg, $err) 
-	{
-		return true;
-
-		$to = '[e-mail]';
-		
-		$from = Config::GetSetting("mail_from");
-		if ($from == "") return true;
-		
-		$subject = "Error message from Digital Signage System";
-		$message = wordwrap("$errmsg\n$err");
-
-		$headers = "From: $from" . "\r\n" . "Reply-To: $from" . "\r\n" .
-				"X-Mailer: PHP/" . phpversion();
-
-		if (!mail($to, $subject, $message, $headers)) trigger_error("Mail not accepted", E_USER_NOTICE);
-		return true;
-	}
-
-	/**
-	 * Write an Entry to the Log table
-	 * @return 
-	 * @param $db Object
-	 * @param $type Object
-	 * @param $message Object
-	 * @param $page Object[optional]
-	 * @param $function Object[optional]
-	 * @param $logdate Object[optional]
-	 * @param $displayid Object[optional]
-	 * @param $scheduleID Object[optional]
-	 * @param $layoutid Object[optional]
-	 * @param $mediaid Object[optional]
-	 */	
-	static function LogEntry($type, $message, $page = "", $function = "", $logdate = "", $displayid = 0, $scheduleID = 0, $layoutid = 0, $mediaid = 0) 
-	{
-		if ($type == 'audit' && !AUDIT)
-			return;
-
-		$currentdate 		= date("Y-m-d H:i:s");
-		$requestUri			= Kit::GetParam('REQUEST_URI', $_SERVER, _STRING, 'Not Supplied');
-		$requestIp			= Kit::GetParam('REMOTE_ADDR', $_SERVER, _STRING, 'Not Supplied');
-		$requestUserAgent   = Kit::GetParam('HTTP_USER_AGENT', $_SERVER, _STRING, 'Not Supplied');
+    public function __construct()
+    {
+        if (!defined('AUDIT'))
+        {
+            // Get the setting from the DB and define it
+            if (Config::GetSetting('audit') != 'On')
+            {
+                define('AUDIT', false);
+            }
+            else
+            {
+                define('AUDIT', true);
+            }
+        }
+    }
+    
+    public function ErrorHandler($errno, $errmsg, $filename, $linenum, $vars) {
+
+        // timestamp for the error entry
+        $dt = date("Y-m-d H:i:s (T)");
+
+        // define an assoc array of error string
+        // in reality the only entries we should
+        // consider are E_WARNING, E_NOTICE, E_USER_ERROR,
+        // E_USER_WARNING and E_USER_NOTICE
+        $errortype = array(E_ERROR => 'Error', E_WARNING => 'Warning', E_PARSE =>
+                'Parsing Error', E_NOTICE => 'Notice', E_CORE_ERROR => 'Core Error',
+                E_CORE_WARNING => 'Core Warning', E_COMPILE_ERROR => 'Compile Error',
+                E_COMPILE_WARNING => 'Compile Warning', E_USER_ERROR => 'User Error',
+                E_USER_WARNING => 'User Warning', E_USER_NOTICE => 'User Notice', E_STRICT =>
+                'Runtime Notice', E_RECOVERABLE_ERROR => 'Recoverable Error', 8192 => 'Deprecated Call');
+
+        // set of errors for which a var trace will be saved
+        $user_errors_halt = array(E_USER_ERROR);
+        $user_errors_inline = array(E_USER_WARNING);
+
+        $err = "<errormsg>" . $errmsg . "</errormsg>\n";
+        $err .= "<errornum>" . $errno . "</errornum>\n";
+        $err .= "<errortype>" . $errortype[$errno] . "</errortype>\n";
+        $err .= "<scriptname>" . $filename . "</scriptname>\n";
+        $err .= "<scriptlinenum>" . $linenum . "</scriptlinenum>\n";
+
+        // Log everything
+        Debug::LogEntry("error", $err);
+        
+        // Test to see if this is a HALT error or not (we do the same if we are in production or not!)
+        if (in_array($errno, $user_errors_halt)) 
+        {
+            // We have a halt error
+            Debug::LogEntry('audit', 'Creating a Response Manager to deal with the HALT Error.');
+
+            $response = new ResponseManager();
+            
+            $response->SetError($errmsg);
+            $response->Respond();
+        }
+        
+        // Is Debug Enabled? (i.e. Development or Support)
+        if (error_reporting() != 0) 
+        {
+            if (in_array($errno, $user_errors_inline)) 
+            {
+                // This is an inline error - therefore we really want to pop up a message box with this in it - so we know?
+                // For now we treat this like a halt error? Or do we just try and output some javascript to pop up an error
+                // surely the javascript idea wont work in ajax?
+                // or prehaps we add this to the session errormessage so we see it at a later date?
+                echo $errmsg;
+                die();
+            }
+        }
+        
+        // Must return false
+        return false;
+    }
+    
+    /**
+     * Mail an error - currently disabled
+     * @return 
+     * @param $errmsg Object
+     * @param $err Object
+     */
+    function MailError($errmsg, $err) 
+    {
+        return true;
+
+        $to = '[e-mail]';
+        
+        $from = Config::GetSetting("mail_from");
+        if ($from == "") return true;
+        
+        $subject = "Error message from Digital Signage System";
+        $message = wordwrap("$errmsg\n$err");
+
+        $headers = "From: $from" . "\r\n" . "Reply-To: $from" . "\r\n" .
+                "X-Mailer: PHP/" . phpversion();
+
+        if (!mail($to, $subject, $message, $headers)) trigger_error("Mail not accepted", E_USER_NOTICE);
+        return true;
+    }
+
+    /**
+     * Write an Entry to the Log table
+     * @return 
+     * @param $db Object
+     * @param $type Object
+     * @param $message Object
+     * @param $page Object[optional]
+     * @param $function Object[optional]
+     * @param $logdate Object[optional]
+     * @param $displayid Object[optional]
+     * @param $scheduleID Object[optional]
+     * @param $layoutid Object[optional]
+     * @param $mediaid Object[optional]
+     */ 
+    static function LogEntry($type, $message, $page = "", $function = "", $logdate = "", $displayid = 0, $scheduleID = 0, $layoutid = 0, $mediaid = 0) 
+    {
+        if ($type == 'audit' && !AUDIT)
+            return;
+
+        $currentdate        = date("Y-m-d H:i:s");
+        $requestUri         = Kit::GetParam('REQUEST_URI', $_SERVER, _STRING, 'Not Supplied');
+        $requestIp          = Kit::GetParam('REMOTE_ADDR', $_SERVER, _STRING, 'Not Supplied');
+        $requestUserAgent   = Kit::GetParam('HTTP_USER_AGENT', $_SERVER, _STRING, 'Not Supplied');
         $requestUserAgent   = substr($requestUserAgent, 0, 253);
-		$userid 			= Kit::GetParam('userid', _SESSION, _INT, 0);
-		$message			= Kit::ValidateParam($message, _HTMLSTRING);
-		
-		if ($logdate == "") 
-			$logdate = $currentdate;
-
-		//Prepare the variables
-		if ($page == "")
-			$page = Kit::GetParam('p', _GET, _WORD);
-
-		// Insert into the DB
-		try {
-			$dbh = PDOConnect::init();
-
-			$SQL  = 'INSERT INTO log (logdate, type, page, function, message, requesturi, remoteaddr, useragent, userid, displayid, scheduleid, layoutid, mediaid) ';
-			$SQL .= ' VALUES (:logdate, :type, :page, :function, :message, :requesturi, :remoteaddr, :useragent, :userid, :displayid, :scheduleid, :layoutid, :mediaid) ';
-
-			$sth = $dbh->prepare($SQL);
-
-			$params = array(
-					'logdate' => $currentdate,
-					'type' => $type,
-					'page' => $page,
-					'function' => $function,
-					'message' => $message,
-					'requesturi' => $requestUri,
-					'remoteaddr' => $requestIp,
-					'useragent' => $requestUserAgent,
-					'userid' => $userid,
-					'displayid' => $displayid,
-					'scheduleid' => $scheduleID,
-					'layoutid' => $layoutid,
-					'mediaid' => $mediaid
-				);
-
-			$sth->execute($params);
-		}
-		catch (PDOException $e) {
-			// In this case just silently log the error
-			error_log($message . '\n\n', 3, './err_log.xml');
-			error_log($e->getMessage() . '\n\n', 3, './err_log.xml');
-		}
-
-		return true;
-	}
+        $userid             = Kit::GetParam('userid', _SESSION, _INT, 0);
+        $message            = Kit::ValidateParam($message, _HTMLSTRING);
+        
+        if ($logdate == "") 
+            $logdate = $currentdate;
+
+        //Prepare the variables
+        if ($page == "")
+            $page = Kit::GetParam('p', _GET, _WORD);
+
+        // Insert into the DB
+        try {
+            $dbh = PDOConnect::init();
+
+            $SQL  = 'INSERT INTO log (logdate, type, page, function, message, requesturi, remoteaddr, useragent, userid, displayid, scheduleid, layoutid, mediaid) ';
+            $SQL .= ' VALUES (:logdate, :type, :page, :function, :message, :requesturi, :remoteaddr, :useragent, :userid, :displayid, :scheduleid, :layoutid, :mediaid) ';
+
+            $sth = $dbh->prepare($SQL);
+
+            $params = array(
+                    'logdate' => $currentdate,
+                    'type' => $type,
+                    'page' => $page,
+                    'function' => $function,
+                    'message' => $message,
+                    'requesturi' => $requestUri,
+                    'remoteaddr' => $requestIp,
+                    'useragent' => $requestUserAgent,
+                    'userid' => $userid,
+                    'displayid' => $displayid,
+                    'scheduleid' => $scheduleID,
+                    'layoutid' => $layoutid,
+                    'mediaid' => $mediaid
+                );
+
+            $sth->execute($params);
+        }
+        catch (PDOException $e) {
+            // In this case just silently log the error
+            error_log($message . '\n\n', 3, './err_log.xml');
+            error_log($e->getMessage() . '\n\n', 3, './err_log.xml');
+        }
+
+        return true;
+    }
+
+    public static function Audit($message) {
+        if (!AUDIT)
+            return;
+
+        // Get the calling class / function
+        $trace = debug_backtrace();
+        $caller = $trace[1];
+
+        Debug::LogEntry('audit', $message, (isset($caller['class'])) ? $caller['class'] : 'Global', $caller['function']);
+    }
 }
-?>
\ No newline at end of file
+?>

=== modified file 'server/lib/app/kit.class.php'
--- server/lib/app/kit.class.php	2014-09-19 12:55:15 +0000
+++ server/lib/app/kit.class.php	2014-10-21 16:06:16 +0000
@@ -45,381 +45,388 @@
 
 class Kit 
 {
-	// Ends the current execution and issues a redirect - should only be called before headers have been sent (i.e. no output)
-	static function Redirect($page, $message = '')
-	{
-		$url 	= $page;
-		$ajax 	= Kit::GetParam('ajax', _REQUEST, _BOOL, false);
-		
-		if ($ajax)
-		{
-			echo json_encode($page);
-			die();
-		}
-		
-		// Header or JS redirect
-		if (headers_sent()) 
-		{
-			echo "<script>document.location.href='$url';</script>\n";
-		} 
-		else 
-		{
-			header( 'HTTP/1.1 302 Moved Temporarily' );
-			header( 'Location: ' . $url );
-		}
-		
-		die();
-	}
-	
-	/**
-	 * Gets the appropriate Param, making sure its valid
-	 * Based on code from Joomla! 1.5
-	 * @return 
-	 * @param $param Object
-	 * @param $source Object[optional]
-	 * @param $type Object[optional]
-	 * @param $default Object[optional]
-	 */
-	static public function GetParam($param, $source = _POST, $type = _STRING, $default = '', $sanitize = true)
-	{
-		// lower case param (we dont care)
-		$param = strtolower($param);
-
-		if (is_array($source))
-		{
-			$source = array_change_key_case($source);
-			
-			if(!isset($source[$param])) 
-			{
-				$return = $default;
-			}
-			else 
-			{
-				$return = $source[$param];	
-			}
-		}
-		else
-		{
-			switch ($source)
-			{
-				case 'session':
-
-					if (isset($_SESSION))
-						$_tempSESSION = array_change_key_case($_SESSION);
-				
-					if(!isset($_tempSESSION[$param])) 
-					{
-						$return = $default;
-					}
-					else if ($type == _CHECKBOX)
-					{
-						// this means that it was defined correctly and it was set
-						$return = 1;
-					}
-					else 
-					{
-						if ($_tempSESSION[$param] == '')
-						{
-							$return = $default;
-						} 
-						else
-						{
-							$return = $_tempSESSION[$param];
-						}
-					}
-				
-					break;
-				
-				case 'request':
-
-					$_tempREQUEST = array_change_key_case($_REQUEST);
-				
-					if(!isset($_tempREQUEST[$param])) 
-					{
-						$return = $default;
-					}
-					else 
-					{
-						if ($_tempREQUEST[$param] == '')
-						{
-							$return = $default;
-						} 
-						else
-						{
-							$return = $_tempREQUEST[$param];
-						}	
-					}
-				
-					break;
-					
-				case 'get':
-
-					$_tempGET = array_change_key_case($_GET);
-				
-					if(!isset($_tempGET[$param])) 
-					{
-						$return = $default;
-					}
-					else 
-					{
-						if ($_tempGET[$param] == '')
-						{
-							$return = $default;
-						} 
-						else
-						{
-							$return = $_tempGET[$param];
-						}		
-					}
-				
-					break;
-					
-				case 'post':
-
-					$_tempPOST = array_change_key_case($_POST);
-		
-					if(!isset($_tempPOST[$param])) 
-					{
-						$return = $default;
-					}
-					else if ($type == _CHECKBOX)
-					{
-						// this means that it was defined correctly and it was set
-						$return = 1;
-					}
-					else 
-					{
-						if ($_tempPOST[$param] == '')
-						{
-							$return = $default;
-						} 
-						else
-						{
-							$return = $_tempPOST[$param];
-						}		
-					}
-				
-					break;
-				
-				default:
-					return $default;
-			}
-		}
-		
-		// Validate this param	
-		return Kit::ValidateParam($return, $type, $sanitize);
-	}
-	
-	/**
-	 * Validates a Parameter
-	 * Based on code from Joomla! 1.5
-	 * @return 
-	 * @param $param Object
-	 * @param $type Object
-	 */
-	static function ValidateParam($param, $type, $sanitize = true)
-	{
-		// If we are a NULL always return a null??
-		//if ($param == NULL || $param == '')
-		//	return NULL;
-
-		// Store in return var
-		$return = $param;
-		
-		// Validate
-		// Handle the type constraint
-		switch ($type)
-		{
-			case _INT :
-
-				if ($sanitize) {
-					// Only use the first integer value
-					if (!$return = filter_var($return, FILTER_SANITIZE_NUMBER_INT))
-						$return = 0;
-				}
-				else {
-					if (!$return = filter_var($return, FILTER_VALIDATE_INT))
-						trigger_error(sprintf(__('No integer match found for [%s] and return value is not an integer'), $param), E_USER_ERROR);
-				}
-
-				break;
-
-			case _DOUBLE :
-				
-				if ($sanitize) {
-					// Only use the first integer value
-					if (!$return = filter_var($return, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION))
-						$return = 0;
-				}
-				else {
-					if (!$return = filter_var($return, FILTER_VALIDATE_FLOAT, FILTER_FLAG_ALLOW_FRACTION))
-						trigger_error(sprintf(__('No integer match found for %s, and return value is not an integer'), $param), E_USER_ERROR);
-				}
-
-				break;
-
-			case _BOOL :
-				$return = filter_var($return, FILTER_VALIDATE_BOOLEAN);
-				break;
-
-			case _ARRAY :
-				if ($return == '')
-				{
-					$return = array();
-					break;	
-				}
-				
-				if (!is_array($return)) 
-				{
-					$return = array($return);
-				}
-				break;
-
-			case _ARRAY_INT:
-
-				if ($return == '') {
-					$return = array();
-				}
-				else {
-					if ($sanitize) {
-						// Only use the first integer value
-						if (!$return = filter_var_array($return, FILTER_SANITIZE_NUMBER_INT))
-							$return = array();
-					}
-					else {
-						if (!$return = filter_var_array($return, FILTER_VALIDATE_INT))
-							trigger_error(sprintf(__('No integer found for %s, and return value is not an integer'), $param), E_USER_ERROR);
-					}
-				}
-				break;
-
-			case _STRING :
-			case _PASSWORD :
-				$return = filter_var($return, FILTER_SANITIZE_STRING);
-				break;
-
-			case _STRINGSPECIAL:
-				$return = filter_var($return, FILTER_SANITIZE_SPECIAL_CHARS);
-				break;			
-				
-			case _HTMLSTRING :
-				
-				// decimal notation
-				$return = preg_replace_callback('/&#(\d+);/m', function($m){
-				    return chr($m[1]);
-				}, $return);
-
-				// convert hex
-				$return = preg_replace_callback('/&#x([a-f0-9]+);/mi', function($m){
-				    return chr("0x".$m[1]);
-				}, $return);
-				
-				$return = (string) $return;
-				break;
-
-			case _WORD :
-				$return = filter_var($return, FILTER_SANITIZE_STRING);
-				$return = (string) preg_replace( '/[^A-Z_\-]/i', '', $return );
-				break;
-				
-			case _USERNAME :
-				$return = filter_var($return, FILTER_SANITIZE_STRING);
-				$return = (string) preg_replace( '/[\x00-\x1F\x7F<>"\'%&]/', '', $return );
-				$return	= strtolower($return);
-				break;
-				
-			case _FILENAME :
-				if ($return == '')
-				{
-					$return = '';
-					break;	
-				}
-				// Remove non alphanumerics
-				$return = strtolower($return); 
-				$code_entities_match 	= array('&quot;' ,'!' ,'@' ,'#' ,'$' ,'%' ,'^' ,'&' ,'*' ,'(' ,')' ,'+' ,'{' ,'}' ,'|' ,':' ,'"' ,'<' ,'>' ,'?' ,'[' ,']' ,'' ,';' ,"'" ,',' ,'_' ,'/' ,'*' ,'+' ,'~' ,'`' ,'=' ,' ' ,'---' ,'--','--'); 
-				$code_entities_replace 	= array('' ,'-' ,'-' ,'' ,'' ,'' ,'-' ,'-' ,'' ,'' ,'' ,'' ,'' ,'' ,'' ,'-' ,'' ,'' ,'' ,'' ,'' ,'' ,'' ,'' ,'' ,'-' ,'-' ,'-' ,'' ,'' ,'' ,'' ,'' ,'-' ,'-' ,'-','-'); 
-	
-				$return = str_replace($code_entities_match, $code_entities_replace, $return);
-				break;
-				
-			case _URI :
-				if ($return == '')
-				{
-					$return = '';
-					break;	
-				}
-				$return = urlencode($return);
-				break;
-				
-			case _CHECKBOX:
-				if ($return == 'on') {
-					$return = 1;
-				}
-				if ($return == 'off' || $return == '') {
-					$return = 0;
-				}
-
-				break;
-
-			default :
-				// No casting necessary
-				if (!$sanitize)
-					trigger_error(sprintf(__('Unknown Type %s'), $type), E_USER_ERROR);
-
-				break;
-		}
-		
-		return $return;
-	}
-	
-	/**
-	 * Gets a formatted Url
-	 * @return 
-	 * @param $page Object[optional]
-	 */
-	public static function GetURL($page = "")
-	{
-		$page = Kit::ValidateParam($page, _WORD);
-		$fullUrl = 'http';
-		
-		if(isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on')
-		{
-			$fullUrl .=  's';
-		}
-		
-		$fullUrl .=  '://';
-		
-		if($_SERVER['SERVER_PORT']!='80')
-		{
-			$fullUrl .=  $_SERVER['HTTP_HOST'].':'.$_SERVER['SERVER_PORT'].$_SERVER['SCRIPT_NAME'];
-		}
-		else
-		{
-			$fullUrl .=  $_SERVER['HTTP_HOST'].$_SERVER['SCRIPT_NAME'];
-		}
-		
-		// Append the page if its not empty
-		if ($page != '')
-		{
-			$fullUrl .= '?p=' . $page;
-		}
-		
-		return $fullUrl;
-	}
+    // Ends the current execution and issues a redirect - should only be called before headers have been sent (i.e. no output)
+    static function Redirect($page, $message = '')
+    {
+        $url    = $page;
+        $ajax   = Kit::GetParam('ajax', _REQUEST, _BOOL, false);
+        
+        if ($ajax)
+        {
+            echo json_encode($page);
+            die();
+        }
+        
+        // Header or JS redirect
+        if (headers_sent()) 
+        {
+            echo "<script>document.location.href='$url';</script>\n";
+        } 
+        else 
+        {
+            header( 'HTTP/1.1 302 Moved Temporarily' );
+            header( 'Location: ' . $url );
+        }
+        
+        die();
+    }
+    
+    /**
+     * Gets the appropriate Param, making sure its valid
+     * Based on code from Joomla! 1.5
+     * @return 
+     * @param $param Object
+     * @param $source Object[optional]
+     * @param $type Object[optional]
+     * @param $default Object[optional]
+     */
+    static public function GetParam($param, $source = _POST, $type = _STRING, $default = '', $sanitize = true)
+    {
+        // lower case param (we dont care)
+        $param = strtolower($param);
+
+        if (is_array($source))
+        {
+            $source = array_change_key_case($source);
+            
+            if(!isset($source[$param])) 
+            {
+                $return = $default;
+            }
+            else 
+            {
+                $return = $source[$param];  
+            }
+        }
+        else
+        {
+            switch ($source)
+            {
+                case 'session':
+
+                    if (isset($_SESSION))
+                        $_tempSESSION = array_change_key_case($_SESSION);
+                
+                    if(!isset($_tempSESSION[$param])) 
+                    {
+                        $return = $default;
+                    }
+                    else if ($type == _CHECKBOX)
+                    {
+                        // this means that it was defined correctly and it was set
+                        $return = 1;
+                    }
+                    else 
+                    {
+                        if ($_tempSESSION[$param] == '')
+                        {
+                            $return = $default;
+                        } 
+                        else
+                        {
+                            $return = $_tempSESSION[$param];
+                        }
+                    }
+                
+                    break;
+                
+                case 'request':
+
+                    $_tempREQUEST = array_change_key_case($_REQUEST);
+                
+                    if(!isset($_tempREQUEST[$param])) 
+                    {
+                        $return = $default;
+                    }
+                    else 
+                    {
+                        if ($_tempREQUEST[$param] == '')
+                        {
+                            $return = $default;
+                        } 
+                        else
+                        {
+                            $return = $_tempREQUEST[$param];
+                        }   
+                    }
+                
+                    break;
+                    
+                case 'get':
+
+                    $_tempGET = array_change_key_case($_GET);
+                
+                    if(!isset($_tempGET[$param])) 
+                    {
+                        $return = $default;
+                    }
+                    else 
+                    {
+                        if ($_tempGET[$param] == '')
+                        {
+                            $return = $default;
+                        } 
+                        else
+                        {
+                            $return = $_tempGET[$param];
+                        }       
+                    }
+                
+                    break;
+                    
+                case 'post':
+
+                    $_tempPOST = array_change_key_case($_POST);
+        
+                    if(!isset($_tempPOST[$param])) 
+                    {
+                        $return = $default;
+                    }
+                    else if ($type == _CHECKBOX)
+                    {
+                        // this means that it was defined correctly and it was set
+                        $return = 1;
+                    }
+                    else 
+                    {
+                        if ($_tempPOST[$param] == '')
+                        {
+                            $return = $default;
+                        } 
+                        else
+                        {
+                            $return = $_tempPOST[$param];
+                        }       
+                    }
+                
+                    break;
+                
+                default:
+                    return $default;
+            }
+        }
+        
+        // Validate this param  
+        return Kit::ValidateParam($return, $type, $sanitize);
+    }
+    
+    /**
+     * Validates a Parameter
+     * Based on code from Joomla! 1.5
+     * @return 
+     * @param $param Object
+     * @param $type Object
+     */
+    static function ValidateParam($param, $type, $sanitize = true)
+    {
+        // If we are a NULL always return a null??
+        //if ($param == NULL || $param == '')
+        //  return NULL;
+
+        // Store in return var
+        $return = $param;
+        
+        // Validate
+        // Handle the type constraint
+        switch ($type)
+        {
+            case _INT :
+
+                if ($sanitize) {
+                    // Only use the first integer value
+                    if (!$return = filter_var($return, FILTER_SANITIZE_NUMBER_INT))
+                        $return = 0;
+                }
+                else {
+                    if (!$return = filter_var($return, FILTER_VALIDATE_INT))
+                        trigger_error(sprintf(__('No integer match found for [%s] and return value is not an integer'), $param), E_USER_ERROR);
+                }
+
+                break;
+
+            case _DOUBLE :
+                
+                if ($sanitize) {
+                    // Only use the first integer value
+                    if (!$return = filter_var($return, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION))
+                        $return = 0;
+                }
+                else {
+                    if (!$return = filter_var($return, FILTER_VALIDATE_FLOAT, FILTER_FLAG_ALLOW_FRACTION))
+                        trigger_error(sprintf(__('No integer match found for %s, and return value is not an integer'), $param), E_USER_ERROR);
+                }
+
+                break;
+
+            case _BOOL :
+                $return = filter_var($return, FILTER_VALIDATE_BOOLEAN);
+                break;
+
+            case _ARRAY :
+                if ($return == '')
+                {
+                    $return = array();
+                    break;  
+                }
+                
+                if (!is_array($return)) 
+                {
+                    $return = array($return);
+                }
+                break;
+
+            case _ARRAY_INT:
+
+                if ($return == '') {
+                    $return = array();
+                }
+                else {
+                    if ($sanitize) {
+                        // Only use the first integer value
+                        if (!$return = filter_var_array($return, FILTER_SANITIZE_NUMBER_INT))
+                            $return = array();
+                    }
+                    else {
+                        if (!$return = filter_var_array($return, FILTER_VALIDATE_INT))
+                            trigger_error(sprintf(__('No integer found for %s, and return value is not an integer'), $param), E_USER_ERROR);
+                    }
+                }
+                break;
+
+            case _STRING :
+            case _PASSWORD :
+                $return = filter_var($return, FILTER_SANITIZE_STRING);
+                break;
+
+            case _STRINGSPECIAL:
+                $return = filter_var($return, FILTER_SANITIZE_SPECIAL_CHARS);
+                break;          
+                
+            case _HTMLSTRING :
+                
+                // decimal notation
+                $return = preg_replace_callback('/&#(\d+);/m', function($m){
+                    return chr($m[1]);
+                }, $return);
+
+                // convert hex
+                $return = preg_replace_callback('/&#x([a-f0-9]+);/mi', function($m){
+                    return chr("0x".$m[1]);
+                }, $return);
+                
+                $return = (string) $return;
+                break;
+
+            case _WORD :
+                $return = filter_var($return, FILTER_SANITIZE_STRING);
+                $return = (string) preg_replace( '/[^A-Z_\-]/i', '', $return );
+                break;
+                
+            case _USERNAME :
+                $return = filter_var($return, FILTER_SANITIZE_STRING);
+                $return = (string) preg_replace( '/[\x00-\x1F\x7F<>"\'%&]/', '', $return );
+                $return = strtolower($return);
+                break;
+                
+            case _FILENAME :
+                if ($return == '')
+                {
+                    $return = '';
+                    break;  
+                }
+                // Remove non alphanumerics
+                $return = strtolower($return); 
+                $code_entities_match    = array('&quot;' ,'!' ,'@' ,'#' ,'$' ,'%' ,'^' ,'&' ,'*' ,'(' ,')' ,'+' ,'{' ,'}' ,'|' ,':' ,'"' ,'<' ,'>' ,'?' ,'[' ,']' ,'' ,';' ,"'" ,',' ,'_' ,'/' ,'*' ,'+' ,'~' ,'`' ,'=' ,' ' ,'---' ,'--','--'); 
+                $code_entities_replace  = array('' ,'-' ,'-' ,'' ,'' ,'' ,'-' ,'-' ,'' ,'' ,'' ,'' ,'' ,'' ,'' ,'-' ,'' ,'' ,'' ,'' ,'' ,'' ,'' ,'' ,'' ,'-' ,'-' ,'-' ,'' ,'' ,'' ,'' ,'' ,'-' ,'-' ,'-','-'); 
+    
+                $return = str_replace($code_entities_match, $code_entities_replace, $return);
+                break;
+                
+            case _URI :
+                if ($return == '')
+                {
+                    $return = '';
+                    break;  
+                }
+                $return = urlencode($return);
+                break;
+                
+            case _CHECKBOX:
+                if ($return == 'on') {
+                    $return = 1;
+                }
+                if ($return == 'off' || $return == '') {
+                    $return = 0;
+                }
+
+                break;
+
+            default :
+                // No casting necessary
+                if (!$sanitize)
+                    trigger_error(sprintf(__('Unknown Type %s'), $type), E_USER_ERROR);
+
+                break;
+        }
+        
+        return $return;
+    }
+    
+    /**
+     * Gets a formatted Url
+     * @return 
+     * @param $page Object[optional]
+     */
+    public static function GetURL($page = "")
+    {
+        $page = Kit::ValidateParam($page, _WORD);
+        $fullUrl = 'http';
+        
+        if(isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on')
+        {
+            $fullUrl .=  's';
+        }
+        
+        $fullUrl .=  '://';
+        
+        if($_SERVER['SERVER_PORT']!='80')
+        {
+            $fullUrl .=  $_SERVER['HTTP_HOST'].':'.$_SERVER['SERVER_PORT'].$_SERVER['SCRIPT_NAME'];
+        }
+        else
+        {
+            $fullUrl .=  $_SERVER['HTTP_HOST'].$_SERVER['SCRIPT_NAME'];
+        }
+        
+        // Append the page if its not empty
+        if ($page != '')
+        {
+            $fullUrl .= '?p=' . $page;
+        }
+        
+        return $fullUrl;
+    }
 
         /**
-         * Ensures a the relevant file for a class is inclued
+         * Ensures a the relevant file for a class is included
          * @param <string> $class
          * @return <boolean> False on failure
          */
         static function ClassLoader($class)
-	{
+    {
             if (class_exists($class))
                 return;
 
             $class = strtolower($class);
 
-            // It doesnt already exist - so lets look in some places to try and find it
+            if (strpos($class, 'manager')) {
+                // Load from app
+                if (file_exists('lib/app/' . $class . '.class.php')) {
+                    include_once('lib/app/' . $class . '.class.php');
+                }
+            }
+
+            // It doesn't already exist - so lets look in some places to try and find it
             if (file_exists('lib/pages/' . $class . '.class.php'))
             {
                 include_once('lib/pages/' . $class . '.class.php');
@@ -444,7 +451,7 @@
             {
                 include_once('lib/service/' . $class . '.class.php');
             }
-	}
+    }
 
     /**
      * GetXiboRoot
@@ -570,85 +577,89 @@
     }
 
     public static function ReturnBytes($val) {
-    	
-    	$val = trim($val);
-	    $last = strtolower($val[strlen($val)-1]);
-	    switch($last) {
-	        // The 'G' modifier is available since PHP 5.1.0
-	        case 'g':
-	            $val *= 1024;
-	        case 'm':
-	            $val *= 1024;
-	        case 'k':
-	            $val *= 1024;
-	    }
-
-	    return $val;
-    }
-
-    /**
-	* Creates a form token
-	* @return 
-	*/
-	public static function Token($tokenName = "token")
-	{
-		//Store in the users session
-		$token = md5(uniqid() . SECRET_KEY . time());
-		
-		$_SESSION[$tokenName] = $token;
-		$_SESSION[$tokenName.'_timeout'] = time();
-		
-		return '<input type="hidden" name="' . $tokenName . '" value="' . $token . '">';
-	}
-
-	/**
-	 * Checks a form token
-	 * @param string token
-	 * @return 
-	 */
-	public static function CheckToken($tokenName = "token")
-	{
-		if (!isset($_POST[$tokenName]) || !isset($_SESSION[$tokenName]))
-			return false;
-		
-		if ($_POST[$tokenName] == $_SESSION[$tokenName])
-		{
-			// See if its still in Date
-			if (($_SESSION[$tokenName.'_timeout'] + 1200) <= time())
-			{
-				return false;
-			}
-			return true;
-		}
-		else
-		{
-			unset($_SESSION[$tokenName]);
-
-			Debug::LogEntry('error', "Form token incorrect from: ". $_SERVER['REMOTE_ADDR']. " with token [" . $_POST[$tokenName] . "] for session_id [" . session_id() . ']');
-			return false;
-		}
-	}
-
-	/**
-	 * Format Bytes
-	 * http://stackoverflow.com/questions/2510434/format-bytes-to-kilobytes-megabytes-gigabytes
-	 * @param  [int]  $size   The file size in bytes
-	 * @param  integer $precision The precision to go to
-	 * @return [string] The Formatted string with suffix
-	 */
-	public static function formatBytes($size, $precision = 2) {
-		
-		if ($size == 0)
-			return 0;
-
-		$base = log($size) / log(1024);
-		$suffixes = array('', 'k', 'M', 'G', 'T');   
-
-		return round(pow(1024, $base - floor($base)), $precision) . $suffixes[floor($base)];
-	}
-
-	public static function uniqueId() {
-		return uniqid(rand());
-	}
+        
+        $val = trim($val);
+        $last = strtolower($val[strlen($val)-1]);
+        switch($last) {
+            // The 'G' modifier is available since PHP 5.1.0
+            case 'g':
+                $val *= 1024;
+            case 'm':
+                $val *= 1024;
+            case 'k':
+                $val *= 1024;
+        }
+
+        return $val;
+    }
+
+    /**
+    * Creates a form token
+    * @return 
+    */
+    public static function Token($tokenName = "token", $withInput = true)
+    {
+        //Store in the users session
+        $token = md5(uniqid() . SECRET_KEY . time());
+        
+        $_SESSION[$tokenName] = $token;
+        $_SESSION[$tokenName.'_timeout'] = time();
+        
+        if ($withInput)
+            return '<input type="hidden" name="' . $tokenName . '" value="' . $token . '">';
+        else
+            return $token;
+    }
+
+    /**
+     * Checks a form token
+     * @param string token
+     * @return 
+     */
+    public static function CheckToken($tokenName = "token")
+    {
+        if (!isset($_POST[$tokenName]) || !isset($_SESSION[$tokenName]))
+            return false;
+        
+        if ($_POST[$tokenName] == $_SESSION[$tokenName])
+        {
+            // See if its still in Date
+            if (($_SESSION[$tokenName.'_timeout'] + 1200) <= time())
+            {
+                return false;
+            }
+            return true;
+        }
+        else
+        {
+            unset($_SESSION[$tokenName]);
+
+            Debug::LogEntry('error', "Form token incorrect from: ". $_SERVER['REMOTE_ADDR']. " with token [" . $_POST[$tokenName] . "] for session_id [" . session_id() . ']');
+            return false;
+        }
+    }
+
+    /**
+     * Format Bytes
+     * http://stackoverflow.com/questions/2510434/format-bytes-to-kilobytes-megabytes-gigabytes
+     * @param  [int]  $size   The file size in bytes
+     * @param  integer $precision The precision to go to
+     * @return [string] The Formatted string with suffix
+     */
+    public static function formatBytes($size, $precision = 2) 
+    {
+        if ($size == 0)
+            return 0;
+
+        $base = log($size) / log(1024);
+        $suffixes = array('', 'k', 'M', 'G', 'T');   
+
+        return round(pow(1024, $base - floor($base)), $precision) . $suffixes[floor($base)];
+    }
+
+    public static function uniqueId() 
+    {
+        return uniqid(rand());
+    }
 }
 ?>

=== modified file 'server/lib/app/modulemanager.class.php'
--- server/lib/app/modulemanager.class.php	2014-03-08 14:41:11 +0000
+++ server/lib/app/modulemanager.class.php	2014-10-21 16:06:16 +0000
@@ -22,7 +22,6 @@
 
 class ModuleManager
 {
-    private $db;
     private $user;
     
     public $message;
@@ -34,13 +33,11 @@
     /**
      * Constructs the Module Manager.
      * @return 
-     * @param $db Object
      * @param $user Object
      */
-    public function __construct(database $db, User $user, $regionSpecific = -1, $module = '', $assignable = 1)
+    public function __construct(User $user, $regionSpecific = -1, $module = '', $assignable = 1)
     {
-        $this->db       =& $db;
-        $this->user     =& $user;
+        $this->user =& $user;
             
         if (!$this->theMenu = $user->ModuleAuth($regionSpecific, $module, $assignable))
         {

=== modified file 'server/lib/app/permissionmanager.class.php'
--- server/lib/app/permissionmanager.class.php	2014-01-18 09:47:41 +0000
+++ server/lib/app/permissionmanager.class.php	2014-10-21 16:06:16 +0000
@@ -22,7 +22,6 @@
 
 class PermissionManager
 {
-    private $db;
     private $user;
     
     public $ownerId;
@@ -38,9 +37,8 @@
      * @param $db Object
      * @param $user Object
      */
-    public function __construct(database $db, User $user)
+    public function __construct(User $user)
     {
-        $this->db       =& $db;
         $this->user 	=& $user;
 
         $this->view = false;

=== modified file 'server/lib/app/responsemanager.class.php'
--- server/lib/app/responsemanager.class.php	2014-08-11 18:44:46 +0000
+++ server/lib/app/responsemanager.class.php	2014-10-21 16:06:16 +0000
@@ -54,6 +54,7 @@
 	public $focusInFirstInput;
     public $appendHiddenSubmit;
     public $modal;
+    public $nextToken;
 	
 	public $login;
 	public $clockUpdate;
@@ -199,7 +200,7 @@
 		$this->message			= $message;
 		$this->refresh			= $refresh;
 		$this->refreshLocation 	= $refreshLocation;
-		
+		$this->nextToken = Kit::Token();	
 		return;
 	}
 	
@@ -317,6 +318,7 @@
 			$response['refreshLocation']= $this->refreshLocation;
 			$response['focusInFirstInput']= $this->focusInFirstInput;
 			$response['modal'] = $this->modal;
+			$response['nextToken'] = $this->nextToken;
 			
 			// Login
 			$response['login']			= $this->login;

=== modified file 'server/lib/app/session.class.php'
--- server/lib/app/session.class.php	2014-06-15 14:39:41 +0000
+++ server/lib/app/session.class.php	2014-10-21 16:06:16 +0000
@@ -160,8 +160,9 @@
 				// we do not want to update the expiry time of a session if it is the Clock Timer going off
 				$page = Kit::GetParam('p', _REQUEST, _WORD);
 				$query = Kit::GetParam('q', _REQUEST, _WORD);
+				$autoRefresh = (isset($_REQUEST['autoRefresh']) && Kit::GetParam('autoRefresh', _REQUEST, _WORD, 'false') == 'true');
 
-				if (($page == 'clock' && $query == 'GetClock') || ($page == 'index' && $query == 'PingPong') || ($page == 'layout' && $query == 'LayoutStatus')) {
+				if ($autoRefresh || ($page == 'clock' && $query == 'GetClock') || ($page == 'index' && $query == 'PingPong') || ($page == 'layout' && $query == 'LayoutStatus')) {
 
 					// Update the existing session without the expiry
 					$SQL  = "UPDATE session SET session_data = :session_data WHERE session_id = :session_id ";
@@ -336,10 +337,16 @@
      * @param type $secondKey
      * @return boolean
      */
-    public static function Get($key, $secondKey)
+    public static function Get($key, $secondKey = NULL)
     {
-        if (isset($_SESSION[$key][$secondKey]))
-            return $_SESSION[$key][$secondKey];
+    	if ($secondKey != NULL) {
+        	if (isset($_SESSION[$key][$secondKey]))
+	            return $_SESSION[$key][$secondKey];
+	    }
+	    else {
+	    	if (isset($_SESSION[$key]))
+	            return $_SESSION[$key];	
+	    }
         
         return false;
     }        

=== modified file 'server/lib/app/thememanager.class.php'
--- server/lib/app/thememanager.class.php	2014-08-17 12:38:20 +0000
+++ server/lib/app/thememanager.class.php	2014-10-21 16:06:16 +0000
@@ -152,6 +152,46 @@
 	}
 
 	/**
+	 * Get Item Path
+	 * @param string $item The Item required
+	 */
+	public static function ItemPath($item) {
+
+		$theme = Theme::GetInstance();
+		
+		// See if we have the requested file in the theme folder
+		if (file_exists('theme/' . $theme->name . '/' . $item)) {
+			return 'theme/' . $theme->name . '/' . $item;
+		}
+		// If not, then use the default folder
+		elseif (file_exists('theme/default/' . $item)) {
+			return 'theme/default/' . $item;
+		}
+		else
+			return '';
+	}
+
+	/**
+	 * Get Item Path
+	 * @param string $item The Item required
+	 */
+	public static function Script($item) {
+
+		$theme = Theme::GetInstance();
+		
+		// See if we have the requested file in the theme folder
+		if (file_exists('theme/' . $theme->name . '/' . $item)) {
+			return '<script src="theme/' . $theme->name . '/' . $item . '"></script>';
+		}
+		// If not, then use the default folder
+		elseif (file_exists('theme/default/' . $item)) {
+			return '<script src="theme/default/' . $item . '"></script>';
+		}
+		else
+			return '';
+	}
+
+	/**
 	 * Translate a string into the user language
 	 * @param string $string The String to Translate
 	 * @param array $args   Variables to insert (will replace %d %s in order)
@@ -181,6 +221,22 @@
 		return $return;
 	}
 
+	public static function SetTranslation($key, $value) {
+		// Get existing translations
+		$translations = Theme::Get('translations');
+
+		if ($translations == '') {
+			$translations = array();
+		}
+		else {
+			$translations = json_decode($translations, true);
+		}
+
+		$translations[$key] = $value;
+
+		Theme::Set('translations', json_encode($translations));
+	}
+
 	public static function Prepare($string) {
 		return htmlspecialchars($string);
 	}

=== modified file 'server/lib/app/translationengine.class.php'
--- server/lib/app/translationengine.class.php	2014-08-17 12:38:20 +0000
+++ server/lib/app/translationengine.class.php	2014-10-21 16:06:16 +0000
@@ -27,85 +27,86 @@
  
 class TranslationEngine
 {	
+    private static $locale;
+    private static $jsLocale;
+
 	/**
 	 * Gets and Sets the Local 
 	 * @return 
 	 */
 	public static function InitLocale($language = NULL)
 	{
-            $localeDir	= 'locale';
-            $default = ($language == NULL) ? Config::GetSetting('DEFAULT_LANGUAGE') : $language;
-            
-            global $transEngine;
-            global $stream;
-
-            //Debug::LogEntry('audit', 'IN', 'TranslationEngine', 'InitLocal');
-
-            // Try to get the local firstly from _REQUEST (post then get)
-            $lang = Kit::GetParam('lang', _REQUEST, _WORD, '');
-
-            // Build an array of supported languages
-            $supportedLangs = scandir($localeDir);
-
-            if ($lang != '')
-            {
-                // Set the language
-                //Debug::LogEntry('audit', 'Set the Language from REQUEST [' . $lang . ']', 'TranslationEngine', 'InitLocal');
-
-                // Is this language supported?
-                // if not just use the default (eb_GB).
-                if (!in_array($lang . '.mo', $supportedLangs))
-                {
-                    trigger_error(sprintf('Language not supported. %s', $lang));
-
-                    // Use the default language instead.
-                    $lang = $default;
-                }
-            }
-            else
-            {
-                $langs = Kit::GetParam('HTTP_ACCEPT_LANGUAGE', $_SERVER, _STRING);
-
-                if ($langs != '')
-                {
-                    //Debug::LogEntry('audit', ' HTTP_ACCEPT_LANGUAGE [' . $langs . ']', 'TranslationEngine', 'InitLocal');
-                    $langs = explode(',', $langs);
-
-                    foreach ($langs as $lang)
-                    {
-                        // Remove any quality rating (as we aren't interested)
-                        $rawLang = explode(';', $lang);
-                        $lang = str_replace("-", "_", $rawLang[0]);
-
-                        if (in_array($lang . '.mo', $supportedLangs))
-                        {
-                            //Debug::LogEntry('audit', 'Obtained the Language from HTTP_ACCEPT_LANGUAGE [' . $lang . ']', 'TranslationEngine', 'InitLocal');
-                            break;
-                        }
-
-                        // Set lang as the default
-                        $lang = $default;
+        $localeDir	= 'locale';
+        $default = ($language == NULL) ? Config::GetSetting('DEFAULT_LANGUAGE') : $language;
+        
+        global $transEngine;
+        global $stream;
+
+        //Debug::LogEntry('audit', 'IN', 'TranslationEngine', 'InitLocal');
+        // Build an array of supported languages
+        $supportedLangs = scandir($localeDir);
+
+        // Try to get the local firstly from _REQUEST (post then get)
+        $lang = Kit::GetParam('lang', _REQUEST, _WORD, '');
+
+        // If we don't have a language, try from HTTP accept
+        if ($lang == '' && Config::GetSetting('DETECT_LANGUAGE') == 1) {
+            $langs = Kit::GetParam('HTTP_ACCEPT_LANGUAGE', $_SERVER, _STRING);
+
+            if ($langs != '') {
+                //Debug::LogEntry('audit', ' HTTP_ACCEPT_LANGUAGE [' . $langs . ']', 'TranslationEngine', 'InitLocal');
+                $langs = explode(',', $langs);
+
+                foreach ($langs as $lang) {
+                    // Remove any quality rating (as we aren't interested)
+                    $rawLang = explode(';', $lang);
+                    $lang = str_replace('-', '_', $rawLang[0]);
+
+                    if (in_array($lang . '.mo', $supportedLangs)) {
+                        //Debug::LogEntry('audit', 'Obtained the Language from HTTP_ACCEPT_LANGUAGE [' . $lang . ']', 'TranslationEngine', 'InitLocal');
+                        break;
                     }
-                }
-                else
-                {
+
+                    // Set lang as the default
                     $lang = $default;
                 }
             }
-
-            // We have the language
-            //Debug::LogEntry('audit', 'Creating new file streamer for '. $localeDir . '/' . $lang . '.mo', 'TranslationEngine', 'InitLocal');
-
-            if (!$stream = new CachedFileReader($localeDir . '/' . $lang . '.mo'))
-            {
-                trigger_error('Unable to translate this language');
-                $transEngine = false;
-                
-                return;
-            }
-
-            $transEngine    = new gettext_reader($stream);
+        }
+
+        // Are we still empty?
+        if ($lang == '')
+            $lang = $default;
+
+        // Sanitize it
+        $lang = str_replace('-', '_', $lang);
+        $jsLang = str_replace('_', '-', $lang);
+
+        // Check its valid
+        if (!in_array($lang . '.mo', $supportedLangs)) {
+            trigger_error(sprintf('Language not supported. %s', $lang));
+
+            // Fall back
+            $lang = 'en_GB';
+        }
+
+        //Debug::LogEntry('audit', 'Creating new file streamer for '. $localeDir . '/' . $lang . '.mo', 'TranslationEngine', 'InitLocal');
+        if (!$stream = new CachedFileReader($localeDir . '/' . $lang . '.mo')) {
+            $transEngine = false;
+            return;
+        }
+
+        $transEngine = new gettext_reader($stream);
+        self::$locale = $lang;
+        self::$jsLocale = str_replace('_', '-', $lang);
 	}
+
+    public static function GetLocale() {
+        return self::$locale;
+    }
+
+    public static function GetJsLocale() {
+        return self::$jsLocale;
+    }
 }
 
 /**

=== modified file 'server/lib/data/campaign.data.class.php'
--- server/lib/data/campaign.data.class.php	2014-01-18 09:47:41 +0000
+++ server/lib/data/campaign.data.class.php	2014-10-21 16:06:16 +0000
@@ -97,12 +97,14 @@
                 throw new Exception(__('Unable to Unlink'));
 
             // Remove all permissions
-            Kit::ClassLoader('campaignsecurity');
             $security = new CampaignSecurity($this->db);
 
             if (!$security->UnlinkAll($campaignId))
                 throw new Exception(__('Unable to set permissions'));
 
+            // Remove from all Schedules
+            Schedule::DeleteScheduleForCampaign($campaignId);
+
             // Delete from the Campaign
             $sth = $dbh->prepare('DELETE FROM `campaign` WHERE CampaignID = :campaignid');
             $sth->execute(array(

=== modified file 'server/lib/data/campaignsecurity.data.class.php'
--- server/lib/data/campaignsecurity.data.class.php	2014-01-18 09:47:41 +0000
+++ server/lib/data/campaignsecurity.data.class.php	2014-10-21 16:06:16 +0000
@@ -22,6 +22,15 @@
 
 class CampaignSecurity extends Data
 {
+    public function GetPermissions($objectId)
+    {
+        $userGroup = new UserGroup();
+        if (!$result = $userGroup->GetPermissionsForObject('lkcampaigngroup', 'CampaignID', $objectId))
+            return $this->SetError($userGroup->GetErrorMessage());
+
+        return $result;
+    }
+
     /**
      * Links a Campaign to a Group
      * @return

=== modified file 'server/lib/data/datasetdata.data.class.php'
--- server/lib/data/datasetdata.data.class.php	2014-08-06 11:57:27 +0000
+++ server/lib/data/datasetdata.data.class.php	2014-10-21 16:06:16 +0000
@@ -355,6 +355,10 @@
                 $rowNumber++;
             }
 
+            // Close the file
+            fclose($handle);
+
+            // Change the auto detect setting back
             ini_set('auto_detect_line_endings', false);
 
             // Delete the temporary file

=== modified file 'server/lib/data/datasetgroupsecurity.data.class.php'
--- server/lib/data/datasetgroupsecurity.data.class.php	2014-07-10 21:09:24 +0000
+++ server/lib/data/datasetgroupsecurity.data.class.php	2014-10-21 16:06:16 +0000
@@ -27,46 +27,24 @@
         if ($dataSetId == 0 || $dataSetId == '')
             return $this->SetError(25001, __('Missing dataSetId'));
 
-        try {
-            $dbh = PDOConnect::init();
-
-            $sth = $dbh->prepare('SELECT `group`.groupid, `group`.`group`, view, edit, del, `group`.isuserspecific
-              FROM `group`
-               LEFT OUTER JOIN lkdatasetgroup
-               ON lkdatasetgroup.GroupID = group.GroupID
-                   AND lkdatasetgroup.DataSetID = :datasetid
-             WHERE `group`.GroupID <> :groupid
-            ORDER BY `group`.IsEveryone DESC, `group`.IsUserSpecific, `group`.`Group`');
-
-            $sth->execute(array(
-                    'datasetid' => $dataSetId,
-                    'groupid' => $groupId
-                ));
-
-            $security = array();
-
-            foreach($sth->fetchAll() as $row) {
-                $security[] = array(
-                        'groupid' => Kit::ValidateParam($row['groupid'], _INT),
-                        'group' => Kit::ValidateParam($row['group'], _STRING),
-                        'view' => Kit::ValidateParam($row['view'], _INT),
-                        'edit' => Kit::ValidateParam($row['edit'], _INT),
-                        'del' => Kit::ValidateParam($row['del'], _INT),
-                        'isuserspecific' => Kit::ValidateParam($row['isuserspecific'], _INT),
-                    );
-            }
-          
-            return $security;
-        }
-        catch (Exception $e) {
-            
-            Debug::LogEntry('error', $e->getMessage());
-        
-            if (!$this->IsError())
-                $this->SetError(1, __('Unknown Error'));
-        
-            return false;
-        }
+        $userGroup = new UserGroup();
+        if (!$result = $userGroup->GetPermissionsForObject('lkdatasetgroup', 'DataSetID', $dataSetId))
+            return $this->SetError($userGroup->GetErrorMessage());
+
+        $security = array();
+
+        foreach($result as $row) {
+            $security[] = array(
+                    'groupid' => Kit::ValidateParam($row['groupid'], _INT),
+                    'group' => Kit::ValidateParam($row['group'], _STRING),
+                    'view' => Kit::ValidateParam($row['view'], _INT),
+                    'edit' => Kit::ValidateParam($row['edit'], _INT),
+                    'del' => Kit::ValidateParam($row['del'], _INT),
+                    'isuserspecific' => Kit::ValidateParam($row['isuserspecific'], _INT),
+                );
+        }
+      
+        return $security;
     }
 
     /**

=== modified file 'server/lib/data/display.data.class.php'
--- server/lib/data/display.data.class.php	2014-09-16 10:59:55 +0000
+++ server/lib/data/display.data.class.php	2014-10-21 16:06:16 +0000
@@ -63,6 +63,7 @@
     public $screenShotRequested;
 
     public $displayGroupId;
+    private $_config;
     
     public function Load() {
         try {
@@ -105,7 +106,7 @@
             $this->wakeOnLanTime = Kit::ValidateParam($row['WakeOnLanTime'], _STRING);
             $this->broadCastAddress = Kit::ValidateParam($row['BroadCastAddress'], _STRING);
             $this->secureOn = Kit::ValidateParam($row['SecureOn'], _STRING);
-            $this->cidr = Kit::ValidateParam($row['Cidr'], _INT);
+            $this->cidr = Kit::ValidateParam($row['Cidr'], _STRING);
             $this->latitude = Kit::ValidateParam($row['Latitude'], _DOUBLE);
             $this->longitude = Kit::ValidateParam($row['Longitude'], _DOUBLE);
             $this->versionInstructions = Kit::ValidateParam($row['version_instructions'], _STRING);
@@ -656,7 +657,137 @@
         
             return false;
         }
-
+    }
+
+    public function GetSetting($key, $default) {
+
+        if (!$this->SetConfig())
+            return false;
+
+        // Find
+        $return = $default;
+        foreach($this->_config as $row) {
+            if ($row['name'] == $key || $row['name'] == ucfirst($key)) {
+                //Debug::Audit('Found ' . $key . '. value= ' . $row['value']);
+                $return = $row['value'];
+                break;
+            }
+        }
+
+        return $return;
+    }
+
+    private function SetConfig() {
+        if ($this->_config == null) {
+            try {
+                $dbh = PDOConnect::init();
+
+                $displayProfile = new DisplayProfile();
+                $displayProfile->displayProfileId = $this->displayProfileId;
+            
+                if ($displayProfile->displayProfileId == 0) {
+                    // Load the default profile
+                    $displayProfile->type = $this->clientType;
+                    $displayProfile->LoadDefault();
+                }
+                else {
+                    // Load the specified profile
+                    $displayProfile->Load();
+                }
+        
+                $this->_config = $displayProfile->config;
+                
+                return true;
+            }
+            catch (Exception $e) {
+                
+                Debug::LogEntry('error', $e->getMessage(), get_class(), __FUNCTION__);
+            
+                if (!$this->IsError())
+                    $this->SetError(1, __('Unknown Error'));
+            
+                return false;
+            }
+        }
+    }
+    /**
+     * Assess each Display to correctly set the logged in flag based on last accessed time
+     * @return
+     */
+    public static function ValidateDisplays() {
+        // Maintain an array of timed out displays
+        $timedOutDisplays = array();
+
+        try {
+            $dbh = PDOConnect::init();
+            $statObject = new Stat();
+        
+            // Get a list of all displays and there last accessed / alert time out value
+            $sth = $dbh->prepare('SELECT displayid, display, lastaccessed, alert_timeout, client_type, displayprofileid, email_alert, loggedin FROM display');
+            $sthUpdate = $dbh->prepare('UPDATE display SET loggedin = 0 WHERE displayid = :displayid');
+            
+            $sth->execute(array());
+
+            // Get the global time out (overrides the alert time out on the display if 0)
+            $globalTimeout = Config::GetSetting('MAINTENANCE_ALERT_TOUT') * 60;
+        
+            $displays = $sth->fetchAll();
+
+            foreach ($displays as $row) {
+                $displayid = Kit::ValidateParam($row['displayid'], _INT);
+                $lastAccessed = Kit::ValidateParam($row['lastaccessed'], _INT);
+                $alertTimeout = Kit::ValidateParam($row['alert_timeout'], _INT);
+                $clientType = Kit::ValidateParam($row['client_type'], _WORD);
+                $loggedIn = Kit::ValidateParam($row['loggedin'], _INT);
+
+                // Get the config object
+                if ($alertTimeout == 0) {
+                    $displayProfileId = (empty($row['displayprofileid']) ? 0 : Kit::ValidateParam($row['displayprofileid'], _INT));
+
+                    $display = new Display();
+                    $display->displayId = $displayid;
+                    $display->displayProfileId = $displayProfileId;
+                    $display->clientType = $clientType;
+                    $timeoutToTestAgainst = $display->GetSetting('collectInterval', $globalTimeout);
+                }
+                else {
+                    $timeoutToTestAgainst = $globalTimeout;
+                }
+
+                // Store the time out to test against
+                $row['timeout'] = $timeoutToTestAgainst;
+                $timeOut = $lastAccessed + $timeoutToTestAgainst;
+    
+                // If the last time we accessed is less than now minus the time out
+                if ($timeOut < time()) {
+                    Debug::Audit('Timed out display. Last Accessed: ' . date('Y-m-d h:i:s', $lastAccessed) . '. Time out: ' . date('Y-m-d h:i:s', $timeOut));
+
+                    // If this is the first switch (i.e. the row was logged in before)
+                    if ($loggedIn == 1) {
+                        
+                        // Update the display and set it as logged out
+                        $sthUpdate->execute(array('displayid' => $displayid));
+                       
+                        // Log the down event
+                        $statObject->displayDown($displayid, $lastAccessed);
+                    }
+
+                    // Store this row
+                    $timedOutDisplays[] = $row;
+                }
+            }
+
+            return $timedOutDisplays;  
+        }
+        catch (Exception $e) {
+            
+            Debug::LogEntry('error', $e->getMessage(), get_class(), __FUNCTION__);
+            
+            if (!$this->IsError())
+                $this->SetError(1, __('Unknown Error'));
+        
+            return false;
+        }
     }
 
     /**

=== modified file 'server/lib/data/displayprofile.data.class.php'
--- server/lib/data/displayprofile.data.class.php	2014-08-07 11:58:10 +0000
+++ server/lib/data/displayprofile.data.class.php	2014-10-21 16:06:16 +0000
@@ -39,6 +39,8 @@
 
     public function Load() {
 
+        Debug::Audit('Load ' . $this->displayProfileId);
+
         try {
             $dbh = PDOConnect::init();
         
@@ -75,6 +77,59 @@
 
     }
 
+    public function LoadDefault() {
+
+        Debug::Audit('Load Default');
+
+        try {
+            $dbh = PDOConnect::init();
+        
+            $sth = $dbh->prepare('SELECT * FROM `displayprofile` WHERE type = :type AND IsDefault = 1');
+            $sth->execute(array(
+                    'type' => $this->displayProfileId
+                ));
+          
+            if (!$row = $sth->fetch()) {
+                // Return the client default
+                include_once('config/client.config.php');
+                $this->name = $CLIENT_CONFIG[$this->type]['synonym'];
+                $this->type = $this->type;
+                $this->config = $CLIENT_CONFIG[$this->type]['settings'];
+                $this->isDefault = 1;
+                $this->userId = 1;
+
+                // Just populate the values with the defaults if the values aren't set already
+                for ($i = 0; $i < count($this->config); $i++) { 
+                    $this->config[$i]['value'] = isset($this->config[$i]['value']) ? $this->config[$i]['value'] : $this->config[$i]['default'];
+                }
+            }
+            else {
+                $this->name = Kit::ValidateParam($row['name'], _STRING);
+                $this->type = Kit::ValidateParam($row['type'], _STRING);
+                $this->config = Kit::ValidateParam($row['config'], _HTMLSTRING);
+                $this->isDefault = Kit::ValidateParam($row['isdefault'], _INT);
+                $this->userId = Kit::ValidateParam($row['userid'], _INT);
+
+                // Load the client settings into an array
+                $this->config = ($this->config == '') ? array() : json_decode($this->config, true);
+
+                $this->isNew = false;
+            }
+
+            return true;
+        }
+        catch (Exception $e) {
+            
+            Debug::LogEntry('error', $e->getMessage());
+        
+            if (!$this->IsError())
+                $this->SetError(1, __('Unknown Error'));
+        
+            return false;
+        }
+
+    }
+
     public function Save() {
 
         // Validation.

=== modified file 'server/lib/data/layout.data.class.php'
--- server/lib/data/layout.data.class.php	2014-09-16 16:41:43 +0000
+++ server/lib/data/layout.data.class.php	2014-10-21 16:06:16 +0000
@@ -19,19 +19,13 @@
  * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
  */ 
 defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
+Kit::ClassLoader('campaign');
 
 class Layout extends Data
 {
     private $xml;
     private $DomXml;
 
-    public function  __construct($db)
-    {
-        Kit::ClassLoader('campaign');
-
-        parent::__construct($db);
-    }
-
     /**
      * Add a layout
      * @param <type> $layout
@@ -543,10 +537,7 @@
             $campaign = new Campaign($this->db);
     
             // Include to media data class?
-            if ($copyMedia)
-            {
-                Kit::ClassLoader('media');
-                Kit::ClassLoader('mediagroupsecurity');
+            if ($copyMedia) {
                 $mediaObject = new Media($this->db);
                 $mediaSecurity = new MediaGroupSecurity($this->db);
             }
@@ -554,11 +545,6 @@
             // We need the old campaignid
             $oldCampaignId = $campaign->GetCampaignId($oldLayoutId);
     
-            // Permissions model
-            Kit::ClassLoader('campaignsecurity');
-            Kit::ClassLoader('layoutregiongroupsecurity');
-            Kit::ClassLoader('layoutmediagroupsecurity');
-    
             // The Layout ID is the old layout
             $SQL  = "";
             $SQL .= " INSERT INTO layout (layout, xml, userID, description, tags, templateID, retired, duration, backgroundImageId, createdDT, modifiedDT, status) ";
@@ -613,7 +599,7 @@
                 if ($this->IsRegionSpecific($type))
                 {
                     // Generate a new media id
-                    $newMediaId = md5(uniqid());
+                    $newMediaId = md5(Kit::uniqueId());
                     
                     $mediaNode->setAttribute('id', $newMediaId);
     
@@ -740,12 +726,14 @@
             if ($layoutId == 0)
                 $this->ThrowError(__('No Layout selected'));
         
+            // Security
             $sth = $dbh->prepare('DELETE FROM lklayoutmediagroup WHERE layoutid = :layoutid');
             $sth->execute(array('layoutid' => $layoutId));
 
             $sth = $dbh->prepare('DELETE FROM lklayoutregiongroup WHERE layoutid = :layoutid');
             $sth->execute(array('layoutid' => $layoutId));
 
+            // Media Links
             $sth = $dbh->prepare('DELETE FROM lklayoutmedia WHERE layoutid = :layoutid');
             $sth->execute(array('layoutid' => $layoutId));
         
@@ -756,6 +744,10 @@
             // Remove the Campaign (will remove links to this layout - orphaning the layout)
             if (!$campaign->Delete($campaignId))
                 $this->ThrowError(25008, __('Unable to delete campaign'));
+
+            // Remove the Layout from any display defaults
+            $sth = $dbh->prepare('UPDATE `display` SET defaultlayoutid = 4 WHERE defaultlayoutid = :layoutid');
+            $sth->execute(array('layoutid' => $layoutId));
     
             // Remove the Layout (now it is orphaned it can be deleted safely)
             $sth = $dbh->prepare('DELETE FROM layout WHERE layoutid = :layoutid');
@@ -1236,7 +1228,7 @@
             $fileName = $libraryPath . 'temp/export_' . Kit::ValidateParam($row['layout'], _FILENAME) . '.zip';
 
             $zip = new ZipArchive();
-            $zip->open($fileName, ZIPARCHIVE::OVERWRITE);        
+            $zip->open($fileName, ZIPARCHIVE::OVERWRITE);
             $zip->addFromString('layout.xml', $xml);
 
             $params = array('layoutid' => $layoutId);    

=== modified file 'server/lib/data/maintenance.data.class.php'
--- server/lib/data/maintenance.data.class.php	2014-01-18 09:47:41 +0000
+++ server/lib/data/maintenance.data.class.php	2014-10-21 16:06:16 +0000
@@ -28,27 +28,78 @@
      */
     public function BackupDatabase($saveAs = "string")
     {
-        // Always truncate the log first
-        $this->db->query("TRUNCATE TABLE `log` ");
-        $this->db->query("TRUNCATE TABLE `oauth_log` ");
-
+        // Check we can run mysql
+        if (!function_exists('exec'))
+            return $this->SetError(__('Exec is not available.'));
+        
+        // Global database variables to seed into exec
         global $dbhost;
         global $dbuser;
         global $dbpass;
         global $dbname;
 
-        // Run mysqldump to a temporary file
-
         // get temporary file
-        $tempFile = tempnam(Config::GetSetting('LIBRARY_LOCATION'), 'dmp');
-
-        exec('mysqldump --opt --host=' . $dbhost . ' --user=' . $dbuser . ' --password=' . $dbpass . ' ' . $dbname . ' > ' . escapeshellarg($tempFile) . ' ');
-
-        $sqlDump = file_get_contents($tempFile);
-
-        unlink($tempFile);
-
-        return $sqlDump;
+        $fileNameStructure = Config::GetSetting('LIBRARY_LOCATION') . 'structure.dump';
+        $fileNameData = Config::GetSetting('LIBRARY_LOCATION') . 'data.dump';
+        $zipFile = 'database.tar.gz';
+
+        // Run mysqldump structure to a temporary file
+        $command = 'mysqldump --opt --host=' . $dbhost . ' --user=' . $dbuser . ' --password=' . addslashes($dbpass) . ' ' . $dbname . ' --no-data > ' . escapeshellarg($fileNameStructure) . ' ';
+        exec($command);
+        
+        // Run mysqldump data to a temporary file
+        $command = 'mysqldump --opt --host=' . $dbhost . ' --user=' . $dbuser . ' --password=' . addslashes($dbpass) . ' ' . $dbname . ' --ignore-table=' . $dbname . '.log --ignore-table=' . $dbname . '.oauth_log  > ' . escapeshellarg($fileNameData) . ' ';
+        exec($command);
+
+        // Check it worked
+        if (!file_exists($fileNameStructure) || !file_exists($fileNameData))
+            return $this->SetError(__('Database dump failed.'));
+
+        // Zippy
+        Debug::Audit($zipFile);
+        $zip = new ZipArchive();
+        $zip->open($zipFile, ZIPARCHIVE::OVERWRITE);
+        $zip->addFile($fileNameStructure, 'structure.dump');
+        $zip->addFile($fileNameData, 'data.dump');
+        $zip->close();
+
+        // Remove the dump file
+        unlink($fileNameStructure);
+        unlink($fileNameData);
+
+        // Uncomment only if you are having permission issues
+        // chmod($zipFile, 0777);
+
+        // Push file back to browser
+        if (ini_get('zlib.output_compression')) {
+            ini_set('zlib.output_compression', 'Off');
+        }
+
+        $size = filesize($zipFile);
+
+        header('Content-Type: application/octet-stream');
+        header("Content-Transfer-Encoding: Binary"); 
+        header("Content-disposition: attachment; filename=\"" . basename($zipFile) . "\"");
+
+        //Output a header
+        header('Pragma: public');
+        header('Cache-Control: max-age=86400');
+        header('Expires: '. gmdate('D, d M Y H:i:s \G\M\T', time() + 86400));
+        header('Content-Length: ' . $size);
+        
+        // Send via Apache X-Sendfile header?
+        if (Config::GetSetting('SENDFILE_MODE') == 'Apache') {
+            header("X-Sendfile: $zipFile");
+            exit();
+        }
+        
+        // Return the file with PHP
+        // Disable any buffering to prevent OOM errors.
+        @ob_end_clean();
+        @ob_end_flush();
+        readfile($zipFile);
+
+        exit;
     }
 
     /**
@@ -69,5 +120,95 @@
 
         return true;
     }
+
+    public function TidyLibrary($tidyOldRevisions) {
+        // Also run a script to tidy up orphaned media in the library
+        $library = Config::GetSetting('LIBRARY_LOCATION');
+        $library = rtrim($library, '/') . '/';
+        $mediaObject = new Media();
+
+        Debug::Audit('Library Location: ' . $library);
+
+        // Dump the files in the temp folder
+        foreach (scandir($library . 'temp') as $item) {
+            if ($item == '.' || $item == '..')
+                continue;
+
+            Debug::Audit('Deleting temp file: ' . $item);
+
+            unlink($library . 'temp' . DIRECTORY_SEPARATOR . $item);
+        }
+
+        $media = array();
+        $unusedMedia = array();
+
+        // Run a query to get an array containing all of the media in the library
+        try {
+            $dbh = PDOConnect::init();
+        
+            $sth = $dbh->prepare('
+                SELECT media.mediaid, media.storedAs, media.type, media.isedited, COUNT(lklayoutmedia.lklayoutmediaid) AS UsedInLayoutCount 
+                  FROM `media` 
+                    LEFT OUTER JOIN `lklayoutmedia`
+                    ON lklayoutmedia.mediaid = media.mediaid
+                GROUP BY media.mediaid, media.storedAs ');
+
+            $sth->execute(array());
+
+            foreach ($sth->fetchAll() as $row) {
+                $media[$row['storedAs']] = $row;
+                
+                // If its not used in a layout and its not a generic module, add to the unused array.
+                if ($tidyOldRevisions && $row['UsedInLayoutCount'] <= 0 && $row['isedited'] > 0 && $row['type'] != 'module' && $row['type'] != 'font')
+                    $unusedMedia[$row['storedAs']] = $row;
+            }
+        }
+        catch (Exception $e) {
+            
+            Debug::LogEntry('error', $e->getMessage());
+        
+            if (!$this->IsError())
+                $this->SetError(1, __('Unknown Error'));
+        
+            return false;
+        }
+
+        //Debug::Audit(var_export($media, true));
+        //Debug::Audit(var_export($unusedMedia, true));
+
+        // Get a list of all media files
+        foreach(scandir($library) as $file) {
+
+            if ($file == '.' || $file == '..')
+                continue;
+
+            if (is_dir($library . $file))
+                continue;
+
+            // Ignore thumbnails
+            if (strstr($file, 'tn_') || strstr($file, 'bg_'))
+                continue;
+            
+            // Is this file in the system anywhere?
+            if (!array_key_exists($file, $media)) {
+                // Totally missing
+                Debug::Audit('Deleting file: ' . $file);
+                
+                // If not, delete it
+                $mediaObject->DeleteMediaFile($file);
+            }
+            else if (array_key_exists($file, $unusedMedia)) {
+                // It exists but isn't being used any more
+                Debug::Audit('Deleting media: ' . $media[$file]['mediaid']);
+                $mediaObject->Delete($media[$file]['mediaid']);
+            }
+            else {
+                // Don't do anything, this file still exists
+                //Debug::Audit('Still exists: ' . $file);
+            }
+        }
+
+        return true;
+    }
 }
 ?>

=== modified file 'server/lib/data/media.data.class.php'
--- server/lib/data/media.data.class.php	2014-07-24 16:23:27 +0000
+++ server/lib/data/media.data.class.php	2014-10-21 16:06:16 +0000
@@ -22,6 +22,8 @@
 
 class Media extends Data
 {
+    private $_moduleFiles;
+
     private $moduleInfoLoaded;
     private $regionSpecific;
     private $validExtensions;
@@ -80,7 +82,7 @@
                 $this->ThrowError(10, __('The name cannot be longer than 100 characters'));
     
             // Test the duration (except for video and localvideo which can have a 0)
-            if ($duration == 0 && $type != 'video' && $type != 'localvideo' && $type != 'genericfile')
+            if ($duration == 0 && $type != 'video' && $type != 'localvideo' && $type != 'genericfile' && $type != 'font')
                 $this->ThrowError(11, __('You must enter a duration.'));
     
             // Check the naming of this item to ensure it doesnt conflict
@@ -193,7 +195,7 @@
             if (strlen($name) > 100)
                 $this->ThrowError(10, __('The name cannot be longer than 100 characters'));
     
-            if ($duration == 0 && $type != 'video' && $type != 'localvideo' && $type != 'genericfile')
+            if ($duration == 0 && $type != 'video' && $type != 'localvideo' && $type != 'genericfile' && $type != 'font')
                 $this->ThrowError(11, __('You must enter a duration.'));
     
             // Any media (not this one) already has this name?
@@ -330,8 +332,6 @@
     {
         Debug::LogEntry('audit', 'IN', 'Media', 'Delete');
         
-        Kit::ClassLoader('lkmediadisplaygroup');
-
         try {
             $dbh = PDOConnect::init();
         
@@ -357,7 +357,6 @@
             $fileName = Kit::ValidateParam($row['StoredAs'], _STRING);
     
             // Remove permission assignments
-            Kit::ClassLoader('mediagroupsecurity');
             $security = new MediaGroupSecurity($this->db);
     
             if (!$security->UnlinkAll($mediaId))
@@ -648,5 +647,102 @@
             return false;
         }
     }
+
+    public function AddModuleFile($file, $force = false) {
+        try {
+            $name = basename($file);
+
+            $moduleExists = $this->ModuleFileExists($name);
+
+            if (!$force && $moduleExists) {
+                return;
+            }
+
+            $dbh = PDOConnect::init();
+            $libraryFolder = Config::GetSetting('LIBRARY_LOCATION');
+
+            // Get the name
+            $storedAs = $libraryFolder . $name;
+            
+            // Now copy the file
+            if (!@copy($file, $storedAs))
+                $this->ThrowError(15, 'Error storing file.');
+
+            // Calculate the MD5 and the file size
+            $md5        = md5_file($storedAs);
+            $fileSize   = filesize($storedAs);
+        
+            if ($moduleExists) {
+                $SQL = "UPDATE `media` SET md5 = :md5, filesize = :filesize WHERE storedAs = :storedas ";
+
+                $sth = $dbh->prepare($SQL);
+                $sth->execute(array(
+                        'storedas' => $name,
+                        'filesize' => $fileSize,
+                        'md5' => $md5
+                    ));
+            }
+            else {
+                // All OK to insert this record
+                $SQL  = "INSERT INTO media (name, type, duration, originalFilename, userID, retired, is_module, storedAs, FileSize, MD5) ";
+                $SQL .= "VALUES (:name, :type, :duration, :originalfilename, 1, :retired, 1, :storedas, :filesize, :md5) ";
+
+                $sth = $dbh->prepare($SQL);
+                $sth->execute(array(
+                        'name' => $name,
+                        'type' => 'module',
+                        'duration' => 10,
+                        'originalfilename' => $name,
+                        'retired' => 0,
+                        'storedas' => $name,
+                        'filesize' => $fileSize,
+                        'md5' => $md5
+                    ));
+            }
+
+            $dbh->commit();
+
+            // Add to the cache
+            $this->_moduleFiles[] = $name;
+        }
+        catch (Exception $e) {
+            
+            Debug::LogEntry('error', $e->getMessage(), get_class(), __FUNCTION__);
+        
+            if (!$this->IsError())
+                $this->SetError(1, __('Unknown Error'));
+        
+            return false;
+        }
+    }
+
+    public function ModuleFileExists($file) {
+        try {
+            if ($this->_moduleFiles == NULL || count($this->_moduleFiles) < 1) {
+                $dbh = PDOConnect::init();
+            
+                $sth = $dbh->prepare('SELECT storedAs FROM `media` WHERE type = :type');
+                $sth->execute(array(
+                        'type' => 'module'
+                    ));
+                
+                $this->_moduleFiles = array();
+
+                foreach ($sth->fetchAll() as $moduleFile)
+                    $this->_moduleFiles[] = $moduleFile['storedAs'];
+            }
+
+            return (in_array($file, $this->_moduleFiles));
+        }
+        catch (Exception $e) {
+            
+            Debug::LogEntry('error', $e->getMessage(), get_class(), __FUNCTION__);
+        
+            if (!$this->IsError())
+                $this->SetError(1, __('Unknown Error'));
+        
+            return false;
+        }
+    }
 }
 ?>

=== modified file 'server/lib/data/region.data.class.php'
--- server/lib/data/region.data.class.php	2014-08-11 19:57:05 +0000
+++ server/lib/data/region.data.class.php	2014-10-21 16:06:16 +0000
@@ -20,6 +20,9 @@
  */ 
 defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
 
+require_once("lib/pages/module.class.php");
+Kit::ClassLoader('layout');
+
 class Region extends Data
 {
 	// Caching
@@ -27,14 +30,6 @@
 	private $layoutDocument;
 
 	public $delayFinalise = false;
-
-	public function __construct(database $db) 
-	{
-		$this->db 	=& $db;
-		
-		require_once("lib/pages/module.class.php");
-		Kit::ClassLoader('layout');
-	}
 	
 	/**
 	 * Gets the Xml for the specified layout
@@ -44,7 +39,7 @@
 	public function GetLayoutXml($layoutid)
 	{
 		if ($this->layoutXml == '') {
-			$layout = new Layout($this->db);
+			$layout = new Layout();
 			$this->layoutXml = $layout->GetLayoutXml($layoutid);
 		}
 
@@ -97,7 +92,7 @@
 
         //Do we have a region ID provided?
         if ($regionid == '')
-            $regionid = uniqid();
+            $regionid = Kit::uniqid();
 
         // Validation
 		if (!is_numeric($width) || !is_numeric($height) || !is_numeric($top) || !is_numeric($left))

=== modified file 'server/lib/data/schedule.data.class.php'
--- server/lib/data/schedule.data.class.php	2014-09-05 16:07:36 +0000
+++ server/lib/data/schedule.data.class.php	2014-10-21 16:06:16 +0000
@@ -22,29 +22,29 @@
  
 class Schedule extends Data
 {
-	/**
-	 * Add
-	 * @return 
-	 * @param $displayGroupIDs Object
-	 * @param $fromDT Object
-	 * @param $toDT Object
-	 * @param $layoutID Object
-	 * @param $recType Object
-	 * @param $recDetail Object
-	 * @param $recToDT Object
-	 * @param $isPriority Object
-	 * @param $userID Object
-	 * @param $displayOrder Object
-	 */
-	public function Add($displayGroupIDs, $fromDT, $toDT, $campaignId, $recType, $recDetail, $recToDT, $isPriority, $userID, $displayOrder = 0)
-	{
-		Debug::LogEntry('audit', 'IN', 'Schedule', 'Add');
-		
+    /**
+     * Add
+     * @return 
+     * @param $displayGroupIDs Object
+     * @param $fromDT Object
+     * @param $toDT Object
+     * @param $layoutID Object
+     * @param $recType Object
+     * @param $recDetail Object
+     * @param $recToDT Object
+     * @param $isPriority Object
+     * @param $userID Object
+     * @param $displayOrder Object
+     */
+    public function Add($displayGroupIDs, $fromDT, $toDT, $campaignId, $recType, $recDetail, $recToDT, $isPriority, $userID, $displayOrder = 0)
+    {
+        Debug::LogEntry('audit', 'IN', 'Schedule', 'Add');
+        
         try {
             $dbh = PDOConnect::init();
         
             // Validation
-        	if (count($displayGroupIDs) == 0)
+            if (count($displayGroupIDs) == 0)
                 return $this->SetError(25001, __('No display groups selected'));
     
             if ($userID == 0)
@@ -54,121 +54,124 @@
             if ($recDetail == 0)
                 $recDetail = 1;
     
-    		// make the displayid_list from the selected displays.
-    		$displayGroupIDList = implode(",", $displayGroupIDs);
-
-    		// Parameters for the query
-    		$params = array(
-					'campaignid' => $campaignId,
-					'displaygroupids' => $displayGroupIDList,
-					'userid' => $userID,
-					'is_priority' => $isPriority,
-					'fromdt' => $fromDT,
-					'todt' => $toDT,
-					'displayorder' => $displayOrder
-				);
-    		
-    		$SQL  = "";
-    		$SQL .= "INSERT INTO `schedule` (CampaignId, DisplayGroupIDs, userID, is_priority, FromDT, ToDT, DisplayOrder ";
-    		
-    		// Columns for Recurrence
-    		if ($recType != '' && $recType != 'null') {
-    			$SQL .= ", recurrence_type, recurrence_detail, recurrence_range ";
-    		}
-    		
-    		$SQL .= ") ";
-    		$SQL .= " VALUES ( :campaignid, :displaygroupids, :userid, :is_priority, :fromdt, :todt, :displayorder ";
-    		
-    		// Values for Recurrence
-    		if ($recType != '' && $recType != 'null')
-    		{
-    			$SQL .= ", :recurrence_type, :recurrence_detail, :recurrence_range ";
-    			$params['recurrence_type'] = $recType;
-    			$params['recurrence_detail'] = $recDetail;
-    			$params['recurrence_range'] = $recToDT;
-    		}
-
-    		$SQL .= ")";
-
-    		$sth = $dbh->prepare($SQL);
+            // make the displayid_list from the selected displays.
+            $displayGroupIDList = implode(",", $displayGroupIDs);
+
+            // Parameters for the query
+            $params = array(
+                    'campaignid' => $campaignId,
+                    'displaygroupids' => $displayGroupIDList,
+                    'userid' => $userID,
+                    'is_priority' => $isPriority,
+                    'fromdt' => $fromDT,
+                    'todt' => $toDT,
+                    'displayorder' => $displayOrder
+                );
+            
+            $SQL  = "";
+            $SQL .= "INSERT INTO `schedule` (CampaignId, DisplayGroupIDs, userID, is_priority, FromDT, ToDT, DisplayOrder ";
+            
+            // Columns for Recurrence
+            if ($recType != '' && $recType != 'null') {
+                $SQL .= ", recurrence_type, recurrence_detail, recurrence_range ";
+            }
+            
+            $SQL .= ") ";
+            $SQL .= " VALUES ( :campaignid, :displaygroupids, :userid, :is_priority, :fromdt, :todt, :displayorder ";
+            
+            // Values for Recurrence
+            if ($recType != '' && $recType != 'null')
+            {
+                // Check that we have an end date
+                if ($recToDT == '' || $recToDT == 0)
+                    $this->ThrowError(__('Please provide an until date or set repeats to None'));
+
+                $SQL .= ", :recurrence_type, :recurrence_detail, :recurrence_range ";
+                $params['recurrence_type'] = $recType;
+                $params['recurrence_detail'] = $recDetail;
+                $params['recurrence_range'] = $recToDT;
+            }
+
+            $SQL .= ")";
+
+            $sth = $dbh->prepare($SQL);
             $sth->execute($params);
-    		
-    		// Get the event id
-    		$eventID = $dbh->lastInsertId();
-    		
-    		// Make sure we dont just have one...
-    		if (!is_array($displayGroupIDs)) 
-    			$displayGroupIDs = array($displayGroupIDs);
-    		
-    		// Create a detail record for each display group
-    		foreach ($displayGroupIDs as $displayGroupID)
-    		{
-    			// Add the parent detail record for this event
-    			if (!$this->AddDetail($displayGroupID, $fromDT, $toDT, $userID, $eventID))
-    				throw new Exception("Error Processing Request", 1);
-    			    
-    			// Is there any recurrance to take care of?
-    			if ($recType != '' && $recType != 'null') {
-    				// Set the temp starts
-    				$t_start_temp 	= $fromDT;
-    				$t_end_temp 	= $toDT;
-    				
-    				Debug::LogEntry('audit', sprintf('Recurrence detected until %d. Recurrence period is %s and interval is %s.', $recToDT, $recDetail, $recType), 'Schedule', 'Add');
-    				
-    				//loop until we have added the recurring events for the schedule
-    				while ($t_start_temp < $recToDT) 
-    				{
-    					// add the appropriate time to the start and end
-    					switch ($recType) 
-    					{
-    						case 'Minute':
-    							$t_start_temp 	= mktime(date("H", $t_start_temp), date("i", $t_start_temp) + $recDetail, date("s", $t_start_temp) ,date("m", $t_start_temp) ,date("d", $t_start_temp), date("Y", $t_start_temp));
-    							$t_end_temp 	= mktime(date("H", $t_end_temp), date("i", $t_end_temp) + $recDetail, date("s", $t_end_temp) ,date("m", $t_end_temp) ,date("d", $t_end_temp), date("Y", $t_end_temp));
-    							break;
-    							
-    						case 'Hour':
-    							$t_start_temp 	= mktime(date("H", $t_start_temp) + $recDetail, date("i", $t_start_temp), date("s", $t_start_temp) ,date("m", $t_start_temp) ,date("d", $t_start_temp), date("Y", $t_start_temp));
-    							$t_end_temp 	= mktime(date("H", $t_end_temp) + $recDetail, date("i", $t_end_temp), date("s", $t_end_temp) ,date("m", $t_end_temp) ,date("d", $t_end_temp), date("Y", $t_end_temp));
-    							break;
-    							
-    						case 'Day':
-    							$t_start_temp 	= mktime(date("H", $t_start_temp), date("i", $t_start_temp), date("s", $t_start_temp) ,date("m", $t_start_temp) ,date("d", $t_start_temp)+$recDetail, date("Y", $t_start_temp));
-    							$t_end_temp 	= mktime(date("H", $t_end_temp), date("i", $t_end_temp), date("s", $t_end_temp) ,date("m", $t_end_temp) ,date("d", $t_end_temp)+$recDetail, date("Y", $t_end_temp));
-    							break;
-    							
-    						case 'Week':
-    							$t_start_temp 	= mktime(date("H", $t_start_temp), date("i", $t_start_temp), date("s", $t_start_temp) ,date("m", $t_start_temp) ,date("d", $t_start_temp) + ($recDetail * 7), date("Y", $t_start_temp));
-    							$t_end_temp 	= mktime(date("H", $t_end_temp), date("i", $t_end_temp), date("s", $t_end_temp) ,date("m", $t_end_temp) ,date("d", $t_end_temp) + ($recDetail * 7), date("Y", $t_end_temp));
-    							break;
-    							
-    						case 'Month':
-    							$t_start_temp 	= mktime(date("H", $t_start_temp), date("i", $t_start_temp), date("s", $t_start_temp) ,date("m", $t_start_temp)+$recDetail ,date("d", $t_start_temp), date("Y", $t_start_temp));
-    							$t_end_temp 	= mktime(date("H", $t_end_temp), date("i", $t_end_temp), date("s", $t_end_temp) ,date("m", $t_end_temp)+$recDetail ,date("d", $t_end_temp), date("Y", $t_end_temp));
-    							break;
-    							
-    						case 'Year':
-    							$t_start_temp 	= mktime(date("H", $t_start_temp), date("i", $t_start_temp), date("s", $t_start_temp) ,date("m", $t_start_temp) ,date("d", $t_start_temp), date("Y", $t_start_temp)+$recDetail);
-    							$t_end_temp 	= mktime(date("H", $t_end_temp), date("i", $t_end_temp), date("s", $t_end_temp) ,date("m", $t_end_temp) ,date("d", $t_end_temp), date("Y", $t_end_temp)+$recDetail);
-    							break;
-    					}
-    					
-    					// after we have added the appropriate amount, are we still valid
-    					if ($t_start_temp > $recToDT) break;
-    					
-    					if (!$this->AddDetail($displayGroupID, $t_start_temp, $t_end_temp, $userID, $eventID))
-    						throw new Exception("Error Processing Request", 1);		
-    				}
-    			}
-    		}
+            
+            // Get the event id
+            $eventID = $dbh->lastInsertId();
+            
+            // Make sure we dont just have one...
+            if (!is_array($displayGroupIDs)) 
+                $displayGroupIDs = array($displayGroupIDs);
+            
+            // Create a detail record for each display group
+            foreach ($displayGroupIDs as $displayGroupID)
+            {
+                // Add the parent detail record for this event
+                if (!$this->AddDetail($displayGroupID, $fromDT, $toDT, $userID, $eventID))
+                    throw new Exception("Error Processing Request", 1);
+                    
+                // Is there any recurrance to take care of?
+                if ($recType != '' && $recType != 'null') {
+                    // Set the temp starts
+                    $t_start_temp   = $fromDT;
+                    $t_end_temp     = $toDT;
+                    
+                    Debug::LogEntry('audit', sprintf('Recurrence detected until %d. Recurrence period is %s and interval is %s.', $recToDT, $recDetail, $recType), 'Schedule', 'Add');
+                    
+                    //loop until we have added the recurring events for the schedule
+                    while ($t_start_temp < $recToDT) 
+                    {
+                        // add the appropriate time to the start and end
+                        switch ($recType) 
+                        {
+                            case 'Minute':
+                                $t_start_temp   = mktime(date("H", $t_start_temp), date("i", $t_start_temp) + $recDetail, date("s", $t_start_temp) ,date("m", $t_start_temp) ,date("d", $t_start_temp), date("Y", $t_start_temp));
+                                $t_end_temp     = mktime(date("H", $t_end_temp), date("i", $t_end_temp) + $recDetail, date("s", $t_end_temp) ,date("m", $t_end_temp) ,date("d", $t_end_temp), date("Y", $t_end_temp));
+                                break;
+                                
+                            case 'Hour':
+                                $t_start_temp   = mktime(date("H", $t_start_temp) + $recDetail, date("i", $t_start_temp), date("s", $t_start_temp) ,date("m", $t_start_temp) ,date("d", $t_start_temp), date("Y", $t_start_temp));
+                                $t_end_temp     = mktime(date("H", $t_end_temp) + $recDetail, date("i", $t_end_temp), date("s", $t_end_temp) ,date("m", $t_end_temp) ,date("d", $t_end_temp), date("Y", $t_end_temp));
+                                break;
+                                
+                            case 'Day':
+                                $t_start_temp   = mktime(date("H", $t_start_temp), date("i", $t_start_temp), date("s", $t_start_temp) ,date("m", $t_start_temp) ,date("d", $t_start_temp)+$recDetail, date("Y", $t_start_temp));
+                                $t_end_temp     = mktime(date("H", $t_end_temp), date("i", $t_end_temp), date("s", $t_end_temp) ,date("m", $t_end_temp) ,date("d", $t_end_temp)+$recDetail, date("Y", $t_end_temp));
+                                break;
+                                
+                            case 'Week':
+                                $t_start_temp   = mktime(date("H", $t_start_temp), date("i", $t_start_temp), date("s", $t_start_temp) ,date("m", $t_start_temp) ,date("d", $t_start_temp) + ($recDetail * 7), date("Y", $t_start_temp));
+                                $t_end_temp     = mktime(date("H", $t_end_temp), date("i", $t_end_temp), date("s", $t_end_temp) ,date("m", $t_end_temp) ,date("d", $t_end_temp) + ($recDetail * 7), date("Y", $t_end_temp));
+                                break;
+                                
+                            case 'Month':
+                                $t_start_temp   = mktime(date("H", $t_start_temp), date("i", $t_start_temp), date("s", $t_start_temp) ,date("m", $t_start_temp)+$recDetail ,date("d", $t_start_temp), date("Y", $t_start_temp));
+                                $t_end_temp     = mktime(date("H", $t_end_temp), date("i", $t_end_temp), date("s", $t_end_temp) ,date("m", $t_end_temp)+$recDetail ,date("d", $t_end_temp), date("Y", $t_end_temp));
+                                break;
+                                
+                            case 'Year':
+                                $t_start_temp   = mktime(date("H", $t_start_temp), date("i", $t_start_temp), date("s", $t_start_temp) ,date("m", $t_start_temp) ,date("d", $t_start_temp), date("Y", $t_start_temp)+$recDetail);
+                                $t_end_temp     = mktime(date("H", $t_end_temp), date("i", $t_end_temp), date("s", $t_end_temp) ,date("m", $t_end_temp) ,date("d", $t_end_temp), date("Y", $t_end_temp)+$recDetail);
+                                break;
+                        }
+                        
+                        // after we have added the appropriate amount, are we still valid
+                        if ($t_start_temp > $recToDT) break;
+                        
+                        if (!$this->AddDetail($displayGroupID, $t_start_temp, $t_end_temp, $userID, $eventID))
+                            throw new Exception("Error Processing Request", 1);     
+                    }
+                }
+            }
     
             // Notify (dont error)
-            Kit::ClassLoader('Display');
             $displayObject = new Display($this->db);
             $displayObject->NotifyDisplays($campaignId);
-    		
-    		Debug::LogEntry('audit', 'OUT', 'Schedule', 'Add');
-    		
-    		return true;  
+            
+            Debug::LogEntry('audit', 'OUT', 'Schedule', 'Add');
+            
+            return true;  
         }
         catch (Exception $e) {
             
@@ -179,8 +182,8 @@
         
             return false;
         }
-	}
-	
+    }
+    
     /**
      * Edits a Schedule
      * @param <type> $eventID
@@ -196,400 +199,459 @@
      * @param <int> $displayOrder
      * @return <type>
      */
-	public function Edit($eventID, $displayGroupIDs, $fromDT, $toDT, $campaignId, $rec_type, $rec_detail, $recToDT, $isPriority, $userid, $displayOrder)
-	{
-		Debug::LogEntry('audit', 'IN', 'Schedule', 'Edit');
+    public function Edit($eventID, $displayGroupIDs, $fromDT, $toDT, $campaignId, $rec_type, $rec_detail, $recToDT, $isPriority, $userid, $displayOrder)
+    {
+        Debug::LogEntry('audit', 'IN', 'Schedule', 'Edit');
 
         // Cant have a 0 increment as it creates a loop
         if ($rec_detail == 0)
             $rec_detail = 1;
-		
-		// What we are really going to do here is delete and re-add... just because it is easier to get the logic right
-		// and it means the same logic will be applied across both functions.
-		
-		// Delete the old schedule
-		if (!$this->Delete($eventID))
-			return false;
-		
-		// Add the new one
-		if (!$this->Add($displayGroupIDs, $fromDT, $toDT, $campaignId, $rec_type, $rec_detail, $recToDT, $isPriority, $userid, $displayOrder))
-			return false;
-		
-		Debug::LogEntry('audit', 'OUT', 'Schedule', 'Edit');
-		
-		return true;
-	}
-	
-	/**
-	 * Deletes a scheduled event
-	 * @return 
-	 * @param $eventID Object
-	 */
-	public function Delete($eventID)
-	{
-		Debug::LogEntry('audit', 'IN', 'Schedule', 'Delete');
-		
-		try {
-		    $dbh = PDOConnect::init();
-		
-		    if (!$this->DeleteScheduleForEvent($eventID))
-				throw new Exception("Error Processing Request", 1);
-			
-			// Delete all Schedule records for this DisplayGroupID
-			$sth = $dbh->prepare('DELETE FROM schedule WHERE eventID = :eventid');
-		    $sth->execute(array(
-		            'eventid' => $eventID
-		        ));
-				
-			Debug::LogEntry('audit', 'OUT', 'Schedule', 'Delete');
-			
-			return true;  
-		}
-		catch (Exception $e) {
-		    
-		    Debug::LogEntry('error', $e->getMessage());
-		
-		    if (!$this->IsError())
-		        $this->SetError(25016,__('Unable to delete schedule record for this Event.'));
-		
-		    return false;
-		}
-	}
-	
-	/**
-	 * Adds a Schedule Detail record. This can optionally be linked to a Schedule Event record.
-	 * @return 
-	 * @param $displayGroupID Object
-	 * @param $layoutID Object
-	 * @param $fromDT Object
-	 * @param $toDT Object
-	 * @param $userID Object
-	 * @param $isPriority Object
-	 * @param $eventID Object[optional]
-	 */
-	public function AddDetail($displayGroupID, $fromDT, $toDT, $userID, $eventID)
-	{
-		Debug::LogEntry('audit', 'IN', 'Schedule', 'AddDetail');
-		
-		try {
-		    $dbh = PDOConnect::init();
-
-		    // The parameters for the INSERT
-		    $params = array(
-					'displaygroupid' => $displayGroupID,
-					'fromdt' => $fromDT,
-					'todt' => $toDT,
-					'userid' => $userID
-				);
-		
-			// Insert statement
-			$SQL = "INSERT INTO schedule_detail (DisplayGroupID, FromDT, ToDT, userID";
-			
-			// Extras for Event ID
-			if ($eventID != '')
-			{
-				$SQL .= ", eventID";
-				$params['eventid'] = $eventID;
-			}
-
-			$SQL .= ") ";
-			
-			// Values
-			$SQL .= "VALUES (:displaygroupid, :fromdt, :todt, :userid";
-			
-			if ($eventID != '')
-				$SQL .= ", :eventid";
-
-			$SQL .= ")";
-			
-			// Execute the SQL
-		    $sth = $dbh->prepare($SQL);
-		    $sth->execute($params);
-			
-			Debug::LogEntry('audit', 'OUT', 'Schedule', 'AddDetail');
-			
-			return true;  
-		}
-		catch (Exception $e) {
-		    
-		    Debug::LogEntry('error', $e->getMessage());
-		
-		    if (!$this->IsError())
-		        $this->SetError(25002, __('Could not update Layout on Schedule'));
-		
-		    return false;
-		}	
-	}
-	
-	/**
-	 * Deletes all the Schedule records for a display group
-	 * @return 
-	 * @param $displayGroupID Object
-	 */
-	public function DeleteScheduleForDisplayGroup($displayGroupID)
-	{
-		Debug::LogEntry('audit', 'IN', 'DisplayGroup', 'DeleteScheduleForDisplayGroup');
-		
-		try {
-		    $dbh = PDOConnect::init();
-
-			// Delete all Schedule records for this DisplayGroupID
-		    $sth = $dbh->prepare('DELETE FROM schedule_detail WHERE DisplayGroupID = :displaygroupid');
-		    $sth->execute(array(
-		            'displaygroupid' => $displayGroupID
-		        ));
-
-		    // Tidy up the schedule table. There might be orphaned records because of this delete
-		    $this->TidyScheduleTable();
-
-			Debug::LogEntry('audit', 'OUT', 'DisplayGroup', 'DeleteScheduleForDisplayGroup');
-			
-			return true;  
-		}
-		catch (Exception $e) {
-		    
-		    Debug::LogEntry('error', $e->getMessage());
-		
-		    if (!$this->IsError())
-		        $this->SetError(25015,__('Unable to delete schedule records for this Display Group.'));
-		
-		    return false;
-		}
-	}
-
-	/**
-	 * Removes any orphaned records from the Schedule Table
-	 * Usually called as a result of an open-ended delete (such as deleting an entire display group)
-	 */
-	private function TidyScheduleTable() {
-		Debug::LogEntry('audit', 'IN', 'DisplayGroup', 'TidyScheduleTable');
-
-		try {
-		    $dbh = PDOConnect::init();
-		
-		    $sth = $dbh->prepare('DELETE FROM `schedule` WHERE EventID NOT IN (SELECT EventID FROM `schedule_detail`)');
-		    $sth->execute();
-		
-			return true;
-		}
-		catch (Exception $e) {
-		    
-		    Debug::LogEntry('error', $e->getMessage());
-		
-		    if (!$this->IsError())
-		        $this->SetError(1, __('Unknown Error'));
-		
-		    return false;
-		}
-	}
-	
-	/**
-	 * Deletes all the Schedule records for an EventID
-	 * @return 
-	 * @param $displayGroupID Object
-	 */
-	public function DeleteScheduleForEvent($eventID) {
-		Debug::LogEntry('audit', 'IN', 'DisplayGroup', 'DeleteScheduleForEvent');
-		
-		try {
-		    $dbh = PDOConnect::init();
-		
-			// Delete all Schedule records for this DisplayGroupID
-		    $sth = $dbh->prepare('DELETE FROM schedule_detail WHERE EventID = :eventid');
-		    $sth->execute(array(
-		            'eventid' => $eventID
-		        ));
-			
-			Debug::LogEntry('audit', 'OUT', 'DisplayGroup', 'DeleteScheduleForEvent');
-			
-			return true;  
-		}
-		catch (Exception $e) {
-		    
-		    Debug::LogEntry('error', $e->getMessage());
-		
-		    if (!$this->IsError())
-		        $this->SetError(25016,__('Unable to delete schedule records for this Event.'));
-		
-		    return false;
-		}
-	}
-	
-	/**
-	 * Deletes all the Schedule records for an EventID and DisplayGroupID
-	 * @return 
-	 * @param $displayGroupID Object
-	 */
-	public function DeleteScheduleForEventAndGroup($eventID, $displayGroupID) {
-		Debug::LogEntry('audit', 'IN', 'DisplayGroup', 'DeleteScheduleForEventAndGroup');
-		
-		try {
-		    $dbh = PDOConnect::init();
-		
-			// Delete all Schedule records for this DisplayGroupID
-		    $sth = $dbh->prepare('DELETE FROM schedule_detail WHERE EventID = :eventid AND DisplayGroupID = :displaygroupid');
-		    $sth->execute(array(
-		            'displaygroupid' => $displayGroupID,
-		            'eventid' => $eventID
-		        ));
-
-			Debug::LogEntry('audit', 'OUT', 'DisplayGroup', 'DeleteScheduleForEventAndGroup');
-			
-			return true;  
-		}
-		catch (Exception $e) {
-		    
-		    Debug::LogEntry('error', $e->getMessage());
-		
-		    if (!$this->IsError())
-		        $this->SetError(25016,__('Unable to delete schedule records for this Event and DisplayGroup.'));
-		
-		    return false;
-		}
-	}
-	
-	/**
-	 * Deletes the event detail record provided
-	 * @return 
-	 * @param $eventDetailID Object
-	 */
-	public function DeleteEventDetail($eventDetailID) {
-		Debug::LogEntry('audit', 'IN', 'Schedule', 'DeleteEventDetail');
-		
-		try {
-		    $dbh = PDOConnect::init();
-		
-			// Delete all Schedule records for this EventDetail
-		    $sth = $dbh->prepare('DELETE FROM schedule_detail WHERE schedule_detailID = :schedule_detailid');
-		    $sth->execute(array(
-		            'schedule_detailid' => $eventDetailID
-		        ));
-				
-			Debug::LogEntry('audit', 'OUT', 'Schedule', 'DeleteEventDetail');
-			
-			return true;  
-		}
-		catch (Exception $e) {
-		    
-		    Debug::LogEntry('error', $e->getMessage());
-		
-		    if (!$this->IsError())
-		        $this->SetError(25016,__('Unable to delete schedule records for this Event.'));
-		
-		    return false;
-		}
-	}
-	
-	public function DeleteDisplayGroupFromEvent($eventID, $displayGroupID)
-	{
-		Debug::LogEntry('audit', 'IN', 'Schedule', 'EditDisplayGroupsForEvent');
-		
-		try {
-		    $dbh = PDOConnect::init();
-		
-		    // Read the display groups from the event
-			$SQL = sprintf('', $eventID);
-			$sth = $dbh->prepare('SELECT DisplayGroupIDs FROM schedule WHERE EventID = :eventid');
-		    $sth->execute(array(
-		            'eventid' => $eventID
-		        ));
-			
-			if (!$row = $sth->fetch())
-				$this->ThrowError(25034,__('Error retriving information necessary to delete this event'));
-							
-			// Get the Display Group IDs
-			$displayGroupIDs = Kit::ValidateParam($row['DisplayGroupIDs'], _STRING);
-			
-			// Load into an array and remove the one in $displayGroupID
-			$displayGroupIDs = explode(',', $displayGroupIDs);
-			$key = array_search($displayGroupID, $displayGroupIDs);
-			
-			if ($key !== true) {
-				unset($displayGroupIDs[$key]);
-			}
-			else {
-				Debug::LogEntry('audit', 'Display Group ID is already removed from the Event - this is strange.', 'Schedule', 'EditDisplayGroupsForEvent');
-				return true;
-			}
-			
-			// Save the list back to the event
-			$displayGroupIDList = implode(',', $displayGroupIDs);
-			
-			// Delete all Schedule records for this EventDetail
-			$sth = $dbh->prepare('UPDATE schedule SET DisplayGroupIDs = :displaygroupids WHERE EventID = :eventid');
-		    $sth->execute(array(
-		            'eventid' => $eventID,
-		            'displaygroupids' => $displayGroupIDList
-		        ));
-			
-			Debug::LogEntry('audit', 'OUT', 'Schedule', 'EditDisplayGroupsForEvent');
-			
-			return true;  
-		}
-		catch (Exception $e) {
-		    
-		    Debug::LogEntry('error', $e->getMessage());
-		
-		    if (!$this->IsError())
-		        $this->SetError(25036,__('Unable to edit the display groups for this Event.'));
-		
-		    return false;
-		}
-	}
-
-	/**
-	 * Gets an array of display group ids for the given event
-	 * @param [int] $eventId The Event ID
-	 */
-	public function DisplayGroupsForEvent($eventId) {
-		$eventId = Kit::ValidateParam($eventId, _INT);
-
-		try {
-		    $dbh = PDOConnect::init();
-		
-		    $sth = $dbh->prepare('SELECT DISTINCT DisplayGroupID FROM `schedule_detail` WHERE EventID = :eventid');
-		    $sth->execute(array(
-		            'eventid' => $eventId
-		        ));
-
-		    $ids = array();
-		  
-		  	while ($row = $sth->fetch()) {
-		  		$ids[] = Kit::ValidateParam($row['DisplayGroupID'], _INT);
-		  	}
-
-		  	return $ids;
-		}
-		catch (Exception $e) {
-		    
-		    Debug::LogEntry('error', $e->getMessage());
-		
-		    if (!$this->IsError())
-		        $this->SetError(1, __('Unknown Error'));
-		
-		    return false;
-		}
-	}
+        
+        // What we are really going to do here is delete and re-add... just because it is easier to get the logic right
+        // and it means the same logic will be applied across both functions.
+        
+        // Delete the old schedule
+        if (!$this->Delete($eventID))
+            return false;
+        
+        // Add the new one
+        if (!$this->Add($displayGroupIDs, $fromDT, $toDT, $campaignId, $rec_type, $rec_detail, $recToDT, $isPriority, $userid, $displayOrder))
+            return false;
+        
+        Debug::LogEntry('audit', 'OUT', 'Schedule', 'Edit');
+        
+        return true;
+    }
+    
+    /**
+     * Deletes a scheduled event
+     * @return 
+     * @param $eventID Object
+     */
+    public function Delete($eventID)
+    {
+        Debug::LogEntry('audit', 'IN', 'Schedule', 'Delete');
+        
+        try {
+            $dbh = PDOConnect::init();
+        
+            if (!$this->DeleteScheduleForEvent($eventID))
+                throw new Exception("Error Processing Request", 1);
+            
+            // Delete all Schedule records for this DisplayGroupID
+            $sth = $dbh->prepare('DELETE FROM schedule WHERE eventID = :eventid');
+            $sth->execute(array(
+                    'eventid' => $eventID
+                ));
+                
+            Debug::LogEntry('audit', 'OUT', 'Schedule', 'Delete');
+            
+            return true;  
+        }
+        catch (Exception $e) {
+            
+            Debug::LogEntry('error', $e->getMessage());
+        
+            if (!$this->IsError())
+                $this->SetError(25016,__('Unable to delete schedule record for this Event.'));
+        
+            return false;
+        }
+    }
+    
+    /**
+     * Adds a Schedule Detail record. This can optionally be linked to a Schedule Event record.
+     * @return 
+     * @param $displayGroupID Object
+     * @param $layoutID Object
+     * @param $fromDT Object
+     * @param $toDT Object
+     * @param $userID Object
+     * @param $isPriority Object
+     * @param $eventID Object[optional]
+     */
+    public function AddDetail($displayGroupID, $fromDT, $toDT, $userID, $eventID)
+    {
+        Debug::LogEntry('audit', 'IN', 'Schedule', 'AddDetail');
+        
+        try {
+            $dbh = PDOConnect::init();
+
+            // The parameters for the INSERT
+            $params = array(
+                    'displaygroupid' => $displayGroupID,
+                    'fromdt' => $fromDT,
+                    'todt' => $toDT,
+                    'userid' => $userID
+                );
+        
+            // Insert statement
+            $SQL = "INSERT INTO schedule_detail (DisplayGroupID, FromDT, ToDT, userID";
+            
+            // Extras for Event ID
+            if ($eventID != '')
+            {
+                $SQL .= ", eventID";
+                $params['eventid'] = $eventID;
+            }
+
+            $SQL .= ") ";
+            
+            // Values
+            $SQL .= "VALUES (:displaygroupid, :fromdt, :todt, :userid";
+            
+            if ($eventID != '')
+                $SQL .= ", :eventid";
+
+            $SQL .= ")";
+            
+            // Execute the SQL
+            $sth = $dbh->prepare($SQL);
+            $sth->execute($params);
+            
+            Debug::LogEntry('audit', 'OUT', 'Schedule', 'AddDetail');
+            
+            return true;  
+        }
+        catch (Exception $e) {
+            
+            Debug::LogEntry('error', $e->getMessage());
+        
+            if (!$this->IsError())
+                $this->SetError(25002, __('Could not update Layout on Schedule'));
+        
+            return false;
+        }   
+    }
+    
+    /**
+     * Deletes all the Schedule records for a display group
+     * @return 
+     * @param $displayGroupID Object
+     */
+    public function DeleteScheduleForDisplayGroup($displayGroupID)
+    {
+        Debug::LogEntry('audit', 'IN', 'DisplayGroup', 'DeleteScheduleForDisplayGroup');
+        
+        try {
+            $dbh = PDOConnect::init();
+
+            // Delete all Schedule records for this DisplayGroupID
+            $sth = $dbh->prepare('DELETE FROM schedule_detail WHERE DisplayGroupID = :displaygroupid');
+            $sth->execute(array(
+                    'displaygroupid' => $displayGroupID
+                ));
+
+            // Tidy up the schedule table. There might be orphaned records because of this delete
+            $this->TidyScheduleTable();
+
+            Debug::LogEntry('audit', 'OUT', 'DisplayGroup', 'DeleteScheduleForDisplayGroup');
+            
+            return true;  
+        }
+        catch (Exception $e) {
+            
+            Debug::LogEntry('error', $e->getMessage());
+        
+            if (!$this->IsError())
+                $this->SetError(25015,__('Unable to delete schedule records for this Display Group.'));
+        
+            return false;
+        }
+    }
+    
+    /**
+     * Deletes all the Schedule records for a display group
+     * @return 
+     * @param $displayGroupID Object
+     */
+    public static function DeleteScheduleForCampaign($campaignId)
+    {
+        try {
+            $dbh = PDOConnect::init();
+
+            // Delete all Schedule Detail records for this campaignId
+            $sth = $dbh->prepare('DELETE FROM schedule_detail WHERE EventID IN (SELECT EventID FROM `schedule` WHERE CampaignID = :campaignId)');
+            $sth->execute(array(
+                    'campaignId' => $campaignId
+                ));
+
+            // Delete all Schedule records for this campaignId
+            $sth = $dbh->prepare('DELETE FROM schedule WHERE CampaignId = :campaignId');
+            $sth->execute(array(
+                    'campaignId' => $campaignId
+                ));
+            
+            return true;  
+        }
+        catch (Exception $e) {
+            
+            Debug::LogEntry('error', $e->getMessage(), get_class(), __FUNCTION__);
+        
+            if (!$this->IsError())
+                $this->SetError(25015,__('Unable to delete schedule records for Campaign.'));
+        
+            return false;
+        }
+    }
+
+    /**
+     * Removes any orphaned records from the Schedule Table
+     * Usually called as a result of an open-ended delete (such as deleting an entire display group)
+     */
+    private static function TidyScheduleTable() 
+    {
+        try {
+            $dbh = PDOConnect::init();
+        
+            $sth = $dbh->prepare('DELETE FROM `schedule` WHERE EventID NOT IN (SELECT EventID FROM `schedule_detail`)');
+            $sth->execute();
+        
+            return true;
+        }
+        catch (Exception $e) {
+            
+            Debug::LogEntry('error', $e->getMessage());
+        
+            if (!$this->IsError())
+                $this->SetError(1, __('Unknown Error'));
+        
+            return false;
+        }
+    }
+
+    /**
+     * Removes any orphaned records from the Schedule Table
+     * Usually called as a result of an open-ended delete (such as deleting an entire display group)
+     */
+    private static function TidyScheduleDetailTable() 
+    {
+        try {
+            $dbh = PDOConnect::init();
+        
+            $sth = $dbh->prepare('DELETE FROM `schedule_detail` WHERE EventID NOT IN (SELECT EventID FROM `schedule`)');
+            $sth->execute();
+        
+            return true;
+        }
+        catch (Exception $e) {
+            
+            Debug::LogEntry('error', $e->getMessage());
+        
+            if (!$this->IsError())
+                $this->SetError(1, __('Unknown Error'));
+        
+            return false;
+        }
+    }
+    
+    /**
+     * Deletes all the Schedule records for an EventID
+     * @return 
+     * @param $displayGroupID Object
+     */
+    public function DeleteScheduleForEvent($eventID) {
+        Debug::LogEntry('audit', 'IN', 'DisplayGroup', 'DeleteScheduleForEvent');
+        
+        try {
+            $dbh = PDOConnect::init();
+        
+            // Delete all Schedule records for this DisplayGroupID
+            $sth = $dbh->prepare('DELETE FROM schedule_detail WHERE EventID = :eventid');
+            $sth->execute(array(
+                    'eventid' => $eventID
+                ));
+            
+            Debug::LogEntry('audit', 'OUT', 'DisplayGroup', 'DeleteScheduleForEvent');
+            
+            return true;  
+        }
+        catch (Exception $e) {
+            
+            Debug::LogEntry('error', $e->getMessage());
+        
+            if (!$this->IsError())
+                $this->SetError(25016,__('Unable to delete schedule records for this Event.'));
+        
+            return false;
+        }
+    }
+    
+    /**
+     * Deletes all the Schedule records for an EventID and DisplayGroupID
+     * @return 
+     * @param $displayGroupID Object
+     */
+    public function DeleteScheduleForEventAndGroup($eventID, $displayGroupID) {
+        Debug::LogEntry('audit', 'IN', 'DisplayGroup', 'DeleteScheduleForEventAndGroup');
+        
+        try {
+            $dbh = PDOConnect::init();
+        
+            // Delete all Schedule records for this DisplayGroupID
+            $sth = $dbh->prepare('DELETE FROM schedule_detail WHERE EventID = :eventid AND DisplayGroupID = :displaygroupid');
+            $sth->execute(array(
+                    'displaygroupid' => $displayGroupID,
+                    'eventid' => $eventID
+                ));
+
+            Debug::LogEntry('audit', 'OUT', 'DisplayGroup', 'DeleteScheduleForEventAndGroup');
+            
+            return true;  
+        }
+        catch (Exception $e) {
+            
+            Debug::LogEntry('error', $e->getMessage());
+        
+            if (!$this->IsError())
+                $this->SetError(25016,__('Unable to delete schedule records for this Event and DisplayGroup.'));
+        
+            return false;
+        }
+    }
+    
+    /**
+     * Deletes the event detail record provided
+     * @return 
+     * @param $eventDetailID Object
+     */
+    public function DeleteEventDetail($eventDetailID) {
+        Debug::LogEntry('audit', 'IN', 'Schedule', 'DeleteEventDetail');
+        
+        try {
+            $dbh = PDOConnect::init();
+        
+            // Delete all Schedule records for this EventDetail
+            $sth = $dbh->prepare('DELETE FROM schedule_detail WHERE schedule_detailID = :schedule_detailid');
+            $sth->execute(array(
+                    'schedule_detailid' => $eventDetailID
+                ));
+                
+            Debug::LogEntry('audit', 'OUT', 'Schedule', 'DeleteEventDetail');
+            
+            return true;  
+        }
+        catch (Exception $e) {
+            
+            Debug::LogEntry('error', $e->getMessage());
+        
+            if (!$this->IsError())
+                $this->SetError(25016,__('Unable to delete schedule records for this Event.'));
+        
+            return false;
+        }
+    }
+    
+    public function DeleteDisplayGroupFromEvent($eventID, $displayGroupID)
+    {
+        Debug::LogEntry('audit', 'IN', 'Schedule', 'EditDisplayGroupsForEvent');
+        
+        try {
+            $dbh = PDOConnect::init();
+        
+            // Read the display groups from the event
+            $SQL = sprintf('', $eventID);
+            $sth = $dbh->prepare('SELECT DisplayGroupIDs FROM schedule WHERE EventID = :eventid');
+            $sth->execute(array(
+                    'eventid' => $eventID
+                ));
+            
+            if (!$row = $sth->fetch())
+                $this->ThrowError(25034,__('Error retriving information necessary to delete this event'));
+                            
+            // Get the Display Group IDs
+            $displayGroupIDs = Kit::ValidateParam($row['DisplayGroupIDs'], _STRING);
+            
+            // Load into an array and remove the one in $displayGroupID
+            $displayGroupIDs = explode(',', $displayGroupIDs);
+            $key = array_search($displayGroupID, $displayGroupIDs);
+            
+            if ($key !== true) {
+                unset($displayGroupIDs[$key]);
+            }
+            else {
+                Debug::LogEntry('audit', 'Display Group ID is already removed from the Event - this is strange.', 'Schedule', 'EditDisplayGroupsForEvent');
+                return true;
+            }
+            
+            // Save the list back to the event
+            $displayGroupIDList = implode(',', $displayGroupIDs);
+            
+            // Delete all Schedule records for this EventDetail
+            $sth = $dbh->prepare('UPDATE schedule SET DisplayGroupIDs = :displaygroupids WHERE EventID = :eventid');
+            $sth->execute(array(
+                    'eventid' => $eventID,
+                    'displaygroupids' => $displayGroupIDList
+                ));
+            
+            Debug::LogEntry('audit', 'OUT', 'Schedule', 'EditDisplayGroupsForEvent');
+            
+            return true;  
+        }
+        catch (Exception $e) {
+            
+            Debug::LogEntry('error', $e->getMessage());
+        
+            if (!$this->IsError())
+                $this->SetError(25036,__('Unable to edit the display groups for this Event.'));
+        
+            return false;
+        }
+    }
+
+    /**
+     * Gets an array of display group ids for the given event
+     * @param [int] $eventId The Event ID
+     */
+    public function DisplayGroupsForEvent($eventId) {
+        $eventId = Kit::ValidateParam($eventId, _INT);
+
+        try {
+            $dbh = PDOConnect::init();
+        
+            $sth = $dbh->prepare('SELECT DISTINCT DisplayGroupID FROM `schedule_detail` WHERE EventID = :eventid');
+            $sth->execute(array(
+                    'eventid' => $eventId
+                ));
+
+            $ids = array();
+          
+            while ($row = $sth->fetch()) {
+                $ids[] = Kit::ValidateParam($row['DisplayGroupID'], _INT);
+            }
+
+            return $ids;
+        }
+        catch (Exception $e) {
+            
+            Debug::LogEntry('error', $e->getMessage());
+        
+            if (!$this->IsError())
+                $this->SetError(1, __('Unknown Error'));
+        
+            return false;
+        }
+    }
 }
 
 class Event
 {
-	public $eventID;
-	public $eventDetailID;
-	public $fromDT;
-	public $toDT;
-	public $layout;
-	public $layoutUri;
+    public $eventID;
+    public $eventDetailID;
+    public $fromDT;
+    public $toDT;
+    public $layout;
+    public $layoutUri;
     public $deleteUri;
-	public $spanningDays;
-	public $startDayNo;
-	public $displayGroup;
-	public $editPermission;
+    public $spanningDays;
+    public $startDayNo;
+    public $displayGroup;
+    public $editPermission;
     public $isdisplayspecific;
-	
-	public function __construct()
-	{
-		
-	}
+    
+    public function __construct()
+    {
+        
+    }
 }
 ?>
\ No newline at end of file

=== modified file 'server/lib/data/stat.data.class.php'
--- server/lib/data/stat.data.class.php	2014-01-18 09:47:41 +0000
+++ server/lib/data/stat.data.class.php	2014-10-21 16:06:16 +0000
@@ -22,68 +22,126 @@
 
 class Stat extends data
 {
-	public function Add($type, $fromDT, $toDT, $scheduleID, $displayID, $layoutID, $mediaID, $tag)
-	{
-		try {
-		    $dbh = PDOConnect::init();
-
-		    // Lower case the type for consistancy
-		    $type = strtolower($type);
-
-		    // Prepare a statement
-		    $sth = $dbh->prepare('INSERT INTO stat (Type, statDate, start, end, scheduleID, displayID, layoutID, mediaID, Tag) VALUES (:type, :statdate, :start, :end, :scheduleid, :displayid, :layoutid, :mediaid, :tag)');
-		
-			// Construct a parameters array to execute
-		    $params = array();
-			$params['statdate'] = date("Y-m-d H:i:s");
-			$params['type'] = $type;
-			$params['start'] = $fromDT;
-			$params['end'] = $toDT;
-			$params['scheduleid'] = $scheduleID;
-			$params['displayid'] = $displayID;
-			$params['layoutid'] = $layoutID;
-
-			// Optional parameters
-			$params['mediaid'] = null;
-			$params['tag'] = null;
-				
-			// We should run different SQL depending on what Type we are
-			switch ($type)
-			{
-				case 'media':
-					$params['mediaid'] = $mediaID;
-			
-					break;
-
-				case 'layout':
-					// Nothing additional to do
-					break;
-					
-				case 'event':
-				
-					$params['layoutid'] = 0;
-					$params['tag'] = $tag;
-				
-					break;
-					
-				default:
-					// Nothing to do, just exit
-					return true;
-			}
-
-			$sth->execute($params);
-			
-			return true;  
-		}
-		catch (Exception $e) {
-		    
-		    Debug::LogEntry('error', $e->getMessage());
-		
-		    if (!$this->IsError())
-		        $this->SetError(25000, 'Stat Insert Failed.');
-		
-		    return false;
-		}
-	}
+    public function Add($type, $fromDT, $toDT, $scheduleID, $displayID, $layoutID, $mediaID, $tag)
+    {
+        try {
+            $dbh = PDOConnect::init();
+
+            // Lower case the type for consistency
+            $type = strtolower($type);
+
+            // Prepare a statement
+            $sth = $dbh->prepare('INSERT INTO stat (Type, statDate, start, end, scheduleID, displayID, layoutID, mediaID, Tag) VALUES (:type, :statdate, :start, :end, :scheduleid, :displayid, :layoutid, :mediaid, :tag)');
+        
+            // Construct a parameters array to execute
+            $params = array();
+            $params['statdate'] = date("Y-m-d H:i:s");
+            $params['type'] = $type;
+            $params['start'] = $fromDT;
+            $params['end'] = $toDT;
+            $params['scheduleid'] = $scheduleID;
+            $params['displayid'] = $displayID;
+            $params['layoutid'] = $layoutID;
+
+            // Optional parameters
+            $params['mediaid'] = null;
+            $params['tag'] = null;
+                
+            // We should run different SQL depending on what Type we are
+            switch ($type)
+            {
+                case 'media':
+                    $params['mediaid'] = $mediaID;
+            
+                    break;
+
+                case 'layout':
+                    // Nothing additional to do
+                    break;
+                    
+                case 'event':
+                
+                    $params['layoutid'] = 0;
+                    $params['tag'] = $tag;
+                
+                    break;
+                    
+                default:
+                    // Nothing to do, just exit
+                    return true;
+            }
+
+            $sth->execute($params);
+            
+            return true;  
+        }
+        catch (Exception $e) {
+            
+            Debug::LogEntry('error', $e->getMessage());
+        
+            if (!$this->IsError())
+                $this->SetError(25000, 'Stat Insert Failed.');
+        
+            return false;
+        }
+    }
+
+    public function displayDown($displayId, $lastAccessed)
+    {
+        try {
+            $dbh = PDOConnect::init();
+        
+            // Prepare a statement
+            $sth = $dbh->prepare('
+                INSERT INTO stat (Type, statDate, start, scheduleID, displayID) 
+                    VALUES (:type, :statdate, :start, :scheduleid, :displayid)');
+        
+            // Construct a parameters array to execute
+            $params = array();
+            $params['type'] = 'displaydown';
+            $params['displayid'] = $displayId;
+            $params['statdate'] = date('Y-m-d H:i:s');
+            $params['start'] = $lastAccessed;
+            $params['scheduleid'] = 0;
+
+            $sth->execute($params);
+
+            return true;
+        }
+        catch (Exception $e) {
+            
+            Debug::LogEntry('error', $e->getMessage(), get_class(), __FUNCTION__);
+        
+            if (!$this->IsError())
+                $this->SetError(1, __('Unknown Error'));
+        
+            return false;
+        }
+    }
+
+    public function displayUp($displayId) {
+        try {
+            $dbh = PDOConnect::init();
+
+            Debug::Audit('Display Up: ' . $displayId);
+        
+            $sth = $dbh->prepare('UPDATE stat SET end = :toDt WHERE displayId = :displayId AND end IS NULL');
+            $sth->execute(array(
+                    'toDt' => date('Y-m-d H:i:s'),
+                    'displayId' => $displayId
+                ));
+          
+            return true;
+        }
+        catch (Exception $e) {
+            
+            Debug::LogEntry('error', $e->getMessage(), get_class(), __FUNCTION__);
+        
+            if (!$this->IsError())
+                $this->SetError(1, __('Unknown Error'));
+        
+            return false;
+        }
+    }
 }
 ?>
\ No newline at end of file

=== modified file 'server/lib/data/usergroup.data.class.php'
--- server/lib/data/usergroup.data.class.php	2014-08-07 15:47:19 +0000
+++ server/lib/data/usergroup.data.class.php	2014-10-21 16:06:16 +0000
@@ -22,6 +22,58 @@
 
 class UserGroup extends Data
 {
+    public function GetPermissionsForObject($object, $idCol, $objectId, $clause = '') 
+    {
+        try {
+            $dbh = PDOConnect::init();
+
+            $params = array('id' => $objectId);
+            $SQL  = 'SELECT joinedGroup.groupid, joinedGroup.group, view, edit, del, joinedGroup.isuserspecific ';
+            $SQL .= '  FROM (
+                    SELECT `group`.*
+                      FROM `group`
+                        LEFT OUTER JOIN lkusergroup
+                        ON lkusergroup.GroupID = group.GroupID
+                     WHERE IsUserSpecific = 0
+                    UNION ALL
+                    SELECT `group`.*
+                      FROM `group`
+                        INNER JOIN lkusergroup
+                        ON lkusergroup.GroupID = group.GroupID
+                            AND IsUserSpecific = 1
+                        INNER JOIN `user`
+                        ON lkusergroup.UserID = user.UserID
+                            AND retired = 0
+                ) joinedGroup ';
+            $SQL .= '   LEFT OUTER JOIN ' . $object;
+            $SQL .= '   ON ' . $object . '.GroupID = joinedGroup.GroupID ';
+
+            if ($clause != '') {
+                $SQL .= $clause;
+            }
+            else {
+                $SQL .= '       AND ' . $object . '.' . $idCol . ' = :id ';
+                $params = array('id' => $objectId);
+            }
+
+            $SQL .= 'ORDER BY joinedGroup.IsEveryone DESC, joinedGroup.IsUserSpecific, joinedGroup.`Group`; ';
+        
+            $sth = $dbh->prepare($SQL);
+            $sth->execute($params);
+
+            return $sth->fetchAll();
+        }
+        catch (Exception $e) {
+            
+            Debug::LogEntry('error', $e->getMessage());
+        
+            if (!$this->IsError())
+                $this->SetError(1, __('Unknown Error'));
+        
+            return false;
+        }
+    }
+
     /**
      * Adds a User Group to Xibo
      * @return

=== modified file 'server/lib/include.php'
--- server/lib/include.php	2014-08-17 12:38:20 +0000
+++ server/lib/include.php	2014-10-21 16:06:16 +0000
@@ -20,7 +20,7 @@
  */
 defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
 
-define('WEBSITE_VERSION', 80);
+define('WEBSITE_VERSION', 81);
 
 // No errors reported until we read the settings from the DB
 error_reporting(0);
@@ -41,10 +41,11 @@
 require_once("lib/app/responsemanager.class.php");
 require_once("lib/app/datemanager.class.php");
 require_once("lib/app/app_functions.php");
+require_once("lib/data/data.class.php");
 require_once("lib/modules/module.interface.php");
 require_once("lib/modules/module.class.php");
-require_once("lib/data/data.class.php");
 require_once("lib/app/session.class.php");
+require_once("lib/app/cache.class.php");
 require_once("lib/app/thememanager.class.php");
 require_once("lib/pages/base.class.php");
 
@@ -111,6 +112,11 @@
 // Error Handling (our error handler requires a DB connection
 set_error_handler(array(new Debug(), "ErrorHandler"));
 
+// Define an auto-load function
+spl_autoload_register(function ($class) {
+    Kit::ClassLoader($class);
+});
+
 // Define the VERSION
 Config::Version();
 

=== modified file 'server/lib/modules/module.class.php'
--- server/lib/modules/module.class.php	2014-09-05 16:07:36 +0000
+++ server/lib/modules/module.class.php	2014-10-21 16:06:16 +0000
@@ -19,6 +19,7 @@
  * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
  */
 defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
+include_once('lib/data/media.data.class.php');
 
 abstract class Module implements ModuleInterface
 {
@@ -37,6 +38,7 @@
     protected $previewEnabled;
     protected $validExtensions;
     protected $validExtensionsText;
+    protected $imageUri;
     protected $settings;
 
     // The Schema Version of this code
@@ -51,6 +53,7 @@
 	protected $deleteFromRegion;
     protected $width;
     protected $height;
+    protected $layoutSchemaVersion;
 
     // Media information
     protected $mediaid;
@@ -145,6 +148,7 @@
             $this->validExtensionsText = Kit::ValidateParam($row['ValidExtensions'], _STRING);
             $this->previewEnabled = Kit::ValidateParam($row['PreviewEnabled'], _INT);
             $this->assignable = Kit::ValidateParam($row['assignable'], _INT);
+            $this->imageUri = Kit::ValidateParam($row['ImageUri'], _STRING);
             $this->render_as = Kit::ValidateParam($row['render_as'], _WORD);
             $this->settings = Kit::ValidateParam($row['settings'], _HTMLSTRING);
 
@@ -155,7 +159,7 @@
             if ($this->settings == '')
                 $this->settings = array();
             else
-                $this->settings = json_decode($this->settings);
+                $this->settings = json_decode($this->settings, true);
 
             // Translated name of this module
             $this->displayType = __(Kit::ValidateParam($row['Name'], _STRING));
@@ -200,6 +204,8 @@
 
             $layoutDoc = new DOMDocument();
             $layoutDoc->loadXML($layoutXml);
+            
+            $this->layoutSchemaVersion = (int)$layoutDoc->documentElement->getAttribute('schemaVersion');
 
             $layoutXpath = new DOMXPath($layoutDoc);
 
@@ -821,6 +827,7 @@
             case 'video':
             case 'localvideo':
             case 'genericfile':
+            case 'font':
                 $defaultDuration = 0;
                 break;
 
@@ -837,7 +844,7 @@
                 break;
 
             default:
-                $defaultDuration = '';
+                $defaultDuration = 10;
         }
         
 
@@ -979,6 +986,11 @@
                 'r');
         }
 
+        $formFields[] = FormManager::AddCheckbox('deleteOldVersion', __('Delete the old version.'), 
+                ((Config::GetSetting('LIBRARY_MEDIA_UPDATEINALL_CHECKB') == 'Checked') ? 1 : 0), 
+                __('Completely remove the old version of this media item if a new file is being uploaded.'), 
+                '');
+
         // Add in any extra form fields we might have provided by the super-class
         if ($extraFormFields != NULL && is_array($extraFormFields)) {
             foreach($extraFormFields as $field) {
@@ -1085,7 +1097,6 @@
         }
 
         // Hand off to the media module
-        Kit::ClassLoader('media');
         $mediaObject = new Media($db);
 
         // Stored As from the XML
@@ -1116,10 +1127,7 @@
             }            	
 
             // Are we on a region
-            if ($regionid != '')
-            {
-                Kit::ClassLoader('layoutmediagroupsecurity');
-
+            if ($regionid != '') {
                 $security = new LayoutMediaGroupSecurity($db);
                 $security->Copy($layoutid, $regionid, $mediaid, $new_mediaid);
             }
@@ -1176,6 +1184,12 @@
         if (Kit::GetParam('replaceInLayouts', _POST, _CHECKBOX) == 1)
             $this->ReplaceMediaInAllLayouts($mediaid, $this->mediaid, $this->duration);
 
+        // Do we need to delete the old media item?
+        if ($tmpName != '' && Kit::GetParam('deleteOldVersion', _POST, _CHECKBOX) == 1) {
+            if (!$mediaObject->Delete($mediaid))
+                $this->response->message .= ' ' . __('Failed to remove old media');
+        }
+        
         return $this->response;
     }
 
@@ -1337,7 +1351,7 @@
 
         // Default Hover window contains a thumbnail, media type and duration
         $output = '<div class="well">';
-        $output .= '<div class="preview-module-image"><img alt="' . $this->displayType . ' thumbnail" src="theme/default/img/forms/' . $this->type . '.gif"></div>';
+        $output .= '<div class="preview-module-image"><img alt="' . $this->displayType . ' thumbnail" src="theme/default/img/' . $this->imageUri . '"></div>';
         $output .= '<div class="info">';
         $output .= '    <ul>';
         $output .= '    <li>' . $msgType . ': ' . $this->displayType . '</li>';
@@ -1371,52 +1385,37 @@
         if (!$this->auth->modifyPermissions)
             trigger_error(__('You do not have permissions to edit this media'), E_USER_ERROR);
 
-        // List of all Groups with a view/edit/delete checkbox
-        $SQL = '';
-        $SQL .= 'SELECT `group`.GroupID, `group`.`Group`, View, Edit, Del, `group`.IsUserSpecific ';
-        $SQL .= '  FROM `group` ';
-
-        if ($this->assignedMedia)
-        {
-            $SQL .= '   LEFT OUTER JOIN lklayoutmediagroup ';
-            $SQL .= '   ON lklayoutmediagroup.GroupID = group.GroupID ';
-            $SQL .= sprintf(" AND lklayoutmediagroup.MediaID = '%s' AND lklayoutmediagroup.RegionID = '%s' AND lklayoutmediagroup.LayoutID = %d ", $this->mediaid, $this->regionid, $this->layoutid);
-        }
-        else
-        {
-            $SQL .= '   LEFT OUTER JOIN lkmediagroup ';
-            $SQL .= '   ON lkmediagroup.GroupID = group.GroupID ';
-            $SQL .= sprintf('       AND lkmediagroup.MediaID = %d ', $this->mediaid);
-        }
-
-        $SQL .= ' WHERE `group`.GroupID <> %d ';
-        $SQL .= 'ORDER BY `group`.IsEveryone DESC, `group`.IsUserSpecific, `group`.`Group` ';
-
-        $SQL = sprintf($SQL, $user->getGroupFromId($user->userid, true));
-
-        Debug::LogEntry('audit', $SQL, 'module', 'PermissionsForm');
-
-        if (!$results = $db->query($SQL))
-        {
-            trigger_error($db->error());
-            trigger_error(__('Unable to get permissions for this layout'), E_USER_ERROR);
-        }
-
-        while ($row = $db->get_assoc_row($results))
-        {
-            $groupId = $row['GroupID'];
-            $rowClass = ($row['IsUserSpecific'] == 0) ? 'strong_text' : '';
+        // List of all Groups with a view / edit / delete check box
+        $permissions = new UserGroup();
+        
+        if ($this->assignedMedia) {
+            if (!$result = $permissions->GetPermissionsForObject('lklayoutmediagroup', NULL, NULL, sprintf(" AND lklayoutmediagroup.MediaID = '%s' AND lklayoutmediagroup.RegionID = '%s' AND lklayoutmediagroup.LayoutID = %d ", $this->mediaid, $this->regionid, $this->layoutid)))
+                trigger_error($permissions->GetErrorMessage(), E_USER_ERROR);
+        }
+        else {
+            if (!$result = $permissions->GetPermissionsForObject('lkmediagroup', 'MediaID', $this->mediaid))
+                trigger_error($permissions->GetErrorMessage(), E_USER_ERROR); 
+        }
+
+        if (count($result) <= 0)
+            trigger_error(__('Unable to get permissions'), E_USER_ERROR);
+
+        $checkboxes = array();
+
+        foreach ($result as $row) {
+            $groupId = $row['groupid'];
+            $rowClass = ($row['isuserspecific'] == 0) ? 'strong_text' : '';
 
             $checkbox = array(
                     'id' => $groupId,
-                    'name' => Kit::ValidateParam($row['Group'], _STRING),
+                    'name' => Kit::ValidateParam($row['group'], _STRING),
                     'class' => $rowClass,
                     'value_view' => $groupId . '_view',
-                    'value_view_checked' => (($row['View'] == 1) ? 'checked' : ''),
+                    'value_view_checked' => (($row['view'] == 1) ? 'checked' : ''),
                     'value_edit' => $groupId . '_edit',
-                    'value_edit_checked' => (($row['Edit'] == 1) ? 'checked' : ''),
+                    'value_edit_checked' => (($row['edit'] == 1) ? 'checked' : ''),
                     'value_del' => $groupId . '_del',
-                    'value_del_checked' => (($row['Del'] == 1) ? 'checked' : ''),
+                    'value_del_checked' => (($row['del'] == 1) ? 'checked' : ''),
                 );
 
             $checkboxes[] = $checkbox;
@@ -2118,6 +2117,13 @@
             return false;
         }
     }
+
+    public function GetSetting($setting, $default = NULL) {
+        if (isset($this->settings[$setting]))
+            return $this->settings[$setting];
+        else
+            return $default;
+    }
     
     /**
 	 * Return file based media items to the browser for Download/Preview

=== modified file 'server/lib/pages/admin.class.php'
--- server/lib/pages/admin.class.php	2014-09-16 16:41:43 +0000
+++ server/lib/pages/admin.class.php	2014-10-21 16:06:16 +0000
@@ -137,13 +137,13 @@
                 'title' => __('Tidy Library'),
                 'class' => 'XiboFormButton',
                 'selected' => false,
-                'link' => 'index.php?p=admin&q=TidyLibrary',
+                'link' => 'index.php?p=admin&q=TidyLibraryForm',
                 'help' => __('Run through the library and remove and unnecessary files'),
                 'onclick' => ''
                 );
         }
 
-        return $menu;                 
+        return $menu;
     }
 
     function Edit() {
@@ -153,8 +153,7 @@
         if (!Kit::CheckToken())
             trigger_error(__('Sorry the form has expired. Please refresh.'), E_USER_ERROR);
 
-        Kit::ClassLoader('setting');
-        $data = new Setting($this->db);
+        $data = new Setting();
 
         // Get all of the settings in an array
         $settings = Config::GetAll(NULL, array('userChange' => 1, 'userSee' => 1));
@@ -185,6 +184,7 @@
         }
 
         $response->SetFormSubmitResponse(__('Settings Updated'), false);
+        $response->callBack = 'settingsUpdated';
         $response->Respond();
     }
 	
@@ -417,20 +417,10 @@
     public function BackupDatabase()
     {
         // We want to output a load of stuff to the browser as a text file.
-        Kit::ClassLoader('maintenance');
         $maintenance = new Maintenance($this->db);
 
-        $dump = $maintenance->BackupDatabase();
-
-        if ($dump == '')
-            trigger_error(__('Unable to export database'), E_USER_ERROR);
-
-        header('Content-Type: text/plaintext');
-        header('Content-Disposition: attachment; filename="' . date('Y-m-d H:i:s') . '.bak"');
-        header("Content-Transfer-Encoding: binary");
-        header('Accept-Ranges: bytes');
-        echo $dump;
-        exit;
+        if (!$dump = $maintenance->BackupDatabase())
+            trigger_error($maintenance->GetErrorMessage(), E_USER_ERROR);
     }
 
     /**
@@ -545,70 +535,46 @@
         return round($bytes, $precision) . ' ' . $units[$pow];
     }
 
+    public function TidyLibraryForm()
+    {
+        $response = new ResponseManager();
+        
+        Theme::Set('form_id', 'TidyLibraryForm');
+        Theme::Set('form_action', 'index.php?p=admin&q=TidyLibrary');
+
+        $formFields = array();
+
+        // Check box to also delete un-used media that has been revised.
+        $formFields[] = FormManager::AddCheckbox('tidyOldRevisions', __('Remove old revisions'), 0, 
+            __('Cleaning up old revisions of media will result in any unused media revisions being permanently deleted.'), '');
+
+        $formFields[] = FormManager::AddMessage(__('Tidying the Library will delete any temporary files. Are you sure you want to proceed?'));
+
+        Theme::Set('form_fields', $formFields);
+
+        $response->SetFormRequestResponse(NULL, __('Tidy Library'), '350px', '275px');
+        $response->AddButton(__('Help'), 'XiboHelpRender("' . HelpManager::Link('Settings', 'TidyLibrary') . '")');
+        $response->AddButton(__('No'), 'XiboDialogClose()');
+        $response->AddButton(__('Yes'), '$("#TidyLibraryForm").submit()');
+        $response->Respond();
+    }
+
     /**
      * Tidies up the library
      */
     public function TidyLibrary()
     {
-        $db =& $this->db;
         $response = new ResponseManager();
-
+        $tidyOldRevisions = (Kit::GetParam('tidyOldRevisions', _POST, _CHECKBOX) == 1);
         if (Config::GetSetting('SETTING_LIBRARY_TIDY_ENABLED') != 1)
         	trigger_error(__('Sorry this function is disabled.'), E_USER_ERROR);
 
-        // Also run a script to tidy up orphaned media in the library
-        $library = Config::GetSetting('LIBRARY_LOCATION');
-	    $library = rtrim($library, '/') . '/';
-
-        Debug::LogEntry('audit', 'Library Location: ' . $library);
-
-        // Dump the files in the temp folder
-        foreach (scandir($library . 'temp') as $item)
-        {
-            if ($item == '.' || $item == '..')
-                continue;
-
-            Debug::LogEntry('audit', 'Deleting temp file: ' . $item);
-
-            unlink($library . 'temp' . DIRECTORY_SEPARATOR . $item);
-        }
-
-        // Get a list of all media files
-        foreach(scandir($library) as $file)
-        {
-            Debug::LogEntry('audit', 'Checking file: ' . $file);
-
-            if ($file == '.' || $file == '..')
-                continue;
-
-	        if (is_dir($library . $file))
-		        continue;
-
-            $rowCount = $db->GetCountOfRows("SELECT * FROM media WHERE storedAs = '" . $file . "'");
-
-            Debug::LogEntry('audit', 'Media count for file: ' . $file . ' is ' . $rowCount);
-            
-            // For each media file, check to see if the file still exists in the library
-            if ($rowCount == 0)
-            {
-                Debug::LogEntry('audit', 'Deleting file: ' . $file);
-
-                // If not, delete it
-                unlink($library . $file);
-
-                if (file_exists($library . 'tn_' . $file))
-                {
-                    unlink($library . 'tn_' . $file);
-                }
-
-                if (file_exists($library . 'bg_' . $file))
-                {
-                    unlink($library . 'bg_' . $file);
-                }
-            }
-        }
-
-        trigger_error(__('Library Tidy Complete'), E_USER_ERROR);
+        $maintenance = new Maintenance();
+        if (!$maintenance->TidyLibrary($tidyOldRevisions))
+            trigger_error($maintenance->GetErrorMessage(), E_USER_ERROR);
+
+        $response->SetFormSubmitResponse(__('Library Tidy Complete'));
+        $response->Respond();
     }
 }
 ?>

=== modified file 'server/lib/pages/campaign.class.php'
--- server/lib/pages/campaign.class.php	2014-08-15 14:40:03 +0000
+++ server/lib/pages/campaign.class.php	2014-10-21 16:06:16 +0000
@@ -355,41 +355,30 @@
         Theme::Set('form_action', 'index.php?p=campaign&q=Permissions');
         Theme::Set('form_meta', '<input type="hidden" name="campaignId" value="' . $campaignId . '" />');
 
-        // List of all Groups with a view/edit/delete checkbox
-        $SQL = '';
-        $SQL .= 'SELECT `group`.GroupID, `group`.`Group`, View, Edit, Del, `group`.IsUserSpecific ';
-        $SQL .= '  FROM `group` ';
-        $SQL .= '   LEFT OUTER JOIN lkcampaigngroup ';
-        $SQL .= '   ON lkcampaigngroup.GroupID = group.GroupID ';
-        $SQL .= '       AND lkcampaigngroup.CampaignID = %d ';
-        $SQL .= ' WHERE `group`.GroupID <> %d ';
-        $SQL .= 'ORDER BY `group`.IsEveryone DESC, `group`.IsUserSpecific, `group`.`Group` ';
-
-        $SQL = sprintf($SQL, $campaignId, $this->user->getGroupFromID($this->user->userid, true));
-
-        if (!$results = $db->query($SQL))
-        {
-            trigger_error($db->error());
+        // List of all Groups with a view / edit / delete check box
+        $permissions = new CampaignSecurity();
+        if (!$result = $permissions->GetPermissions($campaignId))
+            trigger_error($permissions->GetErrorMessage(), E_USER_ERROR);
+
+        if (count($result) <= 0)
             trigger_error(__('Unable to get permissions for this Campaign'), E_USER_ERROR);
-        }
 
         $checkboxes = array();
 
-        while ($row = $db->get_assoc_row($results))
-        {
-            $groupId = $row['GroupID'];
-            $rowClass = ($row['IsUserSpecific'] == 0) ? 'strong_text' : '';
+        foreach ($result as $row) {
+            $groupId = $row['groupid'];
+            $rowClass = ($row['isuserspecific'] == 0) ? 'strong_text' : '';
 
             $checkbox = array(
                     'id' => $groupId,
-                    'name' => Kit::ValidateParam($row['Group'], _STRING),
+                    'name' => Kit::ValidateParam($row['group'], _STRING),
                     'class' => $rowClass,
                     'value_view' => $groupId . '_view',
-                    'value_view_checked' => (($row['View'] == 1) ? 'checked' : ''),
+                    'value_view_checked' => (($row['view'] == 1) ? 'checked' : ''),
                     'value_edit' => $groupId . '_edit',
-                    'value_edit_checked' => (($row['Edit'] == 1) ? 'checked' : ''),
+                    'value_edit_checked' => (($row['edit'] == 1) ? 'checked' : ''),
                     'value_del' => $groupId . '_del',
-                    'value_del_checked' => (($row['Del'] == 1) ? 'checked' : ''),
+                    'value_del_checked' => (($row['del'] == 1) ? 'checked' : ''),
                 );
 
             $checkboxes[] = $checkbox;
@@ -593,7 +582,7 @@
     public function SetMembers()
     {
         // Check the token
-        if (!Kit::CheckToken())
+        if (!Kit::CheckToken('assign_token'))
             trigger_error(__('Sorry the form has expired. Please refresh.'), E_USER_ERROR);
         
         $db =& $this->db;
@@ -646,10 +635,10 @@
         $id = uniqid();
         Theme::Set('id', $id);
         Theme::Set('form_meta', '<input type="hidden" name="p" value="campaign"><input type="hidden" name="q" value="LayoutAssignView">');
-        Theme::Set('pager', ResponseManager::Pager($id, 'form_grid_pager'));
+        Theme::Set('pager', ResponseManager::Pager($id, 'grid_pager'));
         
         // Get the currently assigned layouts and put them in the "well"
-        // // Layouts in group
+        // Layouts in group
         $SQL  = "SELECT layout.Layoutid, ";
         $SQL .= "       layout.layout, ";
         $SQL .= "       CONCAT('LayoutID_', layout.LayoutID) AS list_id ";
@@ -669,11 +658,17 @@
 
         Debug::LogEntry('audit', count($layoutsAssigned) . ' layouts assigned already');
 
+        $formFields = array();
+        $formFields[] = FormManager::AddText('filter_name', __('Name'), NULL, NULL, 'l');
+        Theme::Set('form_fields', $formFields);
+
         // Set the layouts assigned
         Theme::Set('layouts_assigned', $layoutsAssigned);
+        Theme::Set('append', Theme::RenderReturn('campaign_form_layout_assign'));
 
         // Call to render the template
-        $output = Theme::RenderReturn('campaign_form_layout_assign');
+        Theme::Set('header_text', __('Choose Layouts'));
+        $output = Theme::RenderReturn('grid_render');
 
         // Construct the Response
         $response->html = $output;
@@ -706,12 +701,24 @@
         // Get a list of media
         $layoutList = $user->LayoutList(NULL, array('layout' => $name));
 
+        $cols = array(
+                array('name' => 'layout', 'title' => __('Name'))
+            );
+        Theme::Set('table_cols', $cols);
+
         $rows = array();
 
         // Add some extra information
         foreach ($layoutList as $row) {
 
             $row['list_id'] = 'LayoutID_' . $row['layoutid'];
+            $row['assign_icons'][] = array(
+                    'assign_icons_class' => 'layout_assign_list_select'
+                );
+            $row['dataAttributes'] = array(
+                    array('name' => 'rowid', 'value' => $row['list_id']),
+                    array('name' => 'litext', 'value' => $row['layout'])
+                );
 
             $rows[] = $row;
         }
@@ -719,7 +726,7 @@
         Theme::Set('table_rows', $rows);
 
         // Render the Theme
-        $response->SetGridResponse(Theme::RenderReturn('campaign_form_layout_assign_list'));
+        $response->SetGridResponse(Theme::RenderReturn('table_render'));
         $response->callBack = 'LayoutAssignCallback';
         $response->pageSize = 5;
         $response->Respond();

=== modified file 'server/lib/pages/content.class.php'
--- server/lib/pages/content.class.php	2014-09-15 16:57:34 +0000
+++ server/lib/pages/content.class.php	2014-10-21 16:06:16 +0000
@@ -164,7 +164,7 @@
             $cols[] = array('name' => 'thumbnail', 'title' => __('Thumbnail'));
 
         $cols[] = array('name' => 'duration_text', 'title' => __('Duration'));
-        $cols[] = array('name' => 'size_text', 'title' => __('Size'));
+        $cols[] = array('name' => 'size_text', 'title' => __('Size'), 'sorter' => 'filesize');
         $cols[] = array('name' => 'owner', 'title' => __('Owner'));
         $cols[] = array('name' => 'permissions', 'title' => __('Permissions'));
         $cols[] = array('name' => 'revised', 'title' => __('Revised?'), 'icons' => true);
@@ -188,8 +188,9 @@
             // Thumbnail URL
             $row['thumbnail'] = '';
 
-            if ($row['mediatype'] == 'image')
-                $row['thumbnail'] = '<img src="index.php?p=module&mod=image&q=Exec&method=GetResource&mediaid=' . $row['mediaid'] . '&width=100&height=100&dynamic=true&thumb=true" alt="' . $row['media'] . '" />';
+            if ($row['mediatype'] == 'image') {
+                $row['thumbnail'] = '<a class="img-replace" data-toggle="lightbox" data-type="image" data-img-src="index.php?p=module&mod=image&q=Exec&method=GetResource&mediaid=' . $row['mediaid'] . '&width=100&height=100&dynamic=true&thumb=true" href="index.php?p=module&mod=image&q=Exec&method=GetResource&mediaid=' . $row['mediaid'] . '"><i class="fa fa-file-image-o"></i></a>';
+            }
 
 			$row['buttons'] = array();
 
@@ -257,7 +258,7 @@
 		$response = new ResponseManager();
 		
 		// Get a list of the enabled modules and then create buttons for them
-		if (!$enabledModules = new ModuleManager($db, $user, 0, '', -1)) 
+		if (!$enabledModules = new ModuleManager($user, 0, '', -1)) 
             trigger_error($enabledModules->message, E_USER_ERROR);
 		
 		$buttons = array();
@@ -300,7 +301,7 @@
         $id = uniqid();
         Theme::Set('id', $id);
         Theme::Set('form_meta', '<input type="hidden" name="p" value="content"><input type="hidden" name="q" value="LibraryAssignView">');
-        Theme::Set('pager', ResponseManager::Pager($id, 'form_grid_pager'));
+        Theme::Set('pager', ResponseManager::Pager($id, 'grid_pager'));
         
         // Module types filter
         $modules = $this->user->ModuleAuth(0, '', 1);

=== modified file 'server/lib/pages/display.class.php'
--- server/lib/pages/display.class.php	2014-09-16 10:59:55 +0000
+++ server/lib/pages/display.class.php	2014-10-21 16:06:16 +0000
@@ -27,14 +27,12 @@
         $this->db   =& $db;
         $this->user =& $user;
 
-        Kit::ClassLoader('Display');
-
         $this->sub_page = Kit::GetParam('sp', _GET, _WORD, 'view');
         $this->ajax     = Kit::GetParam('ajax', _REQUEST, _WORD, 'false');
         $displayid      = Kit::GetParam('displayid', _REQUEST, _INT, 0);
 
         // validate displays so we get a realistic view of the table
-        $this->validateDisplays();
+        Display::ValidateDisplays();
     }
 
     /**
@@ -56,12 +54,14 @@
             $filter_displaygroup = Session::Get('display', 'filter_displaygroup');
             $filter_display = Session::Get('display', 'filter_display');
             $filter_showThumbnail = Session::Get('display', 'filter_showThumbnail');
+            $filter_autoRefresh = Session::Get('display', 'filter_autoRefresh');
         }
         else {
             $filter_pinned = 0;
             $filter_displaygroup = NULL;
             $filter_display = NULL;
             $filter_showThumbnail = 0;
+            $filter_autoRefresh = 0;
         }
 
         $formFields = array();
@@ -76,13 +76,26 @@
             $displayGroups,
             'displaygroupid',
             'displaygroup',
+            NULL,
+            'd');
+
+        $formFields[] = FormManager::AddCombo(
+            'filter_showThumbnail', 
+            __('Thumbnails'), 
+            $filter_showThumbnail,
+            array(
+                array('key' => 0, 'value' => __('None')),
+                array('key' => 1, 'value' => __('Always')),
+                array('key' => 2, 'value' => __('When Logged In')),
+                ),
+            'key',
+            'value',
             NULL, 
-            'd');
-
-        $formFields[] = FormManager::AddCheckbox('filter_showThumbnail', __('Show Thumbnails'), 
-            $filter_showThumbnail, NULL, 
             't');
 
+        $formFields[] = FormManager::AddNumber('filter_autoRefresh', __('Auto Refresh'), $filter_autoRefresh, 
+            NULL, 'r');
+
         $formFields[] = FormManager::AddCheckbox('XiboFilterPinned', __('Keep Open'), 
             $filter_pinned, NULL, 
             'k');
@@ -141,7 +154,7 @@
         $displayObject->wakeOnLanTime = Kit::GetParam('wakeOnLanTime', _POST, _STRING);
         $displayObject->broadCastAddress = Kit::GetParam('broadCastAddress', _POST, _STRING);
         $displayObject->secureOn = Kit::GetParam('secureOn', _POST, _STRING);
-        $displayObject->cidr = Kit::GetParam('cidr', _POST, _INT);
+        $displayObject->cidr = Kit::GetParam('cidr', _POST, _STRING);
         $displayObject->latitude = Kit::GetParam('latitude', _POST, _DOUBLE);
         $displayObject->longitude = Kit::GetParam('longitude', _POST, _DOUBLE);
         $displayObject->displayProfileId = Kit::GetParam('displayprofileid', _POST, _INT);
@@ -225,8 +238,8 @@
                     __('Do you want to be notified by email if there is a problem with this display?'), 
                     'a');
 
-        $formFields[] = FormManager::AddNumber('alert_timeout', __('Alert Timeout'), $displayObject->alertTimeout, 
-            __('How long in minutes after the display last connected to the webservice should we send an alert. Set this value higher than the collection interval on the client. Set to 0 to use global default.'), 
+        $formFields[] = FormManager::AddCheckbox('alert_timeout', __('Use the Global Timeout?'), $displayObject->alertTimeout, 
+            __('Should this display be tested against the global time out or the client collection interval?'), 
             'o');
 
         Theme::Set('form_fields_maintenance', $formFields);
@@ -259,7 +272,7 @@
             __('The time this display should receive the WOL command, using the 24hr clock - e.g. 19:00. Maintenance must be enabled.'), 't');
 
         $formFields[] = FormManager::AddText('cidr', __('Wake on LAN CIDR'), $displayObject->cidr, 
-            __('Enter a number within the range of 0 to 32 in the following field. Leave the following field empty, if no subnet mask should be used (CIDR = 0). If the remote host\'s broadcast address is unkown: Enter the host name or IP address of the remote host in Broad Cast Address and enter the CIDR subnet mask of the remote host in this field.'), 'c');
+            __('Enter a number within the range of 0 to 32 in the following field. Leave the following field empty, if no subnet mask should be used (CIDR = 0). If the remote host\'s broadcast address is unknown: Enter the host name or IP address of the remote host in Broad Cast Address and enter the CIDR subnet mask of the remote host in this field.'), 'c');
 
         Theme::Set('form_fields_wol', $formFields);
 
@@ -327,6 +340,7 @@
         $db         =& $this->db;
         $user       =& $this->user;
         $response   = new ResponseManager();
+        $dateFormat = Config::GetSetting('DATE_FORMAT');
 
         // Filter by Name
         $filter_display = Kit::GetParam('filter_display', _POST, _STRING);
@@ -337,9 +351,13 @@
         setSession('display', 'filter_displaygroup', $filter_displaygroupid);
 
         // Thumbnail?
-        $filter_showThumbnail = Kit::GetParam('filter_showThumbnail', _REQUEST, _CHECKBOX);
+        $filter_showThumbnail = Kit::GetParam('filter_showThumbnail', _REQUEST, _INT);
         setSession('display', 'filter_showThumbnail', $filter_showThumbnail);
 
+        // filter_autoRefresh?
+        $filter_autoRefresh = Kit::GetParam('filter_autoRefresh', _REQUEST, _INT, 0);
+        setSession('display', 'filter_autoRefresh', $filter_autoRefresh);
+
         // Pinned option?        
         setSession('display', 'DisplayFilter', Kit::GetParam('XiboFilterPinned', _REQUEST, _CHECKBOX, 'off'));
 
@@ -358,22 +376,19 @@
         $cols = array(
                 array('name' => 'displayid', 'title' => __('ID')),
                 array('name' => 'licensed', 'title' => __('License'), 'icons' => true),
-                array('name' => 'display', 'title' => __('Display')),
-                array('name' => 'description', 'title' => __('Description')),
-                array('name' => 'layout', 'title' => __('Default Layout')),
-                array('name' => 'inc_schedule', 'title' => __('Interleave Default'), 'icons' => true),
-                array('name' => 'email_alert', 'title' => __('Email Alert'), 'icons' => true),
+                array('name' => 'displayWithLink', 'title' => __('Display')),
+                array('name' => 'description', 'title' => __('Description'), 'hidden' => ($filter_showThumbnail == 1 || $filter_showThumbnail == 2)),
+                array('name' => 'layout', 'title' => __('Default Layout'), 'hidden' => ($filter_showThumbnail == 1 || $filter_showThumbnail == 2)),
+                array('name' => 'inc_schedule', 'title' => __('Interleave Default'), 'icons' => true, 'hidden' => ($filter_showThumbnail == 1 || $filter_showThumbnail == 2)),
+                array('name' => 'email_alert', 'title' => __('Email Alert'), 'icons' => true, 'hidden' => ($filter_showThumbnail == 1 || $filter_showThumbnail == 2)),
                 array('name' => 'loggedin', 'title' => __('Logged In'), 'icons' => true),
                 array('name' => 'lastaccessed', 'title' => __('Last Accessed')),
-                array('name' => 'clientaddress', 'title' => __('IP Address')),
-                array('name' => 'macaddress', 'title' => __('Mac Address'))
+                array('name' => 'clientaddress', 'title' => __('IP Address'), 'hidden' => ($filter_showThumbnail == 1)),
+                array('name' => 'macaddress', 'title' => __('Mac Address'), 'hidden' => ($filter_showThumbnail == 1)),
+                array('name' => 'screenShotRequested', 'title' => __('Screen shot?'), 'icons' => true, 'hidden' => ($filter_showThumbnail == 0)),
+                array('name' => 'thumbnail', 'title' => __('Thumbnail'), 'hidden' => ($filter_showThumbnail == 0))
             );
         
-        if ($filter_showThumbnail == 1) {
-            $cols[] = array('name' => 'screenShotRequested', 'title' => __('Screen shot?'), 'icons' => true);
-            $cols[] = array('name' => 'thumbnail', 'title' => __('Thumbnail'));
-        }
-
         Theme::Set('table_cols', $cols);
         Theme::Set('rowClass', 'mediainventorystatus');
 
@@ -387,11 +402,11 @@
                 if ($linkTarget == '')
                     $linkTarget = '_top';
 
-                $row['display'] = sprintf('<a href="' . $vncTemplate . '" title="VNC to ' . $row['display'] . '" target="' . $linkTarget . '">' . Theme::Prepare($row['display']) . '</a>', $row['clientaddress']);
+                $row['displayWithLink'] = sprintf('<a href="' . $vncTemplate . '" title="VNC to ' . $row['display'] . '" target="' . $linkTarget . '">' . Theme::Prepare($row['display']) . '</a>', $row['clientaddress']);
             }
 
             // Format last accessed
-            $row['lastaccessed'] = date("Y-m-d H:i:s", $row['lastaccessed']);
+            $row['lastaccessed'] = date($dateFormat, $row['lastaccessed']);
 
             // Create some login lights
             $row['mediainventorystatus'] = ($row['mediainventorystatus'] == 1) ? 'success' : (($row['mediainventorystatus'] == 2) ? 'danger' : 'warning');
@@ -399,7 +414,10 @@
             // Thumbnail
             $row['thumbnail'] = '';
             if ($filter_showThumbnail == 1 && file_exists(Config::GetSetting('LIBRARY_LOCATION') . 'screenshots/' . $row['displayid'] . '_screenshot.jpg')) {
-                $row['thumbnail'] = '<img class="display-screenshot" src="index.php?p=display&q=ScreenShot&DisplayId=' . $row['displayid'] . '" />';
+                $row['thumbnail'] = '<a data-toggle="lightbox" data-type="image" href="index.php?p=display&q=ScreenShot&DisplayId=' . $row['displayid'] . '"><img class="display-screenshot" src="index.php?p=display&q=ScreenShot&DisplayId=' . $row['displayid'] . '" /></a>';
+            }
+            else if ($filter_showThumbnail == 2) {
+                $row['thumbnail'] = '<i class="fa fa-times-circle"></i>';
             }
 
             // Edit and Delete buttons first
@@ -454,7 +472,13 @@
                 $row['buttons'][] = array(
                         'id' => 'display_button_requestScreenShot',
                         'url' => 'index.php?p=display&q=RequestScreenShotForm&displayId=' . $row['displayid'],
-                        'text' => __('Request Screen Shot')
+                        'text' => __('Request Screen Shot'),
+                        'multi-select' => true,
+                        'dataAttributes' => array(
+                            array('name' => 'multiselectlink', 'value' => 'index.php?p=display&q=RequestScreenShot'),
+                            array('name' => 'rowtitle', 'value' => $row['display']),
+                            array('name' => 'displayId', 'value' => $row['displayid'])
+                        )
                     );
 
                 $row['buttons'][] = array('linkType' => 'divider');
@@ -523,55 +547,11 @@
         $output = Theme::RenderReturn('table_render');
 
         $response->SetGridResponse($output);
+        $response->refresh = Kit::GetParam('filter_autoRefresh', _REQUEST, _INT, 0);
         $response->Respond();
     }
 
     /**
-     * Assess each Display to correctly set the logged in flag based on last accessed time
-     * @return
-     */
-    function validateDisplays()
-    {
-        $db =& $this->db;
-
-        // Get the global timeout (overrides the alert timeout on the display if 0
-        $globalTimeout = Config::GetSetting('MAINTENANCE_ALERT_TOUT');
-
-        // Get a list of all displays and there last accessed / alert timeout value
-        $SQL  = "";
-        $SQL .= "SELECT displayid, lastaccessed, alert_timeout FROM display ";
-