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

[Dan Garner]

=== modified file '.bzrignore'
--- .bzrignore	2013-05-01 19:24:35 +0000
+++ .bzrignore	2014-09-19 11:39:09 +0000
@@ -2,3 +2,6 @@
 .project
 server/.project
 Thumbs.db
+.vagrant
+library/*
+server-tests/node_modules
 
=== added file 'Vagrantfile'
--- Vagrantfile	1970-01-01 00:00:00 +0000
+++ Vagrantfile	2014-09-19 11:39:09 +0000
@@ -0,0 +1,23 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
+VAGRANTFILE_API_VERSION = "2"
+
+$script = <<SCRIPT
+apt-get update
+apt-get install libapache2-mod-xsendfile
+SCRIPT
+
+$ip = <<IP
+ifconfig
+IP
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| 
+  config.vm.box = "avenuefactory/lamp"
+  config.vm.provision "shell", inline: $script
+  config.vm.provision "shell", inline: $ip, run: "always"
+  config.vm.network :private_network, type: "dhcp"
+  config.vm.synced_folder "server/", "/var/www/html"
+  config.vm.synced_folder "library/", "/var/www/library"
+end
 
=== added directory 'library'
=== added file 'library/readme.txt'
--- library/readme.txt	1970-01-01 00:00:00 +0000
+++ library/readme.txt	2014-09-19 11:39:09 +0000
@@ -0,0 +1,1 @@
+This folder acts as a non-web serviceable location for the Xibo Library when using Vagrant.
 \ No newline at end of file
 
=== added directory 'server-tests'
=== added directory 'server-tests/features'
=== added file 'server-tests/features/login-about-popup.feature'
--- server-tests/features/login-about-popup.feature	1970-01-01 00:00:00 +0000
+++ server-tests/features/login-about-popup.feature	2014-09-19 11:39:09 +0000
@@ -0,0 +1,9 @@
+Feature: About Popup
+	While we are logged out
+	We need to make sure the about link is visible
+	And that the popup opens when we click it
+
+	Scenario: Visit the Xibo CMS
+		Given I visit the Xibo CMS
+		When I press the 'About' link
+		Then I should see the dialog titled 'About'
 \ No newline at end of file
 
=== added file 'server-tests/features/login-admin-user.feature'
--- server-tests/features/login-admin-user.feature	1970-01-01 00:00:00 +0000
+++ server-tests/features/login-admin-user.feature	2014-09-19 11:39:09 +0000
@@ -0,0 +1,10 @@
+Feature: Login
+	I visit the Xibo CMS and want to login
+
+	Scenario: Login
+		Given I visit the Xibo CMS
+		When the 'login-form' form is visible
+			And I enter 'dan' into 'username'
+			And I enter 'dan' into 'password'
+			And I press the login button
+		Then I should see the dashboard
 \ No newline at end of file
 
=== added file 'server-tests/features/schedule_view.feature'
--- server-tests/features/schedule_view.feature	1970-01-01 00:00:00 +0000
+++ server-tests/features/schedule_view.feature	2014-09-19 11:39:09 +0000
@@ -0,0 +1,7 @@
+Feature: View the Calendar
+
+	Scenario: View the Calendar without any Display Groups selected
+		Given I visit the Xibo CMS
+			And I am logged in as a 'super admin'
+			And I visit 'the schedule'
+		Then the 'Calendar' is visible
 
=== added directory 'server-tests/features/step_definitions'
=== added file 'server-tests/features/step_definitions/generic.js'
--- server-tests/features/step_definitions/generic.js	1970-01-01 00:00:00 +0000
+++ server-tests/features/step_definitions/generic.js	2014-09-19 11:39:09 +0000
@@ -0,0 +1,97 @@
+module.exports = function () {
+
+    this.World = require('../support/world.js');
+    var PROPERTIES = require('../support/testproperties.json');
+    var assert = require("assert");
+
+    /* "<Given> I visit <url>" */
+    this.Given(/^I visit (.*)$/, function (url, callback) {
+
+        if (url == "the Xibo CMS") {
+            
+            url = PROPERTIES.url;
+            this
+                .init()
+                .url(url, callback);
+
+            return;
+        }
+        else if ("the schedule")
+            url = PROPERTIES.url + "?p=schedule";
+        else
+            url = PROPERTIES.url + url;
+
+        this.url(url, callback);
+    });
+
+    /* "<Given>I am logged in as a <usertype>" */
+    this.Given(/^I am logged in as a (.*)$/, function (userType, callback) {
+
+        var username = "dan";
+        var password = "dan";
+
+        this.waitFor("#login-form", 3000, function (err, found) {
+
+            if (!err) {
+                this.setValue("#username", username);
+                this.setValue("#password", password);
+                this.click("#login-form button", callback);
+                return;
+            }
+
+            callback.fail(new Error('Login form was not found after 3s'));
+        });
+    });
+
+    /* "<When> I enter <text> into <inputId>" */
+    this.When(/^I enter '(.*)' into '(.*)'$/, function (text, inputId, callback) {
+
+        inputId = '#' + inputId;
+
+        this.waitFor(inputId, 3000, function (err, found) {
+
+            if (!err) {
+                this.setValue(inputId, text, callback);
+                return;
+            }
+
+            callback.fail(new Error('Element ' + inputId + ' was not found after 3s'));
+        });
+    });
+
+    /* "<When> I press the <id> link" */
+    this.When(/^I press the '(.*)' link$/, function (link, callback) {
+        this.click("=" + link, callback);
+    });
+
+    /* "<When> I press the <id> button" */
+    this.When(/^I press the '(.*)' button$/, function (link, callback) {
+        this.click("#" + link, callback);
+    });
+
+    this.When(/^the '(.*)' form is visible$/, function (link, callback) {
+        this.isVisible("#" + link, callback);
+    });
+
+    this.Then(/^the '(.*)' is visible$/, function (link, callback) {
+        this.isVisible("#" + link, callback);
+    });
+
+    /* "<Then>I should see the dialog titled <title>" */
+    this.Then(/^I should see the dialog titled '(.*)'$/, function (title, callback) {
+        
+        this.waitFor("h4.modal-title", 5000, function (err, found) {
+
+            if (!err) {
+                this.getText("h4.modal-title", function (err, result) {
+
+                    assert.equal(result, title, "Cannot find " + title + " form.");
+                });
+                this.call(callback);
+                return;
+            }
+
+            callback.fail(new Error('A form was not found after 3s'));
+        });
+    });
+};
 \ No newline at end of file
 
=== added file 'server-tests/features/step_definitions/login-admin-user.js'
--- server-tests/features/step_definitions/login-admin-user.js	1970-01-01 00:00:00 +0000
+++ server-tests/features/step_definitions/login-admin-user.js	2014-09-19 11:39:09 +0000
@@ -0,0 +1,14 @@
+module.exports = function () {
+
+    this.World = require('../support/world.js');
+    var PROPERTIES = require('../support/testproperties.json');
+    var assert = require("assert");
+
+    this.Then(/^I should see the dashboard$/, function (callback) {
+        this.isVisible("li.sidebar-main", callback);
+    });
+
+    this.When(/^I press the login button$/, function (link, callback) {
+        this.click("#login-form button", callback);
+    });
+};
 \ No newline at end of file
 
=== added directory 'server-tests/features/support'
=== added file 'server-tests/features/support/teardown.js'
--- server-tests/features/support/teardown.js	1970-01-01 00:00:00 +0000
+++ server-tests/features/support/teardown.js	2014-09-19 11:39:09 +0000
@@ -0,0 +1,9 @@
+//module.exports = function () {
+//  
+//  this.After(function(callback) {
+//
+//    this.end(callback);
+//
+//  });
+//
+//};
 \ No newline at end of file
 
=== added file 'server-tests/features/support/testproperties.json'
--- server-tests/features/support/testproperties.json	1970-01-01 00:00:00 +0000
+++ server-tests/features/support/testproperties.json	2014-09-19 11:39:09 +0000
@@ -0,0 +1,9 @@
+{
+    "logLevel": "silent",
+
+    "host": "127.0.0.1",
+
+    "browser": "firefox",
+
+    "url": "http://172.28.128.4/index.php"
+}
 \ No newline at end of file
 
=== added file 'server-tests/features/support/world.js'
--- server-tests/features/support/world.js	1970-01-01 00:00:00 +0000
+++ server-tests/features/support/world.js	2014-09-19 11:39:09 +0000
@@ -0,0 +1,37 @@
+module.exports = function(callback) {
+
+    if ( callback ) {
+
+        // Get our test properties
+        var PROPERTIES = require('./testproperties.json');
+
+        // Override any testproperty from command line with --[PROPERTY]=[VALUE]
+        process.argv.forEach(function (arg) {
+            arg = arg.match(/^--([A-Za-z]+)=(.*)/);
+
+            // Only look for --[PROPERTY] style args, everything else can be forgotten
+            if (arg === null || !arg[1]) return;
+
+            // If the JSON file has the argument to override, then override it.
+            if (PROPERTIES.hasOwnProperty(arg[1])) {
+                PROPERTIES[arg[1]] = arg[2];
+
+            // Otherwise proclaim that it is an unrecognised argument
+            } else {
+                console.log('Unrecognised argument ' + arg[1]);
+            }
+
+        });
+
+        var browser = require("webdriverio").remote({
+            logLevel: PROPERTIES.logLevel || 'none',
+            host: PROPERTIES.host,
+            desiredCapabilities: {
+                browserName: PROPERTIES.browser || 'firefox'
+            }
+        });
+
+        // Inject the browser into the callback, we don't need anything else
+        callback(browser);
+    }
+};
 \ No newline at end of file
 
=== added file 'server-tests/package.json'
--- server-tests/package.json	1970-01-01 00:00:00 +0000
+++ server-tests/package.json	2014-09-19 11:39:09 +0000
@@ -0,0 +1,16 @@
+{
+    "name": "xibo",
+    "version": "1.7.0-alpha",
+    "description": "Xibo Digital Signage - Test Suite",
+    "main": "xibo",
+    "scripts": {
+        "test": "echo \"Error: no test specified\" && exit 1"
+    },
+    "dependencies":{
+        "webdriverio":"*",
+        "cucumber":"*",
+        "selenium-standalone":"*"
+    },
+    "author": "Spring Signage Ltd and the Xibo Developers",
+    "license": "AGPL-3.0"
+}
 
=== added file 'server-tests/readme.md'
--- server-tests/readme.md	1970-01-01 00:00:00 +0000
+++ server-tests/readme.md	2014-09-19 11:39:09 +0000
@@ -0,0 +1,13 @@
+Tests written in:
+
+Nodejs
+
+With:
+
+https://github.com/webdriverio/webdriverio
+https://github.com/cucumber/cucumber/wiki
+
+
+Run npm install
+node_modules/.bin/start-selenium
+node_modules/.bin/cucumber
 \ No newline at end of file
 
=== modified file 'server/3rdparty/jquery-file-upload/UploadHandler.php'
--- server/3rdparty/jquery-file-upload/UploadHandler.php	2013-11-02 15:32:17 +0000
+++ server/3rdparty/jquery-file-upload/UploadHandler.php	2014-09-19 11:39:09 +0000
@@ -36,10 +36,7 @@
         'min_height' => 'Image requires a minimum height'
     );
 
-    function __construct($db, $user, $options = null, $initialize = true, $error_messages = null) {
-        $this->db =& $db;
-        $this->user =& $user;
-
+    function __construct($options = null, $initialize = true, $error_messages = null) {
         $this->options = array(
             'script_url' => $this->get_full_url().'/',
             'upload_dir' => dirname($this->get_server_var('SCRIPT_FILENAME')).'/files/',
@@ -508,38 +505,6 @@
         );
     }
 
-    protected function handle_form_data($file, $index) {
-        // Handle form data, e.g. $_REQUEST['description'][$index]
-        
-        // Link the file to the module
-        $name = $_REQUEST['name'][$index];
-        $duration = $_REQUEST['duration'][$index];
-
-        $layoutid = Kit::GetParam('layoutid', _REQUEST, _INT);
-        $regionid = Kit::GetParam('regionid', _REQUEST, _STRING);
-        $type = Kit::GetParam('type', _REQUEST, _WORD);
-
-        Debug::LogEntry('audit', 'Upload complete for Type: ' . $type . ' and file name: ' . $file->name . '. Name: ' . $name . '. Duration:' . $duration);
-
-        // We want to create a module for each of the uploaded files.
-        // Do not pass in the region ID so that we only assign to the library and not to the layout
-        require_once("modules/$type.module.php");
-        if (!$module = new $type($this->db, $this->user, '', $layoutid, '', '')) {
-            $file->error = $module->GetErrorMessage();
-        }
-
-        // We want to add this item to our library
-        if (!$storedAs = $module->AddLibraryMedia($file->name, $name, $duration, $file->name)) {
-            $file->error = $module->GetErrorMessage();
-        }
-
-        // Set new file details
-        $file->storedas = $storedAs;
-
-        // Delete the file
-        @unlink($this->get_upload_path($file->name));
-    }
-
     protected function orient_image($file_path) {
         if (!function_exists('exif_read_data')) {
             return false;
 
=== added file 'server/3rdparty/jquery-file-upload/XiboUploadHandler.php'
--- server/3rdparty/jquery-file-upload/XiboUploadHandler.php	1970-01-01 00:00:00 +0000
+++ server/3rdparty/jquery-file-upload/XiboUploadHandler.php	2014-09-19 11:39:09 +0000
@@ -0,0 +1,38 @@
+<?php 
+
+require_once("3rdparty/jquery-file-upload/UploadHandler.php");
+
+class XiboUploadHandler extends UploadHandler {
+	
+	protected function handle_form_data($file, $index) {
+        // Handle form data, e.g. $_REQUEST['description'][$index]
+        
+        // Link the file to the module
+        $name = $_REQUEST['name'][$index];
+        $duration = $_REQUEST['duration'][$index];
+
+        $layoutid = Kit::GetParam('layoutid', _REQUEST, _INT);
+        $regionid = Kit::GetParam('regionid', _REQUEST, _STRING);
+        $type = Kit::GetParam('type', _REQUEST, _WORD);
+
+        Debug::LogEntry('audit', 'Upload complete for Type: ' . $type . ' and file name: ' . $file->name . '. Name: ' . $name . '. Duration:' . $duration);
+
+        // We want to create a module for each of the uploaded files.
+        // Do not pass in the region ID so that we only assign to the library and not to the layout
+        require_once("modules/$type.module.php");
+        if (!$module = new $type($this->options['db'], $this->options['user'], '', $layoutid, '', '')) {
+            $file->error = $module->GetErrorMessage();
+        }
+
+        // We want to add this item to our library
+        if (!$storedAs = $module->AddLibraryMedia($file->name, $name, $duration, $file->name)) {
+            $file->error = $module->GetErrorMessage();
+        }
+
+        // Set new file details
+        $file->storedas = $storedAs;
+
+        // Delete the file
+        @unlink($this->get_upload_path($file->name));
+    }
+}
 \ No newline at end of file
 
=== added file 'server/config/client.config.php'
--- server/config/client.config.php	1970-01-01 00:00:00 +0000
+++ server/config/client.config.php	2014-09-19 11:39:09 +0000
@@ -0,0 +1,477 @@
+<?php
+/*
+ * Xibo - Digital Signage - http://www.xibo.org.uk
+ * Copyright (C) 2006-2014 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/>.
+ */
+defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
+
+// Client config
+$CLIENT_CONFIG = array(
+
+        'windows' => array(
+            'synonym' => 'dotnetclient',
+            'tabs' => array(
+                    array('id' => 'general', 'name' => __('General')),
+                    array('id' => 'location', 'name' => __('Location')),
+                    array('id' => 'trouble', 'name' => __('Troubleshooting')),
+                    array('id' => 'advanced', 'name' => __('Advanced')),
+                ),
+            'settings' => array(
+                    array(
+                        'name' => 'CollectInterval',
+                        'tabId' => 'general',
+                        'title' => __('Collection Interval (seconds)'),
+                        'type' => _INT,
+                        'fieldType' => 'number',
+                        'default' => 900,
+                        'helpText' => __('The number of seconds between connections to the CMS.'),
+                        'validation' => 'numeric',
+                        'enabled' => true,
+                        'groupClass' => NULL
+                    ),
+                    array(
+                        'name' => 'PowerpointEnabled',
+                        'tabId' => 'general',
+                        'title' => __('Enable PowerPoint?'),
+                        'type' => _CHECKBOX,
+                        'fieldType' => 'checkbox',
+                        'default' => false,
+                        'helpText' => __('Should Microsoft PowerPoint be Enabled?'),
+                        'enabled' => true,
+                        'groupClass' => NULL
+                    ),
+                    array(
+                        'name' => 'StatsEnabled',
+                        'tabId' => 'general',
+                        'title' => __('Enable stats reporting?'),
+                        'type' => _CHECKBOX,
+                        'fieldType' => 'checkbox',
+                        'default' => true,
+                        'helpText' => __('Should the application send proof of play stats to the CMS.'),
+                        'enabled' => true,
+                        'groupClass' => NULL
+                    ),
+                    array(
+                        'name' => 'SizeX',
+                        'tabId' => 'location',
+                        'title' => __('Width'),
+                        'type' => _DOUBLE,
+                        'fieldType' => 'number',
+                        'default' => '0',
+                        'helpText' => __('The Width of the Display Window. 0 means full width.'),
+                        'enabled' => true,
+                        'groupClass' => NULL
+                    ),
+                    array(
+                        'name' => 'SizeY',
+                        'tabId' => 'location',
+                        'title' => __('Height'),
+                        'type' => _DOUBLE,
+                        'fieldType' => 'number',
+                        'default' => '0',
+                        'helpText' => __('The Height of the Display Window. 0 means full height.'),
+                        'enabled' => true,
+                        'groupClass' => NULL
+                    ),
+                    array(
+                        'name' => 'OffsetX',
+                        'tabId' => 'location',
+                        'title' => __('Left Coordinate'),
+                        'type' => _DOUBLE,
+                        'fieldType' => 'number',
+                        'default' => '0',
+                        'helpText' => __('The left pixel position the display window should be sized from.'),
+                        'enabled' => true,
+                        'groupClass' => NULL
+                    ),
+                    array(
+                        'name' => 'OffsetY',
+                        'tabId' => 'location',
+                        'title' => __('Top Coordinate'),
+                        'type' => _DOUBLE,
+                        'fieldType' => 'number',
+                        'default' => '0',
+                        'helpText' => __('The top pixel position the display window should be sized from.'),
+                        'enabled' => true,
+                        'groupClass' => NULL
+                    ),
+                    array(
+                        'name' => 'ShowInTaskbar',
+                        'tabId' => 'advanced',
+                        'title' => __('Show the icon in the task bar?'),
+                        'type' => _CHECKBOX,
+                        'fieldType' => 'checkbox',
+                        'default' => true,
+                        'helpText' => __('Should the application icon be shown in the task bar?'),
+                        'enabled' => true,
+                        'groupClass' => NULL
+                    ),
+                    array(
+                        'name' => 'ClientInfomationCtrlKey',
+                        'tabId' => 'trouble',
+                        'title' => __('CTRL Key required to access Client Information Screen?'),
+                        'type' => _CHECKBOX,
+                        'fieldType' => 'checkbox',
+                        'default' => false,
+                        'helpText' => __('Should the client information screen require the CTRL key?'),
+                        'enabled' => true,
+                        'groupClass' => NULL
+                    ),
+                    array(
+                        'name' => 'ClientInformationKeyCode',
+                        'tabId' => 'trouble',
+                        'title' => __('Key for Client Information Screen'),
+                        'type' => _WORD,
+                        'fieldType' => 'text',
+                        'default' => 'I',
+                        'helpText' => __('Which key should activate the client information screen? A single character.'),
+                        'enabled' => true,
+                        'groupClass' => NULL
+                    ),
+                    array(
+                        'name' => 'CursorStartPosition',
+                        'tabId' => 'advanced',
+                        'title' => __('Cursor Start Position'),
+                        'type' => _STRING,
+                        'fieldType' => 'dropdown',
+                        'options' => array(
+                                array('id' => 'Top Left', 'value' => 'Top Left'),
+                                array('id' => 'Top Right', 'value' => 'Top Right'),
+                                array('id' => 'Bottom Left', 'value' => 'Bottom Left'),
+                                array('id' => 'Bottom Right', 'value' => 'Bottom Right'),
+                            ),
+                        'default' => 'Bottom Right',
+                        'helpText' => __('The position of the cursor when the client starts up.'),
+                        'enabled' => true,
+                        'groupClass' => NULL
+                    ),
+                    array(
+                        'name' => 'DoubleBuffering',
+                        'tabId' => 'advanced',
+                        'title' => __('Enable Double Buffering'),
+                        'type' => _CHECKBOX,
+                        'fieldType' => 'checkbox',
+                        'default' => true,
+                        'helpText' => __('Double buffering helps smooth the playback but should be disabled if graphics errors occur'),
+                        'enabled' => true,
+                        'groupClass' => NULL
+                    ),
+                    array(
+                        'name' => 'EmptyLayoutDuration',
+                        'tabId' => 'advanced',
+                        'title' => __('Duration for Empty Layouts'),
+                        'type' => _INT,
+                        'fieldType' => 'text',
+                        'default' => 10,
+                        'helpText' => __('If an empty layout is detected how long should it remain on screen. Must be greater then 1.'),
+                        'validation' => 'number',
+                        'enabled' => true,
+                        'groupClass' => NULL
+                    ),
+                    array(
+                        'name' => 'EnableMouse',
+                        'tabId' => 'advanced',
+                        'title' => __('Enable Mouse'),
+                        'type' => _CHECKBOX,
+                        'fieldType' => 'checkbox',
+                        'default' => true,
+                        'helpText' => __('Enable the mouse.'),
+                        'enabled' => true,
+                        'groupClass' => NULL
+                    ),
+                    array(
+                        'name' => 'EnableShellCommands',
+                        'tabId' => 'advanced',
+                        'title' => __('Enable Shell Commands'),
+                        'type' => _CHECKBOX,
+                        'fieldType' => 'checkbox',
+                        'default' => true,
+                        'helpText' => __('Enable the Shell Command module.'),
+                        'enabled' => true,
+                        'groupClass' => NULL
+                    ),
+                    array(
+                        'name' => 'ExpireModifiedLayouts',
+                        'tabId' => 'advanced',
+                        'title' => __('Expire Modified Layouts'),
+                        'type' => _CHECKBOX,
+                        'fieldType' => 'checkbox',
+                        'default' => true,
+                        'helpText' => __('Expire Modified Layouts immediately on change. This means a layout can be cut during playback if it receives an update from the CMS'),
+                        'enabled' => true,
+                        'groupClass' => NULL
+                    ),
+                    array(
+                        'name' => 'LogLevel',
+                        'tabId' => 'trouble',
+                        'title' => __('Log Level'),
+                        'type' => _WORD,
+                        'fieldType' => 'dropdown',
+                        'options' => array(
+                                array('id' => 'audit', 'value' => 'Audit'),
+                                array('id' => 'info', 'value' => 'Information'),
+                                array('id' => 'error', 'value' => 'Error'),
+                                array('id' => 'off', 'value' => 'Off')
+                            ),
+                        'default' => 'error',
+                        'helpText' => __('The position of the cursor when the client starts up.'),
+                        'enabled' => true,
+                        'groupClass' => NULL
+                    ),
+                    array(
+                        'name' => 'LogToDiskLocation',
+                        'tabId' => 'trouble',
+                        'title' => __('Log file path name.'),
+                        'type' => _STRING,
+                        'fieldType' => 'text',
+                        'default' => '',
+                        'helpText' => __('Create a log file on disk in this location. Please enter a fully qualified path.'),
+                        'enabled' => true,
+                        'groupClass' => NULL
+                    ),
+                    array(
+                        'name' => 'MaxConcurrentDownloads',
+                        'tabId' => 'advanced',
+                        'title' => __('Maximum concurrent downloads'),
+                        'type' => _INT,
+                        'fieldType' => 'text',
+                        'default' => '2',
+                        'helpText' => __('The maximum number of concurrent downloads the client will attempt.'),
+                        'enabled' => true,
+                        'groupClass' => NULL
+                    ),
+                    array(
+                        'name' => 'ShellCommandAllowList',
+                        'tabId' => 'advanced',
+                        'title' => __('Shell Command Allow List'),
+                        'type' => _STRING,
+                        'fieldType' => 'text',
+                        'default' => '',
+                        'helpText' => __('Which shell commands should the client execute?'),
+                        'enabled' => true,
+                        'groupClass' => NULL
+                    ),
+                    array(
+                        'name' => 'UseCefWebBrowser',
+                        'tabId' => 'advanced',
+                        'title' => __('Use CEF as the Web Browser'),
+                        'type' => _CHECKBOX,
+                        'fieldType' => 'checkbox',
+                        'default' => 1,
+                        '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
+                    ),
+                    array(
+                        'name' => 'SendCurrentLayoutAsStatusUpdate',
+                        'tabId' => 'advanced',
+                        'title' => __('Notify current layout'),
+                        'type' => _CHECKBOX,
+                        'fieldType' => 'checkbox',
+                        'default' => 0,
+                        'helpText' => __('When enabled the client will send the current layout to the CMS each time it changes. Warning: This is bandwidth intensive and should be disabled unless on a LAN.'),
+                        'enabled' => true,
+                        'groupClass' => NULL
+                    ),
+                    array(
+                        'name' => 'ScreenShotRequestInterval',
+                        'tabId' => 'advanced',
+                        'title' => __('Screen shot interval'),
+                        'type' => _INT,
+                        'fieldType' => 'number',
+                        'default' => 0,
+                        'helpText' => __('The duration between status screen shots in minutes. 0 to disable. Warning: This is bandwidth intensive.'),
+                        'enabled' => true,
+                        'groupClass' => NULL
+                    )
+                )
+            ),
+
+        /*'ubuntu' => array(
+            'synonym' => 'python',
+            'settings' => array(
+
+                )
+            ),*/
+
+        'android' => array(
+            'synonym' => 'xiboforandroid',
+            'tabs' => array(
+                    array('id' => 'general', 'name' => __('General')),
+                    array('id' => 'location', 'name' => __('Location')),
+                    array('id' => 'trouble', 'name' => __('Troubleshooting')),
+                    array('id' => 'advanced', 'name' => __('Advanced')),
+                ),
+            'settings' => array(
+                    array(
+                        'name' => 'emailAddress',
+                        'tabId' => 'general',
+                        'title' => __('Email Address'),
+                        'type' => _STRING,
+                        'fieldType' => 'text',
+                        'default' => '',
+                        'helpText' => __('The email address will be used to license this client. This is the email address you provided when you purchased the licence.'),
+                        'enabled' => true,
+                        'groupClass' => NULL
+                    ),
+                    array(
+                        'name' => 'settingsPassword',
+                        'tabId' => 'general',
+                        'title' => __('Password Protect Settings'),
+                        'type' => _STRING,
+                        'fieldType' => 'text',
+                        'default' => '',
+                        'helpText' => __('Provide a Password which will be required to access settings'),
+                        'enabled' => true,
+                        'groupClass' => NULL
+                    ),
+                    array(
+                        'name' => 'collectInterval',
+                        'tabId' => 'general',
+                        'title' => __('Collect interval'),
+                        'type' => _INT,
+                        'fieldType' => 'dropdown',
+                        'options' => array(
+                                array('id' => 60, 'value' => __('1 minute')),
+                                array('id' => 300, 'value' => __('5 minutes')),
+                                array('id' => 600, 'value' => __('10 minutes')),
+                                array('id' => 1800, 'value' => __('30 minutes')),
+                                array('id' => 3600, 'value' => __('1 hour')),
+                                array('id' => 14400, 'value' => __('4 hours')),
+                                array('id' => 43200, 'value' => __('12 hours'))
+                            ),
+                        'default' => 900,
+                        'helpText' => __('How often should the Player check for new content.'),
+                        'validation' => 'numeric',
+                        'enabled' => true,
+                        'groupClass' => NULL
+                    ),
+                    array(
+                        'name' => 'orientation',
+                        'tabId' => 'location',
+                        'title' => __('Orientation'),
+                        'type' => _INT,
+                        'fieldType' => 'dropdown',
+                        'options' => array(
+                                array('id' => 0, 'value' => __('Landscape')),
+                                array('id' => 1, 'value' => __('Portrait')),
+                                array('id' => 8, 'value' => __('Reverse Landscape')),
+                                array('id' => 9, 'value' => __('Reverse Portrait'))
+                            ),
+                        'default' => 0,
+                        'helpText' => __('Set the orientation of the device (portrait mode will only work if supported by the hardware) Application Restart Required.'),
+                        'enabled' => true,
+                        'groupClass' => NULL
+                    ),
+                    array(
+                        'name' => 'startOnBoot',
+                        'tabId' => 'advanced',
+                        'title' => __('Start during device start up?'),
+                        'type' => _CHECKBOX,
+                        'fieldType' => 'checkbox',
+                        'default' => true,
+                        'helpText' => __('When the device starts and Android finishes loading, should the client start up and come to the foreground?'),
+                        'enabled' => true,
+                        'groupClass' => NULL
+                    ),
+                    array(
+                        'name' => 'actionBarMode',
+                        'tabId' => 'advanced',
+                        'title' => __('Action Bar Mode'),
+                        'type' => _INT,
+                        'fieldType' => 'dropdown',
+                        'options' => array(
+                                array('id' => 0, 'value' => 'Hide'),
+                                array('id' => 1, 'value' => 'Timed')
+                            ),
+                        'default' => 1,
+                        'helpText' => __('How should the action bar behave?'),
+                        'enabled' => true,
+                        'groupClass' => NULL
+                    ),
+                    array(
+                        'name' => 'actionBarDisplayDuration',
+                        'tabId' => 'advanced',
+                        'title' => __('Action Bar Display Duration'),
+                        'type' => _INT,
+                        'fieldType' => 'text',
+                        'default' => 30,
+                        'helpText' => __('How long should the Action Bar be shown for, in seconds?'),
+                        'validation' => 'numeric',
+                        'enabled' => true,
+                        'groupClass' => NULL
+                    ),
+                    array(
+                        'name' => 'screenDimensions',
+                        'tabId' => 'location',
+                        'title' => __('Screen Dimensions'),
+                        'type' => _STRING,
+                        'fieldType' => 'text',
+                        'default' => '',
+                        'helpText' => __('Override the screen dimensions (left,top,width,height). Requires restart. Care should be taken to ensure these are within the actual screen size.'),
+                        'enabled' => true,
+                        'groupClass' => NULL
+                    ),
+                    array(
+                        'name' => 'autoRestart',
+                        'tabId' => 'advanced',
+                        'title' => __('Automatic Restart'),
+                        'type' => _CHECKBOX,
+                        'fieldType' => 'checkbox',
+                        'default' => true,
+                        'helpText' => __('Automatically Restart the application if we detect it is not visible.'),
+                        'enabled' => true,
+                        'groupClass' => NULL
+                    ),
+                    array(
+                        'name' => 'startOnBootDelay',
+                        'tabId' => 'advanced',
+                        'title' => __('Start delay for device start up'),
+                        'type' => _INT,
+                        'fieldType' => 'text',
+                        'default' => 60,
+                        'helpText' => __('The number of seconds to wait before starting the application after the device has started. Minimum 10.'),
+                        'validation' => 'numeric',
+                        'enabled' => true,
+                        'groupClass' => NULL
+                    ),
+                    array(
+                        'name' => 'blacklistVideo',
+                        'tabId' => 'trouble',
+                        'title' => __('Blacklist Videos?'),
+                        'type' => _CHECKBOX,
+                        'fieldType' => 'checkbox',
+                        'default' => true,
+                        'helpText' => __('Should Videos we fail to play be blacklisted and no longer attempted?'),
+                        'enabled' => true,
+                        'groupClass' => NULL
+                    ),
+                    array(
+                        'name' => 'storeHtmlOnInternal',
+                        'tabId' => 'trouble',
+                        'title' => __('Store HTML resources on the Internal Storage?'),
+                        'type' => _CHECKBOX,
+                        'fieldType' => 'checkbox',
+                        'default' => false,
+                        'helpText' => __('Store all HTML resources on the Internal Storage? Should be selected if the device cannot display text, ticker, dataset media.'),
+                        'enabled' => true,
+                        'groupClass' => NULL
+                    )
+                )
+            )
+    );
 
=== modified file 'server/config/config.class.php'
--- server/config/config.class.php	2014-07-17 09:35:07 +0000
+++ server/config/config.class.php	2014-09-19 11:39:09 +0000
@@ -77,6 +77,42 @@
 			return false;
 		}
 	}
+
+	static function GetAll($sort_order = array('cat', 'ordering'), $filter_by = array()) {
+
+		if ($sort_order == NULL)
+			$sort_order = array('cat', 'ordering');
+
+		try {
+			$dbh = PDOConnect::init();
+			
+			$SQL = 'SELECT * FROM setting WHERE 1 = 1 ';
+			$params = array();
+
+			if (Kit::GetParam('userChange', $filter_by, _INT, -1) != -1) {
+				$SQL .= ' AND userChange = :userChange ';
+				$params['userChange'] = Kit::GetParam('userChange', $filter_by, _INT);
+			}
+
+			if (Kit::GetParam('userSee', $filter_by, _INT, -1) != -1) {
+				$SQL .= ' AND userSee = :userSee ';
+				$params['userSee'] = Kit::GetParam('userSee', $filter_by, _INT);
+			}
+			
+			// Sorting?
+        	if (is_array($sort_order))
+            	$SQL .= 'ORDER BY ' . implode(',', $sort_order);
+
+			$sth = $dbh->prepare($SQL);
+			$sth->execute($params);
+
+			return $sth->fetchAll();
+		}
+		catch (Exception $e) {
+			trigger_error($e->getMessage());
+			return false;
+		}
+	}
 	
 	/**
 	 * Defines the Version and returns it
@@ -116,311 +152,365 @@
 	}
 	
 	/**
-	 * Checks the Environment and Determines if it is suitable for Xibo
+	 * Checks the Environment and Determines if it is suitable
 	 * @return 
 	 */
 	public function CheckEnvironment()
 	{
-		$output  = '';
-		$imgGood = '<img src="install/dot_green.gif"> ';
-		$imgBad  = '<img src="install/dot_red.gif"> ';
-		$imgWarn = '<img src="install/dot_amber.gif"> ';
-		
-		$output .= '<div class="checks">';
-		
+		$cols = array(
+                array('name' => 'item', 'title' => __('Item')),
+                array('name' => 'status', 'title' => __('Status'), 'icons' => true),
+                array('name' => 'advice', 'title' => __('Advice'))
+            );
+        Theme::Set('table_cols', $cols);
+
+        $rows = array();
+
 		// Check for PHP version
-		$message = __('PHP Version');
-
+		$advice = sprintf(__("PHP version %s or later required."), Config::$VERSION_REQUIRED) . ' Detected ' . phpversion();
 		if ($this->CheckPHP()) 
 		{
-			$output .= $imgGood.$message.'<br />';
+			$status = 1;
 		}
 		else
 		{
 			$this->envFault = true;
-			
-			$output .= $imgBad.$message.'<br />';
-			$output .= '<div class="check_explain"> <p>' . sprintf(__("PHP version %s or later required."), Config::$VERSION_REQUIRED) . '. Detected ' . phpversion() . '</p></div>';
+			$status = 0;
 		}
+
+		$rows[] = array(
+				'item' => __('PHP Version'),
+				'status' => $status,
+				'advice' => $advice
+			);
 		
 		// Check for file system permissions
-		$message = __('Filesystem Permissions');
-
+		$advice = __("Write access required for settings.php, install.php and upgrade.php");
 		if ($this->CheckFsPermissions()) 
 		{
-			$output .= $imgGood.$message.'<br />';
+			$status = 1;
 		}
 		else
 		{
 			$this->envFault = true;
 			
-			$output .= $imgBad.$message.'<br />';
-			$output .= '<div class="check_explain"><p>' . __("Write access required for the following:");
-			$output .= <<<END
-      			<ul>
-        			<li> settings.php
-        			<li> install.php
-				<li> upgrade.php
-      			</ul>
-END;
-      			$output .= __('Please fix this, and retest.') . '</p></div>';
+			$status = 0;
 		}
+
+		$rows[] = array(
+				'item' => __('File System Permissions'),
+				'status' => $status,
+				'advice' => $advice
+			);
 		
 		// Check for MySQL
-		$message = __('MySQL database (PHP MySql)');
-
+		$advice = __('MySQL support must be enabled in PHP.');
 		if ($this->CheckMySQL()) 
 		{
-			$output .= $imgGood.$message.'<br />';
+			$status = 1;
 		}
 		else
 		{
 			$this->envFault = true;
 			
-			$output .= $imgBad.$message.'<br />';
-			$output .= <<<END
-			<div class="check_explain">
-      			<p>Xibo requires the PHP MySQL Extension to function.</p>
-      		</div>
-END;
+			$status = 0;
 		}
 
+		$rows[] = array(
+				'item' => __('MySQL database (PHP MySql)'),
+				'status' => $status,
+				'advice' => $advice
+			);
+
 		// Check for PDO
-		$message = __('MySQL database (PDO MySql)');
-
+		$advice = __('PDO support with MySQL drivers must be enabled in PHP.');
 		if ($this->CheckPDO()) 
 		{
-			$output .= $imgGood.$message.'<br />';
+			$status = 1;
 		}
 		else
 		{
 			$this->envFault = true;
 			
-			$output .= $imgBad.$message.'<br />';
-			$output .= <<<END
-			<div class="check_explain">
-      			<p>Xibo requires the PHP PDO Extension to function.</p>
-      		</div>
-END;
+			$status = 0;
 		}
+
+		$rows[] = array(
+				'item' => __('MySQL database (PDO MySql)'),
+				'status' => $status,
+				'advice' => $advice
+			);
 		
 		// Check for JSON
-		$message = __('JSON Extension');
-
+		$advice = __('PHP JSON extension required to function.');
 		if ($this->CheckJson())
 		{
-			$output .= $imgGood.$message.'<br />';
+			$status = 1;
 		}
 		else
 		{
 			$this->envFault = true;
 
-			$output .= $imgBad.$message.'<br />';
-			$output .= '<div class="check_explain"><p>' . __('PHP JSON extension required to function.') . '</p></div>';
+			$status = 0;
 		}
 
-                // Check for SOAP
-		$message = __('SOAP Extension');
+		$rows[] = array(
+				'item' => __('JSON Extension'),
+				'status' => $status,
+				'advice' => $advice
+			);
 
+        // Check for SOAP
+		$advice = __('PHP SOAP extension required to function.');
 		if ($this->CheckSoap())
 		{
-			$output .= $imgGood.$message.'<br />';
+			$status = 1;
 		}
 		else
 		{
 			$this->envFault = true;
 
-			$output .= $imgBad.$message.'<br />';
-			$output .= '<div class="check_explain"><p>' . __('PHP SOAP extension required to function.') . '</p></div>';
+			$status = 0;
 		}
+
+		$rows[] = array(
+				'item' => __('SOAP Extension'),
+				'status' => $status,
+				'advice' => $advice
+			);
 		
 		// Check for GD (graphics)
-		$message = __('GD Extension');
-
+		$advice = __('PHP GD extension to function.');
 		if ($this->CheckGd()) 
 		{
-			$output .= $imgGood.$message.'<br />';
+			$status = 1;
 		}
 		else
 		{
 			$this->envFault = true;
 			
-			$output .= $imgBad.$message.'<br />';
-			$output .= '<div class="check_explain"><p>' . __('PHP GD extension to function.') . '</p></div>';
+			$status = 0;
 		}
 
+		$rows[] = array(
+				'item' => __('GD Extension'),
+				'status' => $status,
+				'advice' => $advice
+			);
+
 		// Check for PHP Session
-		$message = __('Session');
-
+		$advice = __('PHP session support to function.');
 		if ($this->CheckSession()) 
 		{
-			$output .= $imgGood.$message.'<br />';
+			$status = 1;
 		}
 		else
 		{
 			$this->envFault = true;
 			
-			$output .= $imgBad.$message.'<br />';
-			$output .= '<div class="check_explain"><p>' . __('PHP session support to function.') . '</p></div>';
+			$status = 0;
 		}
 
+		$rows[] = array(
+				'item' => __('Session'),
+				'status' => $status,
+				'advice' => $advice
+			);
+
 		// Check for PHP FileInfo
-		$message = __('FileInfo');
-
+		$advice = __('Requires PHP FileInfo support to function. If you are on Windows you need to enable the php_fileinfo.dll in your php.ini file.');
 		if ($this->CheckFileInfo()) 
 		{
-			$output .= $imgGood.$message.'<br />';
+			$status = 1;
 		}
 		else
 		{
 			$this->envFault = true;
 			
-			$output .= $imgBad.$message.'<br />';
-			$output .= '<div class="check_explain"><p>' . __('Requires PHP FileInfo support to function. If you are on Windows you need to enable the php_fileinfo.dll in your php.ini file.') . '</p></div>';
+			$status = 0;
 		}
+
+		$rows[] = array(
+				'item' => __('FileInfo'),
+				'status' => $status,
+				'advice' => $advice
+			);
 		
 		// Check for PHP PCRE
-		$message = __('PCRE');
-
+		$advice = __('PHP PCRE support to function.');
 		if ($this->CheckPCRE()) 
 		{
-			$output .= $imgGood.$message.'<br />';
+			$status = 1;
 		}
 		else
 		{
 			$this->envFault = true;
 			
-			$output .= $imgBad.$message.'<br />';
-			$output .= '<div class="check_explain"><p>' . __('PHP PCRE support to function.') . '</p></div>';
+			$status = 0;
 		}
+
+		$rows[] = array(
+				'item' => __('PCRE'),
+				'status' => $status,
+				'advice' => $advice
+			);
 		
 		// Check for PHP Gettext
-		$message = __('Gettext');
-
-		/**
-         * we now use PHP-Gettext which is shipped.
-         */
+		$advice = __('PHP Gettext support to function.');
 		if ($this->CheckGettext())
 		{
-			$output .= $imgGood.$message.'<br />';
+			$status = 1;
 		}
 		else
 		{
 			$this->envFault = true;
 			
-			$output .= $imgBad.$message.'<br />';
-			$output .= '<div class="check_explain"><p>' . __('PHP Gettext support to function.') . '</p></div>';
+			$status = 0;
 		}
+
+		$rows[] = array(
+				'item' => __('Gettext'),
+				'status' => $status,
+				'advice' => $advice
+			);
 	
 		// Check for Calendar
-		$message = __('Calendar Extension');
-
+		$advice = __('PHP Calendar extension to function.');
 		if ($this->CheckCal()) 
 		{
-			$output .= $imgGood.$message.'<br />';
+			$status = 1;
 		}
 		else
 		{
 			$this->envFault = true;
 			
-			$output .= $imgBad.$message.'<br />';
-			$output .= '<div class="check_explain"><p>' . __('PHP Calendar extension to function.') . '</p></div>';
+			$status = 0;
 		}
+
+		$rows[] = array(
+				'item' => __('Calendar Extension'),
+				'status' => $status,
+				'advice' => $advice
+			);
 		
 		// Check for DOM
-		$message = __('DOM Extension');
-
+		$advice = __('PHP DOM core functionality enabled.');
 		if ($this->CheckDom()) 
 		{
-			$output .= $imgGood.$message.'<br />';
+			$status = 1;
 		}
 		else
 		{
 			$this->envFault = true;
 			
-			$output .= $imgBad.$message.'<br />';
-			$output .= '<div class="check_explain"><p>' . __('PHP DOM core functionality enabled.') . '</p></div>';
+			$status = 0;
 		}
+
+		$rows[] = array(
+				'item' => __('DOM Extension'),
+				'status' => $status,
+				'advice' => $advice
+			);
 		
 		// Check for DOM XML
-		$message = __('DOM XML Extension');
-
+		$advice = __('PHP DOM XML extension to function.');
 		if ($this->CheckDomXml()) 
 		{
-			$output .= $imgGood.$message.'<br />';
+			$status = 1;
 		}
 		else
 		{
 			$this->envFault = true;
 			
-			$output .= $imgBad.$message.'<br />';
-			$output .= '<div class="check_explain"><p>' . __('PHP DOM XML extension to function.') . '</p></div>';
+			$status = 0;
 		}
+
+		$rows[] = array(
+				'item' => __('DOM XML Extension'),
+				'status' => $status,
+				'advice' => $advice
+			);
 		
 		// Check for Mcrypt
-		$message = __('Mcrypt Extension');
-
+		$advice = __('PHP Mcrypt extension to function.');
 		if ($this->CheckMcrypt()) 
 		{
-			$output .= $imgGood.$message.'<br />';
+			$status = 1;
 		}
 		else
 		{
 			$this->envFault = true;
 			
-			$output .= $imgBad.$message.'<br />';
-			$output .= '<div class="check_explain"><p>' . __('PHP Mcrypt extension to function.') . '</p></div>';
+			$status = 0;
 		}
+
+		$rows[] = array(
+				'item' => __('Mcrypt Extension'),
+				'status' => $status,
+				'advice' => $advice
+			);
 		
-		// Check to see if we are allowed to open remote URLs (homecall will not work otherwise)
-		$message = __('Allow PHP to open external URLs');
-
+		// Check to see if we are allowed to open remote URLs (home call will not work otherwise)
+		$advice = __('You must have allow_url_fopen = On in your PHP.ini file for RSS Feeds / Anonymous statistics gathering to function.');
 		if (ini_get('allow_url_fopen')) 
 		{
-			$output .= $imgGood.$message.'<br />';
+			$status = 1;
 		}
 		else
 		{
-			// Not a fault as this will not block installation/upgrade. Informational.
+			// Not a fault as this will not block installation / upgrade. Informational.
 			$this->envWarning = true;
-			$output .= $imgWarn.$message.'<br />';
-			$output .= '<div class="check_explain"><p>' . __('You must have allow_url_fopen = On in your PHP.ini file for anonymous statistics gathering to function.') . '<br />';
-			$output .= __('If you do not intend to enable anonymous statistics gathering you need not worry about this problem.') . '</p></div>';
+			$status = 2;
 		}
 
+		$rows[] = array(
+				'item' => __('Allow PHP to open external URLs'),
+				'status' => $status,
+				'advice' => $advice
+			);
+
 		// Check to see if timezone_identifiers_list exists
-		$message = 'DateTimeZone';
-
+		$advice = __('This enables us to get a list of time zones supported by the hosting server.');
 		if (function_exists('timezone_identifiers_list')) 
 		{
-			$output .= $imgGood.$message.'<br />';
+			$status = 1;
 		}
 		else
 		{
 			$this->envWarning = true;
 			
-			$output .= $imgWarn.$message.'<br />';
 		}
+
+		$rows[] = array(
+				'item' => __('DateTimeZone'),
+				'status' => $status,
+				'advice' => $advice
+			);
 		
 		// Check to see if large file uploads enabled
-		$message = 'Large File Uploads';
-
+		$advice = __('Support for uploading large files is recommended.');
 		if ($this->CheckPHPUploads()) 
 		{
-			$output .= $imgGood.$message.'<br />';
+			$status = 1;
 		}
 		else
 		{
 			$this->envWarning = true;
-			$output .= $imgWarn.$message.'<br />';
-			$output .= '<div class="check_explain"><p>' . __('You probably want to allow larger files to be uploaded than is currently available with your PHP configuration.') . '<br />';
-			$output .= __('We suggest setting your PHP post_max_size and upload_max_size to at least 128M, and also increasing your max_execution_time to at least 120 seconds.') . '</p></div>';
+			$status = 2;
+			$advice = __('You probably want to allow larger files to be uploaded than is currently available with your PHP configuration.') . '<br />';
+			$advice .= __('We suggest setting your PHP post_max_size and upload_max_size to at least 128M, and also increasing your max_execution_time to at least 120 seconds.');
 		}
-				
-		$output .= '</div>';
+
+		$rows[] = array(
+				'item' => __('Large File Uploads'),
+				'status' => $status,
+				'advice' => $advice
+			);
 		
 		$this->envTested = true;
-		return $output;
+
+		Theme::Set('table_rows', $rows);
+		return Theme::RenderReturn('table_render');
 	}
 	
 	/**
@@ -582,6 +672,10 @@
 	{
 		return extension_loaded("fileinfo");
 	}
+
+	function CheckZip() {
+		return extension_loaded('zip');
+	}
 	
 	/**
 	 * Check PHP is setup for large file uploads
 
=== modified file 'server/install.php'
--- server/install.php	2014-09-18 17:14:29 +0000
+++ server/install.php	2014-09-19 11:39:09 +0000
@@ -1,7 +1,7 @@
 <?php
 /*
  * Xibo - Digital Signage - http://www.xibo.org.uk
- * Copyright (C) 2009-2013 Alex Harrington
+ * Copyright (C) 2009-2014 Alex Harrington and Daniel Garner
  *
  * This file is part of Xibo.
  *
@@ -19,726 +19,124 @@
  * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
  */ 
 DEFINE('XIBO', true);
+DEFINE('MAX_EXECUTION', true);
 
 error_reporting(0);
 ini_set('display_errors', 0);
 
-include('lib/app/kit.class.php');
-include('install/header.inc');
-include('config/config.class.php');
-include('config/db_config.php');
-
-$config = new Config();
-
-if (!$config->CheckPHP()) {
-  die(sprintf('Xibo required PHP version %s.', Config::$VERSION_REQUIRED));
-}
-
-// Setup for the Translations using Gettext.
-// There is normally a class that will do this for us - but it requires a DB object (which we do not have at install time)
-// Would be nice to include a method on the TranslationEngine that did this for us - but without the debugging
-// The actual translation function __() is included later in this file.
-$langs 		= Kit::GetParam('HTTP_ACCEPT_LANGUAGE', $_SERVER, _STRING);
-$lang		= 'en-gb'; 		// Default language
-$encoding 	= '';			// We do not seem to need an encoding, but I read somewhere that we might - left as a reminder of this.
-
-if ($langs != '') 
-{
-	$langs 	= explode(',', $langs);
-	$lang 	= $langs[0];
-}
-
-// For windows
-putenv('LANG='.$lang.'.'.$encoding);
-putenv('LANGUAGE='.$lang.'.'.$encoding); 
-putenv('LC_ALL='.$lang.'.'.$encoding); 
-
-// Set local
-setlocale(LC_ALL, $lang.'.'.$encoding);
-
-// Translations have been setup.
-
-$fault = false;
-
-$xibo_step = Kit::GetParam('xibo_step',_POST,_INT,'0');
-
-if (!isset($xibo_step) || $xibo_step == 0) {
-  # First step of the process.
-  # Show a welcome screen and next button
-  ?>
-  <?php echo __("Welcome to the Xibo Installer!"); ?><br /><br />
-  <?php echo __("The installer will take you through setting up Xibo one step at a time."); ?><br /><br />
-  <?php echo __("Lets get started!"); ?><br /><br />
-  <form action="install.php" method="POST">
-    <input type="hidden" name="xibo_step" value="1" />
-    <div class="loginbutton"><button type="submit"><?php echo __("Next"); ?> ></button></div>
-  </form>
-  <?php
-}
-elseif ($xibo_step == 1) {
-  # Check environment
-  $db = new Database();
-  $cObj = new Config();
-  ?>
-  <p><?php echo __("First we need to check if your server meets Xibo's requirements."); ?></p>
-  <div class="checks">
-  <?php
-    echo $cObj->CheckEnvironment();
-    if ($cObj->EnvironmentFault()) {
-    ?>
-      <form action="install.php" method="POST">
-        <input type="hidden" name="xibo_step" value="1" />
-        <div class="loginbutton"><button type="submit"><?php echo __("Retest"); ?></button></div>
-      </form>
-    <?php
-    }
-    else if ($cObj->EnvironmentWarning()) {
-    ?>
-      <form action="install.php" method="POST">
-        <input type="hidden" name="xibo_step" value="1" />
-        <div class="loginbutton"><button type="submit"><?php echo __("Retest"); ?></button></div>
-      </form>
-      <form action="install.php" method="POST">
-        <input type="hidden" name="xibo_step" value="2" />
-        <div class="loginbutton"><button type="submit"><?php echo __("Next"); ?> ></button></div>
-      </form>
-    <?php
-    }
-    else {
-    ?>
-      <form action="install.php" method="POST">
-        <input type="hidden" name="xibo_step" value="2" />
-        <div class="loginbutton"><button type="submit"><?php echo __("Next"); ?> ></button></div>
-      </form>
-    <?php
-    }    
-}
-elseif ($xibo_step == 2) {
-# Create database
-## Does database exist already?
-
-  ?>
-  <div class="info">
-    <p><?php echo __("Xibo needs to setup a new database."); ?></p>
-    <p><?php echo __("If you have not yet created an empty database and database user for Xibo to use, and know the username/password of a MySQL administrator, click the \"Create New\" button, otherwise click \"Use Existing\"."); ?></p>
-    <p><i><?php echo __("Note that any existing database must be empty"); ?></i></p>
-  </div>
-  <form action="install.php" method="POST">
-    <input type="hidden" name="xibo_step" value="3" />
-    <button type="submit"><?php echo __("Create New"); ?></button>
-  </form>
-  <form action="install.php" method="POST">
-    <input type="hidden" name="xibo_step" value="4" />
-    <button type="submit"><?php echo __("Use Existing"); ?></button>
-  </form>
-  <?php
-}
-elseif ($xibo_step == 3) {
-## If not, gather admin password and use to create empty db and new user.
-?>
-<div class="info">
-<p><?php echo __("Since no empty database has been created for Xibo to use, we need the username and password of a MySQL administrator to create a new database, and database user for Xibo."); ?></p>
-<p><?php echo __("Additionally, please give us a new username and password to create in MySQL for Xibo to use. Xibo will create this automatically for you."); ?></p>
-<form action="install.php" method="POST">
-<input type="hidden" name="xibo_step" value="5" />
-<input type="hidden" name="db_create" value="On" />
-<div class="install_table">
-  <p><label for="host"><?php echo __("Host:"); ?>&nbsp;</label><input class="username" type="text" id="host" name="host" size="12" value="localhost" /></p>
-  <p><label for="admin_username"><?php echo __("Admin Username:"); ?>&nbsp;</label><input class="username" type="text" id="admin_username" name="admin_username" size="12" /></p>
-  <p><label for="admin_password"><?php echo __("Admin Password:"); ?>&nbsp;</label><input class="username" type="password" id="admin_password" name="admin_password" size="12" /></p>
-  <p><label for="db_name"><?php echo __("Xibo Database Name:"); ?>&nbsp;</label><input class="username" type="text" id="db_name" name="db_name" size="12" value="xibo" /></p>
-  <p><label for="db_username"><?php echo __("Xibo Database Username:"); ?>&nbsp;</label><input class="username" type="text" id="db_username" name="db_username" size="12" value="xibo" /></p>
-  <p><label for="db_password"><?php echo __("Xibo Database Password:"); ?>&nbsp;</label><input class="username" type="password" id="db_password" name="db_password" size="12" /></p>
-</div>
-</div>
-<button type="submit"><?php echo __("Create"); ?></button>
-</form>
-<?php
-}
-elseif ($xibo_step == 4) {
-## Get details of db that's been created already for us
-?>
-<div class="info">
-<p><?php echo __("Please enter the details of the database and user you have created for Xibo."); ?></p>
-<form action="install.php" method="POST">
-<input type="hidden" name="xibo_step" value="5" />
-<input type="hidden" name="db_create" value="Off" />
-<div class="install_table">
-  <p><label for="host"><?php echo __("Host:"); ?>&nbsp;</label><input class="username" type="text" id="host" name="host" size="12" value="localhost" /></p>
-  <p><label for="db_name"><?php echo __("Xibo Database Name:"); ?>&nbsp;</label><input class="username" type="text" id="db_name" name="db_name" size="12" value="xibo" /></p>
-  <p><label for="db_username"><?php echo __("Xibo Database Username:"); ?>&nbsp;</label><input class="username" type="text" id="db_username" name="db_username" size="12" value="xibo" /></p>
-  <p><label for="db_password"><?php echo __("Xibo Database Password:"); ?>&nbsp;</label><input class="username" type="password" id="db_password" name="db_password" size="12" /></p>
-</div>
-</div>
-<button type="submit"><?php echo __("Create"); ?></button>
-</form>
-<?php
-}
-elseif ($xibo_step == 5) {
-
-  $db_create = Kit::GetParam('db_create',_POST,_STRING);
-
-  if (!isset($db_create)) {
-    reportError("2",__("Something went wrong"));
-  }
-  else {
-    $db_host = Kit::GetParam('host',_POST,_STRING,'localhost');
-    $db_user = Kit::GetParam('db_username',_POST,_PASSWORD);
-    $db_pass = Kit::GetParam('db_password',_POST,_PASSWORD);
-    $db_name = Kit::GetParam('db_name',_POST,_PASSWORD);
-    ?>
-    <div class="info">
-    <?php
-    if ($db_create == 'On') {  
-      $db_admin_user = Kit::GetParam('admin_username',_POST,_PASSWORD);
-      $db_admin_pass = Kit::GetParam('admin_password',_POST,_PASSWORD);
-      
-      if (! ($db_host && $db_name && $db_user && $db_admin_user)) {
-        # Something was blank.
-        # Throw an error.
-        reportError("3", __("A field was blank. Please fill in all fields."));
-      }
-      
-      $db = @mysql_connect($db_host,$db_admin_user,$db_admin_pass);
-      
-      if (! $db) {
-        reportError("3", __("Could not connect to MySQL with the administrator details. Please check and try again.") . "<br /><br />" . __("MySQL Error:") . "<br />" . mysql_error());
-      }
-      
-      ?>
-      <p><?php echo __("Creating new database."); ?></p>
-      <?php
-      flush();
-      
-      $SQL = sprintf("CREATE DATABASE `%s`",
-                      mysql_real_escape_string($db_name));
-      if (! @mysql_query($SQL, $db)) {
-        # Create database and user
-        reportError("3", __("Could not create a new database with the administrator details. Please check and try again.") . "<br /><br />" . "MySQL Error:" . "<br />" . mysql_error());
-      }
-      
-      # Choose the MySQL DB to create a user
-      @mysql_select_db("mysql", $db);
-
-      # Make $db_host lowercase so it matches "localhost" if required.
-      $db_host = strtolower($db_host);
-      
-      ?>
-      <p><?php echo __("Creating new user"); ?></p>
-      <?php
-      flush();
-      
-      if ($db_host == 'localhost') {
-        $SQL = sprintf("GRANT ALL PRIVILEGES ON `%s`.* to '%s'@'%s' IDENTIFIED BY '%s'",
-                        mysql_real_escape_string($db_name),
-                        mysql_real_escape_string($db_user),
-                        mysql_real_escape_string($db_host),
-                        mysql_real_escape_string($db_pass));
-      }
-      else {
-        $SQL = sprintf("GRANT ALL PRIVILEGES ON `%s`.* to '%s'@'%%' IDENTIFIED BY '%s'",
-                        mysql_real_escape_string($db_name),
-                        mysql_real_escape_string($db_user),
-                        mysql_real_escape_string($db_pass));
-      }
-      if (! @mysql_query($SQL, $db)) {
-          reportError("3", __("Could not create a new user with the administrator details. Please check and try again.") . "<br /><br />" . __("MySQL Error:") . "<br />" . mysql_error());
-      }
-      
-
-      @mysql_query("FLUSH PRIVILEGES", $db);      
-      @mysql_close($db);
-      
-    }
-    else {
-      if (! ($db_host && $db_name && $db_user && $db_pass)) {
-        # Something was blank
-        # Throw an error.
-        reportError("4", __("A field was blank. Please fill in all fields.") . " " . $db_host . " " . $db_name . " " . $db_user . " " . $db_pass);
-      }
-    }
-    ## Populate database
-    
-    $db = @mysql_connect($db_host,$db_user,$db_pass);
-      
-    if (! $db) {
-      reportError("4", __("Could not connect to MySQL with the Xibo User account details. Please check and try again.") . "<br /><br />" . __("MySQL Error:") . "<br />" . mysql_error());
-    }
-      
-    @mysql_select_db($db_name,$db);
-    
-    ?>
-    <p>Populating the database</p>
-    <?php
-    flush();
-    
-    # Load from sql files to db - HOW?
-    $sql_files = array('structure.sql', 'data.sql');
-
-    $sqlStatementCount = 0;
-
-    foreach ($sql_files as $filename) {
-      ?>
-      <p>Loading from <?php print $filename; ?>
-      <?php
-        flush();
-        
-        $delimiter = ';';
-        $sql_file = @file_get_contents('install/master/' . $filename);
-        $sql_file = remove_remarks($sql_file);
-        $sql_file = split_sql_file($sql_file, $delimiter);
-    
-        foreach ($sql_file as $sql) {
-          print ".";
-          $sqlStatementCount++;
-          flush();
-          if (! @mysql_query($sql,$db)) {
-            reportError("4", __("An error occured populating the database.") . "<br /><br />" . __("MySQL Error:") . "<br />" . mysql_error() . "<br /><br />SQL executed:<br />" . $sql . "<br /><br />Statement number: " . $sqlStatementCount);
-          }
-        }
-        print "</p>";
-    }
-    @mysql_close($db);
-  }
-  # Write out a new settings.php
-  $fh = fopen("settings.php", 'wt');
-  
-  if (! $fh) {
-    reportError("0", __("Unable to write to settings.php. We already checked this was possible earlier, so something changed."));
-  }
-  
-  settings_strings();
-  
-  $settings_content = '$dbhost = \'' . $db_host . '\';' . "\n";
-  $settings_content .= '$dbuser = \'' . $db_user . '\';' . "\n";
-  $settings_content .= '$dbpass = \'' . $db_pass . '\';' . "\n";
-  $settings_content .= '$dbname = \'' . $db_name . '\';' . "\n\n";
-  $settings_content .= 'define(\'SECRET_KEY\',\'' . gen_secret() . '\');' . "\n";
-  
-  if (! fwrite($fh, $settings_header . $settings_content . $settings_footer)) {
-    reportError("0", __("Unable to write to settings.php. We already checked this was possible earlier, so something changed."));
-  }
-    
-  fclose($fh);
-  
-  ?>
-  </div>
-  <div class="install_table">
-    <form action="install.php" method="POST">
-      <input type="hidden" name="xibo_step" value="6" />
-  </div>
-    <button type="submit"><?php echo __("Next"); ?> ></button>
-  </form>
-  <?php
-}
-elseif ($xibo_step == 6) {
-  # Form to get new admin password
-  ?>
-  <div class="info">
-  <p><?php echo __("Xibo needs to set the \"xibo_admin\" user password. Please enter a password for this account below."); ?></p>
-  </div>
-  <div class="install_table">
-    <form action="install.php" method="POST">
-      <input type="hidden" name="xibo_step" value="7" />
-      <p><label for="password1"><?php echo __("Password:"); ?>&nbsp;</label><input type="password" name="password1" size="12" /></p>
-      <p><label for="password2"><?php echo __("Retype Password:"); ?>&nbsp;</label><input type="password" name="password2" size="12" /></p>
-  </div>
-    <button type="submit"><?php echo __("Next"); ?> ></button>
-  </form>
-  <?php
-}
-elseif ($xibo_step == 7) {
-  # Setup xibo_admin password
-  $password1 = Kit::GetParam('password1',_POST,_PASSWORD);
-  $password2 = Kit::GetParam('password2',_POST,_PASSWORD);
-  
-  if (!(($password1 && $password2) && ($password1 == $password2))) {
-    reportError("6", __("Please input a new password. Ensure both password fields are identical."));
-  }
-  
-  include('settings.php');
-  
-  $password_hash = md5($password1);
-  
-  $db = @mysql_connect($dbhost,$dbuser,$dbpass);
-      
-    if (! $db) {
-      reportError("6", __("Could not connect to MySQL with the Xibo User account details saved in settings.php. Please check and try again.") . "<br /><br />" . __("MySQL Error:") . "<br />" . mysql_error());
-    }
-      
-    @mysql_select_db($dbname,$db);
-
-    $SQL = sprintf("UPDATE `user` SET UserPassword = '%s' WHERE UserID = 1 LIMIT 1",
-                    mysql_real_escape_string($password_hash));
-    if (! @mysql_query($SQL, $db)) {
-      reportError("6", __("An error occured changing the xibo_admin password.") . "<br /><br />" . __("MySQL Error:") . "<br />" . mysql_error());    
-    }
- 
-    @mysql_close($db);
-    
-    ?>
-    <div class="info">
-      <?php echo __("Successfully changed the xibo_admin password. We're nearly there now. Just a couple more steps!"); ?>
-    </div>
-    <form action="install.php" method="POST">
-      <input type="hidden" name="xibo_step" value="8" />
-      <button type="submit"><?php echo __("Next"); ?> ></button>
-    </form>
-    <?php
-}
-elseif ($xibo_step == 8) {
-  # Configure paths and keys
-  ## nuSoap
-  ## libraries
-  ## server_key
-  ?>
-  <div class="info">
-    <p><b><?php echo __("Library Location"); ?></b></p>
-    <p><?php echo __("Xibo needs somewhere to store the things you upload to be shown. Ideally, this should be somewhere outside the root of your webserver - that is such that is not accessible by a web browser. Please input the full path to this folder. If the folder does not already exist, Xibo will attempt to create it for you."); ?></p>
-    <form action="install.php" method="POST">
-    <div class="install_table">
-       <p><label for="library_location"><?php echo __("Library Location:"); ?>&nbsp;</label><input type="text" name="library_location" value="" /></p>
-    </div>
-    <p><b><?php echo __("Server Key"); ?></b></p>
-    <p><?php echo __("Xibo needs you to choose a \"key\". This will be required each time you setup a new client. It should be complicated, and hard to remember. It is visible in the admin interface, so it need not be written down separately."); ?></p>
-    <div class="install_table">
-      <p><label for="server_key"><?php echo __("Server Key:"); ?> </label><input type="text" name="server_key" value="" /></p>
-    </div>
-    <p><b><?php echo __("Statistics"); ?></b></p>
-    <p><?php echo __("We'd love to know you're running Xibo. If you're happy for us to collect anonymous statistics (version number, number of displays) then please leave the box ticked. Please untick the box if your server does not have direct access to the internet."); ?></p>
-    <div class="install_table">
-      <p><label for="stats"><?php echo __("Anonymous Statistics:"); ?>&nbsp;</label><input type="checkbox" name="stats" value="true" checked /></p>
-    </div>
-      <input type="hidden" name="xibo_step" value="9" />
-    </div>
-      <button type="submit"><?php echo __("Next"); ?> ></button>
-    </form>
-  <?php
-}
-elseif ($xibo_step == 9) {
-
-  $server_key = Kit::GetParam('server_key',_POST,_STRING);
-  $library_location = Kit::GetParam('library_location',_POST,_STRING);
-  $stats = Kit::GetParam('stats',_POST,_BOOL);
-  
-  // Remove trailing whitespace from the path given.
-  $library_location = trim($library_location);
-
-  // Check both fields were completed
-  if (! ($server_key && $library_location)) {
-    reportError("8", __("A field was blank. Please make sure you complete all fields"));
-  }
-
-  if ($stats) {
-    $stats="On"; // Fixme: translate ?
-  }
-  else {
-    $stats="Off"; //Fixme : translate ?
-  }
-
-  // Does library_location exist already?
-  if (! is_dir($library_location)) {
-    if (is_file($library_location)) {
-      reportError("8", __("A file exists with the name you gave for the Library Location. Please choose another location"));
-    }
-
-    // Directory does not exist. Attempt to make it
-    // Using mkdir recursively, so it will attempt to make any
-    // intermediate folders required.
-    if (! mkdir($library_location,0755,true)) {
-      reportError("8", __("Could not create the Library Location directory for you. Please ensure the webserver has permission to create a folder in this location, or create the folder manually and grant permission for the webserver to write to the folder."));
-    }
-    
-  }
-  
-  // Is library_location writable?
-  if (! is_writable($library_location)) {
-    // Directory is not writable.
-    reportError("8", __("The Library Location you gave is not writable by the webserver. Please fix the permissions and try again."));
-  }
-  
-  // Is library_location empty?
-  if (count(ls("*",$library_location,true)) > 0) {
-    reportError("8", __("The Library Location you gave is not empty. Please give the location of an empty folder"));
-  }
-  
-  // Check if the user has added a trailing slash.
-  // If not, add one.
-  if (!((substr($library_location, -1) == '/') || (substr($library_location, -1) == '\\'))) {
-    $library_location = $library_location . '/';
-  }
-
-  include('settings.php');
-  
-  $db = @mysql_connect($dbhost,$dbuser,$dbpass);
-      
-    if (! $db) {
-      reportError("8", __("Could not connect to MySQL with the Xibo User account details saved in settings.php. Please check and try again.") . "<br /><br />" . __("MySQL Error:") . "<br />" . mysql_error());
-    }
-      
-    @mysql_select_db($dbname,$db);
-    
-    $SQL = sprintf("UPDATE `setting` SET `value` = '%s' WHERE `setting`.`setting` = 'LIBRARY_LOCATION' LIMIT 1",
-                    mysql_real_escape_string($library_location));
-    if (! @mysql_query($SQL, $db)) {
-      reportError("8", __("An error occured changing the library location.") . "<br /><br />" . __("MySQL Error:") . "<br />" . mysql_error());    
-    }
-    
-    $SQL = sprintf("UPDATE `setting` SET `value` = '%s' WHERE `setting`.`setting` = 'SERVER_KEY' LIMIT 1",
-                      mysql_real_escape_string($server_key));
-    if (! @mysql_query($SQL, $db)) {
-      reportError("8", __("An error occured changing the server key.") . "<br /><br />" . __("MySQL Error:") . "<br />" . mysql_error());    
-    }
-    
-    $SQL = sprintf("UPDATE `setting` SET `value` = '%s' WHERE `setting`.`setting` = 'defaultTimezone' LIMIT 1",
-                      mysql_real_escape_string(date_default_timezone_get()));
-    if (! @mysql_query($SQL, $db)) {
-      reportError("8", __("An error occured setting the default timezone.") . "<br /><br />" . __("MySQL Error:") . "<br />" . mysql_error());    
-    }
- 
-    $SQL = sprintf("UPDATE `setting` SET `value` = '%s' WHERE `setting`.`setting` = 'PHONE_HOME' LIMIT 1",
-                      mysql_real_escape_string($stats));
-    if (! @mysql_query($SQL, $db)) {
-      reportError("8", __("An error occured setting anonymous statistics.") . "<br /><br />" . __("MySQL Error:") . "<br />" . mysql_error());
-    }
-    $SQL = "UPDATE `setting` SET `value` = '" . md5(uniqid(rand(), true)) . "' WHERE `setting`.`setting` = 'PHONE_HOME_KEY' LIMIT 1";
-    if (! @mysql_query($SQL, $db)) {
-      reportError("8", __("An error occured setting anonymous statistics.") . "<br /><br />" . __("MySQL Error:") . "<br />" . mysql_error());
-    }
-    
-    @mysql_close($db);
-  
-  ?>
-  <div class="info">
-    <p><?php echo __("Successfully set library location and server key."); ?></p>
-  </div>
-    <form action="install.php" method="POST">
-      <input type="hidden" name="xibo_step" value="10" />
-      <button type="submit"><?php echo __("Next"); ?> ></button>
-    </form>
-  <?php
-}
-elseif ($xibo_step == 10) {
-# Delete install.php
-# Redirect to login page.
-  if (! unlink('install.php')) {
-    reportError("10", __("Unable to delete install.php. Please ensure the webserver has permission to unlink this file and retry"), __("Retry")); // Fixme : translate "Retry" ?
-  }
-  if (! unlink('upgrade.php')) {
-    reportError("10", __("Unable to delete upgrade.php. Please ensure the webserver has permission to unlink this file and retry"), __("Retry")); // Fixme : translate "Retry" ?
-  }
-  ?>
-  <div class="info">
-    <p><b><?php echo __("Xibo was successfully installed."); ?></b></p>
-    <p><?php echo __("Please click"); ?>&nbsp;<a href="index.php"><?php echo __("here"); ?></a>&nbsp;<?php echo __("to logon to Xibo as \"xibo_admin\" with the password you chose earlier."); ?></p>
-  </div>
-  <?php
-}
-else {
-  reportError("0", __("A required parameter was missing. Please go through the installer sequentially!"), __("Start Again")); // Fixme : translate "Start Again" ?
-}
- 
-include('install/footer.inc');
-
-# Functions
-function checkFsPermissions() {
-  # Check for appropriate filesystem permissions
-  return ((is_writable("install.php") && (is_writable("settings.php")) && (is_writable("upgrade.php")) || is_writable(".")));
-}
-
-function checkMySQL() {
-  # Check PHP has MySQL module installed
-  return extension_loaded("mysql");
-}
-
-function checkJson() {
-  # Check PHP has JSON module installed
-  return extension_loaded("json");
-}
-
-function checkGd() {
-  # Check PHP has JSON module installed
-  return extension_loaded("gd");
-}
-
-function checkCal() {
-  # Check PHP has JSON module installed
-  return extension_loaded("calendar");
-}
- 
-function reportError($step, $message, $button_text="&lt; Back") { // fixme : translate ?
-?>
-    <div class="info">
-      <?php print $message; ?>
-    </div>
-    <form action="install.php" method="POST">
-      <input type="hidden" name="xibo_step" value="<?php print $step; ?>"/>
-      <button type="submit"><?php print $button_text; ?></button>
-    </form>
-  <?php
-  include('install/footer.inc');
-  die();
-} 
-
-// Taken from http://forums.devshed.com/php-development-5/php-wont-load-sql-from-file-515902.html
-// By Crackster 
-/**
- * remove_remarks will strip the sql comment lines out of an uploaded sql file
- */
-function remove_remarks($sql){
-  $sql = preg_replace('/\n{2,}/', "\n", preg_replace('/^[-].*$/m', "\n", $sql));
-  $sql = preg_replace('/\n{2,}/', "\n", preg_replace('/^#.*$/m', "\n", $sql));
-  return $sql;
-}
-
-// Taken from http://forums.devshed.com/php-development-5/php-wont-load-sql-from-file-515902.html
-// By Crackster              
-/**
- * split_sql_file will split an uploaded sql file into single sql statements.
- * Note: expects trim() to have already been run on $sql.
- */
-function split_sql_file($sql, $delimiter){
-  $sql = str_replace("\r" , '', $sql);
-  $data = preg_split('/' . preg_quote($delimiter, '/') . '$/m', $sql);
-  $data = array_map('trim', $data);
-  // The empty case
-  $end_data = end($data);
-  if (empty($end_data))
-  {
-    unset($data[key($data)]);
-  }
-  return $data;
-}
- 
-/**
- * This funtion will take a pattern and a folder as the argument and go thru it(recursivly if needed)and return the list of 
- *               all files in that folder.
- * Link             : http://www.bin-co.com/php/scripts/filesystem/ls/
- * License	: BSD
- * Arguments     :  $pattern - The pattern to look out for [OPTIONAL]
- *                    $folder - The path of the directory of which's directory list you want [OPTIONAL]
- *                    $recursivly - The funtion will traverse the folder tree recursivly if this is true. Defaults to false. [OPTIONAL]
- *                    $options - An array of values 'return_files' or 'return_folders' or both
- * Returns       : A flat list with the path of all the files(no folders) that matches the condition given.
- */
-function ls($pattern="*", $folder="", $recursivly=false, $options=array('return_files','return_folders')) {
-    if($folder) {
-        $current_folder = realpath('.');
-        if(in_array('quiet', $options)) { // If quiet is on, we will suppress the 'no such folder' error
-            if(!file_exists($folder)) return array();
-        }
-        
-        if(!chdir($folder)) return array();
-    }
-    
-    
-    $get_files    = in_array('return_files', $options);
-    $get_folders= in_array('return_folders', $options);
-    $both = array();
-    $folders = array();
-    
-    // Get the all files and folders in the given directory.
-    if($get_files) $both = glob($pattern, GLOB_BRACE + GLOB_MARK);
-    if($recursivly or $get_folders) $folders = glob("*", GLOB_ONLYDIR + GLOB_MARK);
-    
-    //If a pattern is specified, make sure even the folders match that pattern.
-    $matching_folders = array();
-    if($pattern !== '*') $matching_folders = glob($pattern, GLOB_ONLYDIR + GLOB_MARK);
-    
-    //Get just the files by removing the folders from the list of all files.
-    $all = array_values(array_diff($both,$folders));
-        
-    if($recursivly or $get_folders) {
-        foreach ($folders as $this_folder) {
-            if($get_folders) {
-                //If a pattern is specified, make sure even the folders match that pattern.
-                if($pattern !== '*') {
-                    if(in_array($this_folder, $matching_folders)) array_push($all, $this_folder);
-                }
-                else array_push($all, $this_folder);
-            }
-            
-            if($recursivly) {
-                // Continue calling this function for all the folders
-                $deep_items = ls($pattern, $this_folder, $recursivly, $options); # :RECURSION:
-                foreach ($deep_items as $item) {
-                    array_push($all, $this_folder . $item);
-                }
-            }
-        }
-    }
-    
-    if($folder) chdir($current_folder);
-    return $all;
-}
-
-function gen_secret() {
-  # Generates a random 12 character alphanumeric string to use as a salt
-  mt_srand((double)microtime()*1000000);
-  $key = "";
-  for ($i=0; $i < 12; $i++) {
-    $c = mt_rand(0,2);
-    if ($c == 0) {
-      $key .= chr(mt_rand(65,90));
-    }
-    elseif ($c == 1) {
-      $key .= chr(mt_rand(97,122));
-    }
-    else {
-      $key .= chr(mt_rand(48,57));
-    }
-  } 
-  
-  return $key;
-}
-
-function CheckGettext() 
-{
-	return extension_loaded("gettext");
-}
-
-// Setup the translations for gettext
-function __($string)
-{
-	if (CheckGettext())
-	{
-		return _($string);
-	}
-	else
-	{
-		return $string;
-	}
-}
-
-function settings_strings() {
-global $settings_header;
-global $settings_footer;
-
-  $settings_header = <<<END
-<?php
-
-/*
- * Xibo - Digital Signage - http://www.xibo.org.uk
- *
- * This file is part of Xibo - and is automatically generated by the installer
- *
- * You should not need to edit this file, unless your SQL connection details have changed.
- */
-
-defined('XIBO') or die(__("Sorry, you are not allowed to directly access this page.") . "<br />" . __("Please press the back button in your browser."));
-
-global \$dbhost;
-global \$dbuser;
-global \$dbpass;
-global \$dbname;
-
-
-END;
-
-$settings_footer = <<<END
-?>
-END;
-
-  return;
-}
+require_once('lib/app/kit.class.php');
+require_once('config/config.class.php');
+require_once('config/db_config.php');
+require_once("lib/app/pdoconnect.class.php");
+require_once("lib/app/translationengine.class.php");
+require_once("lib/app/thememanager.class.php");
+require_once("lib/app/helpmanager.class.php");
+require_once("lib/app/datemanager.class.php");
+require_once("lib/app/formmanager.class.php");
+require_once('modules/module_user_general.php');
+require_once('lib/pages/install.class.php');
+require_once("lib/data/data.class.php");
+require_once('lib/app/debug.class.php');
+
+// Create a theme
+new Theme(new User(new Database()), 'default');
+Theme::SetPagename('install');
+
+// Set-up the translations for get text
+TranslationEngine::InitLocale('en_GB');
+
+$xibo_step = Kit::GetParam('step', _REQUEST, _INT, 1);
+
+$content = '';
+$install = new Install();
+
+switch ($xibo_step) {
+
+    case 1:
+        // Welcome to the installer (this should only show once)
+        // Checks environment
+        $content = $install->Step1();
+        break;
+
+    case 2:
+        // Collect details about the database
+        $content = $install->Step2();
+        break;
+
+    case 3:
+        // Check and validate DB details
+        if (defined('MAX_EXECUTION') && MAX_EXECUTION)
+            set_time_limit(0);
+
+        try {
+            $install->Step3();
+
+            // Redirect to step 4
+            header('Location: install.php?step=4');
+        }
+        catch (Exception $e) {
+            $install->errorMessage = $e->getMessage();
+
+            // Reload step 2
+            $content = $install->Step2();
+        }
+        break;
+
+    case 4:
+        // DB installed and we are ready to collect some more details
+        // We should get the admin username and password
+        $content = $install->Step4();
+        break;
+
+    case 5:
+        // Create a user account
+        include_once('settings.php');
+        try {
+            $install->Step5();
+
+            // Redirect to step 6
+            header('Location: install.php?step=6');
+        }
+        catch (Exception $e) {
+            $install->errorMessage = $e->getMessage();
+
+            // Reload step 4
+            $content = $install->Step4();
+        }
+        break;
+
+    case 6:
+        $content = $install->Step6();
+        break;
+
+    case 7:
+        // Create a user account
+        include_once('settings.php');
+        try {
+            $install->Step7();
+
+            // Redirect to step 6
+            header('Location: install.php?step=8');
+        }
+        catch (Exception $e) {
+            $install->errorMessage = $e->getMessage();
+
+            // Reload step 4
+            $content = $install->Step6();
+        }
+        break;
+
+    case 8:
+        include_once('settings.php');
+        // Step 8 ends the execution
+        $install->Step8();
+        break;
+}
+
+Theme::Set('step', $xibo_step);
+Theme::Set('stepContent', $content);
+
+// Include the header
+Theme::Render('install_header');
+Theme::Render('install_footer');
 ?>
 
=== added file 'server/install/database/80.sql'
--- server/install/database/80.sql	1970-01-01 00:00:00 +0000
+++ server/install/database/80.sql	2014-09-19 11:39:09 +0000
@@ -0,0 +1,178 @@
+
+ALTER TABLE  `module` ADD  `render_as` VARCHAR( 10 ) NULL;
+ALTER TABLE  `module` ADD  `settings` TEXT NULL;
+
+UPDATE `resolution` SET enabled = 0;
+
+ALTER TABLE  `resolution` ADD  `version` TINYINT NOT NULL DEFAULT  '1';
+ALTER TABLE  `resolution` ADD  `enabled` TINYINT NOT NULL DEFAULT  '1';
+ALTER TABLE  `resolution` CHANGE  `resolution`  `resolution` VARCHAR( 254 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;
+
+INSERT INTO `resolution` (`resolutionID`, `resolution`, `width`, `height`, `intended_width`, `intended_height`, `version`, `enabled`) VALUES
+(9, '1080p HD Landscape', 800, 450, 1920, 1080, 2, 1),
+(10, '720p HD Landscape', 800, 450, 1280, 720, 2, 1),
+(11, '1080p HD Portrait', 450, 800, 1080, 1920, 2, 1),
+(12, '720p HD Portrait', 450, 800, 720, 1280, 2, 1),
+(13, '4k', 800, 450, 4096, 2304, 2, 1),
+(14, 'Common PC Monitor 4:3', 800, 600, 1024, 768, 2, 1);
+
+DELETE FROM `lktemplategroup` WHERE TemplateID IN (SELECT TemplateID FROM `template` WHERE isSystem = 1);
+DELETE FROM `template` WHERE isSystem = 1;
+
+ALTER TABLE `template` DROP `isSystem`;
+
+ALTER TABLE  `display` ADD  `displayprofileid` INT NULL;
+
+INSERT INTO `pages` (`name`, `pagegroupID`)
+SELECT 'displayprofile', pagegroupID FROM `pagegroup` WHERE pagegroup.pagegroup = 'Displays';
+
+INSERT INTO `menuitem` (MenuID, PageID, Args, Text, Class, Img, Sequence, External)
+SELECT 7, PageID, NULL, 'Display Settings', NULL, NULL, 4, 0
+  FROM `pages`
+ WHERE name = 'displayprofile';
+
+CREATE TABLE IF NOT EXISTS `displayprofile` (
+  `displayprofileid` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(50) NOT NULL,
+  `type` varchar(15) NOT NULL,
+  `config` text NOT NULL,
+  `isdefault` int(11) NOT NULL,
+  `userid` int(11) NOT NULL,
+  PRIMARY KEY (`displayprofileid`)
+) ENGINE=InnoDB  DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+
+UPDATE layout SET background = SUBSTRING_INDEX(background, '.', 1) WHERE IFNULL(background, '') <> '';
+ALTER TABLE  `layout` CHANGE  `background`  `backgroundImageId` INT( 11 ) NULL DEFAULT NULL;
+
+INSERT INTO `lklayoutmedia` (mediaid, layoutid, regionid)
+SELECT backgroundimageid, layoutid, 'background' FROM `layout` WHERE IFNULL(backgroundImageId, 0) <> 0;
+
+ALTER TABLE  `setting` CHANGE  `type`  `fieldType` VARCHAR( 24 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;
+
+ALTER TABLE  `setting` ADD  `title` VARCHAR( 254 ) NOT NULL ,
+ADD  `type` VARCHAR( 50 ) NOT NULL,
+ADD  `validation` VARCHAR( 50 ) NOT NULL ,
+ADD  `ordering` INT NOT NULL,
+ADD  `default` VARCHAR( 1000 ) NOT NULL,
+ADD  `userSee` TINYINT NOT NULL DEFAULT  '1';
+
+UPDATE `setting` SET type = fieldType;
+
+DELETE FROM `setting` WHERE setting IN ('BASE_URL', 'adminMessage', 'ppt_width', 'ppt_height');
+
+UPDATE `setting` SET cat = 'configuration', ordering = 10, usersee = '1', userchange = '1', `default` = '' WHERE setting = 'LIBRARY_LOCATION';
+UPDATE `setting` SET cat = 'configuration', ordering = 20, usersee = '1', userchange = '1', `default` = '' WHERE setting = 'SERVER_KEY';
+UPDATE `setting` SET cat = 'configuration', ordering = 30, usersee = '1', userchange = '1', `default` = 'default' WHERE setting = 'GLOBAL_THEME_NAME';
+UPDATE `setting` SET cat = 'content', ordering = 10, usersee = '1', userchange = '1', `default` = '10' WHERE setting = 'ppt_length';
+UPDATE `setting` SET cat = 'content', ordering = 20, usersee = '1', userchange = '1', `default` = '10' WHERE setting = 'swf_length';
+UPDATE `setting` SET cat = 'content', ordering = 30, usersee = '1', userchange = '1', `default` = '10' WHERE setting = 'jpg_length';
+UPDATE `setting` SET cat = 'defaults', ordering = 10, usersee = '1', userchange = '1', `default` = 'Unchecked' WHERE setting = 'LIBRARY_MEDIA_UPDATEINALL_CHECKB';
+UPDATE `setting` SET cat = 'defaults', ordering = 20, usersee = '1', userchange = '1', `default` = 'Unchecked' WHERE setting = 'LAYOUT_COPY_MEDIA_CHECKB';
+UPDATE `setting` SET cat = 'defaults', ordering = 30, usersee = '0', userchange = '0', `default` = 'Unchecked' WHERE setting = 'MODULE_CONFIG_LOCKED_CHECKB';
+UPDATE `setting` SET cat = 'defaults', ordering = 40, usersee = '1', userchange = '0', `default` = 'Unchecked' WHERE setting = 'TRANSITION_CONFIG_LOCKED_CHECKB';
+UPDATE `setting` SET cat = 'displays', ordering = 10, usersee = '1', userchange = '1', `default` = '51.504' WHERE setting = 'DEFAULT_LAT';
+UPDATE `setting` SET cat = 'displays', ordering = 20, usersee = '1', userchange = '1', `default` = '-0.104' WHERE setting = 'DEFAULT_LONG';
+UPDATE `setting` SET cat = 'displays', ordering = 30, usersee = '1', userchange = '1', `default` = '0' WHERE setting = 'SHOW_DISPLAY_AS_VNCLINK';
+UPDATE `setting` SET cat = 'displays', ordering = 40, usersee = '1', userchange = '1', `default` = '_top' WHERE setting = 'SHOW_DISPLAY_AS_VNC_TGT';
+UPDATE `setting` SET cat = 'displays', ordering = 50, usersee = '0', userchange = '0', `default` = '0' WHERE setting = 'MAX_LICENSED_DISPLAYS';
+UPDATE `setting` SET cat = 'general', ordering = 10, usersee = '1', userchange = '1', `default` = 'On' WHERE setting = 'PHONE_HOME';
+UPDATE `setting` SET cat = 'general', ordering = 20, usersee = '0', userchange = '0', `default` = '' WHERE setting = 'PHONE_HOME_KEY';
+UPDATE `setting` SET cat = 'general', ordering = 30, usersee = '0', userchange = '0', `default` = '0' WHERE setting = 'PHONE_HOME_DATE';
+UPDATE `setting` SET cat = 'general', ordering = 40, usersee = '1', userchange = '0', `default` = 'On' WHERE setting = 'SCHEDULE_LOOKAHEAD';
+UPDATE `setting` SET cat = 'general', ordering = 50, usersee = '1', userchange = '1', `default` = '172800' WHERE setting = 'REQUIRED_FILES_LOOKAHEAD';
+UPDATE `setting` SET cat = 'general', ordering = 60, usersee = '1', userchange = '1', `default` = 'Off' WHERE setting = 'SENDFILE_MODE';
+UPDATE `setting` SET cat = 'general', ordering = 70, usersee = '1', userchange = '0', `default` = '' WHERE setting = 'EMBEDDED_STATUS_WIDGET';
+UPDATE `setting` SET cat = 'general', ordering = 80, usersee = '1', userchange = '1', `default` = '1' WHERE setting = 'SETTING_IMPORT_ENABLED';
+UPDATE `setting` SET cat = 'general', ordering = 90, usersee = '1', userchange = '1', `default` = '1' WHERE setting = 'SETTING_LIBRARY_TIDY_ENABLED';
+UPDATE `setting` SET cat = 'general', ordering = 10, usersee = '1', userchange = '1', `default` = 'http://www.xibo.org.uk/manual/' WHERE setting = 'HELP_BASE';
+UPDATE `setting` SET cat = 'maintenance', ordering = 10, usersee = '1', userchange = '1', `default` = 'Off' WHERE setting = 'MAINTENANCE_ENABLED';
+UPDATE `setting` SET cat = 'maintenance', ordering = 20, usersee = '1', userchange = '1', `default` = 'On' WHERE setting = 'MAINTENANCE_EMAIL_ALERTS';
+UPDATE `setting` SET cat = 'maintenance', ordering = 30, usersee = '1', userchange = '1', `default` = '[e-mail]' WHERE setting = 'mail_to';
+UPDATE `setting` SET cat = 'maintenance', ordering = 40, usersee = '1', userchange = '1', `default` = '[e-mail]' WHERE setting = 'mail_from';
+UPDATE `setting` SET cat = 'maintenance', ordering = 50, usersee = '1', userchange = '1', `default` = 'changeme' WHERE setting = 'MAINTENANCE_KEY';
+UPDATE `setting` SET cat = 'maintenance', ordering = 60, usersee = '1', userchange = '1', `default` = '30' WHERE setting = 'MAINTENANCE_LOG_MAXAGE';
+UPDATE `setting` SET cat = 'maintenance', ordering = 70, usersee = '1', userchange = '1', `default` = '30' WHERE setting = 'MAINTENANCE_STAT_MAXAGE';
+UPDATE `setting` SET cat = 'maintenance', ordering = 80, usersee = '1', userchange = '1', `default` = '12' WHERE setting = 'MAINTENANCE_ALERT_TOUT';
+UPDATE `setting` SET cat = 'maintenance', ordering = 80, usersee = '1', userchange = '1', `default` = 'Off' WHERE setting = 'MAINTENANCE_ALWAYS_ALERT';
+UPDATE `setting` SET cat = 'network', ordering = 10, usersee = '1', userchange = '1', `default` = '' WHERE setting = 'PROXY_HOST';
+UPDATE `setting` SET cat = 'network', ordering = 20, usersee = '1', userchange = '1', `default` = '0' WHERE setting = 'PROXY_PORT';
+UPDATE `setting` SET cat = 'network', ordering = 30, usersee = '1', userchange = '1', `default` = '' WHERE setting = 'PROXY_AUTH';
+UPDATE `setting` SET cat = 'network', ordering = 40, usersee = '1', userchange = '0', `default` = '0' WHERE setting = 'MONTHLY_XMDS_TRANSFER_LIMIT_KB';
+UPDATE `setting` SET cat = 'network', ordering = 50, usersee = '1', userchange = '0', `default` = '0' WHERE setting = 'LIBRARY_SIZE_LIMIT_KB';
+UPDATE `setting` SET cat = 'network', ordering = 60, usersee = '0', userchange = '0', `default` = 'http://www.xibo.org.uk/stats/track.php' WHERE setting = 'PHONE_HOME_URL';
+UPDATE `setting` SET cat = 'permissions', ordering = 10, usersee = '1', userchange = '1', `default` = 'private' WHERE setting = 'LAYOUT_DEFAULT';
+UPDATE `setting` SET cat = 'permissions', ordering = 20, usersee = '1', userchange = '1', `default` = 'private' WHERE setting = 'MEDIA_DEFAULT';
+UPDATE `setting` SET cat = 'permissions', ordering = 30, usersee = '1', userchange = '1', `default` = 'Media Colouring' WHERE setting = 'REGION_OPTIONS_COLOURING';
+UPDATE `setting` SET cat = 'permissions', ordering = 40, usersee = '1', userchange = '1', `default` = 'No' WHERE setting = 'SCHEDULE_WITH_VIEW_PERMISSION';
+UPDATE `setting` SET cat = 'regional', ordering = 10, usersee = '1', userchange = '1', `default` = 'en_GB' WHERE setting = 'DEFAULT_LANGUAGE';
+UPDATE `setting` SET cat = 'regional', ordering = 20, usersee = '1', userchange = '1', `default` = 'Europe/London' WHERE setting = 'defaultTimezone';
+UPDATE `setting` SET cat = 'troubleshooting', ordering = 10, usersee = '1', userchange = '1', `default` = 'Off' WHERE setting = 'debug';
+UPDATE `setting` SET cat = 'troubleshooting', ordering = 20, usersee = '1', userchange = '1', `default` = 'Off' WHERE setting = 'audit';
+UPDATE `setting` SET cat = 'troubleshooting', ordering = 30, usersee = '1', userchange = '1', `default` = 'Production' WHERE setting = 'SERVER_MODE';
+UPDATE `setting` SET cat = 'users', ordering = 0, usersee = '0', userchange = '0', `default` = 'module_user_general.php' WHERE setting = 'userModule';
+UPDATE `setting` SET cat = 'users', ordering = 10, usersee = '1', userchange = '1', `default` = 'User' WHERE setting = 'defaultUsertype';
+UPDATE `setting` SET cat = 'users', ordering = 20, usersee = '1', userchange = '1', `default` = '' WHERE setting = 'USER_PASSWORD_POLICY';
+UPDATE `setting` SET cat = 'users', ordering = 30, usersee = '1', userchange = '1', `default` = '' WHERE setting = 'USER_PASSWORD_ERROR';
+
+ALTER TABLE  `schedule` ADD  `DisplayOrder` INT NOT NULL DEFAULT  '0';
+
+UPDATE `schedule` SET DisplayOrder = (SELECT MAX(DisplayOrder) FROM `schedule_detail` WHERE schedule_detail.eventid = schedule.eventid);
+
+ALTER TABLE  `schedule_detail` DROP FOREIGN KEY  `schedule_detail_ibfk_9` ;
+ALTER TABLE `schedule_detail` DROP `CampaignID`;
+ALTER TABLE `schedule_detail` DROP `is_priority`;
+ALTER TABLE `schedule_detail` DROP `DisplayOrder`;
+
+ALTER TABLE  `user` ADD  `newUserWizard` TINYINT NOT NULL DEFAULT  '0';
+
+CREATE TABLE IF NOT EXISTS `xmdsnonce` (
+  `nonceId` bigint(20) NOT NULL AUTO_INCREMENT,
+  `nonce` varchar(100) NOT NULL,
+  `expiry` int(11) NOT NULL,
+  `lastUsed` int(11) DEFAULT NULL,
+  `displayId` int(11) NOT NULL,
+  `fileId` int(11) DEFAULT NULL,
+  `size` bigint(20) DEFAULT NULL,
+  `storedAs` varchar(100) DEFAULT NULL,
+  `layoutId` int(11) DEFAULT NULL,
+  `regionId` varchar(100) DEFAULT NULL,
+  `mediaId` varchar(100) DEFAULT NULL,
+  PRIMARY KEY (`nonceId`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+
+ALTER TABLE  `schedule` CHANGE  `recurrence_type`  `recurrence_type` ENUM(  'Minute',  'Hour',  'Day',  'Week',  'Month',  'Year' ) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL;
+
+ALTER TABLE  `display` CHANGE  `client_version`  `client_version` VARCHAR( 15 ) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL;
+
+ALTER TABLE  `display` ADD  `currentLayoutId` INT NULL;
+
+CREATE TABLE IF NOT EXISTS `bandwidthtype` (
+  `bandwidthtypeid` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(25) NOT NULL,
+  PRIMARY KEY (`bandwidthtypeid`)
+) ENGINE=InnoDB  DEFAULT CHARSET=latin1 AUTO_INCREMENT=12 ;
+
+INSERT INTO `bandwidthtype` (`bandwidthtypeid`, `name`) VALUES
+(1, 'Register'),
+(2, 'Required Files'),
+(3, 'Schedule'),
+(4, 'Get File'),
+(5, 'Get Resource'),
+(6, 'Media Inventory'),
+(7, 'Notify Status'),
+(8, 'Submit Stats'),
+(9, 'Submit Log'),
+(10, 'Blacklist'),
+(11, 'Screen Shot');
+
+ALTER TABLE  `display` ADD  `screenShotRequested` TINYINT NOT NULL DEFAULT  '0';
+
+INSERT INTO `help` (`Topic`, `Category`, `Link`) VALUES
+('Displayprofile', 'General', 'manual/single.php?p=admin/displayprofiles'),
+('DisplayProfile', 'Edit', 'manual/single.php?p=admin/displayprofiles#edit'),
+('DisplayProfile', 'Delete', 'manual/single.php?p=admin/displayprofiles#delete');
+
+
+UPDATE `version` SET `app_ver` = '1.7.0-alpha', `XmdsVersion` = 4;
+UPDATE `setting` SET `value` = 0 WHERE `setting` = 'PHONE_HOME_DATE';
+UPDATE `version` SET `DBVersion` = '80';
 
=== removed file 'server/install/dot_amber.gif'
 Binary files server/install/dot_amber.gif	2010-10-03 16:14:21 +0000 and server/install/dot_amber.gif	1970-01-01 00:00:00 +0000 differ
=== removed file 'server/install/dot_green.gif'
 Binary files server/install/dot_green.gif	2010-10-03 16:14:21 +0000 and server/install/dot_green.gif	1970-01-01 00:00:00 +0000 differ
=== removed file 'server/install/dot_red.gif'
 Binary files server/install/dot_red.gif	2010-10-03 16:14:21 +0000 and server/install/dot_red.gif	1970-01-01 00:00:00 +0000 differ
=== removed file 'server/install/header_upgrade.inc'
--- server/install/header_upgrade.inc	2014-01-18 09:47:41 +0000
+++ server/install/header_upgrade.inc	1970-01-01 00:00:00 +0000
@@ -1,50 +0,0 @@
-<?php
-/*
- * Xibo - Digital Signage - http://www.xibo.org.uk
- * Copyright (C) 2006-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/>.
- */ 
-defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
-?><!DOCTYPE html>
-<html lang="en">
-	<head>
-		<title>Xibo Admin - Upgrade</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-		<meta name="viewport" content="width=device-width, initial-scale=1.0">
-		<link rel="stylesheet" type="text/css" href="install/install.css" />
-		<link rel="shortcut icon" href="theme/default/img/favicon.ico" />
-		<link href="theme/default/libraries/bootstrap/css/bootstrap.min.css" rel="stylesheet" media="screen">
-		<link href="theme/default/libraries/bootstrap/css/bootstrap-responsive.min.css" rel="stylesheet">
-
-		<script type="text/javascript">
-			$(document).ready(function(){
-			
-				document.getElementById('username').focus();
-				
-			});
-		</script>
-	</head>
-
-	<body>
-
-	<!-- Copyright 2006-2013 Daniel Garner. Part of the Xibo Open Source Digital Signage Solution. Released under the AGPLv3 or later. -->
-	<div class="container">
-		<div class="form-signin text-center">
-			<div class="row">
-				<h1>Xibo Upgrade</h1>
-			</div>
-			<div class="row">
 
=== modified file 'server/install/master/data.sql'
--- server/install/master/data.sql	2014-07-15 15:35:22 +0000
+++ server/install/master/data.sql	2014-09-19 11:39:09 +0000
@@ -1,5 +1,5 @@
 INSERT INTO `version` (`app_ver`, `XmdsVersion`, `XlfVersion`, `DBVersion`) VALUES
-('1.6.2', 3, 1, 70);
+('1.7.0-alpha', 4, 1, 80);
 
 INSERT INTO `group` (`groupID`, `group`, `IsUserSpecific`, `IsEveryone`) VALUES
 (1, 'Users', 0, 0),
@@ -84,7 +84,10 @@
 (78, 'User', 'SetPassword', 'manual/single.php?p=users/users#Set_Password'),
 (79, 'DataSet', 'ImportCSV', 'manual/single.php?p=content/content_dataset#Import_CSV'),
 (80, 'DisplayGroup', 'FileAssociations', 'manual/single.php?p=admin/fileassociations'),
-(81, 'Statusdashboard', 'General', 'manual/single.php?p=coreconcepts/dashboard#Status_Dashboard');
+(81, 'Statusdashboard', 'General', 'manual/single.php?p=coreconcepts/dashboard#Status_Dashboard'),
+(82, 'Displayprofile', 'General', 'manual/single.php?p=admin/displayprofiles'),
+(83, 'DisplayProfile', 'Edit', 'manual/single.php?p=admin/displayprofiles#edit'),
+(84, 'DisplayProfile', 'Delete', 'manual/single.php?p=admin/displayprofiles#delete');
 
 INSERT INTO `menu` (`MenuID`, `Menu`) VALUES
 (8, 'Administration Menu'),
@@ -108,8 +111,9 @@
 (10, 'Counter', 'Counter', 0, 1, 'Customer Counter connected to a Remote Control', 'forms/counter.gif', 1, NULL, 1, 1),
 (11, 'datasetview', 'Data Set', 1, 1, 'A view on a DataSet', 'forms/datasetview.gif', 1, NULL, 1, 1),
 (12, 'shellcommand', 'Shell Command', 1, 1, 'Execute a shell command on the client', 'forms/shellcommand.gif', 1, NULL, 1, 1),
-(13, 'localvideo', 'Local Video', 0, 1, 'Play a video locally stored on the client', 'forms/video.gif', 1, NULL, 1, 1),
-(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);
+(13, 'localvideo', 'Local Video', 1, 1, 'Play a video locally stored on the client', 'forms/video.gif', 1, NULL, 1, 1),
+(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),
+(15, 'clock', 'Clock', 1, 1, 'Display a Clock', 'forms/library.gif', 1, '', 1, 1, 'html', '[]');
 
 INSERT INTO `pagegroup` (`pagegroupID`, `pagegroup`) VALUES
 (1, 'Schedule'),
@@ -157,7 +161,8 @@
 (39, 'timeline', 3),
 (40, 'sessions', 9),
 (41, 'preview', 3),
-(42, 'statusdashboard', 2);
+(42, 'statusdashboard', 2),
+(43, 'displayprofile', 7);
 
 INSERT INTO `menuitem` (`MenuItemID`, `MenuID`, `PageID`, `Args`, `Text`, `Class`, `Img`, `Sequence`, `External`) VALUES
 (1, 1, 2, NULL, 'Schedule', NULL, NULL, 1, 0),
@@ -193,77 +198,72 @@
 (36, 8, 24, NULL, 'Modules', NULL, NULL, 5, 0),
 (37, 6, 37, NULL, 'Campaigns', NULL, NULL, 1, 0),
 (38, 8, 38, NULL, 'Transitions', NULL, NULL, 6, 0),
-(39, 9, 30, NULL, 'Help Links', NULL, NULL, 6, 0);
-
-
-INSERT INTO `resolution` (`resolutionID`, `resolution`, `width`, `height`, `intended_width`, `intended_height`) VALUES
-(1, '4:3 Monitor', 800, 600, 1024, 768),
-(2, '3:2 Tv', 720, 480, 1440, 960),
-(3, '16:10 Widescreen Mon', 800, 500, 1680, 1050),
-(4, '16:9 HD Widescreen', 800, 450, 1920, 1080),
-(5, '3:4 Monitor', 600, 800, 768, 1024),
-(6, '2:3 Tv', 480, 720, 960, 1440),
-(7, '10:16 Widescreen', 500, 800, 1050, 1680),
-(8, '9:16 HD Widescreen', 450, 800, 1080, 1920);
-
-INSERT INTO `setting` (`settingid`, `setting`, `value`, `type`, `helptext`, `options`, `cat`, `userChange`) VALUES
-(1, 'MEDIA_DEFAULT', 'private', 'dropdown', 'Media will be created with these settings. If public everyone will be able to view and use this media.', 'private|public', 'default', 1),
-(2, 'LAYOUT_DEFAULT', 'private', 'dropdown', 'New layouts will be created with these settings. If public everyone will be able to view and use this layout.', 'private|public', 'default', 1),
-(3, 'defaultUsertype', 'user', 'dropdown', 'Sets the default user type selected when creating a user.\r\n<br />\r\nWe recommend that this is set to "User"', 'User|Group Admin|Super Admin', 'default', 1),
-(5, 'debug', 'Off', 'dropdown', 'Sets whether debug information is recorded when an error occurs.\r\n<br />\r\nThis should be set to "off" to ensure smaller log sizes', 'On|Off', 'error', 1),
-(7, 'userModule', 'module_user_general.php', 'dirselect', 'This sets which user authentication module is currently being used.', NULL, 'user', 0),
-(10, 'adminMessage', '', 'text', 'Sets the admin message to be displayed on the client page at all times', NULL, 'general', 0),
-(11, 'defaultTimezone', 'UTC', 'timezone', 'Set the default timezone for the application', 'Europe/London', 'default', 1),
-(18, 'mail_to', '[e-mail]', 'text', 'Errors will be mailed here', NULL, 'maintenance', 1),
-(19, 'mail_from', '[e-mail]', 'text', 'Mail will be sent from this address', NULL, 'maintenance', 1),
-(20, 'BASE_URL', 'http://localhost/xibo/', 'text', 'This is the fully qualified URI of the site. e.g http://www.xibo.co.uk/', NULL, 'general', 0),
-(23, 'jpg_length', '10', 'text', 'Default length for JPG files (in seconds)', NULL, 'content', 1),
-(24, 'ppt_width', '1024', 'text', 'Default length for PPT files', NULL, 'content', 0),
-(25, 'ppt_height', '768', 'text', 'Default height for PPT files', NULL, 'content', 0),
-(26, 'ppt_length', '120', 'text', 'Default length for PPT files (in seconds)', NULL, 'content', 1),
-(29, 'swf_length', '60', 'text', 'Default length for SWF files', NULL, 'content', 1),
-(30, 'audit', 'Off', 'dropdown', 'Turn on the auditing information. Warning this will quickly fill up the log', 'On|Off', 'error', 1),
-(33, 'LIBRARY_LOCATION', 'C:\\Users\\dan\\Documents\\Xibo\\release140/', 'text', NULL, NULL, 'path', 1),
-(34, 'SERVER_KEY', 'xsm', 'text', NULL, NULL, 'general', 1),
-(35, 'HELP_BASE', 'http://www.xibo.org.uk/manual/', 'text', NULL, NULL, 'path', 0),
-(36, 'PHONE_HOME', 'Off', 'dropdown', 'Should the server send anonymous statistics back to the Xibo project?', 'On|Off', 'general', 1),
-(37, 'PHONE_HOME_KEY', 'b904d63cc837b2af0b033bfcd781f364', 'text', 'Key used to distinguish each Xibo instance. This is generated randomly based on the time you first installed Xibo, and is completely untraceable.', NULL, 'general', 0),
-(38, 'PHONE_HOME_URL', 'http://www.xibo.org.uk/stats/track.php', 'text', 'The URL to connect to to PHONE_HOME (if enabled)', NULL, 'path', 0),
-(39, 'PHONE_HOME_DATE', '0', 'text', 'The last time we PHONED_HOME in seconds since the epoch', NULL, 'general', 0),
-(40, 'SERVER_MODE', 'Production', 'dropdown', 'This should only be set if you want to display the maximum allowed error messaging through the user interface. <br /> Useful for capturing critical php errors and environment issues.', 'Production|Test', 'error', 1),
-(41, 'MAINTENANCE_ENABLED', 'Off', 'dropdown', 'Allow the maintenance script to run if it is called?', 'Protected|On|Off', 'maintenance', 1),
-(42, 'MAINTENANCE_EMAIL_ALERTS', 'On', 'dropdown', 'Global switch for email alerts to be sent', 'On|Off', 'maintenance', 1),
-(43, 'MAINTENANCE_KEY', 'changeme', 'text', 'String appended to the maintenance script to prevent malicious calls to the script.', NULL, 'maintenance', 1),
-(44, 'MAINTENANCE_LOG_MAXAGE', '30', 'text', 'Maximum age for log entries. Set to 0 to keep logs indefinitely.', NULL, 'maintenance', 1),
-(45, 'MAINTENANCE_STAT_MAXAGE', '30', 'text', 'Maximum age for statistics entries. Set to 0 to keep statistics indefinitely.', NULL, 'maintenance', 1),
-(46, 'MAINTENANCE_ALERT_TOUT', '12', 'text', 'How long in minutes after the last time a client connects should we send an alert? Can be overridden on a per client basis.', NULL, 'maintenance', 1),
-(47, 'SHOW_DISPLAY_AS_VNCLINK', '', 'text', 'Turn the display name in display management into a VNC link using the IP address last collected. The %s is replaced with the IP address. Leave blank to disable.', NULL, 'general', 1),
-(48, 'SHOW_DISPLAY_AS_VNC_TGT', '_top', 'text', 'If the display name is shown as a link in display management, what target should the link have? Set _top to open the link in the same window or _blank to open in a new window.', NULL, 'general', 1),
-(49, 'MAINTENANCE_ALWAYS_ALERT', 'Off', 'dropdown', 'Should Xibo send an email if a display is in an error state every time the maintenance script runs?', 'On|Off', 'maintenance', 1),
-(50, 'SCHEDULE_LOOKAHEAD', 'On', 'dropdown', 'Should Xibo send future schedule information to clients?', 'On|Off', 'general', 0),
-(51, 'REQUIRED_FILES_LOOKAHEAD', '172800', 'text', 'How many seconds in to the future should the calls to RequiredFiles look?', NULL, 'general', 1),
-(52, 'REGION_OPTIONS_COLOURING', 'Media Colouring', 'dropdown', NULL, 'Media Colouring|Permissions Colouring', 'permissions', 1),
-(53, 'LAYOUT_COPY_MEDIA_CHECKB', 'Unchecked', 'dropdown', 'Default the checkbox for making duplicates of media when copying layouts', 'Checked|Unchecked', 'default', 1),
-(54, 'MAX_LICENSED_DISPLAYS', '0', 'text', 'The maximum number of licensed clients for this server installation. 0 = unlimited', NULL, 'general', 0),
-(55, 'LIBRARY_MEDIA_UPDATEINALL_CHECKB', 'Unchecked', 'dropdown', 'Default the checkbox for updating media on all layouts when editing in the library', 'Checked|Unchecked', 'default', 1),
-(56, 'USER_PASSWORD_POLICY', '', 'text', 'Regular Expression for password complexity, leave blank for no policy.', '', 'permissions', 1),
-(57, 'USER_PASSWORD_ERROR', '', 'text', 'A text description of this password policy. Will be show to users when their password does not meet the required policy', '', 'permissions', 1),
-(58, 'MODULE_CONFIG_LOCKED_CHECKB', 'Unchecked', 'dropdown', 'Is the module config locked? Useful for Service providers.', 'Checked|Unchecked', 'general', 0),
-(59, 'LIBRARY_SIZE_LIMIT_KB', '0', 'text', 'The Limit for the Library Size in KB', NULL, 'content', 0),
-(60, 'MONTHLY_XMDS_TRANSFER_LIMIT_KB', '0', 'text', 'XMDS Transfer Limit in KB/month', NULL, 'general', 0),
-(61, 'DEFAULT_LANGUAGE', 'en_GB', 'text', 'The default language to use', NULL, 'general', 1),
-(62, 'TRANSITION_CONFIG_LOCKED_CHECKB', 'Unchecked', 'dropdown', 'Is the Transition config locked?', 'Checked|Unchecked', 'general', 0),
-(63, 'GLOBAL_THEME_NAME', 'default', 'text', 'The Theme to apply to all pages by default', NULL, 'general', 1),
-(64, 'DEFAULT_LAT', '51.504', 'text', 'The Latitude to apply for any Geo aware Previews', NULL, 'general', 1),
-(65, 'DEFAULT_LONG', '-0.104', 'text', 'The Longitude to apply for any Geo aware Previews', NULL, 'general', 1),
-(66, 'SCHEDULE_WITH_VIEW_PERMISSION', 'No', 'dropdown', 'Should users with View permissions on displays be allowed to schedule to them?', 'Yes|No', 'permissions', '1'),
-(67, 'SETTING_IMPORT_ENABLED', 'Off', 'dropdown', NULL , 'On|Off', 'general', '0'), 
-(68, 'SETTING_LIBRARY_TIDY_ENABLED', 'Off', 'dropdown', NULL , 'On|Off', 'general', '0'),
-(69, 'SENDFILE_MODE', 'Off', 'dropdown', 'When a user downloads a file from the library or previews a layout, should we attempt to use Apache X-Sendfile, Nginx X-Accel, or PHP (Off) to return the file from the library?', 'Off|Apache|Nginx', 'general', '1'),
-(70, 'EMBEDDED_STATUS_WIDGET', '', 'text', 'HTML to embed in an iframe on the Status Dashboard' , NULL, 'general', '0'),
-(71, 'PROXY_HOST', '', 'text', 'The Proxy URL' , NULL, 'general', '1'),
-(72, 'PROXY_PORT', '', 'text', 'The Proxy Port' , NULL, 'general', '1'),
-(73, 'PROXY_AUTH', '', 'text', 'The Authentication information for this proxy. username:password' , NULL, 'general', '1');
+(39, 9, 30, NULL, 'Help Links', NULL, NULL, 6, 0),
+(40, 7, 43, NULL, 'Display Settings', NULL, NULL, 4, 0);
+
+
+INSERT INTO `resolution` (`resolutionID`, `resolution`, `width`, `height`, `intended_width`, `intended_height`, `version`, `enabled`) VALUES
+(9, '1080p HD Landscape', 800, 450, 1920, 1080, 2, 1),
+(10, '720p HD Landscape', 800, 450, 1280, 720, 2, 1),
+(11, '1080p HD Portrait', 450, 800, 1080, 1920, 2, 1),
+(12, '720p HD Portrait', 450, 800, 720, 1280, 2, 1),
+(13, '4k', 800, 450, 4096, 2304, 2, 1),
+(14, 'Common PC Monitor 4:3', 800, 600, 1024, 768, 2, 1);
+
+INSERT INTO `setting` (`settingid`, `setting`, `value`, `fieldType`, `helptext`, `options`, `cat`, `userChange`, `title`, `validation`, `ordering`, `default`, `userSee`, `type`) VALUES
+(1, 'MEDIA_DEFAULT', 'private', 'dropdown', 'Media will be created with these settings. If public everyone will be able to view and use this media.', 'private|public', 'permissions', 1, 'Media Permissions', '', 20, 'private', 1, 'word'),
+(2, 'LAYOUT_DEFAULT', 'private', 'dropdown', 'New layouts will be created with these settings. If public everyone will be able to view and use this layout.', 'private|public', 'permissions', 1, 'Layout Permissions', '', 10, 'private', 1, 'word'),
+(3, 'defaultUsertype', 'User', 'dropdown', 'Sets the default user type selected when creating a user.\r\n<br />\r\nWe recommend that this is set to "User"', 'User|Group Admin|Super Admin', 'users', 1, 'Default User Type', '', 10, 'User', 1, 'string'),
+(5, 'debug', 'Off', 'dropdown', 'Sets whether debug information is recorded when an error occurs.\r\n<br />\r\nThis should be set to "off" to ensure smaller log sizes', 'On|Off', 'troubleshooting', 1, 'Enable Debugging?', '', 10, 'Off', 1, 'word'),
+(7, 'userModule', 'module_user_general.php', 'dirselect', 'This sets which user authentication module is currently being used.', NULL, 'users', 0, 'User Module', '', 0, 'module_user_general.php', 0, 'string'),
+(11, 'defaultTimezone', 'Europe/London', 'timezone', 'Set the default timezone for the application', 'Europe/London', 'regional', 1, 'Timezone', '', 20, 'Europe/London', 1, 'string'),
+(18, 'mail_to', '[e-mail]', 'email', 'Errors will be mailed here', NULL, 'maintenance', 1, 'Admin email address', '', 30, '[e-mail]', 1, 'string'),
+(19, 'mail_from', '[e-mail]', 'email', 'Mail will be sent from this address', NULL, 'maintenance', 1, 'Sending email address', '', 40, '[e-mail]', 1, 'string'),
+(23, 'jpg_length', '10', 'number', 'Default length for JPG files (in seconds)', NULL, 'content', 1, 'Default Image Duration', '', 30, '10', 1, 'int'),
+(26, 'ppt_length', '10', 'number', 'Default length for PPT files (in seconds)', NULL, 'content', 1, 'Default PowerPoint Duration', '', 10, '10', 1, 'int'),
+(29, 'swf_length', '10', 'number', 'Default length for SWF files', NULL, 'content', 1, 'Default Flash Duration', '', 20, '10', 1, 'int'),
+(30, 'audit', 'Off', 'dropdown', 'Turn on the auditing information. Warning this will quickly fill up the log', 'On|Off', 'troubleshooting', 1, 'Enable Auditing?', '', 20, 'Off', 1, 'word'),
+(33, 'LIBRARY_LOCATION', '', 'text', 'The fully qualified path to the CMS library location.', NULL, 'configuration', 1, 'Library Location', 'required', 10, '', 1, 'string'),
+(34, 'SERVER_KEY', '', 'text', NULL, NULL, 'configuration', 1, 'CMS Secret Key', 'required', 20, '', 1, 'string'),
+(35, 'HELP_BASE', 'http://www.xibo.org.uk/manual/', 'text', NULL, NULL, 'general', 1, 'Location of the Manual', 'required', 10, 'http://www.xibo.org.uk/manual/', 1, 'string'),
+(36, 'PHONE_HOME', 'On', 'dropdown', 'Should the server send anonymous statistics back to the Xibo project?', 'On|Off', 'general', 1, 'Allow usage tracking?', '', 10, 'On', 1, 'word'),
+(37, 'PHONE_HOME_KEY', '', 'text', 'Key used to distinguish each Xibo instance. This is generated randomly based on the time you first installed Xibo, and is completely untraceable.', NULL, 'general', 0, 'Phone home key', '', 20, '', 0, 'string'),
+(38, 'PHONE_HOME_URL', 'http://www.xibo.org.uk/stats/track.php', 'text', 'The URL to connect to to PHONE_HOME (if enabled)', NULL, 'network', 0, 'Phone home URL', '', 60, 'http://www.xibo.org.uk/stats/track.php', 0, 'string'),
+(39, 'PHONE_HOME_DATE', '0', 'text', 'The last time we PHONED_HOME in seconds since the epoch', NULL, 'general', 0, 'Phone home time', '', 30, '0', 0, 'int'),
+(40, 'SERVER_MODE', 'Production', 'dropdown', 'This should only be set if you want to display the maximum allowed error messaging through the user interface. <br /> Useful for capturing critical php errors and environment issues.', 'Production|Test', 'troubleshooting', 1, 'Server Mode', '', 30, 'Production', 1, 'word'),
+(41, 'MAINTENANCE_ENABLED', 'Off', 'dropdown', 'Allow the maintenance script to run if it is called?', 'Protected|On|Off', 'maintenance', 1, 'Enable Maintenance?', '', 10, 'Off', 1, 'word'),
+(42, 'MAINTENANCE_EMAIL_ALERTS', 'On', 'dropdown', 'Global switch for email alerts to be sent', 'On|Off', 'maintenance', 1, 'Enable Email Alerts?', '', 20, 'On', 1, 'word'),
+(43, 'MAINTENANCE_KEY', 'changeme', 'text', 'String appended to the maintenance script to prevent malicious calls to the script.', NULL, 'maintenance', 1, 'Maintenance Key', '', 50, 'changeme', 1, 'string'),
+(44, 'MAINTENANCE_LOG_MAXAGE', '30', 'number', 'Maximum age for log entries. Set to 0 to keep logs indefinitely.', NULL, 'maintenance', 1, 'Max Log Age', '', 60, '30', 1, 'int'),
+(45, 'MAINTENANCE_STAT_MAXAGE', '30', 'number', 'Maximum age for statistics entries. Set to 0 to keep statistics indefinitely.', NULL, 'maintenance', 1, 'Max Statistics Age', '', 70, '30', 1, 'int'),
+(46, 'MAINTENANCE_ALERT_TOUT', '12', 'number', 'How long in minutes after the last time a client connects should we send an alert? Can be overridden on a per client basis.', NULL, 'maintenance', 1, 'Max Display Timeout', '', 80, '12', 1, 'int'),
+(47, 'SHOW_DISPLAY_AS_VNCLINK', '0', 'checkbox', 'Turn the display name in display management into a VNC link using the IP address last collected. The %s is replaced with the IP address. Leave blank to disable.', NULL, 'displays', 1, 'Display a VNC Link?', '', 30, '0', 1, 'checkbox'),
+(48, 'SHOW_DISPLAY_AS_VNC_TGT', '_top', 'text', 'If the display name is shown as a link in display management, what target should the link have? Set _top to open the link in the same window or _blank to open in a new window.', NULL, 'displays', 1, 'Open VNC Link in new window?', '', 40, '_top', 1, 'string'),
+(49, 'MAINTENANCE_ALWAYS_ALERT', 'Off', 'dropdown', 'Should Xibo send an email if a display is in an error state every time the maintenance script runs?', 'On|Off', 'maintenance', 1, 'Send repeat Display Timeouts', '', 80, 'Off', 1, 'word'),
+(50, 'SCHEDULE_LOOKAHEAD', 'On', 'dropdown', 'Should Xibo send future schedule information to clients?', 'On|Off', 'general', 0, 'Send Schedule in advance?', '', 40, 'On', 1, 'word'),
+(51, 'REQUIRED_FILES_LOOKAHEAD', '172800', 'number', 'How many seconds in to the future should the calls to RequiredFiles look?', NULL, 'general', 1, 'Send files in advance?', '', 50, '172800', 1, 'int'),
+(52, 'REGION_OPTIONS_COLOURING', 'Media Colouring', 'dropdown', NULL, 'Media Colouring|Permissions Colouring', 'permissions', 1, 'How to colour Media on the Region Timeline', '', 30, 'Media Colouring', 1, 'string'),
+(53, 'LAYOUT_COPY_MEDIA_CHECKB', 'Unchecked', 'dropdown', 'Default the checkbox for making duplicates of media when copying layouts', 'Checked|Unchecked', 'defaults', 1, 'Default copy media when copying a layout?', '', 20, 'Unchecked', 1, 'word'),
+(54, 'MAX_LICENSED_DISPLAYS', '0', 'number', 'The maximum number of licensed clients for this server installation. 0 = unlimited', NULL, 'displays', 0, 'Number of display slots', '', 50, '0', 0, 'int'),
+(55, 'LIBRARY_MEDIA_UPDATEINALL_CHECKB', 'Unchecked', 'dropdown', 'Default the checkbox for updating media on all layouts when editing in the library', 'Checked|Unchecked', 'defaults', 1, 'Default update media in all layouts', '', 10, 'Unchecked', 1, 'word'),
+(56, 'USER_PASSWORD_POLICY', '', 'text', 'Regular Expression for password complexity, leave blank for no policy.', '', 'users', 1, 'Password Policy Regular Expression', '', 20, '', 1, 'string'),
+(57, 'USER_PASSWORD_ERROR', '', 'text', 'A text description of this password policy. Will be show to users when their password does not meet the required policy', '', 'users', 1, 'Description of Password Policy', '', 30, '', 1, 'string'),
+(58, 'MODULE_CONFIG_LOCKED_CHECKB', 'Unchecked', 'dropdown', 'Is the module config locked? Useful for Service providers.', 'Checked|Unchecked', 'defaults', 0, 'Lock Module Config', '', 30, 'Unchecked', 0, 'word'),
+(59, 'LIBRARY_SIZE_LIMIT_KB', '0', 'number', 'The Limit for the Library Size in KB', NULL, 'network', 0, 'Library Size Limit', '', 50, '0', 1, 'int'),
+(60, 'MONTHLY_XMDS_TRANSFER_LIMIT_KB', '0', 'number', 'XMDS Transfer Limit in KB/month', NULL, 'network', 0, 'Monthly bandwidth Limit', '', 40, '0', 1, 'int'),
+(61, 'DEFAULT_LANGUAGE', 'en_GB', 'text', 'The default language to use', NULL, 'regional', 1, 'Default Language', '', 10, 'en_GB', 1, 'string'),
+(62, 'TRANSITION_CONFIG_LOCKED_CHECKB', 'Unchecked', 'dropdown', 'Is the Transition config locked?', 'Checked|Unchecked', 'defaults', 0, 'Allow modifications to the transition configuration?', '', 40, 'Unchecked', 1, 'word'),
+(63, 'GLOBAL_THEME_NAME', 'default', 'text', 'The Theme to apply to all pages by default', NULL, 'configuration', 1, 'CMS Theme', '', 30, 'default', 1, 'word'),
+(64, 'DEFAULT_LAT', '51.504', 'number', 'The Latitude to apply for any Geo aware Previews', NULL, 'displays', 1, 'Default Latitude', '', 10, '51.504', 1, 'double'),
+(65, 'DEFAULT_LONG', '-0.104', 'number', 'The Longitude to apply for any Geo aware Previews', NULL, 'displays', 1, 'Default Longitude', '', 20, '-0.104', 1, 'double'),
+(66, 'SCHEDULE_WITH_VIEW_PERMISSION', 'No', 'dropdown', 'Should users with View permissions on displays be allowed to schedule to them?', 'Yes|No', 'permissions', 1, 'Schedule with view permissions?', '', 40, 'No', 1, 'word'),
+(67, 'SETTING_IMPORT_ENABLED', '1', 'checkbox', NULL, NULL, 'general', 1, 'Allow Import?', '', 80, '1', 1, 'checkbox'),
+(68, 'SETTING_LIBRARY_TIDY_ENABLED', '1', 'checkbox', NULL, NULL, 'general', 1, 'Enable Library Tidy?', '', 90, '1', 1, 'checkbox'),
+(69, 'SENDFILE_MODE', 'Off', 'dropdown', 'When a user downloads a file from the library or previews a layout, should we attempt to use Apache X-Sendfile, Nginx X-Accel, or PHP (Off) to return the file from the library?', 'Off|Apache|Nginx', 'general', 1, 'File download mode', '', 60, 'Off', 1, 'word'),
+(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');
 
 INSERT INTO `usertype` (`usertypeid`, `usertype`) VALUES
 (1, 'Super Admin'),
@@ -271,19 +271,10 @@
 (3, 'User');
 
 INSERT INTO `user` (`UserID`, `usertypeid`, `UserName`, `UserPassword`, `loggedin`, `lastaccessed`, `email`, `homepage`, `Retired`) VALUES
-(1, 1, 'xibo_admin', '21232f297a57a5a743894a0e4a801fc3', 1, '2013-02-02 15:07:29', '[e-mail]', 'statusdashboard', 0);
-
-INSERT INTO `template` (`templateID`, `template`, `xml`, `userID`, `createdDT`, `modifiedDT`, `description`, `tags`, `thumbnail`, `isSystem`, `retired`) VALUES
-(1, 'Full Screen 16:9', '<?xml version="1.0"?>\n<layout schemaVersion="1" width="800" height="450" bgcolor="#000000"><region id="47ff29524ce1b" width="800" height="450" top="0" left="0"/></layout>\n', 1, '2008-01-01 01:00:00', '2008-01-01 01:00:00', '', 'fullscreen', NULL, 1, 0),
-(2, 'Full Screen 16:10', '<?xml version="1.0"?>\n<layout schemaVersion="1" width="800" height="500" bgcolor="#000000"><region id="47ff29524ce1b" width="800" height="500" top="0" left="0"/></layout>\n', 1, '2008-01-01 01:00:00', '2008-01-01 01:00:00', '', 'fullscreen', NULL, 1, 0),
-(3, 'Full Screen 4:3', '<?xml version="1.0"?>\n<layout schemaVersion="1" width="800" height="600" bgcolor="#000000"><region id="47ff29524ce1b" width="800" height="600" top="0" left="0"/></layout>\n', 1, '2008-01-01 01:00:00', '2008-01-01 01:00:00', '', 'fullscreen', NULL, 1, 0),
-(4, 'Full Screen 3:2', '<?xml version="1.0"?>\n<layout schemaVersion="1" width="720" height="480" bgcolor="#000000"><region id="47ff29524ce1b" width="720" height="480" top="0" left="0"/></layout>\n', 1, '2008-01-01 01:00:00', '2008-01-01 01:00:00', '', 'fullscreen', NULL, 1, 0),
-(5, 'Portrait - 10:16', '<?xml version="1.0"?>\n<layout width="500" height="800" bgcolor="#000000" background="" schemaVersion="1"><region id="47ff2f524ae1b" width="500" height="800" top="0" left="0"/></layout>\n', 1, '2008-01-01 01:00:00', '2008-01-01 01:00:00', '', '', NULL, 1, 0),
-(6, 'Portrait - 9:16', '<?xml version="1.0"?>\n<layout width="450" height="800" bgcolor="#000000" background="" schemaVersion="1"><region id="47ff2f524be1b" width="450" height="800" top="0" left="0"/></layout>\n', 1, '2008-01-01 01:00:00', '2008-01-01 01:00:00', '', '', NULL, 1, 0),
-(7, 'Portrait - 3:4', '<?xml version="1.0"?>\n<layout width="600" height="800" bgcolor="#000000" background="" schemaVersion="1"><region id="47ff2f524ce1b" width="600" height="800" top="0" left="0"/></layout>\n', 1, '2008-01-01 01:00:00', '2008-01-01 01:00:00', '', '', NULL, 1, 0),
-(8, 'Portrait - 2:3', '<?xml version="1.0"?>\n<layout width="480" height="720" bgcolor="#000000" background="" schemaVersion="1"><region id="47ff2f524de1b" width="480" height="720" top="0" left="0"/></layout>\n', 1, '2008-01-01 01:00:00', '2008-01-01 01:00:00', '', '', NULL, 1, 0);
-
-INSERT INTO `layout` (`layoutID`, `layout`, `xml`, `userID`, `createdDT`, `modifiedDT`, `description`, `tags`, `templateID`, `retired`, `duration`, `background`) VALUES
+(1, 1, 'xibo_admin', '21232f297a57a5a743894a0e4a801fc3', 1, NOW(), '', 'statusdashboard', 0);
+
+
+INSERT INTO `layout` (`layoutID`, `layout`, `xml`, `userID`, `createdDT`, `modifiedDT`, `description`, `tags`, `templateID`, `retired`, `duration`, `backgroundImageId`) VALUES
 (4, 'Default Layout', '<?xml version="1.0"?><layout schemaVersion="1" width="800" height="450" bgcolor="#000000"><region id="47ff29524ce1b" width="800" height="401" top="0" left="0" userId="1"><media id="522caef6e13cb6c9fe5fac15dde59ef7" type="text" duration="15" lkid="" userId="1" schemaVersion="1">
                             <options><xmds>1</xmds><direction>none</direction><scrollSpeed>2</scrollSpeed><fitText>0</fitText></options>
                             <raw><text><![CDATA[<p style="text-align: center;"><strong><span style="font-family:arial,helvetica,sans-serif;"><span style="font-size:72px;"><span style="color:#FFFFFF;">Welcome to&nbsp;<br />
@@ -331,16 +322,6 @@
 (9, 41, 1),
 (10, 42, 1);
 
-INSERT INTO `lktemplategroup` (`LkTemplateGroupID`, `TemplateID`, `GroupID`, `View`, `Edit`, `Del`) VALUES
-(1, 1, 2, 1, 0, 0),
-(2, 2, 2, 1, 0, 0),
-(3, 3, 2, 1, 0, 0),
-(4, 4, 2, 1, 0, 0),
-(5, 5, 2, 1, 0, 0),
-(6, 6, 2, 1, 0, 0),
-(7, 7, 2, 1, 0, 0),
-(8, 8, 2, 1, 0, 0);
-
 INSERT INTO `lkusergroup` (`LkUserGroupID`, `GroupID`, `UserID`) VALUES
 (10, 3, 1);
 
@@ -357,3 +338,20 @@
 INSERT INTO `datasetcolumntype` (`DataSetColumnTypeID`, `DataSetColumnType`) VALUES
 (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":1,"type":"checkbox"},{"name":"statsEnabled","value":1,"type":"checkbox"},{"name":"sizeX","value":"1280","type":"double"},{"name":"sizeY","value":"720","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":"1","type":"int"},{"name":"EnableMouse","value":0,"type":"checkbox"},{"name":"EnableShellCommands","value":1,"type":"checkbox"},{"name":"expireModifiedLayouts","value":1,"type":"checkbox"},{"name":"LogLevel","value":"audit","type":"word"},{"name":"LogToDiskLocation","value":"","type":"string"},{"name":"MaxConcurrentDownloads","value":"2","type":"int"},{"name":"ShellCommandAllowList","value":"","type":"string"}]', 1, 1),
+(2, 'Production', 'android', '[{"name":"emailAddress","value":"[e-mail]","type":"string"},{"name":"settingsPassword","value":"test2","type":"string"},{"name":"collectInterval","value":"600","type":"int"},{"name":"orientation","value":0,"type":"int"},{"name":"startOnBoot","value":0,"type":"checkbox"},{"name":"actionBarMode","value":"1","type":"int"},{"name":"actionBarDisplayDuration","value":"60","type":"int"},{"name":"screenDimensions","value":"","type":"string"},{"name":"autoRestart","value":0,"type":"checkbox"},{"name":"startOnBootDelay","value":"60","type":"int"},{"name":"blacklistVideo","value":1,"type":"checkbox"},{"name":"storeHtmlOnInternal","value":1,"type":"checkbox"}]', 1, 1);
+
+INSERT INTO `bandwidthtype` (`bandwidthtypeid`, `name`) VALUES
+(1, 'Register'),
+(2, 'Required Files'),
+(3, 'Schedule'),
+(4, 'Get File'),
+(5, 'Get Resource'),
+(6, 'Media Inventory'),
+(7, 'Notify Status'),
+(8, 'Submit Stats'),
+(9, 'Submit Log'),
+(10, 'Blacklist'),
+(11, 'Screen Shot');
 
=== modified file 'server/install/master/structure.sql'
--- server/install/master/structure.sql	2014-07-18 22:43:48 +0000
+++ server/install/master/structure.sql	2014-09-19 11:39:09 +0000
@@ -88,11 +88,14 @@
   `GeoLocation` POINT NULL,
   `version_instructions` varchar(255) NULL,
   `client_type` VARCHAR( 20 ) NULL ,
-  `client_version` VARCHAR( 5 ) NULL ,
+  `client_version` VARCHAR( 15 ) NULL ,
   `client_code` SMALLINT NULL,
+  `displayprofileid` int(11) NULL,
+  `currentLayoutId` int(11) NULL,
+  `screenShotRequested` tinyint(4) NOT NULL DEFAULT '0',
   PRIMARY KEY (`displayid`),
   KEY `defaultplaylistid` (`defaultlayoutid`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=3 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 
 CREATE TABLE IF NOT EXISTS `displaygroup` (
   `DisplayGroupID` int(11) NOT NULL AUTO_INCREMENT,
@@ -138,7 +141,7 @@
   `templateID` int(11) DEFAULT NULL COMMENT 'The ID of the template',
   `retired` tinyint(4) NOT NULL DEFAULT '0' COMMENT 'Is this layout retired',
   `duration` int(11) NOT NULL DEFAULT '0' COMMENT 'The duration in seconds',
-  `background` varchar(254) DEFAULT NULL,
+  `backgroundImageId` int(11) DEFAULT NULL,
   `status` TINYINT NOT NULL DEFAULT  '0',
   PRIMARY KEY (`layoutID`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COMMENT='Layouts' AUTO_INCREMENT=5 ;
@@ -355,6 +358,8 @@
   `ValidExtensions` varchar(254) DEFAULT NULL,
   `PreviewEnabled` tinyint(4) NOT NULL DEFAULT '1',
   `assignable` tinyint(4) NOT NULL DEFAULT '1',
+  `render_as` varchar(10) DEFAULT NULL,
+  `settings` TEXT,
   PRIMARY KEY (`ModuleID`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COMMENT='Functional Modules' AUTO_INCREMENT=14 ;
 
@@ -448,11 +453,13 @@
 
 CREATE TABLE IF NOT EXISTS `resolution` (
   `resolutionID` int(11) NOT NULL AUTO_INCREMENT,
-  `resolution` varchar(20) NOT NULL,
+  `resolution` varchar(254) NOT NULL,
   `width` smallint(6) NOT NULL,
   `height` smallint(6) NOT NULL,
   `intended_width` smallint(6) NOT NULL,
   `intended_height` smallint(6) NOT NULL,
+  `version` tinyint(4) NOT NULL DEFAULT '1',
+  `enabled` tinyint(4) NOT NULL DEFAULT '1',
   PRIMARY KEY (`resolutionID`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COMMENT='Supported Resolutions' AUTO_INCREMENT=9 ;
 
@@ -460,13 +467,14 @@
   `eventID` int(11) NOT NULL AUTO_INCREMENT,
   `CampaignID` int(11) NOT NULL,
   `DisplayGroupIDs` varchar(254) NOT NULL COMMENT 'A list of the display group ids for this event',
-  `recurrence_type` enum('Hour','Day','Week','Month','Year') DEFAULT NULL,
+  `recurrence_type` enum('Minute','Hour','Day','Week','Month','Year') DEFAULT NULL,
   `recurrence_detail` varchar(100) DEFAULT NULL,
   `userID` int(11) NOT NULL,
   `is_priority` tinyint(4) NOT NULL,
   `FromDT` bigint(20) NOT NULL DEFAULT '0',
   `ToDT` bigint(20) NOT NULL DEFAULT '0',
   `recurrence_range` bigint(20) DEFAULT NULL,
+  `DisplayOrder` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`eventID`),
   KEY `layoutID` (`CampaignID`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COMMENT='High level schedule information' AUTO_INCREMENT=2 ;
@@ -474,15 +482,11 @@
 CREATE TABLE IF NOT EXISTS `schedule_detail` (
   `schedule_detailID` int(11) NOT NULL AUTO_INCREMENT,
   `DisplayGroupID` int(11) NOT NULL,
-  `CampaignID` int(11) NOT NULL,
   `userID` int(8) NOT NULL DEFAULT '1' COMMENT 'Owner of the Event',
-  `is_priority` tinyint(4) NOT NULL DEFAULT '0' COMMENT 'This scheduled event has priority and will take precidence over any others scheduled',
   `eventID` int(11) DEFAULT NULL,
   `FromDT` bigint(20) NOT NULL DEFAULT '0',
   `ToDT` bigint(20) NOT NULL DEFAULT '0',
-  `DisplayOrder` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`schedule_detailID`),
-  KEY `layoutID` (`CampaignID`),
   KEY `scheduleID` (`eventID`),
   KEY `DisplayGroupID` (`DisplayGroupID`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COMMENT='Replicated schedule across displays and recurrence' AUTO_INCREMENT=6 ;
@@ -506,13 +510,19 @@
   `settingid` int(11) NOT NULL AUTO_INCREMENT,
   `setting` varchar(50) NOT NULL,
   `value` varchar(1000) NOT NULL,
-  `type` varchar(24) NOT NULL,
-  `helptext` text ,
+  `fieldType` varchar(24) NOT NULL,
+  `helptext` text,
   `options` varchar(254) DEFAULT NULL,
   `cat` varchar(24) NOT NULL DEFAULT 'general',
   `userChange` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Can the user change this setting',
+  `title` varchar(254) NOT NULL,
+  `validation` varchar(50) NOT NULL,
+  `ordering` int(11) NOT NULL,
+  `default` varchar(1000) NOT NULL,
+  `userSee` tinyint(4) NOT NULL DEFAULT '1',
+  `type` varchar(50) NOT NULL,
   PRIMARY KEY (`settingid`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=62 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=74 ;
 
 CREATE TABLE IF NOT EXISTS `stat` (
   `statID` bigint(20) NOT NULL AUTO_INCREMENT,
@@ -566,6 +576,7 @@
   `homepage` varchar(254) NOT NULL DEFAULT 'dashboard.php' COMMENT 'The users homepage',
   `Retired` tinyint(4) NOT NULL DEFAULT '0',
   `CSPRNG` tinyint(4) NOT NULL DEFAULT '0',
+  `newUserWizard` tinyint(4) NOT NULL DEFAULT '0',
   PRIMARY KEY (`UserID`),
   KEY `usertypeid` (`usertypeid`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=3 ;
@@ -610,7 +621,39 @@
   `RegionID` varchar(50) NOT NULL,
   `MediaID` varchar(50) NOT NULL,
   PRIMARY KEY (`LkDataSetLayoutID`)
-) ENGINE=InnoDB  DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+
+CREATE TABLE IF NOT EXISTS `displayprofile` (
+  `displayprofileid` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(50) NOT NULL,
+  `type` varchar(15) NOT NULL,
+  `config` text NOT NULL,
+  `isdefault` int(11) NOT NULL,
+  `userid` int(11) NOT NULL,
+  PRIMARY KEY (`displayprofileid`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+
+CREATE TABLE IF NOT EXISTS `xmdsnonce` (
+  `nonceId` bigint(20) NOT NULL AUTO_INCREMENT,
+  `nonce` varchar(100) NOT NULL,
+  `expiry` int(11) NOT NULL,
+  `lastUsed` int(11) DEFAULT NULL,
+  `displayId` int(11) NOT NULL,
+  `fileId` int(11) DEFAULT NULL,
+  `size` bigint(20) DEFAULT NULL,
+  `storedAs` varchar(100) DEFAULT NULL,
+  `layoutId` int(11) DEFAULT NULL,
+  `regionId` varchar(100) DEFAULT NULL,
+  `mediaId` varchar(100) DEFAULT NULL,
+  PRIMARY KEY (`nonceId`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+
+CREATE TABLE IF NOT EXISTS `bandwidthtype` (
+  `bandwidthtypeid` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(25) NOT NULL,
+  PRIMARY KEY (`bandwidthtypeid`)
+) ENGINE=InnoDB  DEFAULT CHARSET=latin1 AUTO_INCREMENT=12 ;
+
 
 --
 -- Constraints for dumped tables
@@ -702,7 +745,6 @@
   ADD CONSTRAINT `schedule_ibfk_1` FOREIGN KEY (`CampaignID`) REFERENCES `campaign` (`CampaignID`);
 
 ALTER TABLE `schedule_detail`
-  ADD CONSTRAINT `schedule_detail_ibfk_9` FOREIGN KEY (`CampaignID`) REFERENCES `campaign` (`CampaignID`),
   ADD CONSTRAINT `schedule_detail_ibfk_7` FOREIGN KEY (`eventID`) REFERENCES `schedule` (`eventID`),
   ADD CONSTRAINT `schedule_detail_ibfk_8` FOREIGN KEY (`DisplayGroupID`) REFERENCES `displaygroup` (`DisplayGroupID`);
 
 
=== added file 'server/install/upgradestep.class.php'
--- server/install/upgradestep.class.php	1970-01-01 00:00:00 +0000
+++ server/install/upgradestep.class.php	2014-09-19 11:39:09 +0000
@@ -0,0 +1,51 @@
+<?php
+/*
+ * Xibo - Digital Signage - http://www.xibo.org.uk
+ * Copyright (C) 2006-2014 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/>.
+ */ 
+defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
+
+class UpgradeStep 
+{
+	protected $db;
+	protected $q;
+	protected $a;
+
+	public function __construct($db)
+	{
+		$this->db 	=& $db;
+		$this->q	= array();
+		$this->a	= array();
+	}
+
+	public function Boot()
+	{
+
+	}
+
+	public function Questions()
+	{
+		return array();
+	}
+
+	public function ValidateQuestion($questionNumber,$response)
+	{
+		return true;
+	}
+}
+?>
 
=== modified file 'server/lib/app/app_functions.php'
--- server/lib/app/app_functions.php	2014-01-18 09:47:41 +0000
+++ server/lib/app/app_functions.php	2014-09-19 11:39:09 +0000
@@ -40,112 +40,6 @@
 	$_SESSION['message'] = $message;
 }
 
-// Returns a drop down list based on the provided SQL - the ID should be the first field, and the name the second
-function dropdownlist($SQL, $list_name, $selected = "", $callback = "", $flat_list = false, $checkPermissions = false, $userid = "", $permissionLevel = "see", $useQueryId = false) {
-	global $db;
-	global $user;
-
-	if (!$result = $db->query($SQL)) 
-	{
-		trigger_error($db->error());
-		return "Query Error";
-	}
-	
-	if ($db->num_rows($result)==0) 
-	{
-		$list = "No selections available";
-		return $list;
-	}
-	
-	if ($flat_list) 
-	{
-		//we want to generate a flat list of option | value pairs
-		$list = "";
-	
-		while ($results = $db->get_row($result)) 
-		{
-			$col0 = $results[0];
-			$col1 = $results[1];
-			
-			if ($checkPermissions) 
-			{
-				$permissionid = $results[2];
-				$ownerid	  = $results[3];
-				
-				if ($useQueryId)
-				{
-					list($see_permissions , $edit_permissions) = $user->eval_permission($ownerid, $permissionid, $col0);					
-				}
-				else
-				{
-					list($see_permissions , $edit_permissions) = $user->eval_permission($ownerid, $permissionid, $userid);
-				}
-
-				if (($permissionLevel == "see" && $see_permissions) || $permissionLevel == "edit" && $edit_permissions) {
-					$list .= "$col0|$col1,";
-				}
-			}
-			else 
-			{
-				$list .= "$col0|$col1,";
-			}
-		}
-		//trim the commas
-		$list = rtrim($list,",");
-	}
-	else 
-	{
-		$list = <<<END
-		<select name="$list_name" id="$list_name" $callback>
-END;
-		while ($results = $db->get_row($result)) 
-		{
-			$col0 = $results[0];
-			$col1 = $results[1];
-			
-			if ($checkPermissions) 
-			{
-				$permissionid = $results[2];
-				$ownerid	  = $results[3];
-				
-				if ($useQueryId)
-				{
-					list($see_permissions , $edit_permissions) = $user->eval_permission($ownerid, $permissionid, $col0);					
-				}
-				else
-				{
-					list($see_permissions , $edit_permissions) = $user->eval_permission($ownerid, $permissionid, $userid);
-				}
-
-				if (($permissionLevel == "see" && $see_permissions) || $permissionLevel == "edit" && $edit_permissions) 
-				{
-					if ($col0 == $selected) 
-					{
-						$list .= "<option value='" . $col0 . "' selected>" . $col1 . "</option>\n";
-					}
-					else 
-					{
-						$list .= "<option value='" . $col0 . "'>" . $col1 . "</option>\n";
-					}
-				}
-			}
-			else 
-			{
-				if ($col0 == $selected) 
-				{
-					$list .= "<option value='" . $col0 . "' selected>" . $col1 . "</option>\n";
-				}
-				else 
-				{
-					$list .= "<option value='" . $col0 . "'>" . $col1 . "</option>\n";
-				}
-			}
-		}
-		$list .= "</select>\n";
-	}
-	return $list;
-}
-
 function listcontent($list_string, $list_name, $selected = "", $callback = "") 
 {
 	//generates a list based on a list option | value, list
@@ -181,47 +75,6 @@
 }
 
 
-//generates a list of all the users - assuming that the SQL given contains userid's
-function userlist($SQL) 
-{
-	global $db;
-	global $user;
-
-	if (!$result = $db->query($SQL)) 
-	{
-		trigger_error($db->error());
-		return "Query Error";
-	}
-	
-	if ($db->num_rows($result)==0) 
-	{
-		$list = "No selections available";
-		return $list;
-	}
-	
-	while ($row = $db->get_row($result)) 
-	{
-	
-		$userid 	= $row[0];
-		$username 	= $user->getNameFromID($userid);
-		
-		$user_ids[] = array('id'=>$userid);
-		$user_names[] = array('name'=>$username);
-	}
-	
-	array_multisort($user_names, SORT_DESC, $user_ids, SORT_ASC); //sorts the two arrays, so that the usernames are Alpha sorted, and the ID's tag along
-
-	$list = "";
-	foreach ($user_names as $key => $row) 
-	{
-		
-		if($list != "") $list .= ","; //if we arnt equal to the first, append a seperator
-		
-		$list .= $user_ids[$key]['id']."|".$row['name'];
-	}
-	return $list;
-}
-
 /**
  * Sets a session variable from a javascript call (so when we XMLHTTPRequest we can set a sesson var)
  * @return 
@@ -270,30 +123,6 @@
 }
 
 /**
- * Gets web safe colors
- * @return 
- */
-function gwsc() 
-{
-	$colors = array();
-    $cs = array('00', '33', '66', '99', 'CC', 'FF');
-	
-    for($i=0; $i<6; $i++) 
-	{
-        for($j=0; $j<6; $j++) 
-		{
-            for($k=0; $k<6; $k++) 
-			{
-                $c = $cs[$i] .$cs[$j] .$cs[$k];
-				$colors[] = array('colorid' => $c, 'color' => '#' . $c, 'style' => 'background-color:#' . $c . ';color:#' . $c);
-			}
-        }
-    }
-	
-	return $colors;
-}
-
-/**
  * Resizes the image
  * Based on code from the Web - cannot find source.
  * If this is your code please send a mail to [e-mail]
 
=== modified file 'server/lib/app/datemanager.class.php'
--- server/lib/app/datemanager.class.php	2014-01-18 09:47:41 +0000
+++ server/lib/app/datemanager.class.php	2014-09-19 11:39:09 +0000
@@ -21,14 +21,7 @@
 defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
 
 class DateManager
-{
-	private $db;
-	
-	public function __construct(database $db)
-	{
-		$this->db 	=& $db;
-	}
-	
+{	
 	public static function GetClock()
 	{
 		return date("H:i T");
 
=== modified file 'server/lib/app/formmanager.class.php'
--- server/lib/app/formmanager.class.php	2014-01-18 09:47:41 +0000
+++ server/lib/app/formmanager.class.php	2014-09-19 11:39:09 +0000
@@ -1,7 +1,7 @@
 <?php
 /*
  * Xibo - Digital Signage - http://www.xibo.org.uk
- * Copyright (C) 2006,2007,2008 Daniel Garner
+ * Copyright (C) 2006-2014 Daniel Garner
  *
  * This file is part of Xibo.
  *
@@ -19,135 +19,225 @@
  * 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.");
-	
-class FormManager
-{
-	private $db;
-	private $user;
-	
-	public function __construct(database $db, user $user)
-	{
-		$this->db 	=& $db;
-		$this->user =& $user;
-	}
-	
-	/**
-	 * Returns a drop down list based on the provided SQL - the ID should be the first field, and the name the second
-	 * @return 
-	 * @param $SQL Object
-	 * @param $list_name Object
-	 * @param $selected Object[optional]
-	 * @param $callback Object[optional]
-	 * @param $flat_list Object[optional]
-	 * @param $checkPermissions Object[optional]
-	 * @param $userid Object[optional]
-	 * @param $permissionLevel Object[optional]
-	 * @param $useQueryId Object[optional]
-	 */
-	public function DropDown($SQL, $list_name, $selected = "", $callback = "", $flat_list = false, $checkPermissions = false, $userid = "", $permissionLevel = "see", $useQueryId = false) 
-	{
-		$db 	=& $this->db;
-		$user 	=& $this->user;
-	
-		if (!$result = $db->query($SQL)) 
-		{
-			trigger_error($db->error());
-			return __("Query Error");
-		}
-		
-		if ($db->num_rows($result)==0) 
-		{
-			$list = __("No selections available");
-			return $list;
-		}
-		
-		if ($flat_list) 
-		{
-			//we want to generate a flat list of option | value pairs
-			$list = "";
-		
-			while ($results = $db->get_row($result)) 
-			{
-				$col0 = $results[0];
-				$col1 = $results[1];
-				
-				if ($checkPermissions) 
-				{
-					$permissionid = $results[2];
-					$ownerid	  = $results[3];
-					
-					if ($useQueryId)
-					{
-						list($see_permissions , $edit_permissions) = $user->eval_permission($ownerid, $permissionid, $col0);					
-					}
-					else
-					{
-						list($see_permissions , $edit_permissions) = $user->eval_permission($ownerid, $permissionid, $userid);
-					}
-	
-					if (($permissionLevel == "see" && $see_permissions) || $permissionLevel == "edit" && $edit_permissions) {
-						$list .= "$col0|$col1,";
-					}
-				}
-				else 
-				{
-					$list .= "$col0|$col1,";
-				}
-			}
-			//trim the commas
-			$list = rtrim($list,",");
-		}
-		else 
-		{
-			$list = <<<END
-			<select name="$list_name" id="$list_name" $callback>
-END;
-			while ($results = $db->get_row($result)) 
-			{
-				$col0 = $results[0];
-				$col1 = $results[1];
-				
-				if ($checkPermissions) 
-				{
-					$permissionid = $results[2];
-					$ownerid	  = $results[3];
-					
-					if ($useQueryId)
-					{
-						list($see_permissions , $edit_permissions) = $user->eval_permission($ownerid, $permissionid, $col0);					
-					}
-					else
-					{
-						list($see_permissions , $edit_permissions) = $user->eval_permission($ownerid, $permissionid, $userid);
-					}
-	
-					if (($permissionLevel == "see" && $see_permissions) || $permissionLevel == "edit" && $edit_permissions) 
-					{
-						if ($col0 == $selected) 
-						{
-							$list .= "<option value='" . $col0 . "' selected>" . $col1 . "</option>\n";
-						}
-						else 
-						{
-							$list .= "<option value='" . $col0 . "'>" . $col1 . "</option>\n";
-						}
-					}
-				}
-				else 
-				{
-					if ($col0 == $selected) 
-					{
-						$list .= "<option value='" . $col0 . "' selected>" . $col1 . "</option>\n";
-					}
-					else 
-					{
-						$list .= "<option value='" . $col0 . "'>" . $col1 . "</option>\n";
-					}
-				}
-			}
-			$list .= "</select>\n";
-		}
-		return $list;
-	}
+    
+class FormManager {
+
+    public static function AddMessage($message, $groupClass = '') {
+        return array(
+            'name' => NULL,
+            'title' => NULL,
+            'value' => NULL,
+            'helpText' => $message,
+            'fieldType' => 'message',
+            'options' => NULL,
+            'validation' => NULL,
+            'accesskey' => NULL,
+            'groupClass' => $groupClass,
+            'enabled' => true
+        );
+    }
+
+    public static function AddRaw($raw) {
+        return array(
+            'name' => NULL,
+            'title' => NULL,
+            'value' => NULL,
+            'helpText' => $raw,
+            'fieldType' => 'raw',
+            'options' => NULL,
+            'validation' => NULL,
+            'accesskey' => NULL,
+            'groupClass' => '',
+            'enabled' => true
+        );
+    }
+
+    public static function AddHidden($name, $value) {
+        return array(
+            'name' => $name,
+            'value' => $value,
+            'fieldType' => 'hidden',
+            'enabled' => true
+        );
+    }
+
+    public static function AddButton($title, $type = 'submit', $link = '', $groupClass = '') {
+        return array(
+            'title' => $title,
+            'type' => $type,
+            'link' => $link,
+            'groupClass' => $groupClass,
+            'fieldType' => 'button',
+            'enabled' => true
+        );
+    }
+
+    public static function AddText($name, $title, $value, $helpText, $accessKey, $validation = '', $groupClass = '', $enabled = true) {
+        return array(
+            'name' => $name,
+            'title' => $title,
+            'value' => $value,
+            'helpText' => $helpText,
+            'fieldType' => 'text',
+            'options' => NULL,
+            'validation' => $validation,
+            'accesskey' => $accessKey,
+            'groupClass' => $groupClass,
+            'enabled' => $enabled
+        );
+    }
+
+    public static function AddMultiText($name, $title, $value, $helpText, $accessKey, $rows, $validation = '', $groupClass = '', $enabled = true) {
+        return array(
+            'name' => $name,
+            'title' => $title,
+            'value' => $value,
+            'helpText' => $helpText,
+            'fieldType' => 'textarea',
+            'options' => NULL,
+            'validation' => $validation,
+            'accesskey' => $accessKey,
+            'groupClass' => $groupClass,
+            'enabled' => $enabled,
+            'rows' => $rows
+        );
+    }
+
+    public static function AddNumber($name, $title, $value, $helpText, $accessKey, $validation = '', $groupClass = '', $enabled = true) {
+        return array(
+            'name' => $name,
+            'title' => $title,
+            'value' => $value,
+            'helpText' => $helpText,
+            'fieldType' => 'number',
+            'options' => NULL,
+            'validation' => $validation,
+            'accesskey' => $accessKey,
+            'groupClass' => $groupClass,
+            'enabled' => $enabled
+        );
+    }
+
+    public static function AddEmail($name, $title, $value, $helpText, $accessKey, $validation = '', $groupClass = '', $enabled = true) {
+        return array(
+            'name' => $name,
+            'title' => $title,
+            'value' => $value,
+            'helpText' => $helpText,
+            'fieldType' => 'email',
+            'options' => NULL,
+            'validation' => $validation,
+            'accesskey' => $accessKey,
+            'groupClass' => $groupClass,
+            'enabled' => $enabled
+        );
+    }
+
+    public static function AddCheckbox($name, $title, $value, $helpText, $accessKey, $groupClass = '', $enabled = true) {
+        return array(
+            'name' => $name,
+            'title' => $title,
+            'value' => $value,
+            'helpText' => $helpText,
+            'fieldType' => 'checkbox',
+            'options' => NULL,
+            'validation' => NULL,
+            'accesskey' => $accessKey,
+            'groupClass' => $groupClass,
+            'enabled' => $enabled
+        );
+    }
+
+    public static function AddRadio($name, $id, $title, $value, $setValue, $helpText, $accessKey, $groupClass = '', $enabled = true) {
+        return array(
+            'id' => $id,
+            'name' => $name,
+            'title' => $title,
+            'value' => $value,
+            'setValue' => $setValue,
+            'helpText' => $helpText,
+            'fieldType' => 'radio',
+            'options' => NULL,
+            'validation' => NULL,
+            'accesskey' => $accessKey,
+            'groupClass' => $groupClass,
+            'enabled' => $enabled
+        );
+    }
+
+    public static function AddPassword($name, $title, $value, $helpText, $accessKey, $groupClass = '', $enabled = true) {
+        return array(
+            'name' => $name,
+            'title' => $title,
+            'value' => $value,
+            'helpText' => $helpText,
+            'fieldType' => 'password',
+            'options' => NULL,
+            'validation' => NULL,
+            'accesskey' => $accessKey,
+            'groupClass' => $groupClass,
+            'enabled' => $enabled
+        );
+    }
+
+    public static function AddCombo($name, $title, $value, $options, $optionId, $optionValue, $helpText, $accessKey, $groupClass = '', $enabled = true, $callBack = '', $classColumn = '', $styleColumn = '', $optionGroups = '', $attributes = array()) {
+        return array(
+            'name' => $name,
+            'title' => $title,
+            'value' => $value,
+            'helpText' => $helpText,
+            'fieldType' => 'dropdown',
+            'options' => $options,
+            'optionId' => $optionId,
+            'optionValue' => $optionValue,
+            'validation' => NULL,
+            'accesskey' => $accessKey,
+            'groupClass' => $groupClass,
+            'enabled' => $enabled,
+            'callBack' => $callBack,
+            'classColumn' => $classColumn,
+            'styleColumn' => $styleColumn,
+            'optionGroups' => $optionGroups,
+            'dataAttributes' => $attributes
+        );
+    }
+
+    public static function AddMultiCombo($name, $title, $value, $options, $optionId, $optionValue, $helpText, $accessKey, $groupClass = '', $enabled = true, $callBack = '', $classColumn = '', $styleColumn = '', $optionGroups = '', $attributes = array()) {
+        return array(
+            'name' => $name,
+            'title' => $title,
+            'value' => $value,
+            'helpText' => $helpText,
+            'fieldType' => 'dropdownmulti',
+            'options' => $options,
+            'optionId' => $optionId,
+            'optionValue' => $optionValue,
+            'validation' => NULL,
+            'accesskey' => $accessKey,
+            'groupClass' => $groupClass,
+            'enabled' => $enabled,
+            'callBack' => $callBack,
+            'classColumn' => $classColumn,
+            'styleColumn' => $styleColumn,
+            'optionGroups' => $optionGroups,
+            'dataAttributes' => $attributes
+        );
+    }
+
+    public static function AddPermissions($name, $options) {
+        return array(
+            'name' => $name,
+            'fieldType' => 'permissions',
+            'options' => $options,
+            'groupClass' => NULL,
+            'enabled' => true
+        );
+    }
+
+    public static function AddTab($id, $name) {
+        return array(
+            'id' => $id, 'name' => $name
+        );
+    }
 }
-?>
 \ No newline at end of file
+?>
 
=== modified file 'server/lib/app/helpmanager.class.php'
--- server/lib/app/helpmanager.class.php	2014-01-18 09:47:41 +0000
+++ server/lib/app/helpmanager.class.php	2014-09-19 11:39:09 +0000
@@ -20,23 +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.");
 
-class HelpManager
-{
-	private $db;
-	private $user;
-	
-	/**
-	 * Constructs the Module Manager.
-	 * @return 
-	 * @param $db Object
-	 * @param $user Object
-	 */
-	public function __construct(database $db, User $user)
-	{
-            $this->db       =& $db;
-            $this->user 	=& $user;
-	}
-	
+class HelpManager {	
 	/**
 	 * Help Button
 	 * @return 
 
=== modified file 'server/lib/app/kit.class.php'
--- server/lib/app/kit.class.php	2014-05-26 09:09:06 +0000
+++ server/lib/app/kit.class.php	2014-09-19 11:39:09 +0000
@@ -46,7 +46,7 @@
 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 = '', $pageIsUrl = false)
+	static function Redirect($page, $message = '')
 	{
 		$url 	= $page;
 		$ajax 	= Kit::GetParam('ajax', _REQUEST, _BOOL, false);
@@ -64,6 +64,7 @@
 		} 
 		else 
 		{
+			header( 'HTTP/1.1 302 Moved Temporarily' );
 			header( 'Location: ' . $url );
 		}
 		
@@ -351,8 +352,14 @@
 				break;
 				
 			case _CHECKBOX:
-				if ($return == 'on') $return = 1;
-				if ($return == 'off' || $return == '') $return = 0;
+				if ($return == 'on') {
+					$return = 1;
+				}
+				if ($return == 'off' || $return == '') {
+					$return = 0;
+				}
+
+				break;
 
 			default :
 				// No casting necessary
@@ -372,7 +379,7 @@
 	 */
 	public static function GetURL($page = "")
 	{
-		$page = $this->ValidateParam($page, _WORD);
+		$page = Kit::ValidateParam($page, _WORD);
 		$fullUrl = 'http';
 		
 		if(isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on')
@@ -535,7 +542,7 @@
      */
     public static function SelectList($listName, $listValues, $idColumn, $nameColumn, $selectedId = '', $callBack = '', $classColumn = '')
     {
-        $list = '<select name="' . $listName . '" id="' . $listName . '"' . $callBack . '>';
+        $list = '<select class="form-control" name="' . $listName . '" id="' . $listName . '"' . $callBack . '>';
 
         foreach ($listValues as $listItem)
         {
@@ -586,7 +593,7 @@
 	public static function Token($tokenName = "token")
 	{
 		//Store in the users session
-		$token = md5(uniqid()."xsmsalt".time());
+		$token = md5(uniqid() . SECRET_KEY . time());
 		
 		$_SESSION[$tokenName] = $token;
 		$_SESSION[$tokenName.'_timeout'] = time();
 
=== modified file 'server/lib/app/menumanager.class.php'
--- server/lib/app/menumanager.class.php	2014-01-18 09:47:41 +0000
+++ server/lib/app/menumanager.class.php	2014-09-19 11:39:09 +0000
@@ -22,27 +22,17 @@
 
 class MenuManager
 {
-	private $db;
 	private $user;
-	private $p;
-	private $q;
-
-	private $ajax;
-	private $userid;
+	
 	public $message;
 	
 	private $theMenu;
 	private $current;
 	private $numberItems;
 	
-	public function __construct(database $db, User $user, $menu)
+	public function __construct(User $user, $menu)
 	{
-		$this->db 		=& $db;
 		$this->user 	=& $user;
-		$this->ajax		= Kit::GetParam('ajax', _REQUEST, _BOOL, false);
-		$this->q		= Kit::GetParam('q', _REQUEST, _WORD);
-		$this->userid 	= Kit::GetParam('userid', _SESSION, _INT);
-		$usertypeid		= Kit::GetParam('usertype', _SESSION, _INT);
 		
 		if ($menu == '')
 		{
 
=== modified file 'server/lib/app/pagemanager.class.php'
--- server/lib/app/pagemanager.class.php	2014-03-08 11:39:48 +0000
+++ server/lib/app/pagemanager.class.php	2014-09-19 11:39:09 +0000
@@ -26,8 +26,8 @@
     private $db;
     private $user;
 
-    private $p;
-    private $q;
+    public $p;
+    public $q;
 
     private $page;
     private $path;
@@ -36,9 +36,13 @@
     private $authed;
     private $thePage;
     
-    // Maintain a list of pages/functions we are allowed to get to without going through the authentication system
-    private $nonAuthedPages = array('index', 'clock');
+    // Maintain a list of pages / functions we are allowed to get to without going through the authentication system
+    private $nonAuthedPages = array('index', 'clock', 'error');
+    private $nonAuthedPagesWithoutFunctionCall = array('error');
     private $nonAuthedFunctions = array('login', 'logout', 'GetClock', 'About');
+
+    // Maintain a list of pages we can get to that are not checked in the database but require a valid login
+    private $nonPageAuthedPages = array('upgrade');
 	
     function __construct(database $db, user $user, $page)
     {
@@ -56,7 +60,7 @@
         $this->authed = false;
 
         // Create a theme
-		new Theme($db, $user);
+		new Theme($user);
 		Theme::SetPagename($this->p);
     }
 	
@@ -69,10 +73,11 @@
         $user =& $this->user;
         
         // The user MUST be logged in unless they are trying to assess some of the public facing pages
-        if (in_array($this->p, $this->nonAuthedPages) && in_array($this->q, $this->nonAuthedFunctions))
+        if ((in_array($this->p, $this->nonAuthedPages) && in_array($this->q, $this->nonAuthedFunctions)) 
+            || (in_array($this->p, $this->nonAuthedPagesWithoutFunctionCall) && $this->q == ''))
         {
             // Automatically authed
-            $this->authed = true;
+            $this->authed = true;        
         }
         else
         {
@@ -80,7 +85,10 @@
             if (!$user->attempt_login($this->ajax))
                 return false;
 
-            $this->authed = $user->PageAuth($this->p);
+            if (in_array($this->p, $this->nonPageAuthedPages))
+                $this->authed = true;
+            else
+                $this->authed = $user->PageAuth($this->p);
         }
     }
 	
@@ -130,6 +138,9 @@
         }
         else 
         {
+            Theme::Set('sidebar_html', $this->thePage->sideBarContent());
+            Theme::Set('action_menu', $this->thePage->actionMenu());
+
             // Display a page instead
 			Theme::Render('header');
 			
@@ -142,4 +153,4 @@
         $_SESSION['message'] = '';
     }
 }
-?>
 \ No newline at end of file
+?>
 
=== modified file 'server/lib/app/pdoconnect.class.php'
--- server/lib/app/pdoconnect.class.php	2014-07-17 10:37:47 +0000
+++ server/lib/app/pdoconnect.class.php	2014-09-19 11:39:09 +0000
@@ -44,13 +44,49 @@
 				$dsn = 'mysql:host=' . $dbhost . ';dbname=' . $dbname . ';';
 			}
 
-			// Open the connection and set the error mode
-			self::$conn = new PDO($dsn, $dbuser, $dbpass);
-			self::$conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-
-			self::$conn->query("SET NAMES 'utf8'");
-		}
-
-		return self::$conn;
+			//echo 'init ' . $dsn , ' user ' . $dbuser . ' pass ' . $dbpass;
+
+			// Open the connection and set the error mode
+			self::$conn = new PDO($dsn, $dbuser, $dbpass);
+			self::$conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+
+			self::$conn->query("SET NAMES 'utf8'");
+		}
+
+		return self::$conn;
+	}
+
+	public static function connect($dbhost, $dbuser, $dbpass, $dbname = '') {
+		if (!self::$conn) {
+			
+			$dbport = '';
+
+			if (strstr($dbhost, ':')) {
+				$hostParts = explode(':', $dbhost);
+				$dsn = 'mysql:host=' . $hostParts[0] . ';port=' . $hostParts[1] . ';';
+			}
+			else {
+				$dsn = 'mysql:host=' . $dbhost . ';';
+			}
+
+			if ($dbname != '')
+				$dsn .= 'dbname=' . $dbname . ';';
+
+			//echo 'connect ' . $dsn , ' user ' . $dbuser . ' pass ' . $dbpass;
+
+			// Open the connection and set the error mode
+			self::$conn = new PDO($dsn, $dbuser, $dbpass);
+			self::$conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+
+			self::$conn->query("SET NAMES 'utf8'");
+		}
+
+		return self::$conn;
+	}
+
+	public static function close() {
+		if (self::$conn) {
+			self::$conn = null;
+		}
 	}
 }
 \ No newline at end of file
 
=== modified file 'server/lib/app/responsemanager.class.php'
--- server/lib/app/responsemanager.class.php	2014-01-18 09:47:41 +0000
+++ server/lib/app/responsemanager.class.php	2014-09-19 11:39:09 +0000
@@ -29,6 +29,7 @@
 	public $html;
 	public $callBack;
 	public $buttons;
+	public $fieldActions;
 	
 	public $sortable;
 	public $sortingDiv;
@@ -73,6 +74,7 @@
         $this->appendHiddenSubmit = true;
         $this->uniqueReference = '';
 		$this->buttons = '';
+		$this->fieldActions = '';
         $this->pageSize = 10;
         $this->pageNumber = 0;
         $this->initialSortColumn = 1;
@@ -150,6 +152,9 @@
 	 */
 	public function SetFormRequestResponse($form, $title, $width = '', $height = '', $callBack = '')
 	{
+		if ($form == NULL)
+			$form = Theme::RenderReturn('form_render');
+
 		$this->html 					= $form;
 		$this->dialogTitle 				= $title;
 		$this->callBack 				= $callBack;
@@ -211,6 +216,26 @@
 		return true;
 	}
 
+	/**
+	 * Add a Field Action to a Field
+	 * @param string $field   The field name
+	 * @param string $action  The action name
+	 * @param string $value  The value to trigger on
+	 * @param string $actions The actions (field => action)
+	 * @param string $operation The Operation (optional)
+	 */
+	public function AddFieldAction($field, $action, $value, $actions, $operation = "equals") {
+		$this->fieldActions[] = array(
+			'field' => $field,
+			'trigger' => $action, 
+			'value' => $value,
+			'operation' => $operation,
+			'actions' => $actions
+			);
+
+		return true;
+	}
+
         /**
          * Responds with an Error
          * @param <string> $message
@@ -255,6 +280,7 @@
 			// General
 			$response['html'] 			= $this->html;
 			$response['buttons']		= $this->buttons;
+			$response['fieldActions'] = $this->fieldActions;
             $response['uniqueReference'] = $this->uniqueReference;
 			
 			$response['success']		= $this->success;
@@ -307,42 +333,31 @@
 			// End the execution
 			die();
 		}
-		else
-		{			
+		else {			
 			// If the response does not equal success then output an error
-			if (!$this->success)
-			{
+			if (!$this->success) {
 				// Store the message
 				$_SESSION['ErrorMessage'] 	= $this->message;
 				
 				// Redirect to the following
-				$url						= 'index.php?p=error';
-				
-				// Header or JS redirect
-				if (headers_sent()) 
-				{
-					echo "<script>document.location.href='$url';</script>\n";
-				} 
-				else 
-				{
-					header( 'HTTP/1.1 301 Moved Permanently' );
-					header( 'Location: ' . $url );
-				}
-				
-				// End the execution
-				die();
-			}
+				$url = 'index.php?p=error';
+			}
+			else {
+				// Have we been asked to refresh?
+				$url = ($this->refresh) ? $this->refreshLocation : 'index.php?p=' . Kit::GetParam('p', _GET, _WORD, 'index');
+			}
+
+			// Redirect and end execution
+			Kit::Redirect($url);
 		}
 		
 		return;
 	}
         
-    public static function Pager($id)
-    {
+    public static function Pager($id, $type = 'grid_pager') {
         Theme::Set('pager_id', 'XiboPager_' . $id);
         
-        return Theme::RenderReturn('grid_pager');
+        return Theme::RenderReturn($type);
     }
 }
-
-?>
 \ No newline at end of file
+?>
 
=== modified file 'server/lib/app/thememanager.class.php'
--- server/lib/app/thememanager.class.php	2014-03-06 22:37:29 +0000
+++ server/lib/app/thememanager.class.php	2014-09-19 11:39:09 +0000
@@ -23,7 +23,6 @@
 class Theme {
 	private static $instance = null;
 	
-	private $db;
 	private $user;
 	private $helpManager;
 	private $dateManager;
@@ -33,18 +32,15 @@
 	private $vars = null;
 	private $config = null;
 	
-	public function __construct(database $db, user $user) {
+	public function __construct(user $user, $theme = NULL) {
 
 		// Store some things for the Theme engine to use
-		$this->db =& $db;
 		$this->user =& $user;
-		$this->help = new HelpManager($db, $user);
-		$this->dateManager = new DateManager($db);
-
-		// TODO: Perhaps we also allow the user to configure their own theme for their session?
+		$this->help = new HelpManager();
+		$this->dateManager = new DateManager();
 
 		// What is the currently selected theme?
-		$globalTheme = Config::GetSetting('GLOBAL_THEME_NAME');
+		$globalTheme = ($theme == NULL) ? Config::GetSetting('GLOBAL_THEME_NAME') : $theme;
 
 		// Is this theme valid?
 		if (!is_dir('theme/' . $globalTheme))
@@ -85,8 +81,12 @@
 		if (file_exists('theme/' . $theme->name . '/html/' . $item . '.php')) {
 			include('theme/' . $theme->name . '/html/' . $item . '.php');
 		}
+		// Check the module theme folder
+		else if (file_exists('modules/theme/' . $item . '.php')) {
+			include('modules/theme/' . $item . '.php');	
+		}
 		// If not, then use the default folder
-		elseif (file_exists('theme/default/html/' . $item . '.php')) {
+		else if (file_exists('theme/default/html/' . $item . '.php')) {
 			include('theme/default/html/' . $item . '.php');
 		}
 		else
@@ -156,8 +156,8 @@
 	 * @param string $string The String to Translate
 	 * @param array $args   Variables to insert (will replace %d %s in order)
 	 */
-	public static function Translate($string, $args = null) {
-		return __($string, $args);
+	public static function Translate($string) {
+		return call_user_func_array('__', func_get_args());
 	}
 
 	public static function Set($key, $value) {
@@ -217,6 +217,10 @@
 		return Theme::GetInstance()->config['theme_name'];
 	}
 
+	public static function SourceLink() {
+		return (isset(Theme::GetInstance()->config['cms_source_url']) ? Theme::GetInstance()->config['cms_source_url'] : 'https://launchpad.net/xibo/1.7');
+	}
+
 	public static function ThemeFolder() {
 		return Theme::GetInstance()->name;
 	}
@@ -240,7 +244,7 @@
 		$theme = Theme::GetInstance();
 		$array = array();
 
-		if (!$menu = new MenuManager($theme->db, $theme->user, $menu))
+		if (!$menu = new MenuManager($theme->user, $menu))
 			trigger_error($menu->message, E_USER_ERROR);
 					
 		while ($menuItem = $menu->GetNextMenuItem()) {
@@ -282,7 +286,7 @@
      */
     public static function SelectList($listName, $listValues, $idColumn, $nameColumn, $selectedId = null, $callBack = '', $classColumn = '', $styleColumn = '')
     {
-    	$list = '<select name="' . $listName . '" id="' . $listName . '"' . $callBack . '>';
+    	$list = '<select class="form-control" name="' . $listName . '" id="' . $listName . '"' . $callBack . '>';
 
         foreach ($listValues as $listItem)
         {
@@ -296,4 +300,4 @@
         return $list;
     }
 }
-?>
 \ No newline at end of file
+?>
 
=== modified file 'server/lib/app/translationengine.class.php'
--- server/lib/app/translationengine.class.php	2014-01-18 09:47:41 +0000
+++ server/lib/app/translationengine.class.php	2014-09-19 11:39:09 +0000
@@ -1,7 +1,7 @@
 <?php
 /*
  * Xibo - Digital Signage - http://www.xibo.org.uk
- * Copyright (C) 2009 Daniel Garner
+ * Copyright (C) 2009-14 Daniel Garner
  *
  * This file is part of Xibo.
  *
@@ -31,10 +31,10 @@
 	 * Gets and Sets the Local 
 	 * @return 
 	 */
-	public static function InitLocale()
+	public static function InitLocale($language = NULL)
 	{
             $localeDir	= 'locale';
-            $default    = Config::GetSetting('DEFAULT_LANGUAGE');
+            $default = ($language == NULL) ? Config::GetSetting('DEFAULT_LANGUAGE') : $language;
             
             global $transEngine;
             global $stream;
@@ -50,7 +50,7 @@
             if ($lang != '')
             {
                 // Set the language
-                Debug::LogEntry('audit', 'Set the Language from REQUEST [' . $lang . ']', 'TranslationEngine', 'InitLocal');
+                //Debug::LogEntry('audit', 'Set the Language from REQUEST [' . $lang . ']', 'TranslationEngine', 'InitLocal');
 
                 // Is this language supported?
                 // if not just use the default (eb_GB).
@@ -113,16 +113,19 @@
  * @return 
  * @param $string Object
  */ 
-function __($string, $args = null)
+function __($string)
 {
 	global $transEngine;
         
     if ($transEngine != '')
 	   $string = $transEngine->translate($string);
 
+    $args = func_get_args();
+    array_shift($args);
+
     if (count($args) > 0)
         $string = vsprintf($string, $args);
 
     return $string;
 }
-?>
 \ No newline at end of file
+?>
 
=== added file 'server/lib/data/bandwidth.data.class.php'
--- server/lib/data/bandwidth.data.class.php	1970-01-01 00:00:00 +0000
+++ server/lib/data/bandwidth.data.class.php	2014-09-19 11:39:09 +0000
@@ -0,0 +1,62 @@
+<?php
+/*
+ * Xibo - Digital Signage - http://www.xibo.org.uk
+ * Copyright (C) 2009-2012 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/>.
+ */
+defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
+
+class Bandwidth extends Data {
+
+    public static $REGISTER = 1;
+    public static $RF = 2;
+    public static $SCHEDULE = 3;
+    public static $GETFILE = 4;
+    public static $GETRESOURCE = 5;
+    public static $MEDIAINVENTORY = 6;
+    public static $NOTIFYSTATUS = 7;
+    public static $SUBMITSTATS = 8;
+    public static $SUBMITLOG = 9;
+    public static $BLACKLIST = 10;
+    public static $SCREENSHOT = 11;
+
+	public function Log($displayId, $type, $sizeInBytes) {
+        try {
+            $dbh = PDOConnect::init();
+        
+            $sth = $dbh->prepare('
+                INSERT INTO `bandwidth` (Month, Type, DisplayID, Size) VALUES (:month, :type, :displayid, :size)
+                ON DUPLICATE KEY UPDATE Size = Size + :size2
+                ');
+
+            $sth->execute(array(
+                    'month' => strtotime(date('m').'/02/'.date('Y').' 00:00:00'), 
+                    'type' => $type, 
+                    'displayid' => $displayId, 
+                    'size' => $sizeInBytes,
+                    'size2' => $sizeInBytes
+                ));
+            
+            return true;  
+        }
+        catch (Exception $e) {
+            Debug::LogEntry('error', $e->getMessage());
+            return false;
+        }
+    }
+} 
+?>
 
=== modified file 'server/lib/data/data.class.php'
--- server/lib/data/data.class.php	2014-01-18 09:47:41 +0000
+++ server/lib/data/data.class.php	2014-09-19 11:39:09 +0000
@@ -31,9 +31,10 @@
          * Data Class
          * @param database $db
          */
-	public function __construct(database $db)
+	public function __construct(database $db = null)
 	{
-		$this->db =& $db;
+		if ($db != null)
+			$this->db =& $db;
 		
 		$this->error		= false;
 		$this->errorNo 		= 0;
 
=== modified file 'server/lib/data/dataset.data.class.php'
--- server/lib/data/dataset.data.class.php	2014-07-08 14:45:16 +0000
+++ server/lib/data/dataset.data.class.php	2014-09-19 11:39:09 +0000
@@ -250,7 +250,7 @@
         try {
             $dbh = PDOConnect::init();
         
-            $sth = $dbh->prepare('SELECT `lkcampaignlayout`.CampaignID FROM `lkdatasetlayout` INNER JOIN `lkcampaignlayout` ON `lkcampaignlayout`.LayoutID = `lkdatasetlayout`.LayoutID WHERE DataSetID = :datasetid');
+            $sth = $dbh->prepare('SELECT DISTINCT `lkcampaignlayout`.CampaignID FROM `lkdatasetlayout` INNER JOIN `lkcampaignlayout` ON `lkcampaignlayout`.LayoutID = `lkdatasetlayout`.LayoutID WHERE DataSetID = :datasetid');
             $sth->execute(array(
                     'datasetid' => $dataSetId
                 ));
@@ -441,8 +441,7 @@
 
         Debug::LogEntry('audit', $SQL);
 
-        if (!$rows = $db->GetArray($SQL, $associative))
-            trigger_error($db->error());
+        $rows = $db->GetArray($SQL, $associative);
 
         if (!is_array($rows))
             $rows = array();
 
=== modified file 'server/lib/data/datasetdata.data.class.php'
--- server/lib/data/datasetdata.data.class.php	2014-07-12 13:54:51 +0000
+++ server/lib/data/datasetdata.data.class.php	2014-09-19 11:39:09 +0000
@@ -377,4 +377,4 @@
         }
     }
 }
-?>
 \ No newline at end of file
+?>
 
=== modified file 'server/lib/data/display.data.class.php'
--- server/lib/data/display.data.class.php	2014-03-09 14:41:56 +0000
+++ server/lib/data/display.data.class.php	2014-09-19 11:39:09 +0000
@@ -20,28 +20,134 @@
  */
 defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
 
-class Display extends Data
-{
-	public function __construct(database $db)
-	{
-		include_once('lib/data/displaygroup.data.class.php');
-		
-		parent::__construct($db);
-	}
-	
-	/**
-	 * Adds a Display
-	 * @return 
-	 * @param $display Object
-	 * @param $isAuditing Object
-	 * @param $defaultLayoutID Object
-	 * @param $license Object
-	 * @param $licensed Object
-	 * @param $incSchedule Object
-	 */
-	public function Add($display, $isAuditing, $defaultLayoutID, $license, $licensed, $incSchedule)
-	{
-        Debug::LogEntry('audit', 'IN', 'Display', 'Add');
+// Companion classes
+Kit::ClassLoader('displaygroup');
+
+class Display extends Data {
+
+    public $loaded;
+
+    public $displayId;
+    public $isAuditing;
+    public $display;
+    public $description;
+    public $defaultLayoutId;
+    public $license;
+    public $licensed;
+    public $currentLicensed;
+    public $loggedIn;
+    public $lastAccessed;
+    public $incSchedule;
+    public $emailAlert;
+    public $alertTimeout;
+    public $clientAddress;
+    public $mediaInventoryStatus;
+    public $mediaInventoryXml;
+    public $macAddress;
+    public $lastChanged;
+    public $numberOfMacAddressChanges;
+    public $lastWakeOnLanCommandSent;
+    public $wakeOnLanEnabled;
+    public $wakeOnLanTime;
+    public $broadCastAddress;
+    public $secureOn;
+    public $cidr;
+    public $latitude;
+    public $longitude;
+    public $versionInstructions;
+    public $clientType;
+    public $clientVersion;
+    public $clientCode;
+    public $displayProfileId;
+    public $currentLayoutId;
+    public $screenShotRequested;
+
+    public $displayGroupId;
+    
+    public function Load() {
+        try {
+            $dbh = PDOConnect::init();
+        
+            $sth = $dbh->prepare('
+                SELECT display.*, displaygroup.displaygroupid, displaygroup.description, X(display.GeoLocation) AS Latitude, Y(display.GeoLocation) AS Longitude 
+                  FROM `display`
+                    INNER JOIN `lkdisplaydg`
+                    ON lkdisplaydg.displayid = display.displayId
+                    INNER JOIN `displaygroup`
+                    ON displaygroup.displaygroupid = lkdisplaydg.displaygroupid
+                        AND isdisplayspecific = 1
+                WHERE display.displayid = :display_id');
+            
+            $sth->execute(array('display_id' => $this->displayId));
+          
+            if (!$row = $sth->fetch())
+                $this->ThrowError(25004, __('Cannot find display record'));
+
+            $this->isAuditing = Kit::ValidateParam($row['isAuditing'], _INT);
+            $this->display = Kit::ValidateParam($row['display'], _STRING);
+            $this->description = Kit::ValidateParam($row['description'], _STRING);
+            $this->defaultLayoutId = Kit::ValidateParam($row['defaultlayoutid'], _INT);
+            $this->license = Kit::ValidateParam($row['license'], _STRING);
+            $this->licensed = Kit::ValidateParam($row['licensed'], _INT);
+            $this->loggedIn = Kit::ValidateParam($row['loggedin'], _INT);
+            $this->lastAccessed = Kit::ValidateParam($row['lastaccessed'], _INT);
+            $this->incSchedule = Kit::ValidateParam($row['inc_schedule'], _INT);
+            $this->emailAlert = Kit::ValidateParam($row['email_alert'], _INT);
+            $this->alertTimeout = Kit::ValidateParam($row['alert_timeout'], _INT);
+            $this->clientAddress = Kit::ValidateParam($row['ClientAddress'], _STRING);
+            $this->mediaInventoryStatus = Kit::ValidateParam($row['MediaInventoryStatus'], _INT);
+            $this->mediaInventoryXml = Kit::ValidateParam($row['MediaInventoryXml'], _HTMLSTRING);
+            $this->macAddress = Kit::ValidateParam($row['MacAddress'], _STRING);
+            $this->lastChanged = Kit::ValidateParam($row['LastChanged'], _INT);
+            $this->numberOfMacAddressChanges = Kit::ValidateParam($row['NumberOfMacAddressChanges'], _INT);
+            $this->lastWakeOnLanCommandSent = Kit::ValidateParam($row['LastWakeOnLanCommandSent'], _INT);
+            $this->wakeOnLanEnabled = Kit::ValidateParam($row['WakeOnLan'], _INT);
+            $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->latitude = Kit::ValidateParam($row['Latitude'], _DOUBLE);
+            $this->longitude = Kit::ValidateParam($row['Longitude'], _DOUBLE);
+            $this->versionInstructions = Kit::ValidateParam($row['version_instructions'], _STRING);
+            $this->clientType = Kit::ValidateParam($row['client_type'], _STRING);
+            $this->clientVersion = Kit::ValidateParam($row['client_version'], _STRING);
+            $this->clientCode = Kit::ValidateParam($row['client_code'], _INT);
+            $this->displayProfileId = Kit::ValidateParam($row['displayprofileid'], _INT);
+            $this->currentLayoutId = Kit::ValidateParam($row['currentLayoutId'], _INT);
+            $this->screenShotRequested = Kit::ValidateParam($row['screenShotRequested'], _INT);
+            
+            $this->displayGroupId = Kit::ValidateParam($row['displaygroupid'], _INT);
+
+            // Store the current licensed flag, in case we are changing it and need to check it.
+            $this->currentLicensed = $this->licensed;
+
+            $this->loaded = true;
+
+            return true;
+        }
+        catch (Exception $e) {
+            
+            Debug::LogEntry('error', $e->getMessage());
+        
+            if (!$this->IsError())
+                $this->SetError(1, __('Unknown Error'));
+        
+            return false;
+        }
+    }
+
+    /**
+     * Adds a Display
+     * @return 
+     * @param $display Object
+     * @param $isAuditing Object
+     * @param $defaultLayoutID Object
+     * @param $license Object
+     * @param $licensed Object
+     * @param $incSchedule Object
+     */
+    public function Add($display, $isAuditing, $defaultLayoutID, $license, $licensed, $incSchedule) {
+        Debug::LogEntry('audit', 'IN', get_class(), __FUNCTION__);
         
         try {
             $dbh = PDOConnect::init();
@@ -62,7 +168,7 @@
                     'email_alert' => 0,
                     'alert_timeout' => 0
                 ));
-		
+        
             // Get the ID of the inserted record
             $displayId = $dbh->lastInsertId();
 
@@ -89,20 +195,26 @@
 
             return false;
         }
-	}
-	
-	/**
-	 * Edits a Display 
-	 * @return 
-	 * @param $displayID Object
-	 * @param $isAuditing Object
-	 * @param $defaultLayoutID Object
-	 * @param $licensed Object
-	 * @param $incSchedule Object
-	 */
-	public function Edit($displayID, $display, $isAuditing, $defaultLayoutID, $licensed, $incSchedule, $email_alert, $alert_timeout, $wakeOnLanEnabled, $wakeOnLanTime, $broadCastAddress, $secureOn, $cidr, $latitude, $longitude)
-    {
-		Debug::LogEntry('audit', 'IN', 'Display', 'Edit');
+    }
+    
+    /**
+     * Edits a Display 
+     * @return 
+     * @param $displayID Object
+     * @param $isAuditing Object
+     * @param $defaultLayoutID Object
+     * @param $licensed Object
+     * @param $incSchedule Object
+     */
+    public function Edit() {
+        Debug::LogEntry('audit', 'IN', get_class(), __FUNCTION__);
+
+        // Validation
+        if ($this->display == '')
+            return $this->SetError(__("Can not have a display without a name"));
+
+        if ($this->wakeOnLanEnabled == 1 && $this->wakeOnLanTime == '')
+            return $this->SetError(__('Wake on Lan is enabled, but you have not specified a time to wake the display'));
         
         try {
             $dbh = PDOConnect::init();
@@ -110,19 +222,10 @@
             // Check the number of licensed displays
             $maxDisplays = Config::GetSetting('MAX_LICENSED_DISPLAYS');
 
-            if ($maxDisplays > 0)
-            {
+            if ($maxDisplays > 0) {
                 // See if this is a license switch
-                $sth = $dbh->prepare('SELECT licensed FROM display WHERE DisplayID = :displayid');
-                $sth->execute(array(
-                        'displayid' => $displayID
-                    ));
-
-                if (!$row = $sth->fetch())
-                    $this->ThrowError(25004, __('Cannot find display record'));
-
                 // Has the licence flag toggled?
-                if (Kit::ValidateParam($row['licensed'], _INT) != $licensed && $licensed == 1)
+                if ($this->currentLicensed != $this->licensed && $this->licensed == 1)
                 {
                     // License change - test number of licensed displays.
                     $sth = $dbh->prepare('SELECT COUNT(DisplayID) AS CountLicensed FROM display WHERE licensed = 1');
@@ -143,101 +246,106 @@
             // Validate some parameters
 
             // Fill $addr with client's IP address, if $addr is empty
-            if ($broadCastAddress != '')
+            if ($this->broadCastAddress != '')
             {
                 // Resolve broadcast address
                 // same as (but easier than):  preg_match("/\b(([01]?\d?\d|2[0-4]\d|25[0-5])\.){3}([01]?\d?\d|2[0-4]\d|25[0-5])\b/",$addr)
-                if (!filter_var($broadCastAddress, FILTER_VALIDATE_IP))
+                if (!filter_var($this->broadCastAddress, FILTER_VALIDATE_IP))
                     $this->ThrowError(25015, __('BroadCast Address is not a valid IP Address'));
             }
 
             // Check whether $cidr is valid
-            if ($cidr != '')
+            if ($this->cidr != '')
             {
-                if ((!is_numeric($cidr)) || ($cidr < 0) || ($cidr > 32))
+                if ((!is_numeric($this->cidr)) || ($this->cidr < 0) || ($this->cidr > 32))
                     $this->ThrowError(25015, __('CIDR subnet mask is not a number within the range of 0 to 32.'));
             }
 
             // Check whether $secureOn is valid
-            if ($secureOn != '')
+            if ($this->secureOn != '')
             {
-                $secureOn = strtoupper($secureOn);
-                $secureOn = str_replace(":", "-", $secureOn);
+                $this->secureOn = strtoupper($this->secureOn);
+                $this->secureOn = str_replace(":", "-", $this->secureOn);
 
-                if ((!preg_match("/([A-F0-9]{2}[-]){5}([0-9A-F]){2}/", $secureOn)) || (strlen($secureOn) != 17))
+                if ((!preg_match("/([A-F0-9]{2}[-]){5}([0-9A-F]){2}/", $this->secureOn)) || (strlen($this->secureOn) != 17))
                     $this->ThrowError(25015, __('Pattern of secureOn-password is not "xx-xx-xx-xx-xx-xx" (x = digit or CAPITAL letter)'));
             }
 
             Debug::LogEntry('audit', 'Validation Complete and Passed', 'Display', 'Edit');
 
-    		// Update the display record
-    		$SQL  = "UPDATE display SET display = :display, ";
-    		$SQL .= "		defaultlayoutid = :defaultlayoutid, ";
-    		$SQL .= "		inc_schedule = :incschedule, ";
-    		$SQL .= " 		licensed = :licensed, ";
-    		$SQL .= "		isAuditing = :isauditing, ";
-            $SQL .= "       email_alert = :emailalert, ";
-            $SQL .= "       alert_timeout = :alerttimeout, ";
-            $SQL .= "       WakeOnLan = :wakeonlan, ";
-            $SQL .= "       WakeOnLanTime = :wakeonlantime, ";
-            $SQL .= "       BroadCastAddress = :broadcastaddress, ";
-            $SQL .= "       SecureOn = :secureon, ";
-            $SQL .= "       Cidr = :cidr, ";
-            $SQL .= "       GeoLocation = POINT(:latitude, :longitude) ";
-    		$SQL .= " WHERE displayid = :displayid ";
+            // Update the display record
+            $SQL  = '
+                UPDATE display 
+                    SET display = :display,
+                        defaultlayoutid = :defaultlayoutid,
+                        inc_schedule = :incschedule,
+                        licensed = :licensed,
+                        isAuditing = :isauditing,
+                        email_alert = :emailalert,
+                        alert_timeout = :alerttimeout,
+                        WakeOnLan = :wakeonlan,
+                        WakeOnLanTime = :wakeonlantime,
+                        BroadCastAddress = :broadcastaddress,
+                        SecureOn = :secureon,
+                        Cidr = :cidr,
+                        GeoLocation = POINT(:latitude, :longitude),
+                        displayprofileid = :displayprofileid
+             WHERE displayid = :displayid';
 
             $sth = $dbh->prepare($SQL);
             $sth->execute(array(
-                    'display' => $display,
-                    'defaultlayoutid' => $defaultLayoutID,
-                    'incschedule' => $incSchedule,
-                    'licensed' => $licensed,
-                    'isauditing' => $isAuditing,
-                    'emailalert' => $email_alert,
-                    'alerttimeout' => $alert_timeout,
-                    'wakeonlan' => $wakeOnLanEnabled,
-                    'wakeonlantime' => $wakeOnLanTime,
-                    'broadcastaddress' => $broadCastAddress,
-                    'secureon' => $secureOn,
-                    'cidr' => $cidr,
-                    'latitude' => $latitude,
-                    'longitude' => $longitude,
-                    'displayid' => $displayID
+                    'display' => $this->display,
+                    'defaultlayoutid' => $this->defaultLayoutId,
+                    'incschedule' => $this->incSchedule,
+                    'licensed' => $this->licensed,
+                    'isauditing' => $this->isAuditing,
+                    'emailalert' => $this->emailAlert,
+                    'alerttimeout' => $this->alertTimeout,
+                    'wakeonlan' => $this->wakeOnLanEnabled,
+                    'wakeonlantime' => $this->wakeOnLanTime,
+                    'broadcastaddress' => $this->broadCastAddress,
+                    'secureon' => $this->secureOn,
+                    'cidr' => $this->cidr,
+                    'latitude' => $this->latitude,
+                    'longitude' => $this->longitude,
+                    'displayprofileid' => $this->displayProfileId,
+                    'displayid' => $this->displayId
                 ));
 
             Debug::LogEntry('audit', 'Display Edited', 'Display', 'Edit');
-        
-    		// Use a DisplayGroup to handle the default layout and displaygroup name for this display
-    		$displayGroupObject = new DisplayGroup($this->db);
-    		
-    		// Do we also want to update the linked Display Groups name (seeing as that is what we will be presenting to everyone)
-    		if (!$displayGroupObject->EditDisplayGroup($displayID, $display)) {
+
+            // Use a DisplayGroup to handle the default layout and displaygroup name for this display
+            Kit::ClassLoader('displaygroup');
+            $displayGroupObject = new DisplayGroup();
+            
+            // Do we also want to update the linked Display Groups name (seeing as that is what we will be presenting to everyone)
+            if (!$displayGroupObject->Edit($this->displayGroupId, $this->display, $this->description)) {
                 $this->ThrowError(25002, __('Could not update this display with a new name.'));
             }
 
-    		Debug::LogEntry('audit', 'OUT', 'DisplayGroup', 'Edit');
-    		
-    		return true;
+            Debug::LogEntry('audit', 'OUT', 'DisplayGroup', 'Edit');
+            
+            return true;
         }
         catch (Exception $e) {
             
-            Debug::LogEntry('error', $e->getMessage());
+            Debug::LogEntry('error', $e->getMessage(), get_class(), __FUNCTION__);
 
             if (!$this->IsError())
                 $this->SetError(25000, __('Could not update display'));
 
             return false;
         }
-	}
-	
-	/**
-	 * Deletes a Display
-	 * @return 
-	 * @param $displayID Object
-	 */
-	public function Delete($displayID)
-	{
-        Debug::LogEntry('audit', 'IN', 'Display', 'Delete');
+    }
+    
+    /**
+     * Deletes a Display
+     * @return 
+     * @param $displayID Object
+     */
+    public function Delete($displayID)
+    {
+        Debug::LogEntry('audit', 'IN', get_class(), __FUNCTION__);
         
         try {
             $dbh = PDOConnect::init();
@@ -276,17 +384,17 @@
 
             return false;
         }
-	}
-	
-	/**
-	 * Edits a Displays Name
-	 * @return 
-	 * @param $license Object
-	 * @param $display Object
-	 */
-	public function EditDisplayName($license, $display) 
-	{
-		Debug::LogEntry('audit', 'IN', 'DisplayGroup', 'EditDisplayName');
+    }
+    
+    /**
+     * Edits a Displays Name
+     * @return 
+     * @param $license Object
+     * @param $display Object
+     */
+    public function EditDisplayName($license, $display) 
+    {
+        Debug::LogEntry('audit', 'IN', get_class(), __FUNCTION__);
 
         try {
             $dbh = PDOConnect::init();
@@ -297,17 +405,17 @@
                     'display' => $display,
                     'license' => $license
                 ));
-			
-    		// Also need to update the display group name here.
-    		$displayGroupObject = new DisplayGroup($this->db);
-    		
-    		// Do we also want to update the linked Display Groups name (seeing as that is what we will be presenting to everyone)
-    		if (!$displayGroupObject->EditDisplayGroup($displayID, $display))
-    			$this->ThrowError(25015, __('Could not update this display with a new name.'));
-    		
-    		Debug::LogEntry('audit', 'OUT', 'DisplayGroup', 'EditDisplayName');
-    		
-    		return true;
+            
+            // Also need to update the display group name here.
+            $displayGroupObject = new DisplayGroup($this->db);
+            
+            // Do we also want to update the linked Display Groups name (seeing as that is what we will be presenting to everyone)
+            if (!$displayGroupObject->EditDisplayGroup($displayID, $display))
+                $this->ThrowError(25015, __('Could not update this display with a new name.'));
+            
+            Debug::LogEntry('audit', 'OUT', 'DisplayGroup', 'EditDisplayName');
+            
+            return true;
         }
         catch (Exception $e) {
             
@@ -318,106 +426,95 @@
 
             return false;
         }
-	}
-	
-	/**
+    }
+    
+    /**
      * Sets the information required on the display to indicate that it is still logged in
-     * @param string  $license                The display licence key
-     * @param string  $clientAddress          The client IP address
-     * @param integer $mediaInventoryComplete The Media Inventory Status
-     * @param string  $mediaInventoryXml      The Media Inventory XML
-     * @param string  $macAddress             The Client Mac Address
-     * @param string  $clientType             The Client Type
-     * @param string  $clientVersion          The Client Version
-     * @param integer $clientCode             The Client Version Code
+     * @param int  $displayId The Display ID
+     * @param array  $status The Display Status
      */
-	public function Touch($license, $clientAddress = '', $mediaInventoryComplete = 0, $mediaInventoryXml = '', $macAddress = '', $clientType = '', $clientVersion = '', $clientCode = 0)
-	{
-		Debug::LogEntry('audit', 'IN', 'DisplayGroup', 'Touch');
+    public function Touch($displayId, $status = array())
+    {
+        Debug::LogEntry('audit', 'IN', get_class(), __FUNCTION__);
         
         try {
             $dbh = PDOConnect::init();
 
-            // Set the last accessed flag on the display
-            $SQL  = "";
-            $SQL .= "UPDATE display SET lastaccessed = :lastaccessed, loggedin = :loggedin ";
-
-            $params = array();
-            $params['lastaccessed'] = time();
-            $params['loggedin'] = 1;
-            $params['license'] = $license;
-
-            // We will want to update the client Address if it is given
-            if ($clientAddress != '') {
-                $SQL .= " , ClientAddress = :clientaddress ";
-                $params['clientaddress'] = $clientAddress;
-            }
-
-            // Media Inventory Settings (if appropriate)
-            if ($mediaInventoryComplete != 0) {
-                $SQL .= " , MediaInventoryStatus = :mediainventorystatus ";
-                $params['mediainventorystatus'] = $mediaInventoryComplete;
-            }
-
-            if ($mediaInventoryXml != '') {
-                $SQL .= " , MediaInventoryXml = :mediainventoryxml ";
-                $params['mediainventoryxml'] = $mediaInventoryXml;
-            }
-
-            // Client information if present
-            if ($clientType != '') {
-                $SQL .= " , client_type = :client_type ";
-                $params['client_type'] = $clientType;
-            }
-
-            if ($clientVersion != '') {
-                $SQL .= " , client_version = :client_version ";
-                $params['client_version'] = $clientVersion;
-            }
-
-            if ($clientCode != '') {
-                $SQL .= " , client_code = :client_code ";
-                $params['client_code'] = $clientCode;
-            }
-
-            // Mac address storage
-            if ($macAddress != '')
-            {
-                // Address changed.
-                $sth = $dbh->prepare('SELECT MacAddress FROM display WHERE license = :license');
-                $sth->execute(array(
-                        'license' => $license
-                    ));
-
-                if (!$row = $sth->fetch())
-                    $currentAddress = '';
-                else
-                    $currentAddress = $row['MacAddress'];
-
-                if ($macAddress != $currentAddress)
-                {
-                    $SQL .= " , MacAddress = :macaddress, LastChanged = :lastchanged, NumberOfMacAddressChanges = NumberOfMacAddressChanges + 1 ";
-                    $params['macaddress'] = $macAddress;
-                    $params['lastchanged'] = time();
+            $this->displayId = $displayId;
+            $this->Load();
+
+            // Update last accessed and set to be logged in
+            $this->lastAccessed = time();
+            $this->loggedIn = 1;
+
+            // Pull in any of the optional parameters from the status array
+            $this->clientAddress = (Kit::GetParam('clientAddress', $status, _STRING) == '') ? $this->clientAddress : Kit::GetParam('clientAddress', $status, _STRING);
+            $this->mediaInventoryStatus = (Kit::GetParam('mediaInventoryStatus', $status, _INT) == 0) ? $this->mediaInventoryStatus : Kit::GetParam('mediaInventoryStatus', $status, _INT);
+            $this->mediaInventoryXml = (Kit::GetParam('mediaInventoryXml', $status, _HTMLSTRING) == '') ? $this->mediaInventoryXml : Kit::GetParam('mediaInventoryXml', $status, _HTMLSTRING);
+            $this->clientType = (Kit::GetParam('clientType', $status, _STRING) == '') ? $this->clientType : Kit::GetParam('clientType', $status, _STRING);
+            $this->clientVersion = (Kit::GetParam('clientVersion', $status, _STRING) == '') ? $this->clientVersion : Kit::GetParam('clientVersion', $status, _STRING);
+            $this->clientCode = (Kit::GetParam('clientCode', $status, _INT) == 0) ? $this->clientCode : Kit::GetParam('clientCode', $status, _INT);
+            $this->currentLayoutId = (Kit::GetParam('currentLayoutId', $status, _INT) == 0) ? $this->currentLayoutId : Kit::GetParam('currentLayoutId', $status, _INT);
+            $this->screenShotRequested = (Kit::GetParam('screenShotRequested', $status, _INT, -1) == -1) ? $this->screenShotRequested : Kit::GetParam('screenShotRequested', $status, _INT);
+
+            // Has the mac address changed
+            if (Kit::GetParam('macAddress', $status, _STRING) != '') {
+                if ($this->macAddress != Kit::GetParam('macAddress', $status, _STRING)) {
+                    // Mac address change detected
+                    $this->macAddress = Kit::GetParam('macAddress', $status, _STRING);
+                    $this->numberOfMacAddressChanges++;
+                    $this->lastChanged = time();
                 }
             }
 
-            // Restrict to the display license
-            $SQL .= " WHERE license = :license";
+            // Save
+            $SQL = '
+                    UPDATE display SET lastaccessed = :lastAccessed, 
+                        loggedin = :loggedIn,
+                        ClientAddress = :clientAddress,
+                        MediaInventoryStatus = :mediaInventoryStatus,
+                        MediaInventoryXml = :mediaInventoryXml,
+                        client_type = :clientType,
+                        client_version = :clientVersion,
+                        client_code = :clientCode,
+                        MacAddress = :macAddress, 
+                        LastChanged = :lastChanged, 
+                        NumberOfMacAddressChanges = :numberOfMacAddressChanges,
+                        currentLayoutId = :currentLayoutId,
+                        screenShotRequested = :screenShotRequested
+                     WHERE displayId = :displayId
+                ';
 
-            // Update the display with its new name (using the license as the key)
+            // Update the display
             $sth = $dbh->prepare($SQL);
-            $sth->execute($params);
-    		
-    		Debug::LogEntry('audit', 'OUT', 'DisplayGroup', 'Touch');
-    		
-    		return true;
+            $sth->execute(array(
+                    'displayId' => $this->displayId,
+                    'lastAccessed' => $this->lastAccessed,
+                    'loggedIn' => $this->loggedIn,
+                    'clientAddress' => $this->clientAddress,
+                    'mediaInventoryStatus' => $this->mediaInventoryStatus,
+                    'mediaInventoryXml' => $this->mediaInventoryXml,
+                    'clientType' => $this->clientType,
+                    'clientVersion' => $this->clientVersion,
+                    'clientCode' => $this->clientCode,
+                    'macAddress' => $this->macAddress,
+                    'lastChanged' => $this->lastChanged,
+                    'numberOfMacAddressChanges' => $this->numberOfMacAddressChanges,
+                    'currentLayoutId' => $this->currentLayoutId,
+                    'screenShotRequested' => $this->screenShotRequested
+                ));
+
+            return true;
         }
         catch (Exception $e) {
             Debug::LogEntry('error', $e->getMessage());
             return $this->SetError(25002, __("Error updating this displays last accessed information."));
         }
-	}
+    }
+
+    public function RequestScreenShot($displayId) {
+        return $this->Touch($displayId, array('screenShotRequested' => 1));
+    }
 
     /**
      * Flags a display as being incomplete
@@ -460,12 +557,14 @@
 
             // Which displays does a change to this layout effect?
             $SQL  = " SELECT DISTINCT display.DisplayID ";
-            $SQL .= "   FROM schedule_detail ";
-            $SQL .= " 	INNER JOIN lkdisplaydg ";
-            $SQL .= "	ON lkdisplaydg.DisplayGroupID = schedule_detail.DisplayGroupID ";
-            $SQL .= " 	INNER JOIN display ";
-            $SQL .= "	ON lkdisplaydg.DisplayID = display.displayID ";
-            $SQL .= " WHERE schedule_detail.CampaignID = :campaignid ";
+            $SQL .= "   FROM schedule ";
+            $SQL .= "   INNER JOIN schedule_detail ";
+            $SQL .= "   ON schedule_detail.eventid = schedule.eventid ";
+            $SQL .= "   INNER JOIN lkdisplaydg ";
+            $SQL .= "   ON lkdisplaydg.DisplayGroupID = schedule_detail.DisplayGroupID ";
+            $SQL .= "   INNER JOIN display ";
+            $SQL .= "   ON lkdisplaydg.DisplayID = display.displayID ";
+            $SQL .= " WHERE schedule.CampaignID = :campaignid ";
             $SQL .= " AND schedule_detail.FromDT < :fromdt AND schedule_detail.ToDT > :todt ";
             $SQL .= " UNION ";
             $SQL .= " SELECT DISTINCT display.DisplayID ";
@@ -505,7 +604,7 @@
      */
     public function EditDefaultLayout($displayId, $defaultLayoutId)
     {
-        Debug::LogEntry('audit', 'IN', 'Display', 'EditDefaultLayout');
+        Debug::LogEntry('audit', 'IN', get_class(), __FUNCTION__);
 
         try {
             $dbh = PDOConnect::init();
@@ -567,7 +666,7 @@
      */
     public function WakeOnLan($displayId)
     {
-        Debug::LogEntry('audit', 'IN', 'Display', 'WakeOnLan');
+        Debug::LogEntry('audit', 'IN', get_class(), __FUNCTION__);
 
         try {
             $dbh = PDOConnect::init();
@@ -613,15 +712,16 @@
      * Wake On Lan Script
      *  // Version: 2
      *  // Author of this application:
-     *  //	DS508_customer (http://www.synology.com/enu/forum/memberlist.php?mode=viewprofile&u=12636)
-     *  //	Please inform the author of any suggestions on (the functionality, graphical design, ... of) this application.
-     *  //	More info: http://wolviaphp.sourceforge.net
+     *  //  DS508_customer (http://www.synology.com/enu/forum/memberlist.php?mode=viewprofile&u=12636)
+     *  //  Please inform the author of any suggestions on (the functionality, graphical design, ... of) this application.
+     *  //  More info: http://wolviaphp.sourceforge.net
      *  // License: GPLv2.0
      *
      * Modified for use with the Xibo project by Dan Garner.
      */
-    function TransmitWakeOnLan($mac_address, $secureon, $addr, $cidr, $port)
-    {
+    function TransmitWakeOnLan($mac_address, $secureon, $addr, $cidr, $port) {
+        Debug::LogEntry('audit', 'IN', get_class(), __FUNCTION__);
+
         // Prepare magic packet: part 1/3 (defined constant)
         $buf = "";
         
 
=== modified file 'server/lib/data/displaygroup.data.class.php'
--- server/lib/data/displaygroup.data.class.php	2014-04-19 09:11:34 +0000
+++ server/lib/data/displaygroup.data.class.php	2014-09-19 11:39:09 +0000
@@ -22,12 +22,12 @@
 
 class DisplayGroup extends Data
 {
-    public function __construct(database $db)
+    public function __construct()
     {
         include_once('lib/data/schedule.data.class.php');
         include_once('lib/data/displaygroupsecurity.data.class.php');
         
-        parent::__construct($db);
+        parent::__construct();