Merge lp:~dangarner/xibo/server-162 into lp:xibo/1.7

[Dan Garner]

[lp:~dangarner/xibo/server-162]

382. By Dan Garner on 2014-07-15

[cms] Bump version in install.

383. By Dan Garner on 2014-07-15

[cms] Bump version in include.php

384. By Dan Garner on 2014-07-15

[api] Disable errors in API.

=== added file 'client/dotNET/KeyStore.cs'
--- client/dotNET/KeyStore.cs	1970-01-01 00:00:00 +0000
+++ client/dotNET/KeyStore.cs	2014-07-15 15:37:37 +0000
@@ -0,0 +1,178 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Windows.Forms;
+
+namespace XiboClient
+{
+    /// <summary>
+    /// The KeyStoreEventHandler is used by the KeyPress event of the KeyStore
+    /// class. It notifies listeners of a named key press.
+    /// </summary>
+    /// <param name="name">The name of the key.</param>
+    public delegate void KeyStoreEventHandler(string name);
+
+    class KeyStore : IMessageFilter
+    {
+        // Interop
+        [DllImport("user32.dll")]
+        static extern short GetKeyState(Keys key);
+
+        // Windows message constants
+        private const int WM_KEYDOWN = 0x100;
+        private const int WM_KEYUP = 0x101;
+
+        // The singleton instance
+        private static KeyStore s_instance = null;
+
+        // The modifier keys
+        private bool _shift = false;
+        private bool _control = false;
+
+        // The definitions
+        private Dictionary<Keys, string> _definitions;
+
+        // The KeyPressed Event
+        public event KeyStoreEventHandler KeyPress;
+
+        /// <summary>
+        /// Adds a key definition to the store.
+        /// </summary>
+        /// <param name="name">The name of the key.</param>
+        /// <param name="key">The key</param>
+        /// <param name="modifiers">The modifiers (shift, control)</param>
+        public void AddKeyDefinition(string name, Keys key, Keys modifiers)
+        {
+            Keys combined = key | modifiers;
+
+            _definitions[combined] = name;
+        }
+
+        /// <summary>
+        /// The filter message.
+        /// </summary>
+        public bool PreFilterMessage(ref Message m)
+        {
+            bool handled = false;
+            Keys key = Keys.None;
+
+            switch (m.Msg)
+            {
+                case WM_KEYUP:
+                    key = (Keys)m.WParam;
+                    handled = HandleModifier(key, false);
+                    break;
+
+                case WM_KEYDOWN:
+                    key = (Keys)m.WParam;
+                    handled = HandleModifier(key, true);
+                    if (false == handled)
+                    {
+                        // If one of the defined keys was pressed then we
+                        // raise an event.
+                        handled = HandleDefinedKey(key);
+                    }
+                    break;
+            }
+
+            return handled;
+        }
+
+        /// <summary>
+        /// Compares a key against the definitions, and raises an event
+        /// if there is a match.
+        /// </summary>
+        /// <param name="key">The key</param>
+        /// <returns>True if the key was one of the defined key combinations.</returns>
+        private bool HandleDefinedKey(Keys key)
+        {
+            bool handled = false;
+
+            Keys combined = key;
+            if (_shift) combined |= Keys.Shift;
+            if (_control) combined |= Keys.Control;
+
+            // If we have found a matching combination then we
+            // raise an event.
+            string name = null;
+            if (true == _definitions.TryGetValue(combined, out name))
+            {
+                OnKeyPress(name);
+
+                handled = true;
+            }
+            return handled;
+        }
+
+        /// <summary>
+        /// Attempt to handle a modifier key, and return a boolean indicating if a modifier key was
+        /// handled.
+        /// </summary>
+        /// <param name="key">The key</param>
+        /// <param name="isDown">True if the key is pressed; False if it is released.</param>
+        /// <returns>True if a modifier key was selected; False otherwise.</returns>
+        private bool HandleModifier(Keys key, bool isDown)
+        {
+            bool handled = false;
+
+            switch (key)
+            {
+                case Keys.RControlKey:
+                case Keys.ControlKey:
+                    _control = isDown;
+                    handled = true;
+                    break;
+
+                case Keys.RShiftKey:
+                case Keys.ShiftKey:
+                    _shift = isDown;
+                    handled = true;
+                    break;
+            }
+
+            return handled;
+        }
+
+        /// <summary>
+        /// Raises the KeyPress event.
+        /// </summary>
+        /// <param name="name">The name of the key.</param>
+        private void OnKeyPress(string name)
+        {
+            // Raise event
+            if (null != KeyPress) KeyPress(name);
+
+            // Check if modifier keys were released in the mean time.
+            _control =
+                -127 == GetKeyState(Keys.ControlKey) ||
+                -127 == GetKeyState(Keys.RControlKey);
+
+            _shift =
+                -127 == GetKeyState(Keys.ShiftKey) ||
+                -127 == GetKeyState(Keys.RShiftKey);
+
+        }
+
+        /// <summary>
+        /// Returns the singleton instance.
+        /// </summary>
+        public static KeyStore Instance
+        {
+            get
+            {
+                if (null == s_instance)
+                    s_instance = new KeyStore();
+
+                return s_instance;
+            }
+        }
+
+        // The constructor is private because this is a singleton class.
+        private KeyStore()
+        {
+            _definitions = new Dictionary<Keys, string>();
+        }
+    }
+}

=== modified file 'client/dotNET/MainForm.cs'
--- client/dotNET/MainForm.cs	2013-11-03 22:44:50 +0000
+++ client/dotNET/MainForm.cs	2014-07-15 15:37:37 +0000
@@ -1,6 +1,6 @@
 /*
  * Xibo - Digitial Signage - http://www.xibo.org.uk
- * Copyright (C) 2006-13 Daniel Garner
+ * Copyright (C) 2006-14 Daniel Garner
  *
  * This file is part of Xibo.
  *
@@ -35,6 +35,7 @@
 using XiboClient.Log;
 using System.Threading;
 using XiboClient.Properties;
+using System.Runtime.InteropServices;
 
 namespace XiboClient
 {
@@ -59,6 +60,18 @@
 
         private delegate void ChangeToNextLayoutDelegate(string layoutPath);
 
+        [FlagsAttribute]
+        enum EXECUTION_STATE : uint
+        {
+            ES_AWAYMODE_REQUIRED = 0x00000040,
+            ES_CONTINUOUS = 0x80000000,
+            ES_DISPLAY_REQUIRED = 0x00000002,
+            ES_SYSTEM_REQUIRED = 0x00000001
+        }
+
+        [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)]
+        static extern EXECUTION_STATE SetThreadExecutionState(EXECUTION_STATE esFlags);
+
         public MainForm()
         {
             InitializeComponent();
@@ -95,10 +108,24 @@
             _clientInfoForm.Hide();
 
             // Add a message filter to listen for the i key
-            KeyFilter keyFilter = new KeyFilter();
-            keyFilter.ClientInfoForm = _clientInfoForm;
-
-            Application.AddMessageFilter(keyFilter);
+            Application.AddMessageFilter(KeyStore.Instance);
+
+            // Define the hotkey
+            Keys key;
+            try
+            {
+                key = (Keys)Enum.Parse(typeof(Keys), Settings.Default.ClientInformationKeyCode.ToUpper());
+            }
+            catch
+            {
+                // Default back to I
+                key = Keys.I;
+            }
+
+            KeyStore.Instance.AddKeyDefinition("ClientInfo", key, ((Settings.Default.ClientInfomationCtrlKey) ? Keys.Control : Keys.None));
+
+            // Register a handler for the key event
+            KeyStore.Instance.KeyPress += Instance_KeyPress;
 
             // Trace listener for Client Info
             ClientInfoTraceListener clientInfoTraceListener = new ClientInfoTraceListener(_clientInfoForm);
@@ -116,6 +143,25 @@
         }
 
         /// <summary>
+        /// Handle the Key Event
+        /// </summary>
+        /// <param name="name"></param>
+        void Instance_KeyPress(string name)
+        {
+            if (name != "ClientInfo")
+                return;
+
+            // Toggle
+            if (_clientInfoForm.Visible)
+                _clientInfoForm.Hide();
+            else
+            {
+                _clientInfoForm.Show();
+                _clientInfoForm.BringToFront();
+            }
+        }
+
+        /// <summary>
         /// Called after the form has been shown
         /// </summary>
         /// <param name="sender"></param>
@@ -271,6 +317,8 @@
         {
             try
             {
+                SetThreadExecutionState(EXECUTION_STATE.ES_DISPLAY_REQUIRED | EXECUTION_STATE.ES_SYSTEM_REQUIRED | EXECUTION_STATE.ES_CONTINUOUS);
+
                 // TODO: Check we are never out of the UI thread at this point
 
                 DestroyLayout();
@@ -733,38 +781,4 @@
             }
         }
     }
-
-    /// <summary>
-    /// Key Filter to show the Client Information Screen
-    /// </summary>
-    public class KeyFilter : IMessageFilter
-    {
-        public ClientInfo ClientInfoForm;
-
-        public bool PreFilterMessage(ref Message msg)
-        {
-            const int WM_KEYDOWN = 0x100;
-            const int WM_SYSKEYDOWN = 0x104;
-
-            // Only interested in Key Down messages
-            if ((msg.Msg == WM_KEYDOWN) || (msg.Msg == WM_SYSKEYDOWN))
-            {
-                Keys keyCode = (Keys)(int)msg.WParam & Keys.KeyCode;
-
-                if (keyCode == Keys.I)
-                {
-                    // Toggle
-                    if (ClientInfoForm.Visible)
-                        ClientInfoForm.Hide();
-                    else
-                    {
-                        ClientInfoForm.Show();
-                        ClientInfoForm.BringToFront();
-                    }
-                }
-            }
-
-            return false;
-        }
-    }
 }
\ No newline at end of file

=== modified file 'client/dotNET/OptionForm.Designer.cs'
--- client/dotNET/OptionForm.Designer.cs	2013-05-01 19:24:35 +0000
+++ client/dotNET/OptionForm.Designer.cs	2014-07-15 15:37:37 +0000
@@ -82,6 +82,8 @@
             this.clientHeight = new System.Windows.Forms.NumericUpDown();
             this.clientWidth = new System.Windows.Forms.NumericUpDown();
             this.tabPage5 = new System.Windows.Forms.TabPage();
+            this.cursorStartPosition = new System.Windows.Forms.ComboBox();
+            this.label22 = new System.Windows.Forms.Label();
             this.logToDiskLocation = new System.Windows.Forms.TextBox();
             this.label21 = new System.Windows.Forms.Label();
             this.showInTaskbar = new System.Windows.Forms.CheckBox();
@@ -104,8 +106,9 @@
             this.folderBrowserLibrary = new System.Windows.Forms.FolderBrowserDialog();
             this.splashScreenOverride = new System.Windows.Forms.OpenFileDialog();
             this.xmds1 = new XiboClient.xmds.xmds();
-            this.label22 = new System.Windows.Forms.Label();
-            this.cursorStartPosition = new System.Windows.Forms.ComboBox();
+            this.label23 = new System.Windows.Forms.Label();
+            this.clientInfoHotKeyTextBox = new System.Windows.Forms.TextBox();
+            this.clientInfoCtrlModifierCheckBox = new System.Windows.Forms.CheckBox();
             this.tabControl1.SuspendLayout();
             this.tabPage1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.nupScrollStepAmount)).BeginInit();
@@ -684,6 +687,9 @@
             // 
             // tabPage5
             // 
+            this.tabPage5.Controls.Add(this.clientInfoCtrlModifierCheckBox);
+            this.tabPage5.Controls.Add(this.clientInfoHotKeyTextBox);
+            this.tabPage5.Controls.Add(this.label23);
             this.tabPage5.Controls.Add(this.cursorStartPosition);
             this.tabPage5.Controls.Add(this.label22);
             this.tabPage5.Controls.Add(this.logToDiskLocation);
@@ -707,17 +713,39 @@
             this.tabPage5.Text = "Advanced";
             this.tabPage5.UseVisualStyleBackColor = true;
             // 
+            // cursorStartPosition
+            // 
+            this.cursorStartPosition.FormattingEnabled = true;
+            this.cursorStartPosition.Items.AddRange(new object[] {
+            "Top Left",
+            "Top Right",
+            "Bottom Left",
+            "Bottom Right"});
+            this.cursorStartPosition.Location = new System.Drawing.Point(161, 128);
+            this.cursorStartPosition.Name = "cursorStartPosition";
+            this.cursorStartPosition.Size = new System.Drawing.Size(263, 21);
+            this.cursorStartPosition.TabIndex = 21;
+            // 
+            // label22
+            // 
+            this.label22.AutoSize = true;
+            this.label22.Location = new System.Drawing.Point(5, 131);
+            this.label22.Name = "label22";
+            this.label22.Size = new System.Drawing.Size(102, 13);
+            this.label22.TabIndex = 20;
+            this.label22.Text = "Cursor Start Position";
+            // 
             // logToDiskLocation
             // 
-            this.logToDiskLocation.Location = new System.Drawing.Point(176, 176);
+            this.logToDiskLocation.Location = new System.Drawing.Point(161, 99);
             this.logToDiskLocation.Name = "logToDiskLocation";
-            this.logToDiskLocation.Size = new System.Drawing.Size(121, 20);
+            this.logToDiskLocation.Size = new System.Drawing.Size(263, 20);
             this.logToDiskLocation.TabIndex = 19;
             // 
             // label21
             // 
             this.label21.AutoSize = true;
-            this.label21.Location = new System.Drawing.Point(20, 179);
+            this.label21.Location = new System.Drawing.Point(5, 102);
             this.label21.Name = "label21";
             this.label21.Size = new System.Drawing.Size(105, 13);
             this.label21.TabIndex = 18;
@@ -726,7 +754,7 @@
             // showInTaskbar
             // 
             this.showInTaskbar.AutoSize = true;
-            this.showInTaskbar.Location = new System.Drawing.Point(176, 238);
+            this.showInTaskbar.Location = new System.Drawing.Point(51, 220);
             this.showInTaskbar.Name = "showInTaskbar";
             this.showInTaskbar.Size = new System.Drawing.Size(130, 17);
             this.showInTaskbar.TabIndex = 17;
@@ -736,7 +764,7 @@
             // label20
             // 
             this.label20.AutoSize = true;
-            this.label20.Location = new System.Drawing.Point(20, 151);
+            this.label20.Location = new System.Drawing.Point(5, 73);
             this.label20.Name = "label20";
             this.label20.Size = new System.Drawing.Size(54, 13);
             this.label20.TabIndex = 16;
@@ -749,15 +777,15 @@
             "audit",
             "info",
             "error"});
-            this.logLevel.Location = new System.Drawing.Point(176, 148);
+            this.logLevel.Location = new System.Drawing.Point(161, 70);
             this.logLevel.Name = "logLevel";
-            this.logLevel.Size = new System.Drawing.Size(121, 21);
+            this.logLevel.Size = new System.Drawing.Size(263, 21);
             this.logLevel.TabIndex = 15;
             // 
             // label19
             // 
             this.label19.AutoSize = true;
-            this.label19.Location = new System.Drawing.Point(20, 123);
+            this.label19.Location = new System.Drawing.Point(225, 10);
             this.label19.Name = "label19";
             this.label19.Size = new System.Drawing.Size(138, 13);
             this.label19.TabIndex = 14;
@@ -765,14 +793,14 @@
             // 
             // maxConcurrentDownloads
             // 
-            this.maxConcurrentDownloads.Location = new System.Drawing.Point(176, 121);
+            this.maxConcurrentDownloads.Location = new System.Drawing.Point(381, 8);
             this.maxConcurrentDownloads.Minimum = new decimal(new int[] {
             1,
             0,
             0,
             0});
             this.maxConcurrentDownloads.Name = "maxConcurrentDownloads";
-            this.maxConcurrentDownloads.Size = new System.Drawing.Size(121, 20);
+            this.maxConcurrentDownloads.Size = new System.Drawing.Size(43, 20);
             this.maxConcurrentDownloads.TabIndex = 13;
             this.maxConcurrentDownloads.Value = new decimal(new int[] {
             1,
@@ -783,7 +811,7 @@
             // label18
             // 
             this.label18.AutoSize = true;
-            this.label18.Location = new System.Drawing.Point(20, 98);
+            this.label18.Location = new System.Drawing.Point(5, 43);
             this.label18.Name = "label18";
             this.label18.Size = new System.Drawing.Size(127, 13);
             this.label18.TabIndex = 12;
@@ -791,15 +819,15 @@
             // 
             // shellCommandAllowList
             // 
-            this.shellCommandAllowList.Location = new System.Drawing.Point(176, 95);
+            this.shellCommandAllowList.Location = new System.Drawing.Point(161, 40);
             this.shellCommandAllowList.Name = "shellCommandAllowList";
-            this.shellCommandAllowList.Size = new System.Drawing.Size(121, 20);
+            this.shellCommandAllowList.Size = new System.Drawing.Size(263, 20);
             this.shellCommandAllowList.TabIndex = 11;
             // 
             // enableShellCommandsCb
             // 
             this.enableShellCommandsCb.AutoSize = true;
-            this.enableShellCommandsCb.Location = new System.Drawing.Point(176, 72);
+            this.enableShellCommandsCb.Location = new System.Drawing.Point(247, 220);
             this.enableShellCommandsCb.Name = "enableShellCommandsCb";
             this.enableShellCommandsCb.Size = new System.Drawing.Size(140, 17);
             this.enableShellCommandsCb.TabIndex = 10;
@@ -809,7 +837,7 @@
             // doubleBufferingCheckBox
             // 
             this.doubleBufferingCheckBox.AutoSize = true;
-            this.doubleBufferingCheckBox.Location = new System.Drawing.Point(176, 49);
+            this.doubleBufferingCheckBox.Location = new System.Drawing.Point(247, 197);
             this.doubleBufferingCheckBox.Name = "doubleBufferingCheckBox";
             this.doubleBufferingCheckBox.Size = new System.Drawing.Size(141, 17);
             this.doubleBufferingCheckBox.TabIndex = 4;
@@ -818,9 +846,9 @@
             // 
             // numericUpDownEmptyRegions
             // 
-            this.numericUpDownEmptyRegions.Location = new System.Drawing.Point(176, 23);
+            this.numericUpDownEmptyRegions.Location = new System.Drawing.Point(161, 8);
             this.numericUpDownEmptyRegions.Name = "numericUpDownEmptyRegions";
-            this.numericUpDownEmptyRegions.Size = new System.Drawing.Size(121, 20);
+            this.numericUpDownEmptyRegions.Size = new System.Drawing.Size(44, 20);
             this.numericUpDownEmptyRegions.TabIndex = 1;
             this.numericUpDownEmptyRegions.Value = new decimal(new int[] {
             10,
@@ -831,7 +859,7 @@
             // label15
             // 
             this.label15.AutoSize = true;
-            this.label15.Location = new System.Drawing.Point(20, 25);
+            this.label15.Location = new System.Drawing.Point(5, 10);
             this.label15.Name = "label15";
             this.label15.Size = new System.Drawing.Size(136, 13);
             this.label15.TabIndex = 0;
@@ -896,27 +924,31 @@
             this.xmds1.Url = "http://localhost/Xibo/server/xmds.php";
             this.xmds1.UseDefaultCredentials = false;
             // 
-            // label22
-            // 
-            this.label22.AutoSize = true;
-            this.label22.Location = new System.Drawing.Point(23, 206);
-            this.label22.Name = "label22";
-            this.label22.Size = new System.Drawing.Size(102, 13);
-            this.label22.TabIndex = 20;
-            this.label22.Text = "Cursor Start Position";
-            // 
-            // cursorStartPosition
-            // 
-            this.cursorStartPosition.FormattingEnabled = true;
-            this.cursorStartPosition.Items.AddRange(new object[] {
-            "Top Left",
-            "Top Right",
-            "Bottom Left",
-            "Bottom Right"});
-            this.cursorStartPosition.Location = new System.Drawing.Point(176, 203);
-            this.cursorStartPosition.Name = "cursorStartPosition";
-            this.cursorStartPosition.Size = new System.Drawing.Size(121, 21);
-            this.cursorStartPosition.TabIndex = 21;
+            // label23
+            // 
+            this.label23.AutoSize = true;
+            this.label23.Location = new System.Drawing.Point(5, 158);
+            this.label23.Name = "label23";
+            this.label23.Size = new System.Drawing.Size(92, 13);
+            this.label23.TabIndex = 22;
+            this.label23.Text = "Client Info HotKey";
+            // 
+            // clientInfoHotKeyTextBox
+            // 
+            this.clientInfoHotKeyTextBox.Location = new System.Drawing.Point(161, 158);
+            this.clientInfoHotKeyTextBox.Name = "clientInfoHotKeyTextBox";
+            this.clientInfoHotKeyTextBox.Size = new System.Drawing.Size(263, 20);
+            this.clientInfoHotKeyTextBox.TabIndex = 23;
+            // 
+            // clientInfoCtrlModifierCheckBox
+            // 
+            this.clientInfoCtrlModifierCheckBox.AutoSize = true;
+            this.clientInfoCtrlModifierCheckBox.Location = new System.Drawing.Point(51, 197);
+            this.clientInfoCtrlModifierCheckBox.Name = "clientInfoCtrlModifierCheckBox";
+            this.clientInfoCtrlModifierCheckBox.Size = new System.Drawing.Size(177, 17);
+            this.clientInfoCtrlModifierCheckBox.TabIndex = 24;
+            this.clientInfoCtrlModifierCheckBox.Text = "Client Info CTRL Key Required?";
+            this.clientInfoCtrlModifierCheckBox.UseVisualStyleBackColor = true;
             // 
             // OptionForm
             // 
@@ -1037,5 +1069,8 @@
         private System.Windows.Forms.TextBox logToDiskLocation;
         private System.Windows.Forms.Label label22;
         private System.Windows.Forms.ComboBox cursorStartPosition;
+        private System.Windows.Forms.CheckBox clientInfoCtrlModifierCheckBox;
+        private System.Windows.Forms.TextBox clientInfoHotKeyTextBox;
+        private System.Windows.Forms.Label label23;
     }
 }
\ No newline at end of file

=== modified file 'client/dotNET/OptionForm.cs'
--- client/dotNET/OptionForm.cs	2014-02-09 15:08:13 +0000
+++ client/dotNET/OptionForm.cs	2014-07-15 15:37:37 +0000
@@ -1,6 +1,6 @@
 /*
  * Xibo - Digitial Signage - http://www.xibo.org.uk
- * Copyright (C) 2006-2012 Daniel Garner
+ * Copyright (C) 2006-2014 Daniel Garner
  *
  * This file is part of Xibo.
  *
@@ -105,6 +105,8 @@
             logToDiskLocation.Text = Settings.Default.LogToDiskLocation;
             showInTaskbar.Checked = Settings.Default.ShowInTaskbar;
             cursorStartPosition.Text = Settings.Default.CursorStartPosition;
+            clientInfoHotKeyTextBox.Text = Settings.Default.ClientInformationKeyCode;
+            clientInfoCtrlModifierCheckBox.Checked = Settings.Default.ClientInfomationCtrlKey;
 
             Debug.WriteLine("Loaded Options Form", "OptionForm");
         }
@@ -202,6 +204,8 @@
                 Settings.Default.LogToDiskLocation = logToDiskLocation.Text;
                 Settings.Default.ShowInTaskbar = showInTaskbar.Checked;
                 Settings.Default.CursorStartPosition = cursorStartPosition.Text;
+                Settings.Default.ClientInformationKeyCode = clientInfoHotKeyTextBox.Text;
+                Settings.Default.ClientInfomationCtrlKey = clientInfoCtrlModifierCheckBox.Checked;
 
                 // Commit these changes back to the user settings
                 Settings.Default.Save();

=== modified file 'client/dotNET/Properties/Settings.Designer.cs'
--- client/dotNET/Properties/Settings.Designer.cs	2014-03-09 14:46:20 +0000
+++ client/dotNET/Properties/Settings.Designer.cs	2014-07-15 15:37:37 +0000
@@ -541,5 +541,29 @@
                 return ((int)(this["ClientCodeVersion"]));
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("I")]
+        public string ClientInformationKeyCode {
+            get {
+                return ((string)(this["ClientInformationKeyCode"]));
+            }
+            set {
+                this["ClientInformationKeyCode"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("False")]
+        public bool ClientInfomationCtrlKey {
+            get {
+                return ((bool)(this["ClientInfomationCtrlKey"]));
+            }
+            set {
+                this["ClientInfomationCtrlKey"] = value;
+            }
+        }
     }
 }

=== modified file 'client/dotNET/Properties/Settings.settings'
--- client/dotNET/Properties/Settings.settings	2014-03-09 14:46:20 +0000
+++ client/dotNET/Properties/Settings.settings	2014-07-15 15:37:37 +0000
@@ -140,5 +140,11 @@
     <Setting Name="ClientCodeVersion" Type="System.Int32" Scope="Application">
       <Value Profile="(Default)">83</Value>
     </Setting>
+    <Setting Name="ClientInformationKeyCode" Type="System.String" Scope="User">
+      <Value Profile="(Default)">I</Value>
+    </Setting>
+    <Setting Name="ClientInfomationCtrlKey" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file

=== modified file 'client/dotNET/XiboClient.csproj'
--- client/dotNET/XiboClient.csproj	2013-11-09 12:14:38 +0000
+++ client/dotNET/XiboClient.csproj	2014-07-15 15:37:37 +0000
@@ -116,6 +116,7 @@
     </Compile>
     <Compile Include="BlackList.cs" />
     <Compile Include="CacheManager.cs" />
+    <Compile Include="KeyStore.cs" />
     <Compile Include="RegionOptions.cs" />
     <Compile Include="TemporaryFile.cs" />
     <Compile Include="VideoDS.cs">

=== modified file 'client/dotNET/app.config'
--- client/dotNET/app.config	2014-03-09 14:46:20 +0000
+++ client/dotNET/app.config	2014-07-15 15:37:37 +0000
@@ -115,6 +115,12 @@
    <setting name="CursorStartPosition" serializeAs="String">
     <value>Bottom Right</value>
    </setting>
+   <setting name="ClientInformationKeyCode" serializeAs="String">
+    <value>I</value>
+   </setting>
+   <setting name="ClientInfomationCtrlKey" serializeAs="String">
+    <value>False</value>
+   </setting>
   </XiboClient.Properties.Settings>
 	</userSettings>
 	<applicationSettings>

=== modified file 'default.mo'
Binary files default.mo	2014-03-29 16:01:24 +0000 and default.mo	2014-07-15 15:37:37 +0000 differ
=== modified file 'default.pot'
--- default.pot	2014-03-29 16:01:24 +0000
+++ default.pot	2014-07-15 15:37:37 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: Xibo Digital Signage\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-29 16:01-0000\n"
+"POT-Creation-Date: 2014-06-09 20:00-0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Dan Garner <[e-mail]>\n"
 "Language-Team:  <[e-mail]>\n"
@@ -10,7 +10,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Basepath: C:\\Users\\dan\\www\\release\\1.6.0-rc2\n"
+"X-Poedit-Basepath: C:\\Users\\dan\\www\\1.6\\server-162\n"
 "X-Poedit-KeywordsList: __;Translate\n"
 "X-Generator: Poedit 1.5.5\n"
 "X-Poedit-SearchPath-0: server\n"
@@ -37,7 +37,7 @@
 #: server/install.php:329 server/install.php:345 server/install.php:384
 #: server/install.php:413 server/install.php:516 server/upgrade.php:104
 #: server/upgrade.php:199 server/upgrade.php:206 server/upgrade.php:278
-#: server/lib/pages/schedule.class.php:1449
+#: server/lib/pages/schedule.class.php:1452
 msgid "Next"
 msgstr ""
 
@@ -409,6 +409,14 @@
 msgid "Maintenance key invalid."
 msgstr ""
 
+#: server/settings.php:11
+msgid "Sorry, you are not allowed to directly access this page."
+msgstr ""
+
+#: server/settings.php:11
+msgid "Please press the back button in your browser."
+msgstr ""
+
 #: server/upgrade.php:63
 msgid ""
 "Unable to connect to the MySQL database using the settings stored in "
@@ -658,8 +666,8 @@
 msgstr ""
 
 #: server/lib/app/helpmanager.class.php:54
-#: server/lib/modules/module.class.php:493
-#: server/lib/modules/module.class.php:1401
+#: server/lib/modules/module.class.php:498
+#: server/lib/modules/module.class.php:1433
 #: server/lib/pages/campaign.class.php:144
 #: server/lib/pages/campaign.class.php:214
 #: server/lib/pages/campaign.class.php:283
@@ -684,14 +692,14 @@
 #: server/lib/pages/displaygroup.class.php:156
 #: server/lib/pages/displaygroup.class.php:204
 #: server/lib/pages/displaygroup.class.php:232
-#: server/lib/pages/displaygroup.class.php:306
-#: server/lib/pages/displaygroup.class.php:540
-#: server/lib/pages/displaygroup.class.php:701
+#: server/lib/pages/displaygroup.class.php:309
+#: server/lib/pages/displaygroup.class.php:549
+#: server/lib/pages/displaygroup.class.php:710
 #: server/lib/pages/group.class.php:224 server/lib/pages/group.class.php:248
 #: server/lib/pages/group.class.php:342 server/lib/pages/group.class.php:501
 #: server/lib/pages/group.class.php:698 server/lib/pages/help.class.php:107
-#: server/lib/pages/layout.class.php:267 server/lib/pages/layout.class.php:512
-#: server/lib/pages/layout.class.php:598 server/lib/pages/layout.class.php:800
+#: server/lib/pages/layout.class.php:270 server/lib/pages/layout.class.php:515
+#: server/lib/pages/layout.class.php:601 server/lib/pages/layout.class.php:803
 #: server/lib/pages/log.class.php:182 server/lib/pages/module.class.php:201
 #: server/lib/pages/oauth.class.php:130 server/lib/pages/oauth.class.php:208
 #: server/lib/pages/oauth.class.php:286
@@ -699,11 +707,11 @@
 #: server/lib/pages/resolution.class.php:165
 #: server/lib/pages/resolution.class.php:190
 #: server/lib/pages/schedule.class.php:435
-#: server/lib/pages/schedule.class.php:1447
-#: server/lib/pages/schedule.class.php:1613
-#: server/lib/pages/schedule.class.php:1819
-#: server/lib/pages/schedule.class.php:1939
-#: server/lib/pages/schedule.class.php:2026
+#: server/lib/pages/schedule.class.php:1450
+#: server/lib/pages/schedule.class.php:1616
+#: server/lib/pages/schedule.class.php:1822
+#: server/lib/pages/schedule.class.php:1942
+#: server/lib/pages/schedule.class.php:2029
 #: server/lib/pages/sessions.class.php:152
 #: server/lib/pages/template.class.php:154
 #: server/lib/pages/template.class.php:256
@@ -722,22 +730,22 @@
 msgid "Help"
 msgstr ""
 
-#: server/lib/app/kit.class.php:240
+#: server/lib/app/kit.class.php:241
 #, php-format
 msgid "No integer match found for [%s] and return value is not an integer"
 msgstr ""
 
-#: server/lib/app/kit.class.php:254
+#: server/lib/app/kit.class.php:255
 #, php-format
 msgid "No integer match found for %s, and return value is not an integer"
 msgstr ""
 
-#: server/lib/app/kit.class.php:289
+#: server/lib/app/kit.class.php:290
 #, php-format
 msgid "No integer found for %s, and return value is not an integer"
 msgstr ""
 
-#: server/lib/app/kit.class.php:355
+#: server/lib/app/kit.class.php:360
 #, php-format
 msgid "Unknown Type %s"
 msgstr ""
@@ -800,21 +808,22 @@
 msgstr ""
 
 #: server/lib/data/campaign.data.class.php:104
-#: server/lib/modules/module.class.php:1440
-#: server/lib/modules/module.class.php:1446
-#: server/lib/modules/module.class.php:1476
-#: server/lib/modules/module.class.php:1481
+#: server/lib/modules/module.class.php:1472
+#: server/lib/modules/module.class.php:1478
+#: server/lib/modules/module.class.php:1508
 #: server/lib/modules/module.class.php:1513
-#: server/lib/modules/module.class.php:1518
+#: server/lib/modules/module.class.php:1545
+#: server/lib/modules/module.class.php:1550
 #: server/lib/pages/campaign.class.php:416
 #: server/lib/pages/campaign.class.php:443
 #: server/lib/pages/campaign.class.php:472
 #: server/lib/pages/dataset.class.php:938
 #: server/lib/pages/dataset.class.php:965
 #: server/lib/pages/dataset.class.php:994
-#: server/lib/pages/displaygroup.class.php:570
-#: server/lib/pages/displaygroup.class.php:597
-#: server/lib/pages/displaygroup.class.php:626
+#: server/lib/pages/displaygroup.class.php:342
+#: server/lib/pages/displaygroup.class.php:579
+#: server/lib/pages/displaygroup.class.php:606
+#: server/lib/pages/displaygroup.class.php:635
 #: server/lib/pages/template.class.php:400
 #: server/lib/pages/template.class.php:427
 #: server/lib/pages/template.class.php:456
@@ -1041,11 +1050,12 @@
 #: server/lib/data/mediagroupsecurity.data.class.php:98
 #: server/lib/data/region.data.class.php:627
 #: server/lib/data/region.data.class.php:670
-#: server/lib/data/region.data.class.php:975
+#: server/lib/data/region.data.class.php:977
 #: server/lib/data/schedule.data.class.php:413
 #: server/lib/data/schedule.data.class.php:601
 #: server/lib/data/usergroup.data.class.php:337
-#: server/lib/modules/module.class.php:1058
+#: server/lib/modules/module.class.php:1063
+#: server/lib/modules/module.class.php:1279
 #: server/lib/pages/error.class.php:49
 msgid "Unknown Error"
 msgstr ""
@@ -1182,7 +1192,7 @@
 msgstr ""
 
 #: server/lib/data/displaygroup.data.class.php:435
-#: server/lib/pages/displaygroup.class.php:860
+#: server/lib/pages/displaygroup.class.php:869
 msgid ""
 "You have selected media that you no longer have permission to use. Please "
 "reload the form."
@@ -1324,7 +1334,7 @@
 msgstr ""
 
 #: server/lib/data/layout.data.class.php:843
-#: server/lib/pages/layout.class.php:587
+#: server/lib/pages/layout.class.php:590
 msgid "Unable to get the Resolution information"
 msgstr ""
 
@@ -1369,7 +1379,7 @@
 
 #: server/lib/data/media.data.class.php:61
 #: server/lib/data/media.data.class.php:251
-#: server/lib/modules/module.class.php:797
+#: server/lib/modules/module.class.php:802
 #, php-format
 msgid "Your library is full. Library Limit: %s K"
 msgstr ""
@@ -1385,8 +1395,8 @@
 
 #: server/lib/data/media.data.class.php:81
 #: server/lib/data/media.data.class.php:190
-#: server/modules/datasetview.module.php:252
-#: server/modules/datasetview.module.php:309
+#: server/modules/datasetview.module.php:231
+#: server/modules/datasetview.module.php:288
 msgid "You must enter a duration."
 msgstr ""
 
@@ -1452,7 +1462,6 @@
 msgstr ""
 
 #: server/lib/data/region.data.class.php:81
-#: server/lib/data/region.data.class.php:559
 msgid "Size and coordinates must be generic"
 msgstr ""
 
@@ -1478,13 +1487,17 @@
 msgid "Database error deleting this link record."
 msgstr ""
 
-#: server/lib/data/region.data.class.php:932
+#: server/lib/data/region.data.class.php:559
+msgid "Size and coordinates must be numeric"
+msgstr ""
+
+#: server/lib/data/region.data.class.php:934
 msgid ""
 "You have selected media that you no longer have permission to use. Please "
 "reload Library form."
 msgstr ""
 
-#: server/lib/data/region.data.class.php:941
+#: server/lib/data/region.data.class.php:943
 #: server/lib/service/rest.class.php:1037
 msgid "Error getting type from a media item."
 msgstr ""
@@ -1678,154 +1691,155 @@
 msgid "Cannot find this media item. Please refresh the region options."
 msgstr ""
 
-#: server/lib/modules/module.class.php:256
+#: server/lib/modules/module.class.php:248
+#: server/lib/modules/module.class.php:260
 msgid "Unable to find media record with the provided ID"
 msgstr ""
 
-#: server/lib/modules/module.class.php:410
+#: server/lib/modules/module.class.php:415
 msgid "There is an error in the HTML/XML"
 msgstr ""
 
-#: server/lib/modules/module.class.php:458
+#: server/lib/modules/module.class.php:463
 msgid "Unable to Remove this media from the Layout"
 msgstr ""
 
-#: server/lib/modules/module.class.php:468
+#: server/lib/modules/module.class.php:473
 msgid "Unable to assign to the Region"
 msgstr ""
 
-#: server/lib/modules/module.class.php:476
+#: server/lib/modules/module.class.php:481
 msgid "Error adding this media to the library"
 msgstr ""
 
-#: server/lib/modules/module.class.php:511
+#: server/lib/modules/module.class.php:516
 msgid "Return to the Region Options"
 msgstr ""
 
-#: server/lib/modules/module.class.php:512
+#: server/lib/modules/module.class.php:517
 msgid "Are you sure you want to remove this item?"
 msgstr ""
 
-#: server/lib/modules/module.class.php:513
+#: server/lib/modules/module.class.php:518
 msgid "It will be lost"
 msgstr ""
 
-#: server/lib/modules/module.class.php:514
-#: server/lib/modules/module.class.php:528
-#: server/lib/modules/module.class.php:629
+#: server/lib/modules/module.class.php:519
+#: server/lib/modules/module.class.php:533
+#: server/lib/modules/module.class.php:634
 #: server/lib/pages/campaign.class.php:285
 #: server/lib/pages/display.class.php:478
 #: server/lib/pages/display.class.php:616
 #: server/lib/pages/displaygroup.class.php:234
 #: server/lib/pages/group.class.php:344 server/lib/pages/help.class.php:256
-#: server/lib/pages/layout.class.php:269 server/lib/pages/log.class.php:184
+#: server/lib/pages/layout.class.php:272 server/lib/pages/log.class.php:184
 #: server/lib/pages/resolution.class.php:192
-#: server/lib/pages/schedule.class.php:1821
-#: server/lib/pages/schedule.class.php:2028
+#: server/lib/pages/schedule.class.php:1824
+#: server/lib/pages/schedule.class.php:2031
 #: server/lib/pages/sessions.class.php:154
 #: server/lib/pages/template.class.php:258
 #: server/lib/pages/timeline.class.php:334 server/lib/pages/user.class.php:574
 msgid "Yes"
 msgstr ""
 
-#: server/lib/modules/module.class.php:515
-#: server/lib/modules/module.class.php:527
-#: server/lib/modules/module.class.php:625
-#: server/lib/modules/module.class.php:627
+#: server/lib/modules/module.class.php:520
+#: server/lib/modules/module.class.php:532
+#: server/lib/modules/module.class.php:630
+#: server/lib/modules/module.class.php:632
 #: server/lib/pages/campaign.class.php:284
 #: server/lib/pages/display.class.php:477
 #: server/lib/pages/display.class.php:616
 #: server/lib/pages/displaygroup.class.php:233
 #: server/lib/pages/group.class.php:343 server/lib/pages/help.class.php:255
-#: server/lib/pages/layout.class.php:268 server/lib/pages/log.class.php:183
+#: server/lib/pages/layout.class.php:271 server/lib/pages/log.class.php:183
 #: server/lib/pages/resolution.class.php:191
-#: server/lib/pages/schedule.class.php:1820
-#: server/lib/pages/schedule.class.php:2027
+#: server/lib/pages/schedule.class.php:1823
+#: server/lib/pages/schedule.class.php:2030
 #: server/lib/pages/sessions.class.php:153
 #: server/lib/pages/template.class.php:257
 #: server/lib/pages/timeline.class.php:335 server/lib/pages/user.class.php:573
 msgid "No"
 msgstr ""
 
-#: server/lib/modules/module.class.php:536
+#: server/lib/modules/module.class.php:541
 msgid "Unassign from this region only"
 msgstr ""
 
-#: server/lib/modules/module.class.php:551
-#: server/lib/modules/module.class.php:935
+#: server/lib/modules/module.class.php:556
+#: server/lib/modules/module.class.php:940
 msgid "Error querying for the Media information"
 msgstr ""
 
-#: server/lib/modules/module.class.php:556
+#: server/lib/modules/module.class.php:561
 msgid "Unassign from this region and retire"
 msgstr ""
 
-#: server/lib/modules/module.class.php:578
+#: server/lib/modules/module.class.php:583
 msgid "Cannot determine if this media has been used."
 msgstr ""
 
-#: server/lib/modules/module.class.php:585
+#: server/lib/modules/module.class.php:590
 msgid "Delete this media"
 msgstr ""
 
-#: server/lib/modules/module.class.php:589
+#: server/lib/modules/module.class.php:594
 msgid "Unassign from all Layouts"
 msgstr ""
 
-#: server/lib/modules/module.class.php:590
+#: server/lib/modules/module.class.php:595
 msgid "Retire this media"
 msgstr ""
 
-#: server/lib/modules/module.class.php:598
+#: server/lib/modules/module.class.php:603
 msgid "You do not have permission to alter/delete this media."
 msgstr ""
 
-#: server/lib/modules/module.class.php:608
+#: server/lib/modules/module.class.php:613
 msgid "Are you sure you want to delete this media?"
 msgstr ""
 
-#: server/lib/modules/module.class.php:609
+#: server/lib/modules/module.class.php:614
 msgid "Please select from the following options"
 msgstr ""
 
-#: server/lib/modules/module.class.php:610
+#: server/lib/modules/module.class.php:615
 msgid "Deleting media cannot be undone"
 msgstr ""
 
-#: server/lib/modules/module.class.php:633
+#: server/lib/modules/module.class.php:638
 msgid "Delete Media"
 msgstr ""
 
-#: server/lib/modules/module.class.php:706
+#: server/lib/modules/module.class.php:711
 msgid "Completed Successfully"
 msgstr ""
 
-#: server/lib/modules/module.class.php:762
+#: server/lib/modules/module.class.php:767
 msgid "Media unassigned from all Layouts"
 msgstr ""
 
-#: server/lib/modules/module.class.php:772
-#: server/lib/modules/module.class.php:890
+#: server/lib/modules/module.class.php:777
+#: server/lib/modules/module.class.php:895
 msgid "Not yet implemented by this module."
 msgstr ""
 
-#: server/lib/modules/module.class.php:775
-#: server/lib/modules/module.class.php:893
+#: server/lib/modules/module.class.php:780
+#: server/lib/modules/module.class.php:898
 msgid "Add Item"
 msgstr ""
 
-#: server/lib/modules/module.class.php:842
+#: server/lib/modules/module.class.php:847
 msgid "Assign to Layout"
 msgstr ""
 
-#: server/lib/modules/module.class.php:843
+#: server/lib/modules/module.class.php:848
 msgid "View Library"
 msgstr ""
 
-#: server/lib/modules/module.class.php:844
-#: server/lib/modules/module.class.php:848
-#: server/lib/modules/module.class.php:852
-#: server/lib/modules/module.class.php:859
+#: server/lib/modules/module.class.php:849
+#: server/lib/modules/module.class.php:853
+#: server/lib/modules/module.class.php:857
+#: server/lib/modules/module.class.php:864
 #: server/lib/pages/admin.class.php:588 server/lib/pages/admin.class.php:611
 #: server/lib/pages/content.class.php:209
 #: server/lib/pages/dataset.class.php:373
@@ -1838,13 +1852,13 @@
 msgid "Close"
 msgstr ""
 
-#: server/lib/modules/module.class.php:952
-#: server/lib/modules/module.class.php:956
-#: server/lib/modules/module.class.php:960
-#: server/lib/modules/module.class.php:1404
-#: server/lib/modules/module.class.php:1407
-#: server/lib/modules/module.class.php:1654
-#: server/lib/modules/module.class.php:1656
+#: server/lib/modules/module.class.php:957
+#: server/lib/modules/module.class.php:961
+#: server/lib/modules/module.class.php:965
+#: server/lib/modules/module.class.php:1436
+#: server/lib/modules/module.class.php:1439
+#: server/lib/modules/module.class.php:1686
+#: server/lib/modules/module.class.php:1688
 #: server/lib/pages/admin.class.php:672
 #: server/lib/pages/campaign.class.php:145
 #: server/lib/pages/campaign.class.php:215
@@ -1865,20 +1879,20 @@
 #: server/lib/pages/display.class.php:825
 #: server/lib/pages/displaygroup.class.php:157
 #: server/lib/pages/displaygroup.class.php:205
-#: server/lib/pages/displaygroup.class.php:307
-#: server/lib/pages/displaygroup.class.php:541
-#: server/lib/pages/displaygroup.class.php:702
-#: server/lib/pages/displaygroup.class.php:836
+#: server/lib/pages/displaygroup.class.php:310
+#: server/lib/pages/displaygroup.class.php:550
+#: server/lib/pages/displaygroup.class.php:711
+#: server/lib/pages/displaygroup.class.php:845
 #: server/lib/pages/group.class.php:225 server/lib/pages/group.class.php:699
 #: server/lib/pages/help.class.php:195 server/lib/pages/help.class.php:233
-#: server/lib/pages/layout.class.php:513 server/lib/pages/layout.class.php:600
-#: server/lib/pages/layout.class.php:801 server/lib/pages/module.class.php:202
+#: server/lib/pages/layout.class.php:516 server/lib/pages/layout.class.php:603
+#: server/lib/pages/layout.class.php:804 server/lib/pages/module.class.php:202
 #: server/lib/pages/oauth.class.php:209
 #: server/lib/pages/resolution.class.php:125
 #: server/lib/pages/resolution.class.php:166
-#: server/lib/pages/schedule.class.php:1448
-#: server/lib/pages/schedule.class.php:1615
-#: server/lib/pages/schedule.class.php:1940
+#: server/lib/pages/schedule.class.php:1451
+#: server/lib/pages/schedule.class.php:1618
+#: server/lib/pages/schedule.class.php:1943
 #: server/lib/pages/template.class.php:155
 #: server/lib/pages/template.class.php:368
 #: server/lib/pages/timeline.class.php:190
@@ -1888,10 +1902,10 @@
 #: server/lib/pages/user.class.php:547 server/lib/pages/user.class.php:601
 #: server/modules/counter.module.php:60 server/modules/counter.module.php:64
 #: server/modules/counter.module.php:126 server/modules/counter.module.php:130
-#: server/modules/datasetview.module.php:86
-#: server/modules/datasetview.module.php:90
-#: server/modules/datasetview.module.php:206
-#: server/modules/datasetview.module.php:210
+#: server/modules/datasetview.module.php:65
+#: server/modules/datasetview.module.php:69
+#: server/modules/datasetview.module.php:185
+#: server/modules/datasetview.module.php:189
 #: server/modules/embedded.module.php:67 server/modules/embedded.module.php:71
 #: server/modules/embedded.module.php:135
 #: server/modules/embedded.module.php:139
@@ -1917,9 +1931,9 @@
 msgid "Cancel"
 msgstr ""
 
-#: server/lib/modules/module.class.php:963
-#: server/lib/modules/module.class.php:1410
-#: server/lib/modules/module.class.php:1659
+#: server/lib/modules/module.class.php:968
+#: server/lib/modules/module.class.php:1442
+#: server/lib/modules/module.class.php:1691
 #: server/lib/pages/admin.class.php:168
 #: server/lib/pages/campaign.class.php:146
 #: server/lib/pages/campaign.class.php:216
@@ -1933,18 +1947,18 @@
 #: server/lib/pages/display.class.php:731
 #: server/lib/pages/displaygroup.class.php:158
 #: server/lib/pages/displaygroup.class.php:206
-#: server/lib/pages/displaygroup.class.php:308
-#: server/lib/pages/displaygroup.class.php:542
-#: server/lib/pages/displaygroup.class.php:837
+#: server/lib/pages/displaygroup.class.php:311
+#: server/lib/pages/displaygroup.class.php:551
+#: server/lib/pages/displaygroup.class.php:846
 #: server/lib/pages/group.class.php:226 server/lib/pages/group.class.php:700
 #: server/lib/pages/help.class.php:196 server/lib/pages/help.class.php:234
-#: server/lib/pages/layout.class.php:514 server/lib/pages/layout.class.php:601
+#: server/lib/pages/layout.class.php:517 server/lib/pages/layout.class.php:604
 #: server/lib/pages/module.class.php:203
 #: server/lib/pages/resolution.class.php:126
 #: server/lib/pages/resolution.class.php:167
-#: server/lib/pages/schedule.class.php:1450
-#: server/lib/pages/schedule.class.php:1616
-#: server/lib/pages/schedule.class.php:1941
+#: server/lib/pages/schedule.class.php:1453
+#: server/lib/pages/schedule.class.php:1619
+#: server/lib/pages/schedule.class.php:1944
 #: server/lib/pages/template.class.php:156
 #: server/lib/pages/template.class.php:369
 #: server/lib/pages/timeline.class.php:191
@@ -1953,8 +1967,8 @@
 #: server/lib/pages/user.class.php:548 server/lib/pages/user.class.php:602
 #: server/lib/pages/user.class.php:693 server/lib/pages/user.class.php:744
 #: server/modules/counter.module.php:70 server/modules/counter.module.php:136
-#: server/modules/datasetview.module.php:93
-#: server/modules/datasetview.module.php:213
+#: server/modules/datasetview.module.php:72
+#: server/modules/datasetview.module.php:192
 #: server/modules/embedded.module.php:79
 #: server/modules/embedded.module.php:147
 #: server/modules/localvideo.module.php:78
@@ -1970,21 +1984,21 @@
 msgid "Save"
 msgstr ""
 
-#: server/lib/modules/module.class.php:1001
+#: server/lib/modules/module.class.php:1006
 msgid "Add Media has not been implemented for this module."
 msgstr ""
 
-#: server/lib/modules/module.class.php:1048
+#: server/lib/modules/module.class.php:1053
 msgid "Unable to get the storage name"
 msgstr ""
 
-#: server/lib/modules/module.class.php:1084
+#: server/lib/modules/module.class.php:1089
 msgid "Edit Media has not been implemented for this module."
 msgstr ""
 
-#: server/lib/modules/module.class.php:1300
-#: server/lib/pages/schedule.class.php:1195
-#: server/lib/pages/schedule.class.php:1315
+#: server/lib/modules/module.class.php:1332
+#: server/lib/pages/schedule.class.php:1198
+#: server/lib/pages/schedule.class.php:1318
 #: server/modules/ticker.module.php:433
 #: server/theme/default/html/displaygroup_fileassociations_form_assign.php:49
 #: server/theme/default/html/displaygroup_fileassociations_form_assign_list.php:27
@@ -2001,10 +2015,10 @@
 msgid "Type"
 msgstr ""
 
-#: server/lib/modules/module.class.php:1301
+#: server/lib/modules/module.class.php:1333
 #: server/lib/pages/schedule.class.php:462
-#: server/lib/pages/schedule.class.php:1194
-#: server/lib/pages/schedule.class.php:1314
+#: server/lib/pages/schedule.class.php:1197
+#: server/lib/pages/schedule.class.php:1317
 #: server/theme/default/html/campaign_form_add.php:31
 #: server/theme/default/html/campaign_form_edit.php:32
 #: server/theme/default/html/campaign_form_layout_assign.php:47
@@ -2045,7 +2059,7 @@
 msgid "Name"
 msgstr ""
 
-#: server/lib/modules/module.class.php:1302
+#: server/lib/modules/module.class.php:1334
 #: server/modules/localvideo.module.php:48
 #: server/modules/localvideo.module.php:112
 #: server/modules/ticker.module.php:435
@@ -2071,18 +2085,18 @@
 msgid "Duration"
 msgstr ""
 
-#: server/lib/modules/module.class.php:1314
+#: server/lib/modules/module.class.php:1346
 #: server/modules/ticker.module.php:452
 msgid "seconds"
 msgstr ""
 
-#: server/lib/modules/module.class.php:1338
+#: server/lib/modules/module.class.php:1370
 msgid "You do not have permissions to edit this media"
 msgstr ""
 
-#: server/lib/modules/module.class.php:1347
+#: server/lib/modules/module.class.php:1379
 #: server/lib/pages/schedule.class.php:477
-#: server/lib/pages/schedule.class.php:1329
+#: server/lib/pages/schedule.class.php:1332
 #: server/lib/pages/timeline.class.php:504
 #: server/theme/default/html/campaign_form_permissions.php:39
 #: server/theme/default/html/dataset_form_permissions.php:39
@@ -2091,7 +2105,7 @@
 msgid "Group"
 msgstr ""
 
-#: server/lib/modules/module.class.php:1348
+#: server/lib/modules/module.class.php:1380
 #: server/lib/pages/timeline.class.php:505
 #: server/theme/default/html/campaign_form_permissions.php:40
 #: server/theme/default/html/dataset_form_permissions.php:40
@@ -2100,7 +2114,7 @@
 msgid "View"
 msgstr ""
 
-#: server/lib/modules/module.class.php:1349
+#: server/lib/modules/module.class.php:1381
 #: server/lib/pages/campaign.class.php:93
 #: server/lib/pages/content.class.php:127
 #: server/lib/pages/dataset.class.php:102
@@ -2109,7 +2123,7 @@
 #: server/lib/pages/display.class.php:345
 #: server/lib/pages/displaygroup.class.php:91
 #: server/lib/pages/group.class.php:144 server/lib/pages/help.class.php:153
-#: server/lib/pages/layout.class.php:422
+#: server/lib/pages/layout.class.php:425
 #: server/lib/pages/mediamanager.class.php:158
 #: server/lib/pages/module.class.php:135
 #: server/lib/pages/resolution.class.php:87
@@ -2125,7 +2139,7 @@
 msgid "Edit"
 msgstr ""
 
-#: server/lib/modules/module.class.php:1350
+#: server/lib/modules/module.class.php:1382
 #: server/lib/pages/campaign.class.php:103
 #: server/lib/pages/content.class.php:137
 #: server/lib/pages/dataset.class.php:119
@@ -2135,10 +2149,10 @@
 #: server/lib/pages/display.class.php:369
 #: server/lib/pages/displaygroup.class.php:108
 #: server/lib/pages/group.class.php:151 server/lib/pages/help.class.php:160
-#: server/lib/pages/layout.class.php:438 server/lib/pages/layout.class.php:746
+#: server/lib/pages/layout.class.php:441 server/lib/pages/layout.class.php:749
 #: server/lib/pages/resolution.class.php:94
 #: server/lib/pages/schedule.class.php:482
-#: server/lib/pages/schedule.class.php:1614
+#: server/lib/pages/schedule.class.php:1617
 #: server/lib/pages/template.class.php:112
 #: server/lib/pages/timeline.class.php:349
 #: server/lib/pages/timeline.class.php:507
@@ -2150,11 +2164,11 @@
 msgid "Delete"
 msgstr ""
 
-#: server/lib/modules/module.class.php:1381
+#: server/lib/modules/module.class.php:1413
 msgid "Unable to get permissions for this layout"
 msgstr ""
 
-#: server/lib/modules/module.class.php:1400
+#: server/lib/modules/module.class.php:1432
 #: server/lib/pages/campaign.class.php:113
 #: server/lib/pages/campaign.class.php:387
 #: server/lib/pages/content.class.php:147
@@ -2162,8 +2176,8 @@
 #: server/lib/pages/dataset.class.php:909
 #: server/lib/pages/display.class.php:386
 #: server/lib/pages/displaygroup.class.php:118
-#: server/lib/pages/displaygroup.class.php:539
-#: server/lib/pages/layout.class.php:448 server/lib/pages/layout.class.php:747
+#: server/lib/pages/displaygroup.class.php:548
+#: server/lib/pages/layout.class.php:451 server/lib/pages/layout.class.php:750
 #: server/lib/pages/template.class.php:122
 #: server/lib/pages/template.class.php:366
 #: server/lib/pages/timeline.class.php:546
@@ -2175,124 +2189,124 @@
 msgid "Permissions"
 msgstr ""
 
-#: server/lib/modules/module.class.php:1433
-#: server/lib/pages/layout.class.php:65 server/lib/pages/layout.class.php:530
-#: server/lib/pages/layout.class.php:625
+#: server/lib/modules/module.class.php:1465
+#: server/lib/pages/layout.class.php:65 server/lib/pages/layout.class.php:533
+#: server/lib/pages/layout.class.php:628
 msgid "You do not have permissions to edit this layout"
 msgstr ""
 
-#: server/lib/modules/module.class.php:1522
+#: server/lib/modules/module.class.php:1554
 #: server/lib/pages/campaign.class.php:475
 #: server/lib/pages/dataset.class.php:997
-#: server/lib/pages/displaygroup.class.php:629
+#: server/lib/pages/displaygroup.class.php:638
 #: server/lib/pages/template.class.php:459
 #: server/lib/pages/timeline.class.php:634
 msgid "Permissions Changed"
 msgstr ""
 
-#: server/lib/modules/module.class.php:1595
-#: server/lib/modules/module.class.php:1707
-#: server/lib/modules/module.class.php:1740
+#: server/lib/modules/module.class.php:1627
+#: server/lib/modules/module.class.php:1739
+#: server/lib/modules/module.class.php:1772
 msgid "Unknown transition type"
 msgstr ""
 
-#: server/lib/modules/module.class.php:1607
+#: server/lib/modules/module.class.php:1639
 #: server/lib/pages/timeline.class.php:169
 msgid "North"
 msgstr ""
 
-#: server/lib/modules/module.class.php:1608
+#: server/lib/modules/module.class.php:1640
 #: server/lib/pages/timeline.class.php:170
 msgid "North East"
 msgstr ""
 
-#: server/lib/modules/module.class.php:1609
+#: server/lib/modules/module.class.php:1641
 #: server/lib/pages/timeline.class.php:171
 msgid "East"
 msgstr ""
 
-#: server/lib/modules/module.class.php:1610
+#: server/lib/modules/module.class.php:1642
 #: server/lib/pages/timeline.class.php:172
 msgid "South East"
 msgstr ""
 
-#: server/lib/modules/module.class.php:1611
+#: server/lib/modules/module.class.php:1643
 #: server/lib/pages/timeline.class.php:173
 msgid "South"
 msgstr ""
 
-#: server/lib/modules/module.class.php:1612
+#: server/lib/modules/module.class.php:1644
 #: server/lib/pages/timeline.class.php:174
 msgid "South West"
 msgstr ""
 
-#: server/lib/modules/module.class.php:1613
+#: server/lib/modules/module.class.php:1645
 #: server/lib/pages/timeline.class.php:175
 msgid "West"
 msgstr ""
 
-#: server/lib/modules/module.class.php:1614
+#: server/lib/modules/module.class.php:1646
 #: server/lib/pages/timeline.class.php:176
 msgid "North West"
 msgstr ""
 
-#: server/lib/modules/module.class.php:1621
+#: server/lib/modules/module.class.php:1653
 msgid "What transition should be applied to this media item?"
 msgstr ""
 
-#: server/lib/modules/module.class.php:1622
+#: server/lib/modules/module.class.php:1654
 #: server/theme/default/html/region_form_options.php:56
 msgid "The duration for this transition, in milliseconds."
 msgstr ""
 
-#: server/lib/modules/module.class.php:1623
+#: server/lib/modules/module.class.php:1655
 msgid "The direction for this transition."
 msgstr ""
 
-#: server/lib/modules/module.class.php:1744 server/modules/text.module.php:52
+#: server/lib/modules/module.class.php:1776 server/modules/text.module.php:52
 #: server/modules/text.module.php:130 server/modules/ticker.module.php:132
 #: server/modules/webpage.module.php:51 server/modules/webpage.module.php:108
 msgid "None"
 msgstr ""
 
-#: server/lib/modules/module.class.php:1761
+#: server/lib/modules/module.class.php:1793
 msgid "No XLF provided"
 msgstr ""
 
-#: server/lib/modules/module.class.php:1769
+#: server/lib/modules/module.class.php:1801
 msgid "Invalid XLF"
 msgstr ""
 
-#: server/lib/modules/module.class.php:1797
+#: server/lib/modules/module.class.php:1829
 msgid "Too many media nodes"
 msgstr ""
 
-#: server/lib/modules/module.class.php:1804
+#: server/lib/modules/module.class.php:1836
 msgid "SchemaVersion does not match"
 msgstr ""
 
-#: server/lib/modules/module.class.php:1808
+#: server/lib/modules/module.class.php:1840
 msgid "Media Type does not match"
 msgstr ""
 
-#: server/lib/modules/module.class.php:1817
+#: server/lib/modules/module.class.php:1849
 #, php-format
 msgid "ID does not match [%s vs %s]"
 msgstr ""
 
-#: server/lib/modules/module.class.php:1821
+#: server/lib/modules/module.class.php:1853
 msgid "UserId does not match"
 msgstr ""
 
-#: server/lib/modules/module.class.php:1836
+#: server/lib/modules/module.class.php:1868
 msgid "ID does not match"
 msgstr ""
 
-#: server/lib/modules/module.class.php:1848
+#: server/lib/modules/module.class.php:1880
 msgid "Duration not provided or not a number"
 msgstr ""
 
-#: server/lib/modules/module.class.php:1851
+#: server/lib/modules/module.class.php:1883
 msgid "Cannot be less than zero"
 msgstr ""
 
@@ -2516,8 +2530,8 @@
 
 #: server/lib/pages/campaign.class.php:76
 #: server/lib/pages/display.class.php:322
-#: server/lib/pages/layout.class.php:399
-#: server/lib/pages/schedule.class.php:1938
+#: server/lib/pages/layout.class.php:402
+#: server/lib/pages/schedule.class.php:1941
 #: server/theme/default/html/layout_designer.php:49
 msgid "Schedule Now"
 msgstr ""
@@ -2644,7 +2658,7 @@
 msgstr ""
 
 #: server/lib/pages/content.class.php:260
-#: server/lib/pages/displaygroup.class.php:703
+#: server/lib/pages/displaygroup.class.php:712
 msgid "Assign"
 msgstr ""
 
@@ -2798,7 +2812,7 @@
 msgstr ""
 
 #: server/lib/pages/dataset.class.php:1097
-msgid "Files with a CSV extention only."
+msgid "Files with a CSV extension only."
 msgstr ""
 
 #: server/lib/pages/dataset.class.php:1134
@@ -2929,13 +2943,13 @@
 msgstr ""
 
 #: server/lib/pages/display.class.php:728
-#: server/lib/pages/displaygroup.class.php:305
+#: server/lib/pages/displaygroup.class.php:308
 #: server/lib/pages/group.class.php:697
 msgid "Manage Membership"
 msgstr ""
 
 #: server/lib/pages/display.class.php:797
-#: server/lib/pages/displaygroup.class.php:470
+#: server/lib/pages/displaygroup.class.php:479
 #: server/lib/pages/group.class.php:765
 msgid "Group membership set"
 msgstr ""
@@ -2967,12 +2981,12 @@
 
 #: server/lib/pages/displaygroup.class.php:177
 #: server/lib/pages/displaygroup.class.php:222
-#: server/lib/pages/displaygroup.class.php:359
-#: server/lib/pages/displaygroup.class.php:391
-#: server/lib/pages/displaygroup.class.php:422
-#: server/lib/pages/displaygroup.class.php:640
-#: server/lib/pages/displaygroup.class.php:777
-#: server/lib/pages/displaygroup.class.php:854
+#: server/lib/pages/displaygroup.class.php:368
+#: server/lib/pages/displaygroup.class.php:400
+#: server/lib/pages/displaygroup.class.php:431
+#: server/lib/pages/displaygroup.class.php:649
+#: server/lib/pages/displaygroup.class.php:786
+#: server/lib/pages/displaygroup.class.php:863
 msgid "You do not have permission to edit this display group"
 msgstr ""
 
@@ -2992,65 +3006,65 @@
 msgid "Delete Display Group"
 msgstr ""
 
-#: server/lib/pages/displaygroup.class.php:272
-#: server/lib/pages/displaygroup.class.php:297
-#: server/lib/pages/displaygroup.class.php:435
+#: server/lib/pages/displaygroup.class.php:270
+#: server/lib/pages/displaygroup.class.php:290
+#: server/lib/pages/displaygroup.class.php:444
 msgid "Error getting Displays"
 msgstr ""
 
-#: server/lib/pages/displaygroup.class.php:335
+#: server/lib/pages/displaygroup.class.php:344
 msgid "Display Group Added"
 msgstr ""
 
-#: server/lib/pages/displaygroup.class.php:369
+#: server/lib/pages/displaygroup.class.php:378
 msgid "Display Group Edited"
 msgstr ""
 
-#: server/lib/pages/displaygroup.class.php:401
+#: server/lib/pages/displaygroup.class.php:410
 msgid "Display Group Deleted"
 msgstr ""
 
-#: server/lib/pages/displaygroup.class.php:489
-#: server/lib/pages/displaygroup.class.php:565
+#: server/lib/pages/displaygroup.class.php:498
+#: server/lib/pages/displaygroup.class.php:574
 msgid "You do not have permissions to edit this display group"
 msgstr ""
 
-#: server/lib/pages/displaygroup.class.php:510
+#: server/lib/pages/displaygroup.class.php:519
 msgid "Unable to get permissions for this DisplayGroup"
 msgstr ""
 
-#: server/lib/pages/displaygroup.class.php:683
-#: server/lib/pages/displaygroup.class.php:735
+#: server/lib/pages/displaygroup.class.php:692
+#: server/lib/pages/displaygroup.class.php:744
 msgid "Unable to get existing assignments."
 msgstr ""
 
-#: server/lib/pages/displaygroup.class.php:699
+#: server/lib/pages/displaygroup.class.php:708
 msgid "Associate an item from the Library"
 msgstr ""
 
-#: server/lib/pages/displaygroup.class.php:772
+#: server/lib/pages/displaygroup.class.php:781
 msgid "Display Group not selected"
 msgstr ""
 
-#: server/lib/pages/displaygroup.class.php:786
+#: server/lib/pages/displaygroup.class.php:795
 #: server/lib/pages/timeline.class.php:391
 #, php-format
 msgid "%d Media Items Assigned"
 msgstr ""
 
-#: server/lib/pages/displaygroup.class.php:803
+#: server/lib/pages/displaygroup.class.php:812
 msgid "Unknown Display"
 msgstr ""
 
-#: server/lib/pages/displaygroup.class.php:808
+#: server/lib/pages/displaygroup.class.php:817
 msgid "No displays in this group"
 msgstr ""
 
-#: server/lib/pages/displaygroup.class.php:835
+#: server/lib/pages/displaygroup.class.php:844
 msgid "Set Instructions for Upgrading this client"
 msgstr ""
 
-#: server/lib/pages/displaygroup.class.php:881
+#: server/lib/pages/displaygroup.class.php:890
 msgid "Version Instructions Set"
 msgstr ""
 
@@ -3205,111 +3219,115 @@
 "corrupt."
 msgstr ""
 
-#: server/lib/pages/layout.class.php:189 server/lib/pages/layout.class.php:220
+#: server/lib/pages/layout.class.php:152
+msgid "Save Position"
+msgstr ""
+
+#: server/lib/pages/layout.class.php:192 server/lib/pages/layout.class.php:223
 msgid "Layout Details Changed."
 msgstr ""
 
-#: server/lib/pages/layout.class.php:232 server/lib/pages/layout.class.php:287
-#: server/lib/pages/layout.class.php:314
+#: server/lib/pages/layout.class.php:235 server/lib/pages/layout.class.php:290
+#: server/lib/pages/layout.class.php:317
 msgid "You do not have permissions to delete this layout"
 msgstr ""
 
-#: server/lib/pages/layout.class.php:245
+#: server/lib/pages/layout.class.php:248
 msgid "Can not get layout information"
 msgstr ""
 
-#: server/lib/pages/layout.class.php:266
+#: server/lib/pages/layout.class.php:269
 msgid "Delete Layout"
 msgstr ""
 
-#: server/lib/pages/layout.class.php:294
+#: server/lib/pages/layout.class.php:297
 msgid "The Layout has been Deleted"
 msgstr ""
 
-#: server/lib/pages/layout.class.php:322
+#: server/lib/pages/layout.class.php:325
 msgid "The Layout has been Retired"
 msgstr ""
 
-#: server/lib/pages/layout.class.php:359
+#: server/lib/pages/layout.class.php:362
 msgid "Unable to get layouts for user"
 msgstr ""
 
-#: server/lib/pages/layout.class.php:376 server/lib/pages/layout.class.php:962
+#: server/lib/pages/layout.class.php:379 server/lib/pages/layout.class.php:965
 msgid "This Layout is ready to play"
 msgstr ""
 
-#: server/lib/pages/layout.class.php:380 server/lib/pages/layout.class.php:966
+#: server/lib/pages/layout.class.php:383 server/lib/pages/layout.class.php:969
 msgid "There are items on this Layout that can only be assessed by the client"
 msgstr ""
 
-#: server/lib/pages/layout.class.php:384 server/lib/pages/layout.class.php:970
+#: server/lib/pages/layout.class.php:387 server/lib/pages/layout.class.php:973
 msgid "This Layout is invalid and should not be scheduled"
 msgstr ""
 
-#: server/lib/pages/layout.class.php:388 server/lib/pages/layout.class.php:974
+#: server/lib/pages/layout.class.php:391 server/lib/pages/layout.class.php:977
 msgid "The Status of this Layout is not known"
 msgstr ""
 
-#: server/lib/pages/layout.class.php:405
+#: server/lib/pages/layout.class.php:408
 #: server/theme/default/html/layout_designer.php:48
 msgid "Preview Layout"
 msgstr ""
 
-#: server/lib/pages/layout.class.php:415
+#: server/lib/pages/layout.class.php:418
 msgid "Design"
 msgstr ""
 
-#: server/lib/pages/layout.class.php:429 server/lib/pages/layout.class.php:802
+#: server/lib/pages/layout.class.php:432 server/lib/pages/layout.class.php:805
 msgid "Copy"
 msgstr ""
 
-#: server/lib/pages/layout.class.php:509
+#: server/lib/pages/layout.class.php:512
 #: server/theme/default/html/layout_page.php:45
 msgid "Add Layout"
 msgstr ""
 
-#: server/lib/pages/layout.class.php:509
+#: server/lib/pages/layout.class.php:512
 msgid "Edit Layout"
 msgstr ""
 
-#: server/lib/pages/layout.class.php:597
+#: server/lib/pages/layout.class.php:600
 msgid "Change the Background Properties"
 msgstr ""
 
-#: server/lib/pages/layout.class.php:599
+#: server/lib/pages/layout.class.php:602
 msgid "Add Image"
 msgstr ""
 
-#: server/lib/pages/layout.class.php:633
+#: server/lib/pages/layout.class.php:636
 msgid "Layout Background Changed"
 msgstr ""
 
-#: server/lib/pages/layout.class.php:663
+#: server/lib/pages/layout.class.php:666
 msgid "Unable to determine display resolution"
 msgstr ""
 
-#: server/lib/pages/layout.class.php:744
+#: server/lib/pages/layout.class.php:747
 msgid "Timeline"
 msgstr ""
 
-#: server/lib/pages/layout.class.php:744
+#: server/lib/pages/layout.class.php:747
 msgid "Edit Timeline"
 msgstr ""
 
-#: server/lib/pages/layout.class.php:745
+#: server/lib/pages/layout.class.php:748
 #: server/theme/default/html/layout_designer.php:40
 msgid "Options"
 msgstr ""
 
-#: server/lib/pages/layout.class.php:799
+#: server/lib/pages/layout.class.php:802
 msgid "Copy a Layout."
 msgstr ""
 
-#: server/lib/pages/layout.class.php:830
+#: server/lib/pages/layout.class.php:833
 msgid "Layout Copied"
 msgstr ""
 
-#: server/lib/pages/layout.class.php:859
+#: server/lib/pages/layout.class.php:862
 msgid "Unable to get group information for layout"
 msgstr ""
 
@@ -3469,8 +3487,8 @@
 msgstr ""
 
 #: server/lib/pages/schedule.class.php:463
-#: server/lib/pages/schedule.class.php:1126
-#: server/lib/pages/schedule.class.php:1210 server/locale/dbtranslate.php:26
+#: server/lib/pages/schedule.class.php:1129
+#: server/lib/pages/schedule.class.php:1213 server/locale/dbtranslate.php:26
 #: server/theme/default/html/homepage_mediamanager.php:44
 #: server/theme/default/html/homepage_mediamanager_grid.php:38
 #: server/theme/default/html/layout_designer.php:80
@@ -3510,8 +3528,8 @@
 msgstr ""
 
 #: server/lib/pages/schedule.class.php:477
-#: server/lib/pages/schedule.class.php:1240
-#: server/lib/pages/schedule.class.php:1329
+#: server/lib/pages/schedule.class.php:1243
+#: server/lib/pages/schedule.class.php:1332
 #: server/theme/default/html/display_form_edit.php:34
 #: server/theme/default/html/display_form_version_instructions.php:39
 #: server/theme/default/html/display_page_grid.php:46
@@ -3525,136 +3543,136 @@
 msgstr ""
 
 #: server/lib/pages/schedule.class.php:610
-#: server/lib/pages/schedule.class.php:805
-#: server/lib/pages/schedule.class.php:908
-#: server/lib/pages/schedule.class.php:1004
+#: server/lib/pages/schedule.class.php:808
+#: server/lib/pages/schedule.class.php:911
+#: server/lib/pages/schedule.class.php:1007
 msgid "Error getting events for date."
 msgstr ""
 
-#: server/lib/pages/schedule.class.php:829
-#: server/lib/pages/schedule.class.php:1028
-#: server/lib/pages/schedule.class.php:1612
+#: server/lib/pages/schedule.class.php:832
+#: server/lib/pages/schedule.class.php:1031
+#: server/lib/pages/schedule.class.php:1615
 msgid "Edit Event"
 msgstr ""
 
-#: server/lib/pages/schedule.class.php:1079
+#: server/lib/pages/schedule.class.php:1082
 msgid "Can not list Display Groups"
 msgstr ""
 
-#: server/lib/pages/schedule.class.php:1083
+#: server/lib/pages/schedule.class.php:1086
 msgid "No Display Groups"
 msgstr ""
 
-#: server/lib/pages/schedule.class.php:1086 server/locale/dbtranslate.php:32
+#: server/lib/pages/schedule.class.php:1089 server/locale/dbtranslate.php:32
 #: server/theme/default/html/schedule_page_display_list.php:38
 msgid "Groups"
 msgstr ""
 
-#: server/lib/pages/schedule.class.php:1107 server/locale/dbtranslate.php:31
+#: server/lib/pages/schedule.class.php:1110 server/locale/dbtranslate.php:31
 #: server/theme/default/html/schedule_page_display_list.php:48
 msgid "Displays"
 msgstr ""
 
-#: server/lib/pages/schedule.class.php:1210
+#: server/lib/pages/schedule.class.php:1213
 msgid "Campaign"
 msgstr ""
 
-#: server/lib/pages/schedule.class.php:1446
+#: server/lib/pages/schedule.class.php:1449
 msgid "Schedule Event"
 msgstr ""
 
-#: server/lib/pages/schedule.class.php:1497
+#: server/lib/pages/schedule.class.php:1500
 msgid "Error getting details for this event."
 msgstr ""
 
-#: server/lib/pages/schedule.class.php:1524
+#: server/lib/pages/schedule.class.php:1527
 msgid "You do not have permission to edit this event."
 msgstr ""
 
-#: server/lib/pages/schedule.class.php:1664
-#: server/lib/pages/schedule.class.php:1749
-#: server/lib/pages/schedule.class.php:1969
+#: server/lib/pages/schedule.class.php:1667
+#: server/lib/pages/schedule.class.php:1752
+#: server/lib/pages/schedule.class.php:1972
 msgid "No layout selected"
 msgstr ""
 
-#: server/lib/pages/schedule.class.php:1670
-#: server/lib/pages/schedule.class.php:1755
-#: server/lib/pages/schedule.class.php:1976
+#: server/lib/pages/schedule.class.php:1673
+#: server/lib/pages/schedule.class.php:1758
+#: server/lib/pages/schedule.class.php:1979
 msgid "No displays selected"
 msgstr ""
 
-#: server/lib/pages/schedule.class.php:1676
-#: server/lib/pages/schedule.class.php:1761
+#: server/lib/pages/schedule.class.php:1679
+#: server/lib/pages/schedule.class.php:1764
 msgid "Can not have an end time earlier than your start time"
 msgstr ""
 
-#: server/lib/pages/schedule.class.php:1680
-#: server/lib/pages/schedule.class.php:1979
+#: server/lib/pages/schedule.class.php:1683
+#: server/lib/pages/schedule.class.php:1982
 msgid "Your start time is in the past. Cannot schedule events in the past"
 msgstr ""
 
-#: server/lib/pages/schedule.class.php:1686
-#: server/lib/pages/schedule.class.php:1767
+#: server/lib/pages/schedule.class.php:1689
+#: server/lib/pages/schedule.class.php:1770
 msgid ""
 "Your repeat until date is in the past. Cannot schedule events to repeat in "
 "to the past"
 msgstr ""
 
-#: server/lib/pages/schedule.class.php:1697
+#: server/lib/pages/schedule.class.php:1700
 msgid "The Event has been Added."
 msgstr ""
 
-#: server/lib/pages/schedule.class.php:1778
+#: server/lib/pages/schedule.class.php:1781
 msgid "The Event has been Modified."
 msgstr ""
 
-#: server/lib/pages/schedule.class.php:1798
+#: server/lib/pages/schedule.class.php:1801
 msgid "Are you sure you want to delete this event from <b>all</b> displays?"
 msgstr ""
 
-#: server/lib/pages/schedule.class.php:1799
+#: server/lib/pages/schedule.class.php:1802
 msgid ""
 "If you only want to delete this item from certain displays, please deselect "
 "the displays in the edit dialogue and click Save."
 msgstr ""
 
-#: server/lib/pages/schedule.class.php:1818
+#: server/lib/pages/schedule.class.php:1821
 msgid "Delete Event."
 msgstr ""
 
-#: server/lib/pages/schedule.class.php:1854
+#: server/lib/pages/schedule.class.php:1857
 msgid "The Event has been Deleted."
 msgstr ""
 
-#: server/lib/pages/schedule.class.php:1972
+#: server/lib/pages/schedule.class.php:1975
 msgid "You must enter a duration"
 msgstr ""
 
-#: server/lib/pages/schedule.class.php:1989
+#: server/lib/pages/schedule.class.php:1992
 msgid "The Event has been Scheduled"
 msgstr ""
 
-#: server/lib/pages/schedule.class.php:2004
-#: server/lib/pages/schedule.class.php:2051
+#: server/lib/pages/schedule.class.php:2007
+#: server/lib/pages/schedule.class.php:2054
 msgid "Day not selected"
 msgstr ""
 
-#: server/lib/pages/schedule.class.php:2006
+#: server/lib/pages/schedule.class.php:2009
 msgid ""
 "Are you sure you want to delete all events that intersect this day from "
 "<b>all</b> displays?"
 msgstr ""
 
-#: server/lib/pages/schedule.class.php:2007
+#: server/lib/pages/schedule.class.php:2010
 msgid "This action cannot be undone."
 msgstr ""
 
-#: server/lib/pages/schedule.class.php:2025
+#: server/lib/pages/schedule.class.php:2028
 #, php-format
 msgid "Delete %s"
 msgstr ""
 
-#: server/lib/pages/schedule.class.php:2068
+#: server/lib/pages/schedule.class.php:2071
 #, php-format
 msgid "All events for %s have been deleted"
 msgstr ""
@@ -3676,11 +3694,15 @@
 msgid "User Logged Out."
 msgstr ""
 
-#: server/lib/pages/stats.class.php:98
+#: server/lib/pages/stats.class.php:93 server/lib/pages/stats.class.php:262
+msgid "No displays with View permissions"
+msgstr ""
+
+#: server/lib/pages/stats.class.php:117
 msgid "Unable to get Layouts Shown"
 msgstr ""
 
-#: server/lib/pages/stats.class.php:139 server/lib/pages/stats.class.php:181
+#: server/lib/pages/stats.class.php:159 server/lib/pages/stats.class.php:202
 msgid "Unable to get Library Media Ran"
 msgstr ""
 
@@ -4021,12 +4043,12 @@
 msgid "Trying to change the password for another user denied"
 msgstr ""
 
-#: server/lib/service/xmdssoap.class.php:1126
+#: server/lib/service/xmdssoap.class.php:1135
 #, php-format
 msgid "Recovery for Display %s"
 msgstr ""
 
-#: server/lib/service/xmdssoap.class.php:1127
+#: server/lib/service/xmdssoap.class.php:1136
 #, php-format
 msgid "Display %s with ID %d is now back online."
 msgstr ""
@@ -4349,46 +4371,46 @@
 msgid "DataSet View"
 msgstr ""
 
-#: server/modules/datasetview.module.php:81
+#: server/modules/datasetview.module.php:60
 msgid "Add DataSet View"
 msgstr ""
 
-#: server/modules/datasetview.module.php:201
+#: server/modules/datasetview.module.php:180
 #, php-format
 msgid "Edit DataSet View for DataSet %s"
 msgstr ""
 
-#: server/modules/datasetview.module.php:238
+#: server/modules/datasetview.module.php:217
 #: server/modules/ticker.module.php:253
 msgid "Please select a DataSet"
 msgstr ""
 
-#: server/modules/datasetview.module.php:247
+#: server/modules/datasetview.module.php:226
 #: server/modules/ticker.module.php:257
 msgid "You do not have permission to use that dataset"
 msgstr ""
 
-#: server/modules/datasetview.module.php:331
+#: server/modules/datasetview.module.php:310
 #: server/modules/ticker.module.php:362
 msgid "Limits must be numbers"
 msgstr ""
 
-#: server/modules/datasetview.module.php:334
+#: server/modules/datasetview.module.php:313
 #: server/modules/ticker.module.php:365
 msgid "Limits cannot be lower than 0"
 msgstr ""
 
-#: server/modules/datasetview.module.php:338
+#: server/modules/datasetview.module.php:317
 #: server/modules/ticker.module.php:369
 msgid "Upper limit must be higher than lower limit"
 msgstr ""
 
-#: server/modules/datasetview.module.php:341
+#: server/modules/datasetview.module.php:320
 #: server/modules/ticker.module.php:391
 msgid "Update Interval must be greater than or equal to 0"
 msgstr ""
 
-#: server/modules/datasetview.module.php:345
+#: server/modules/datasetview.module.php:324
 #: server/modules/ticker.module.php:359
 msgid "Cannot user ordering criteria in the Filter Clause"
 msgstr ""
@@ -4452,8 +4474,11 @@
 msgstr ""
 
 #: server/modules/module_user_general.php:314
+msgid "User does not have a group and Xibo is unable to add one."
+msgstr ""
+
 #: server/modules/module_user_general.php:371
-msgid "User does not have a group and Xibo is unable to add one."
+msgid "User does not have a group and we are unable to add one."
 msgstr ""
 
 #: server/modules/module_user_general.php:456
@@ -4857,13 +4882,11 @@
 msgstr ""
 
 #: server/theme/default/html/displaygroup_form_display_assign.php:33
-#: server/theme/default/html/display_form_group_assign.php:33
-msgid "Assigned Groups"
+msgid "Assigned Displays"
 msgstr ""
 
 #: server/theme/default/html/displaygroup_form_display_assign.php:41
-#: server/theme/default/html/display_form_group_assign.php:41
-msgid "Available Groups"
+msgid "Available Displays"
 msgstr ""
 
 #: server/theme/default/html/displaygroup_page.php:37
@@ -4998,6 +5021,14 @@
 msgid "Longitude"
 msgstr ""
 
+#: server/theme/default/html/display_form_group_assign.php:33
+msgid "Assigned Groups"
+msgstr ""
+
+#: server/theme/default/html/display_form_group_assign.php:41
+msgid "Available Groups"
+msgstr ""
+
 #: server/theme/default/html/display_form_mediainventory.php:35
 msgid "Id"
 msgstr ""

=== modified file 'example_oauth/index.php'
--- example_oauth/index.php	2013-05-25 09:42:36 +0000
+++ example_oauth/index.php	2014-07-15 15:37:37 +0000
@@ -2,6 +2,7 @@
 require_once('oauth-php/library/OAuthStore.php');
 require_once('oauth-php/library/OAuthRequester.php');
 require_once('oauth-php/library/OAuthRequestLogger.php');
+require_once('nice-json.php');
 
 DEFINE('OAUTH_LOG_REQUEST', true);
 
@@ -12,14 +13,18 @@
 
 OAuthStore::instance('MySQL', $connection);
 
-DEFINE('SERVER_BASE', 'http://localhost/xibo/1.5/server-151-api/server/');
-DEFINE('CONSUMER_KEY', 'e5adc06021aa90157114862e5a22287d0519918d2');
-DEFINE('CONSUMER_SECRET', '9411a8a5d9a8fc63c105cb3119a89395');
+DEFINE('SERVER_BASE', 'http://localhost/xibo/1.6/server-162/server/');
+DEFINE('CONSUMER_KEY', 'e982575d2ab70546923b92e50c5b96ca053b407a8');
+DEFINE('CONSUMER_SECRET', 'a891f97e69985230a2e0e869b9f875e3');
 //DEFINE('SERVER_BASE', 'http://unittest2.xibo.org.uk/api/');
 //DEFINE('CONSUMER_KEY', '201798cda77e4e82e0488d0c8c2e43ae0519d180f');
 //DEFINE('CONSUMER_SECRET', '9eb4aa8a51e4a393b3fb5ad6f1a75bae');
-
-switch($_GET['action'])
+//
+
+// $RESPONSE = 'xml';
+define('RESPONSE', 'json');
+
+switch((isset($_GET['action']) ? $_GET['action'] : ''))
 {
     case 'AddServer':
         AddServerToOAuth();
@@ -37,11 +42,16 @@
         MakeSignedRequest();
         break;
 
+    case '':
+        die('No action');
+
     default:
         $action = $_GET['action'];
         $action();
 }
 
+die();
+
 function AddServerToOAuth()
 {
     // Get the id of the current user (must be an int)
@@ -82,7 +92,7 @@
     }
 
     // Callback to our (consumer) site, will be called when the user finished the authorization at the server
-    $callback_uri = 'http://localhost/xibo/1.5/server-151-api/example_oauth/?action=Exchange&consumer_key='.rawurlencode(CONSUMER_KEY).'&usr_id='.intval($user_id);
+    $callback_uri = '?action=Exchange&consumer_key='.rawurlencode(CONSUMER_KEY).'&usr_id='.intval($user_id);
 
     // Now redirect to the autorization uri and get us authorized
     if (!empty($token['authorize_uri']))
@@ -142,7 +152,7 @@
     $params = array(
                'service' => 'rest',
                'method' => 'Version',
-               'response' => 'xml'
+               'response' => RESPONSE
          );
 
     // Obtain a request object for the request we want to make
@@ -167,7 +177,7 @@
     $params = array(
                'service' => 'rest',
                'method' => 'LayoutList',
-               'response' => 'xml'
+               'response' => RESPONSE
          );
 
     // Obtain a request object for the request we want to make
@@ -203,7 +213,7 @@
     $params = array(
                'service' => 'rest',
                'method' => 'LayoutRegionList',
-               'response' => 'xml',
+               'response' => RESPONSE,
                'layoutid' => 11
          );
 
@@ -234,7 +244,7 @@
     $params = array(
                'service' => 'rest',
                'method' => 'LayoutAdd',
-               'response' => 'xml',
+               'response' => RESPONSE,
                'layout' => 'API test'
          );
 
@@ -246,7 +256,7 @@
     $params = array(
                'service' => 'rest',
                'method' => 'LayoutRegionAdd',
-               'response' => 'xml',
+               'response' => RESPONSE,
                'layoutid' => 11,
                'top' => 102,
                'name' => 'apitest'
@@ -261,7 +271,7 @@
     $params = array(
                'service' => 'rest',
                'method' => 'LayoutRegionEdit',
-               'response' => 'xml',
+               'response' => RESPONSE,
                'layoutid' => 124,
                'regionid' => '519d199c5cb50',
                'width' => 400,
@@ -280,7 +290,7 @@
     $params = array(
                'service' => 'rest',
                'method' => 'LayoutRegionDelete',
-               'response' => 'xml',
+               'response' => RESPONSE,
                'layoutid' => 124,
                'regionid' => '519d1bb00e7a9'
          );
@@ -292,7 +302,7 @@
     $params = array(
                'service' => 'rest',
                'method' => 'LayoutRegionTimelineList',
-               'response' => 'xml',
+               'response' => RESPONSE,
                'layoutid' => 11,
                'regionid' => '519d211ded076'
          );
@@ -305,7 +315,7 @@
     $params = array(
                'service' => 'rest',
                'method' => 'LayoutRegionMediaAdd',
-               'response' => 'xml',
+               'response' => RESPONSE,
                'layoutid' => 11,
                'regionid' => '519d211ded076',
                'type' => 'webpage',
@@ -324,7 +334,7 @@
     $params = array(
                'service' => 'rest',
                'method' => 'LayoutRegionMediaDetails',
-               'response' => 'xml',
+               'response' => RESPONSE,
                'layoutid' => 11,
                'regionid' => '519d211ded076',
                'mediaid' => 'b2036df53ae2bdcbb5322a183709afbc',
@@ -340,7 +350,7 @@
     $params = array(
                'service' => 'rest',
                'method' => 'LayoutRegionMediaEdit',
-               'response' => 'xml',
+               'response' => RESPONSE,
                'layoutid' => 11,
                'regionid' => '519d211ded076',
                'type' => 'webpage',
@@ -355,6 +365,211 @@
     callService($params, true);
 }
 
+function DataSetList() {
+    $params = array(
+            'service' => 'rest',
+            'method' => 'DataSetList',
+            'response' => RESPONSE
+        );
+
+    callService($params, true);
+}
+
+function DataSetAdd() {
+    $params = array(
+            'service' => 'rest',
+            'method' => 'DataSetAdd',
+            'response' => RESPONSE,
+            'dataSet' => 'API Test',
+            'description' => 'A test description.'
+        );
+
+    callService($params, true);
+}
+
+function DataSetEdit() {
+    $params = array(
+            'service' => 'rest',
+            'method' => 'DataSetEdit',
+            'response' => RESPONSE,
+            'dataSetId' => 3,
+            'dataSet' => 'API Test',
+            'description' => 'A test description.'
+        );
+
+    callService($params, true);
+}
+
+function DataSetDelete() {
+    $params = array(
+            'service' => 'rest',
+            'method' => 'DataSetDelete',
+            'response' => RESPONSE,
+            'dataSetId' => 3
+        );
+
+    callService($params, true);
+}
+
+function DataSetColumnList() {
+    $params = array(
+            'service' => 'rest',
+            'method' => 'DataSetColumnList',
+            'response' => RESPONSE,
+            'dataSetId' => 1
+        );
+
+    callService($params, true);
+}
+
+function DataSetColumnAdd() {
+    $params = array(
+            'service' => 'rest',
+            'method' => 'DataSetColumnAdd',
+            'response' => RESPONSE,
+            'dataSetId' => 4,
+            'heading' => 'API Column 1'
+        );
+
+    callService($params, true);
+}
+
+function DataSetColumnEdit() {
+    $params = array(
+            'service' => 'rest',
+            'method' => 'DataSetColumnEdit',
+            'response' => RESPONSE,
+            'dataTypeId' => 1,
+            'dataSetColumnTypeId' => 1,
+            'dataSetId' => 4,
+            'dataSetColumnId' => 3,
+            'heading' => 'API Column 1 Edited'
+        );
+
+    callService($params, true);
+}
+
+function DataSetColumnDelete() {
+    $params = array(
+            'service' => 'rest',
+            'method' => 'DataSetColumnDelete',
+            'response' => RESPONSE,
+            'dataSetId' => 4,
+            'dataSetColumnId' => 3
+        );
+
+    callService($params, true);
+}
+
+function DataSetDataList() {
+    $params = array(
+            'service' => 'rest',
+            'method' => 'DataSetDataList',
+            'response' => RESPONSE,
+            'dataSetId' => 1
+        );
+
+    callService($params, true);
+}
+
+function DataSetSecurityList() {
+    $params = array(
+            'service' => 'rest',
+            'method' => 'DataSetSecurityList',
+            'response' => RESPONSE,
+            'dataSetId' => 4
+        );
+
+    callService($params, true);
+}
+
+function DataSetSecurityAdd() {
+    $params = array(
+            'service' => 'rest',
+            'method' => 'DataSetSecurityAdd',
+            'response' => RESPONSE,
+            'dataSetId' => 4,
+            'groupId' => 1,
+            'view' => 1,
+            'edit' => 1,
+            'delete' => 1
+        );
+
+    callService($params, true);
+}
+
+function DataSetSecurityDelete() {
+    $params = array(
+            'service' => 'rest',
+            'method' => 'DataSetSecurityDelete',
+            'response' => RESPONSE,
+            'dataSetId' => 4,
+            'groupId' => 1
+        );
+
+    callService($params, true);
+}
+
+function DataSetImportCsv() {
+
+    $mappings = array(
+        '0' => '1',
+        '2' => '4',
+        '1' => '5'
+      );
+
+    $params = array(
+            'service' => 'rest',
+            'method' => 'DataSetImportCsv',
+            'response' => RESPONSE,
+            'dataSetId' => 1,
+            'fileId' => 3,
+            'spreadSheetMapping' => json_encode($mappings),
+            'overwrite' => 0,
+            'ignoreFirstRow' => 1,
+        );
+
+    callService($params, true);
+}
+
+function LibraryMediaFileUpload() {
+
+    // Get the test file
+    $file = file_get_contents('test_files/test.csv');
+    $payload = base64_encode($file);
+
+    $params = array(
+            'service' => 'rest',
+            'method' => 'LibraryMediaFileUpload',
+            'response' => RESPONSE,
+            'fileId' => NULL,
+            'checksum' => md5($payload),
+            'payload' => $payload
+        );
+
+    callService($params, true);
+}
+
+function DataTypeList() {
+    $params = array(
+            'service' => 'rest',
+            'method' => 'DataTypeList',
+            'response' => RESPONSE
+        );
+
+    callService($params, true);
+}
+
+function DataSetColumnTypeList() {
+    $params = array(
+            'service' => 'rest',
+            'method' => 'DataSetColumnTypeList',
+            'response' => RESPONSE
+        );
+
+    callService($params, true);
+}
+
 function callService($params, $echo = false) {
     // The request uri being called.
     $user_id = 1;
@@ -366,9 +581,15 @@
     // Sign the request, perform a curl request and return the results, throws OAuthException exception on an error
     $return = $req->doRequest($user_id);
     
-    if ($echo)
+    if ($echo) {
         var_dump($return);
 
+        if (RESPONSE == 'json')
+            echo '<pre>' . json_format($return['body']) . '</pre>';
+        else
+            echo $return['body'];
+    }
+
     return $return;
 }
 ?>

=== added file 'example_oauth/nice-json.php'
--- example_oauth/nice-json.php	1970-01-01 00:00:00 +0000
+++ example_oauth/nice-json.php	2014-07-15 15:37:37 +0000
@@ -0,0 +1,73 @@
+<?php
+
+// original code: http://www.daveperrett.com/articles/2008/03/11/format-json-with-php/
+// adapted to allow native functionality in php version >= 5.4.0
+
+/**
+* Format a flat JSON string to make it more human-readable
+*
+* @param string $json The original JSON string to process
+*        When the input is not a string it is assumed the input is RAW
+*        and should be converted to JSON first of all.
+* @return string Indented version of the original JSON string
+*/
+function json_format($json) {
+  if (!is_string($json)) {
+    if (phpversion() && phpversion() >= 5.4) {
+      return json_encode($json, JSON_PRETTY_PRINT);
+    }
+    $json = json_encode($json);
+  }
+  $result      = '';
+  $pos         = 0;               // indentation level
+  $strLen      = strlen($json);
+  $indentStr   = "\t";
+  $newLine     = "\n";
+  $prevChar    = '';
+  $outOfQuotes = true;
+
+  for ($i = 0; $i < $strLen; $i++) {
+    // Grab the next character in the string
+    $char = substr($json, $i, 1);
+
+    // Are we inside a quoted string?
+    if ($char == '"' && $prevChar != '\\') {
+      $outOfQuotes = !$outOfQuotes;
+    }
+    // If this character is the end of an element,
+    // output a new line and indent the next line
+    else if (($char == '}' || $char == ']') && $outOfQuotes) {
+      $result .= $newLine;
+      $pos--;
+      for ($j = 0; $j < $pos; $j++) {
+        $result .= $indentStr;
+      }
+    }
+    // eat all non-essential whitespace in the input as we do our own here and it would only mess up our process
+    else if ($outOfQuotes && false !== strpos(" \t\r\n", $char)) {
+      continue;
+    }
+
+    // Add the character to the result string
+    $result .= $char;
+    // always add a space after a field colon:
+    if ($char == ':' && $outOfQuotes) {
+      $result .= ' ';
+    }
+
+    // If the last character was the beginning of an element,
+    // output a new line and indent the next line
+    if (($char == ',' || $char == '{' || $char == '[') && $outOfQuotes) {
+      $result .= $newLine;
+      if ($char == '{' || $char == '[') {
+        $pos++;
+      }
+      for ($j = 0; $j < $pos; $j++) {
+        $result .= $indentStr;
+      }
+    }
+    $prevChar = $char;
+  }
+
+  return $result;
+}

=== added directory 'example_oauth/test_files'
=== added file 'example_oauth/test_files/test.csv'
--- example_oauth/test_files/test.csv	1970-01-01 00:00:00 +0000
+++ example_oauth/test_files/test.csv	2014-07-15 15:37:37 +0000
@@ -0,0 +1,6 @@
+Col1,Col2,Col3,Col4
+Row1-1,Row1-2,Row1-3,Row1-4
+Row2-1,Row2-2,Row2-3,Row2-4
+Row3-1,Row3-2,Row3-3,Row3-4
+Row4-1,Row4-2,Row4-3,Row4-4
+Row5-1,Row5-2,Row5-3,Row5-4
\ No newline at end of file

=== modified file 'server/3rdparty/simplepie/library/SimplePie/File.php'
--- server/3rdparty/simplepie/library/SimplePie/File.php	2014-03-23 13:52:47 +0000
+++ server/3rdparty/simplepie/library/SimplePie/File.php	2014-07-15 15:37:37 +0000
@@ -137,6 +137,10 @@
 				{
 					$info = curl_getinfo($fp);
 					curl_close($fp);
+
+					// DG: Patch to strip double headers
+					$this->headers = SimplePie_HTTP_Parser::strip_double_headers($this->headers);
+
 					$this->headers = explode("\r\n\r\n", $this->headers, $info['redirect_count'] + 1);
 					$this->headers = array_pop($this->headers);
 					$parser = new SimplePie_HTTP_Parser($this->headers);

=== modified file 'server/3rdparty/simplepie/library/SimplePie/HTTP/Parser.php'
--- server/3rdparty/simplepie/library/SimplePie/HTTP/Parser.php	2013-05-11 15:26:38 +0000
+++ server/3rdparty/simplepie/library/SimplePie/HTTP/Parser.php	2014-07-15 15:37:37 +0000
@@ -497,4 +497,25 @@
 			}
 		}
 	}
+
+	public static function strip_double_headers($input) {
+        // I have tried to make this regular expression as specific as possible
+        // to avoid any case where it does weird stuff if you happen to put
+        // HTTP/1.1 200 at the start of any line in your RSS file. This should
+        // also make it faster because it can abandon regex processing as soon
+        // as it hits something that doesn't look like an http header. The
+        // header definition is taken from RFC 822, except I didn't support
+        // folding which is never used in practice.
+        $crlf = "\r\n";
+        return preg_replace(
+                // HTTP version and status code (ignore value of code).
+                '~^HTTP/1\..*' . $crlf .
+                // Header name: character between 33 and 126 decimal, except colon.
+                // Colon. Header value: any character except \r and \n. CRLF.
+                '(?:[\x21-\x39\x3b-\x7e]+:[^' . $crlf . ']+' . $crlf . ')*' .
+                // Headers are terminated by another CRLF (blank line).
+                $crlf .
+                // Second HTTP status code, this time must be 200.
+                '(HTTP/1.[01] 200 )~', '$1', $input);
+    }
 }

=== modified file 'server/config/config.class.php'
--- server/config/config.class.php	2014-02-15 11:25:09 +0000
+++ server/config/config.class.php	2014-07-15 15:37:37 +0000
@@ -127,29 +127,18 @@
 		$output .= '<div class="checks">';
 		
 		// Check for PHP version
-		$message = __('PHP Version 5.2.4 or later');
+		$message = __('PHP Version');
 
 		if ($this->CheckPHP() == 1) 
 		{
 			$output .= $imgGood.$message.'<br />';
 		}
-		else if ($this->CheckPHP() == 2)
-		{
-			$this->envWarning = true;
-			$output .= $imgWarn.$message.'<br />';
-			$output .= <<<END
-			<div class="check_explain">
-			<p>Xibo requires PHP version 5.2.4 or later. It may run on PHP 5.1.0 and we have provided compatibility functions to enable that.</p>
-			<p>However, we recommend upgrading your version of PHP to 5.2.4 or later.</p>
-			</div>
-END;
-		}
 		else
 		{
 			$this->envFault = true;
 			
 			$output .= $imgBad.$message.'<br />';
-			$output .= '<div class="check_explain"> <p>' . __("PHP version 5.2.4 or later required.") . '</p></div>';
+			$output .= '<div class="check_explain"> <p>' . __("PHP version 5.3.3 or later required.") . '. Detected ' . phpversion() . '</p></div>';
 		}
 		
 		// Check for file system permissions
@@ -474,17 +463,7 @@
 	 */
 	function CheckPHP() 
 	{
-		if (phpversion() >= '5.2.4') 
-		{
-			return 1;
-		}
-	
-		if (phpversion() >= '5.1.0') 
-		{
-			return 2;
-		}
-
-		return 0;
+		return ((version_compare('5.3.3', phpversion(), '>='))) ? 1 : 0;
 	}
 	
 	/**

=== modified file 'server/install.php'
--- server/install.php	2013-08-21 22:27:13 +0000
+++ server/install.php	2014-07-15 15:37:37 +0000
@@ -22,7 +22,7 @@
 
 if (! checkPHP()) 
 {
-	die('Xibo requires PHP 5.2.4 or later');
+	die('Xibo requires PHP 5.3.3 or later');
 }
 
 error_reporting(0);
@@ -693,7 +693,7 @@
 
 function checkPHP() 
 {
-	return (version_compare("5.2.4",phpversion(), "<="));
+	return (version_compare("5.3.3",phpversion(), "<="));
 }
 
 function CheckGettext() 

=== added file 'server/install/database/69.sql'
--- server/install/database/69.sql	1970-01-01 00:00:00 +0000
+++ server/install/database/69.sql	2014-07-15 15:37:37 +0000
@@ -0,0 +1,4 @@
+
+UPDATE `version` SET `app_ver` = '1.6.1', `XmdsVersion` = 3;
+UPDATE `setting` SET `value` = 0 WHERE `setting` = 'PHONE_HOME_DATE';
+UPDATE `version` SET `DBVersion` = '69';

=== added file 'server/install/database/70.sql'
--- server/install/database/70.sql	1970-01-01 00:00:00 +0000
+++ server/install/database/70.sql	2014-07-15 15:37:37 +0000
@@ -0,0 +1,15 @@
+ALTER TABLE  `dataset` ADD  `LastDataEdit` INT NOT NULL DEFAULT  '0';
+
+CREATE TABLE IF NOT EXISTS `lkdatasetlayout` (
+  `LkDataSetLayoutID` int(11) NOT NULL AUTO_INCREMENT,
+  `DataSetID` int(11) NOT NULL,
+  `LayoutID` int(11) NOT NULL,
+  `RegionID` varchar(50) NOT NULL,
+  `MediaID` varchar(50) NOT NULL,
+  PRIMARY KEY (`LkDataSetLayoutID`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+
+
+UPDATE `version` SET `app_ver` = '1.6.2', `XmdsVersion` = 3;
+UPDATE `setting` SET `value` = 0 WHERE `setting` = 'PHONE_HOME_DATE';
+UPDATE `version` SET `DBVersion` = '70';

=== modified file 'server/install/master/data.sql'
--- server/install/master/data.sql	2014-05-03 21:16:38 +0000
+++ server/install/master/data.sql	2014-07-15 15:37:37 +0000
@@ -1,5 +1,5 @@
 INSERT INTO `version` (`app_ver`, `XmdsVersion`, `XlfVersion`, `DBVersion`) VALUES
-('1.6.0', 3, 1, 68);
+('1.6.2', 3, 1, 70);
 
 INSERT INTO `group` (`groupID`, `group`, `IsUserSpecific`, `IsEveryone`) VALUES
 (1, 'Users', 0, 0),

=== modified file 'server/lib/app/kit.class.php'
--- server/lib/app/kit.class.php	2014-03-29 11:20:40 +0000
+++ server/lib/app/kit.class.php	2014-07-15 15:37:37 +0000
@@ -26,6 +26,7 @@
 define('_REQUEST', "request");
 
 define('_STRING', "string");
+define('_STRINGSPECIAL', 'stringspecial');
 define('_HTMLSTRING', 'htmlstring');
 define('_PASSWORD', "password");
 define('_INT', "int");
@@ -295,6 +296,10 @@
 			case _PASSWORD :
 				$return = filter_var($return, FILTER_SANITIZE_STRING);
 				break;
+
+			case _STRINGSPECIAL:
+				$return = filter_var($return, FILTER_SANITIZE_SPECIAL_CHARS);
+				break;			
 				
 			case _HTMLSTRING :
 				

=== modified file 'server/lib/app/session.class.php'
--- server/lib/app/session.class.php	2014-01-18 09:47:41 +0000
+++ server/lib/app/session.class.php	2014-07-15 15:37:37 +0000
@@ -75,7 +75,7 @@
 			$sth->execute(array('session_id' => $key));
 
 			if (!$row = $sth->fetch())
-				throw new Exception('No session returned');
+				return settype($empty, "string");
 
 			// What happens if the UserAgent has changed?
 			if ($row['useragent'] != $userAgent) {

=== modified file 'server/lib/data/dataset.data.class.php'
--- server/lib/data/dataset.data.class.php	2014-01-18 09:47:41 +0000
+++ server/lib/data/dataset.data.class.php	2014-07-15 15:37:37 +0000
@@ -152,6 +152,7 @@
             $security->UnlinkAll($dataSetId);
 
             // Delete columns
+            Kit::ClassLoader('datasetcolumn');
             $dataSetObject = new DataSetColumn($this->db);
             if (!$dataSetObject->DeleteAll($dataSetId))
                 return $this->SetError(25005, __('Cannot delete dataset, columns could not be deleted.'));
@@ -175,6 +176,129 @@
         }
     }
 
+    public function LinkLayout($dataSetId, $layoutId, $regionId, $mediaId) {
+        try {
+            $dbh = PDOConnect::init();
+        
+            $sth = $dbh->prepare('INSERT INTO `lkdatasetlayout` (DataSetID, LayoutID, RegionID, MediaID) VALUES (:datasetid, :layoutid, :regionid, :mediaid)');
+            $sth->execute(array(
+                    'datasetid' => $dataSetId, 
+                    'layoutid' => $layoutId, 
+                    'regionid' => $regionId, 
+                    'mediaid' => $mediaId
+                ));
+        }
+        catch (Exception $e) {
+            
+            Debug::LogEntry('error', $e->getMessage());
+        
+            if (!$this->IsError())
+                $this->SetError(1, __('Unknown Error'));
+        
+            return false;
+        }
+    }
+
+    public function UnlinkLayout($dataSetId, $layoutId, $regionId, $mediaId) {
+        try {
+            $dbh = PDOConnect::init();
+        
+            $sth = $dbh->prepare('DELETE FROM `lkdatasetlayout` WHERE DataSetID = :datasetid AND LayoutID = :layoutid AND RegionID = :regionid AND MediaID = :mediaid');
+            $sth->execute(array(
+                    'datasetid' => $dataSetId, 
+                    'layoutid' => $layoutId, 
+                    'regionid' => $regionId, 
+                    'mediaid' => $mediaId
+                ));
+        }
+        catch (Exception $e) {
+            
+            Debug::LogEntry('error', $e->getMessage());
+        
+            if (!$this->IsError())
+                $this->SetError(1, __('Unknown Error'));
+        
+            return false;
+        }
+    }
+
+    public function GetDataSetFromLayout($layoutId, $regionId, $mediaId) {
+        try {
+            $dbh = PDOConnect::init();
+        
+            $sth = $dbh->prepare('SELECT `dataset`.* FROM `lkdatasetlayout` INNER JOIN `dataset` ON lkdatasetlayout.DataSetId = dataset.DataSetID WHERE LayoutID = :layoutid AND RegionID = :regionid AND MediaID = :mediaid');
+            $sth->execute(array(
+                    'layoutid' => $layoutId, 
+                    'regionid' => $regionId, 
+                    'mediaid' => $mediaId
+                ));
+
+            return $sth->fetchAll();
+        }
+        catch (Exception $e) {
+            
+            Debug::LogEntry('error', $e->getMessage());
+        
+            if (!$this->IsError())
+                $this->SetError(1, __('Unknown Error'));
+        
+            return false;
+        }
+    }
+
+    public function GetCampaignsForDataSet($dataSetId) {
+        try {
+            $dbh = PDOConnect::init();
+        
+            $sth = $dbh->prepare('SELECT `lkcampaignlayout`.CampaignID FROM `lkdatasetlayout` INNER JOIN `lkcampaignlayout` ON `lkcampaignlayout`.LayoutID = `lkdatasetlayout`.LayoutID WHERE DataSetID = :datasetid');
+            $sth->execute(array(
+                    'datasetid' => $dataSetId
+                ));
+
+            $ids = array();
+
+            foreach ($sth->fetchAll() as $id)
+                $ids[] = $id['CampaignID'];
+
+            return $ids;
+        }
+        catch (Exception $e) {
+            
+            Debug::LogEntry('error', $e->getMessage());
+        
+            if (!$this->IsError())
+                $this->SetError(1, __('Unknown Error'));
+        
+            return false;
+        }
+    }
+
+    public function GetLastDataEditTime($dataSetId) {
+        try {
+            $dbh = PDOConnect::init();
+        
+            $sth = $dbh->prepare('SELECT LastDataEdit FROM `dataset` WHERE DataSetID = :dataset_id');
+            $sth->execute(array(
+                    'dataset_id' => $dataSetId
+                ));
+
+            $updateDate = $sth->fetchColumn(0);
+          
+            Debug::LogEntry('audit', sprintf('Returning update date %s for DataSetId %d', $updateDate, $dataSetId), 'dataset', 'GetLastDataEditTime');
+
+            return $updateDate;
+        }
+        catch (Exception $e) {
+            
+            Debug::LogEntry('error', $e->getMessage());
+        
+            if (!$this->IsError())
+                $this->SetError(1, __('Unknown Error'));
+        
+            return false;
+        }
+    }
+
     /**
      * Data Set Results
      * @param <type> $dataSetId
@@ -327,5 +451,45 @@
 
         return $results;
     }
+
+    public function GetDataTypes() {
+        try {
+            $dbh = PDOConnect::init();
+
+            $sth = $dbh->prepare('SELECT datatypeid, datatype FROM datatype');
+            $sth->execute();
+          
+            return $sth->fetchAll();
+        }
+        catch (Exception $e) {
+            
+            Debug::LogEntry('error', $e->getMessage());
+
+            if (!$this->IsError())
+                $this->SetError(1, __('Unknown Error'));
+
+            return false;
+        }
+    }
+
+    public function GetDataSetColumnTypes() {
+        try {
+            $dbh = PDOConnect::init();
+
+            $sth = $dbh->prepare('SELECT datasetcolumntypeid, datasetcolumntype FROM datasetcolumntype');
+            $sth->execute();
+          
+            return $sth->fetchAll();
+        }
+        catch (Exception $e) {
+            
+            Debug::LogEntry('error', $e->getMessage());
+
+            if (!$this->IsError())
+                $this->SetError(1, __('Unknown Error'));
+
+            return false;
+        }
+    }
 }
-?>
\ No newline at end of file
+?>

=== modified file 'server/lib/data/datasetcolumn.data.class.php'
--- server/lib/data/datasetcolumn.data.class.php	2014-01-18 09:47:41 +0000
+++ server/lib/data/datasetcolumn.data.class.php	2014-07-15 15:37:37 +0000
@@ -26,6 +26,18 @@
     {
         Debug::LogEntry('audit', sprintf('IN - DataSetID = %d', $dataSetId), 'DataSetColumn', 'Add');
 
+        if ($dataSetId == 0 || $dataSetId == '')
+            return $this->SetError(25001, __('Missing dataSetId'));
+        
+        if ($dataTypeId == 0 || $dataTypeId == '')
+            return $this->SetError(25001, __('Missing dataTypeId'));
+        
+        if ($dataSetColumnTypeId == 0 || $dataSetColumnTypeId == '')
+            return $this->SetError(25001, __('Missing dataSetColumnTypeId'));
+
+        if ($heading == '')
+            return $this->SetError(25001, __('Please provide a column heading.'));
+
         try {
             $dbh = PDOConnect::init();
 
@@ -77,6 +89,18 @@
 
     public function Edit($dataSetColumnId, $heading, $dataTypeId, $listContent, $columnOrder, $dataSetColumnTypeId, $formula = '')
     {
+        if ($dataSetColumnId == 0 || $dataSetColumnId == '')
+            return $this->SetError(25001, __('Missing dataSetColumnId'));
+
+        if ($dataTypeId == 0 || $dataTypeId == '')
+            return $this->SetError(25001, __('Missing dataTypeId'));
+        
+        if ($dataSetColumnTypeId == 0 || $dataSetColumnTypeId == '')
+            return $this->SetError(25001, __('Missing dataSetColumnTypeId'));
+
+        if ($heading == '')
+            return $this->SetError(25001, __('Please provide a column heading.'));
+
         try {
             $dbh = PDOConnect::init();
 
@@ -122,7 +146,7 @@
                     'formula' => $formula
                ));
 
-            Debug::LogEntry('audit', 'Complete', 'DataSetColumn', 'Edit');
+            Debug::LogEntry('audit', 'Complete for ' . $heading, 'DataSetColumn', 'Edit');
 
             return true;
         }
@@ -134,6 +158,9 @@
 
     public function Delete($dataSetColumnId)
     {
+        if ($dataSetColumnId == 0 || $dataSetColumnId == '')
+            return $this->SetError(25001, __('Missing dataSetColumnId'));
+
         try {
             $dbh = PDOConnect::init();
 
@@ -155,6 +182,9 @@
     // Delete All Data Set columns
     public function DeleteAll($dataSetId)
     {
+        if ($dataSetId == 0 || $dataSetId == '')
+            return $this->SetError(25001, __('Missing dataSetId'));
+
         try {
             $dbh = PDOConnect::init();
 
@@ -172,5 +202,61 @@
             return $this->SetError(25005, __('Could not delete DataSet Column'));
         }
     }
+
+    public function GetColumns($dataSetId) {
+
+        if ($dataSetId == 0 || $dataSetId == '')
+            return $this->SetError(25001, __('Missing dataSetId'));
+
+        try {
+            $dbh = PDOConnect::init();
+
+            $sth = $dbh->prepare('SELECT DataSetColumnID, Heading, datatype.DataType, datasetcolumntype.DataSetColumnType, ListContent, ColumnOrder 
+                  FROM datasetcolumn 
+                   INNER JOIN `datatype` 
+                   ON datatype.DataTypeID = datasetcolumn.DataTypeID 
+                   INNER JOIN `datasetcolumntype` 
+                   ON datasetcolumntype.DataSetColumnTypeID = datasetcolumn.DataSetColumnTypeID 
+                 WHERE DataSetID = :datasetid
+                ORDER BY ColumnOrder ');
+
+            $sth->execute(array(
+                    'datasetid' => $dataSetId
+                ));
+
+            $results = $sth->fetchAll();
+
+            // Check there are some columns returned
+            if (count($results) <= 0)
+                $this->ThrowError(__('No columns'));
+
+            $rows = array();
+
+            foreach($results as $row) {
+
+                $col['datasetcolumnid'] = Kit::ValidateParam($row['DataSetColumnID'], _INT);
+                $col['heading'] = Kit::ValidateParam($row['Heading'], _STRING);
+                $col['listcontent'] = Kit::ValidateParam($row['ListContent'], _STRING);
+                $col['columnorder'] = Kit::ValidateParam($row['ColumnOrder'], _INT);
+                $col['datatype'] = Kit::ValidateParam($row['DataType'], _STRING);
+                $col['datasetcolumntype'] = Kit::ValidateParam($row['DataSetColumnType'], _STRING);
+
+                $rows[] = $col;
+            }
+
+            Debug::LogEntry('audit', sprintf('Returning %d columns.', count($rows)), 'DataSetColumn', 'GetColumns');
+          
+            return $rows;
+        }
+        catch (Exception $e) {
+            
+            Debug::LogEntry('error', $e->getMessage());
+
+            if (!$this->IsError())
+                $this->SetError(1, __('Unknown Error'));
+
+            return false;
+        }
+    }
 }
-?>
\ No newline at end of file
+?>

=== modified file 'server/lib/data/datasetdata.data.class.php'
--- server/lib/data/datasetdata.data.class.php	2014-01-18 09:47:41 +0000
+++ server/lib/data/datasetdata.data.class.php	2014-07-15 15:37:37 +0000
@@ -22,8 +22,75 @@
 
 class DataSetData extends Data
 {
+    private $updateWatermark;
+
+    public function __construct(database $db) {
+
+        $this->updateWatermark = true;
+
+        parent::__construct($db);
+    }
+
+    /**
+     * List all data for this dataset
+     * @param int $dataSetId The DataSet ID
+     */
+    public function GetData($dataSetId) {
+
+        if ($dataSetId == 0 || $dataSetId == '')
+            return $this->SetError(25001, __('Missing dataSetId'));
+
+        try {
+            $dbh = PDOConnect::init();
+        
+            $sth = $dbh->prepare('SELECT datasetdata.DataSetColumnID, datasetdata.RowNumber, datasetdata.Value 
+                  FROM datasetdata
+                    INNER JOIN datasetcolumn
+                    ON datasetcolumn.DataSetColumnID = datasetdata.DataSetColumnID
+                 WHERE datasetcolumn.DataSetID = :dataset_id');
+
+            $sth->execute(array('dataset_id' => $dataSetId));
+
+            $results = $sth->fetchAll();
+
+            // Check there are some columns returned
+            if (count($results) <= 0)
+                $this->ThrowError(__('No data'));
+
+            $rows = array();
+
+            foreach($results as $row) {
+
+                $col['datasetcolumnid'] = Kit::ValidateParam($row['DataSetColumnID'], _INT);
+                $col['rownumber'] = Kit::ValidateParam($row['RowNumber'], _INT);
+                $col['value'] = Kit::ValidateParam($row['Value'], _STRING);
+
+                $rows[] = $col;
+            }
+
+            Debug::LogEntry('audit', sprintf('Returning %d columns.', count($rows)), 'DataSetColumn', 'GetData');
+          
+            return $rows;          
+        }
+        catch (Exception $e) {
+            
+            Debug::LogEntry('error', $e->getMessage());
+        
+            if (!$this->IsError())
+                $this->SetError(1, __('Unknown Error'));
+        
+            return false;
+        }
+    }
+
     public function Add($dataSetColumnId, $rowNumber, $value)
     {
+        if ($dataSetColumnId == 0 || $dataSetColumnId == '')
+            return $this->SetError(25001, __('Missing dataSetColumnId'));
+
+        if ($rowNumber == 0 || $rowNumber == '')
+            return $this->SetError(25001, __('Missing rowNumber'));
+
         try {
             $dbh = PDOConnect::init();
 
@@ -39,6 +106,9 @@
 
             $id = $dbh->lastInsertId();
 
+            // Update the Water Mark
+            $this->UpdateWatermarkWithColumnId($dataSetColumnId);
+
             Debug::LogEntry('audit', 'Complete', 'DataSetData', 'Add');
             
             return $id;
@@ -51,6 +121,12 @@
 
     public function Edit($dataSetColumnId, $rowNumber, $value)
     {
+        if ($dataSetColumnId == 0 || $dataSetColumnId == '')
+            return $this->SetError(25001, __('Missing dataSetColumnId'));
+
+        if ($rowNumber == 0 || $rowNumber == '')
+            return $this->SetError(25001, __('Missing rowNumber'));
+
         try {
             $dbh = PDOConnect::init();
 
@@ -64,6 +140,8 @@
                     'value' => $value
                ));
 
+            $this->UpdateWatermarkWithColumnId($dataSetColumnId);
+
             Debug::LogEntry('audit', 'Complete', 'DataSetData', 'Edit');
 
             return true;
@@ -88,6 +166,8 @@
                     'rownumber' => $rowNumber
                ));
 
+            $this->UpdateWatermarkWithColumnId($dataSetColumnId);
+
             Debug::LogEntry('audit', 'Complete', 'DataSetData', 'Delete');
 
             return true;
@@ -100,6 +180,9 @@
 
     public function DeleteAll($dataSetId) {
 
+        if ($dataSetId == 0 || $dataSetId == '')
+            return $this->SetError(25001, __('Missing dataSetId'));
+
         try {
             $dbh = PDOConnect::init();
 
@@ -113,6 +196,8 @@
                     'datasetid' => $dataSetId
                ));
 
+            $this->UpdateWatermark($dataSetId);
+
             return true;
         }
         catch (Exception $e) {
@@ -121,8 +206,98 @@
         }
     }
 
+    /**
+     * Update the Water Mark to indicate the last data edit
+     * @param int $dataSetColumnId The Data Set Column ID
+     */
+    private function UpdateWatermarkWithColumnId($dataSetColumnId) {
+
+        if (!$this->updateWatermark)
+            return;
+
+        try {
+            $dbh = PDOConnect::init();
+        
+            $sth = $dbh->prepare('SELECT DataSetID FROM `datasetcolumn` WHERE DataSetColumnID = :dataset_column_id');
+            $sth->execute(array(
+                    'dataset_column_id' => $dataSetColumnId
+                ));
+          
+            $this->UpdateWatermark($sth->fetchColumn(0));
+        }
+        catch (Exception $e) {
+            
+            Debug::LogEntry('error', $e->getMessage());
+        
+            if (!$this->IsError())
+                $this->SetError(1, __('Unknown Error'));
+        
+            return false;
+        }
+    }
+
+    /**
+     * Update the Water Mark to indicate the last data edit
+     * @param int $dataSetId The Data Set ID to Update
+     */
+    private function UpdateWatermark($dataSetId) {
+
+        if ($dataSetId == 0 || $dataSetId == '')
+            return $this->SetError(25001, __('Missing dataSetId'));
+        
+        if (!$this->updateWatermark)
+            return;
+
+        Debug::LogEntry('audit', sprintf('Updating water mark on DataSetId: %d', $dataSetId), 'DataSetData', 'UpdateWatermark');
+
+        try {
+            $dbh = PDOConnect::init();
+        
+            $sth = $dbh->prepare('UPDATE `dataset` SET LastDataEdit = :last_data_edit WHERE DataSetID = :dataset_id');
+            $sth->execute(array(
+                    'last_data_edit' => time(),
+                    'dataset_id' => $dataSetId
+                ));
+
+            // Get affected Campaigns
+            Kit::ClassLoader('dataset');
+            $dataSet = new DataSet($this->db);
+            $campaigns = $dataSet->GetCampaignsForDataSet($dataSetId);
+
+            Kit::ClassLoader('display');
+            $display = new Display($this->db);
+
+            foreach ($campaigns as $campaignId) {
+                // Assess all displays  
+                $campaigns = $display->NotifyDisplays($campaignId);
+            }
+        }
+        catch (Exception $e) {
+            
+            Debug::LogEntry('error', $e->getMessage());
+        
+            if (!$this->IsError())
+                $this->SetError(1, __('Unknown Error'));
+        
+            return false;
+        }
+    }
+
     public function ImportCsv($dataSetId, $csvFile, $spreadSheetMapping, $overwrite = false, $ignoreFirstRow = true) {
 
+        if ($dataSetId == 0 || $dataSetId == '')
+            return $this->SetError(25001, __('Missing dataSetId'));
+
+        if (!file_exists($csvFile))
+            return $this->SetError(25001, __('CSV File does not exist'));
+
+        if (!is_array($spreadSheetMapping) || count($spreadSheetMapping) <= 0)
+            return $this->SetError(25001, __('Missing spreadSheetMapping'));
+
+        Debug::LogEntry('audit', 'spreadSheetMapping: ' . json_encode($spreadSheetMapping), 'DataSetData', 'ImportCsv');
+        
+        $this->updateWatermark = false;
+
         try {
             $dbh = PDOConnect::init();
 
@@ -187,6 +362,8 @@
 
             // TODO: Update list content definitions
 
+            $this->UpdateWatermark($dataSetId);
+
             return true;
         }
         catch (Exception $e) {

=== modified file 'server/lib/data/datasetgroupsecurity.data.class.php'
--- server/lib/data/datasetgroupsecurity.data.class.php	2014-01-18 09:47:41 +0000
+++ server/lib/data/datasetgroupsecurity.data.class.php	2014-07-15 15:37:37 +0000
@@ -22,6 +22,53 @@
 
 class DataSetGroupSecurity extends Data
 {
+    public function ListSecurity($dataSetId, $groupId) {
+
+        if ($dataSetId == 0 || $dataSetId == '')
+            return $this->SetError(25001, __('Missing dataSetId'));
+
+        try {
+            $dbh = PDOConnect::init();
+
+            $sth = $dbh->prepare('SELECT `group`.groupid, `group`.`group`, view, edit, del, `group`.isuserspecific
+              FROM `group`
+               LEFT OUTER JOIN lkdatasetgroup
+               ON lkdatasetgroup.GroupID = group.GroupID
+                   AND lkdatasetgroup.DataSetID = :datasetid
+             WHERE `group`.GroupID <> :groupid
+            ORDER BY `group`.IsEveryone DESC, `group`.IsUserSpecific, `group`.`Group`');
+
+            $sth->execute(array(
+                    'datasetid' => $dataSetId,
+                    'groupid' => $groupId
+                ));
+
+            $security = array();
+
+            foreach($sth->fetchAll() as $row) {
+                $security[] = array(
+                        'groupid' => Kit::ValidateParam($row['groupid'], _INT),
+                        'group' => Kit::ValidateParam($row['group'], _STRING),
+                        'view' => Kit::ValidateParam($row['view'], _INT),
+                        'edit' => Kit::ValidateParam($row['edit'], _INT),
+                        'del' => Kit::ValidateParam($row['del'], _INT),
+                        'isuserspecific' => Kit::ValidateParam($row['isuserspecific'], _INT),
+                    );
+            }
+          
+            return $security;
+        }
+        catch (Exception $e) {
+            
+            Debug::LogEntry('error', $e->getMessage());
+        
+            if (!$this->IsError())
+                $this->SetError(1, __('Unknown Error'));
+        
+            return false;
+        }
+    }
+
     /**
      * Links a Display Group to a Group
      * @return
@@ -30,7 +77,11 @@
      */
     public function Link($dataSetId, $groupId, $view, $edit, $del)
     {
-        Debug::LogEntry('audit', 'IN', 'DataSetGroupSecurity', 'Link');
+        if ($dataSetId == 0 || $dataSetId == '')
+            return $this->SetError(25001, __('Missing dataSetId'));
+
+        if ($groupId == 0 || $groupId == '')
+            return $this->SetError(25001, __('Missing groupId'));
 
         try {
             $dbh = PDOConnect::init();
@@ -69,6 +120,9 @@
     public function LinkEveryone($dataSetId, $view, $edit, $del)
     {
         Debug::LogEntry('audit', 'IN', 'DataSetGroupSecurity', 'LinkEveryone');
+
+        if ($dataSetId == 0 || $dataSetId == '')
+            return $this->SetError(25001, __('Missing dataSetId'));
         
         try {
             $dbh = PDOConnect::init();
@@ -97,7 +151,11 @@
      */
     public function Unlink($dataSetId, $groupId)
     {
-        Debug::LogEntry('audit', 'IN', 'DataSetGroupSecurity', 'Unlink');
+        if ($dataSetId == 0 || $dataSetId == '')
+            return $this->SetError(25001, __('Missing dataSetId'));
+
+        if ($groupId == 0 || $groupId == '')
+            return $this->SetError(25001, __('Missing groupId'));
         
         try {
             $dbh = PDOConnect::init();
@@ -128,6 +186,9 @@
     {
         Debug::LogEntry('audit', 'IN', 'DataSetGroupSecurity', 'UnlinkAll');
 
+        if ($dataSetId == 0 || $dataSetId == '')
+            return $this->SetError(25001, __('Missing dataSetId'));
+
         try {
             $dbh = PDOConnect::init();
 

=== modified file 'server/lib/data/file.data.class.php'
--- server/lib/data/file.data.class.php	2014-01-18 09:47:41 +0000
+++ server/lib/data/file.data.class.php	2014-07-15 15:37:37 +0000
@@ -132,6 +132,20 @@
     }
 
     /**
+     * Get the Path to a file
+     * @param int $fileId The File ID
+     */
+    public function GetPath($fileId) {
+
+        if ($fileId == '' || $fileId == 0)
+            return $this->SetError(25001, __('Missing fileId'));
+
+        $libraryFolder = Config::GetSetting('LIBRARY_LOCATION');
+        $libraryFolder = $libraryFolder . 'temp';
+        return $libraryFolder . '/' . $fileId;
+    }
+
+    /**
      * The current size of a file
      * @param <type> $fileId
      * @return <int> filesize

=== modified file 'server/lib/data/layout.data.class.php'
--- server/lib/data/layout.data.class.php	2014-02-16 18:10:59 +0000
+++ server/lib/data/layout.data.class.php	2014-07-15 15:37:37 +0000
@@ -1065,13 +1065,28 @@
             $regionObject = new Region($this->db);
             $mediaNodes = $regionObject->GetMediaNodeList($layoutId, $region['regionid']);
 
+            // Create a data set to see if there are any requirements to serve an updated date time
+            Kit::ClassLoader('dataset');
+            $dataSetObject = new DataSet($this->db);
+
             foreach($mediaNodes as $mediaNode) {
-                // Put this node vertically in the region timeline
-                $region['media'][] = array(
+
+                $node = array(
                         'mediaid' => $mediaNode->getAttribute('id'),
                         'lkid' => $mediaNode->getAttribute('lkid'),
                         'mediatype' => $mediaNode->getAttribute('type')
                     );
+
+                // DataSets are a special case. We want to get the last updated time from the dataset.
+                $dataSet = $dataSetObject->GetDataSetFromLayout($layoutId, $region['regionid'], $mediaNode->getAttribute('id'));
+
+                if (count($dataSet) == 1) {
+                    
+                    $node['updated'] = $dataSet[0]['LastDataEdit'];
+                }
+
+                // Put this node vertically in the region time-line
+                $region['media'][] = $node;
             }
 
             Debug::LogEntry('audit', 'Finished with Region', 'layout', 'LayoutInformation');

=== modified file 'server/lib/data/region.data.class.php'
--- server/lib/data/region.data.class.php	2014-04-26 09:25:32 +0000
+++ server/lib/data/region.data.class.php	2014-07-15 15:37:37 +0000
@@ -22,6 +22,10 @@
 
 class Region extends Data
 {
+	// Caching
+	private $layoutXml;
+	private $layoutDocument;
+
 	public function __construct(database $db) 
 	{
 		$this->db 	=& $db;
@@ -37,9 +41,23 @@
 	 */
 	public function GetLayoutXml($layoutid)
 	{
-		$layout = new Layout($this->db);
-
-		return $layout->GetLayoutXml($layoutid);
+		if ($this->layoutXml == '') {
+			$layout = new Layout($this->db);
+			$this->layoutXml = $layout->GetLayoutXml($layoutid);
+		}
+
+		return $this->layoutXml;
+	}
+
+	public function GetLayoutDom($layoutId) {
+
+		if ($this->layoutDocument == NULL) {
+			// Load the XML into a new DOMDocument
+	        $this->layoutDocument = new DOMDocument();
+	        $this->layoutDocument->loadXML($this->GetLayoutXml($layoutId));
+		}
+
+        return $this->layoutDocument;
 	}
 	
 	/**
@@ -50,6 +68,9 @@
 	 */
 	private function SetLayoutXml($layoutid, $xml)
 	{
+		// Update Cache
+		$this->layoutXml = $xml;
+
 		$layout = new Layout($this->db);
 
 		if (!$layout->SetLayoutXml($layoutid, $xml))
@@ -904,6 +925,41 @@
     }
 
     /**
+     * Get Option for Media Id
+     * @param int $layoutId The Layout ID
+     * @param string $mediaId  The Media ID
+     * @param string $name     The Option Name
+     * @param string $default  The Default Value if none found
+     */
+    public function GetOptionForMediaId($layoutId, $mediaId, $name, $default = false) {
+
+    	if ($name == '') 
+			return false;
+
+		if (!$this->GetLayoutDom($layoutId))
+			return false;
+
+		// Check to see if we already have this option or not
+		$xpath = new DOMXPath($this->layoutDocument);
+
+		// Xpath for it
+		$userOptions = $xpath->query('//region/media[@id=\'' . $mediaId . '\']/options/' . $name);
+
+        // Debug::LogEntry('audit', '//region/media[@id=\'' . $mediaId . '\']/options/' . $name);
+
+		if ($userOptions->length == 0) {
+			// We do not have an option - return the default
+			Debug::LogEntry('audit', 'GetOption ' . $name . ': Not Set - returning default ' . $default, 'region');
+			return $default;
+		}
+		else {
+			// Replace the old node we found with XPath with the new node we just created
+			Debug::LogEntry('audit', 'GetOption ' . $name . ': Set - returning: ' . $userOptions->item(0)->nodeValue, 'region');
+			return ($userOptions->item(0)->nodeValue != '') ? $userOptions->item(0)->nodeValue : $default;
+		}
+    }
+
+    /**
      * Add Existing Media from the Library
      * @param [int] $user [A user object for the currently logged in user]
      * @param [int] $layoutId  [The LayoutID to Add on]

=== modified file 'server/lib/include.php'
--- server/lib/include.php	2014-04-27 20:16:42 +0000
+++ server/lib/include.php	2014-07-15 15:37:37 +0000
@@ -1,7 +1,7 @@
 <?php
 /*
  * Xibo - Digital Signage - http://www.xibo.org.uk
- * Copyright (C) 2006-2012 Daniel Garner and James Packer
+ * Copyright (C) 2006-2014 Daniel Garner and James Packer
  *
  * This file is part of Xibo.
  *
@@ -20,7 +20,7 @@
  */
 defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
 
-define('WEBSITE_VERSION', 68);
+define('WEBSITE_VERSION', 70);
 
 // No errors reported until we read the settings from the DB
 error_reporting(0);
@@ -137,8 +137,8 @@
 // Create login control system
 require_once('modules/' . Config::GetSetting("userModule"));
 
-$user 		= new User($db);
-$session 	= new Session();
+// Create a Session
+$session = new Session();
 
 // Work out the location of this service
 $serviceLocation = Kit::GetXiboRoot();
@@ -152,6 +152,9 @@
 // Assign the page name to the session
 $session->set_page(session_id(), $page);
 
+// Create a user
+$user = new User($db);
+
 // Create Page
 try {
     $pageManager = new PageManager($db, $user, $page);

=== modified file 'server/lib/modules/module.class.php'
--- server/lib/modules/module.class.php	2014-04-26 09:25:32 +0000
+++ server/lib/modules/module.class.php	2014-07-15 15:37:37 +0000
@@ -233,27 +233,32 @@
                 $this->existingMedia = true;
                 $this->assignedMedia = false;
 
-                // Load what we know about this media into the object
-                $SQL = "SELECT duration, name, UserId, storedAs FROM media WHERE mediaID = '$mediaid'";
-
-                Debug::LogEntry('audit', $SQL, 'Module', 'SetMediaInformation');
-
-                if (!$result = $db->query($SQL))
-                {
-                	// log the error
-                    trigger_error($db->error());
-                }
-
-                if ($db->num_rows($result) != 0)
-                {
-                    $row = $db->get_row($result);
-                    $this->duration = $row[0];
-                    $this->name = $row[1];
-                    $this->originalUserId = $row[2];
-                    $this->storedAs = $row[3];
-                }
-                else
-                	return $this->SetError(__('Unable to find media record with the provided ID'));
+                try {
+                    $dbh = PDOConnect::init();
+                
+                    // Load what we know about this media into the object
+                    $sth = $dbh->prepare('SELECT duration, name, UserId, storedAs FROM media WHERE mediaID = :media_id');
+                    $sth->execute(array(
+                            'media_id' => $mediaid
+                        ));
+                    
+                    $rows = $sth->fetchAll();
+                
+                    if (count($rows) != 1) {
+                        return $this->SetError(__('Unable to find media record with the provided ID'));
+                    }
+
+                    $this->duration = $rows[0]['duration'];
+                    $this->name = $rows[0]['name'];
+                    $this->originalUserId = $rows[0]['UserId'];
+                    $this->storedAs = $rows[0]['storedAs'];
+                }
+                catch (Exception $e) {
+                    
+                    Debug::LogEntry('error', $e->getMessage());
+                
+                    return $this->SetError(__('Unable to find media record with the provided ID'));
+                }
 
                 $this->auth = $this->user->MediaAuth($this->mediaid, true);
             }
@@ -517,7 +522,7 @@
             if ($this->regionSpecific)
             {
                 $form = <<<END
-                <form id="MediaDeleteForm" class="XiboForm" method="post" action="index.php?p=module&mod=text&q=Exec&method=DeleteMedia">
+                <form id="MediaDeleteForm" class="XiboForm" method="post" action="index.php?p=module&mod=$this->type&q=Exec&method=DeleteMedia">
                         <input type="hidden" name="mediaid" value="$mediaid">
                         <input type="hidden" name="layoutid" value="$layoutid">
                         <input type="hidden" name="regionid" value="$regionid">
@@ -865,13 +870,13 @@
 		Theme::Set('form_meta', '<input type="hidden" id="PHPSESSID" value="' . $sessionId . '" /><input type="hidden" id="SecurityToken" value="' . $securityToken . '" /><input type="hidden" name="type" value="' . $this->type . '"><input type="hidden" name="layoutid" value="' . $layoutid . '"><input type="hidden" name="regionid" value="' . $regionid . '">');
 		Theme::Set('form_valid_ext', '/(\.|\/)' . implode('|', $this->validExtensions) . '$/i');
 		Theme::Set('form_max_size', Kit::ReturnBytes($this->maxFileSize));
-		Theme::Set('valid_extensions', 'This form accepts: ' . $this->validExtensionsText . ' files up to a maximum size of ' . $this->maxFileSize);
+		Theme::Set('valid_extensions', sprintf(__('This form accepts: %s files up to a maximum size of %s'), $this->validExtensionsText, $this->maxFileSize));
 		Theme::Set('default_duration', $defaultDuration);
 
 		$form = Theme::RenderReturn('library_form_media_add');
 
         $this->response->html = $form;
-        $this->response->dialogTitle = 'Add New ' . $this->displayType;
+        $this->response->dialogTitle = sprintf(__('Add New %s'), __($this->displayType));
         $this->response->dialogSize = true;
         $this->response->dialogWidth = '450px';
         $this->response->dialogHeight = '280px';
@@ -1201,53 +1206,80 @@
         // Create a region object for later use
         $region = new region($db);
 
-        // Loop through a list of layouts this user has access to
-        foreach($this->user->LayoutList() as $layout)
-        {
-            $layoutId = $layout['layoutid'];
+        try {
+            $dbh = PDOConnect::init();
+        
+            // Some update statements to use
+            $sth = $dbh->prepare('SELECT lklayoutmediaid, regionid FROM lklayoutmedia WHERE mediaid = :media_id AND layoutid = :layout_id');
+            $sth_update = $dbh->prepare('UPDATE lklayoutmedia SET mediaid = :media_id WHERE lklayoutmediaid = :lklayoutmediaid');
 
-            // Does this layout use the old media id?
-            $SQL = sprintf("SELECT lklayoutmediaid, regionid FROM lklayoutmedia WHERE mediaid = %d and layoutid = %d", $oldMediaId, $layoutId);
-            
-            if (!$results = $db->query($SQL))
-                return false;
-            
-            // Loop through each media link for this layout
-            while ($row = $db->get_assoc_row($results))
+            // Loop through a list of layouts this user has access to
+            foreach($this->user->LayoutList() as $layout)
             {
-                // Get the LKID of the link between this layout and this media.. could be more than one?
-                $lkId = $row['lklayoutmediaid'];
-                $regionId = $row['regionid'];
+                $layoutId = $layout['layoutid'];
+                
+                // Does this layout use the old media id?
+                $sth->execute(array(
+                        'media_id' => $oldMediaId,
+                        'layout_id' => $layoutId
+                    ));
 
-                // Get the Type of this media
-                if (!$type = $region->GetMediaNodeType($layoutId, '', '', $lkId))
+                $results = $sth->fetchAll();
+                
+                if (count($results) <= 0)
                     continue;
 
-                // Create a new media node use it to swap the nodes over
-                Debug::LogEntry('audit', 'Creating new module with MediaID: ' . $newMediaId . ' LayoutID: ' . $layoutId . ' and RegionID: ' . $regionId, 'region', 'ReplaceMediaInAllLayouts');
-                require_once('modules/' . $type . '.module.php');
-
-                // Create a new module as if we were assigning it for the first time
-                if (!$module = new $type($db, $this->user, $newMediaId))
-                	return false;
-
-                // Sets the URI field
-                if (!$module->SetRegionInformation($layoutId, $regionId))
-                	return false;
-
-                // Get the media xml string to use in the swap.
-                $mediaXmlString = $module->AsXml();
-
-                // Swap the nodes
-                if (!$region->SwapMedia($layoutId, $regionId, $lkId, $oldMediaId, $newMediaId, $mediaXmlString))
-                    return false;
-
-                // Update the LKID with the new media id
-                $db->query("UPDATE lklayoutmedia SET mediaid = %d WHERE lklayoutmediaid = %d", $newMediaId, $row['lklayoutmediaid']);
-
-                $count++;
+                Debug::LogEntry('audit', sprintf('%d linked media items for layoutid %d', count($results), $layoutId), 'module', 'ReplaceMediaInAllLayouts');
+                
+                // Loop through each media link for this layout
+                foreach ($results as $row)
+                {
+                    // Get the LKID of the link between this layout and this media.. could be more than one?
+                    $lkId = $row['lklayoutmediaid'];
+                    $regionId = $row['regionid'];
+    
+                    // Get the Type of this media
+                    if (!$type = $region->GetMediaNodeType($layoutId, '', '', $lkId))
+                        continue;
+    
+                    // Create a new media node use it to swap the nodes over
+                    Debug::LogEntry('audit', 'Creating new module with MediaID: ' . $newMediaId . ' LayoutID: ' . $layoutId . ' and RegionID: ' . $regionId, 'region', 'ReplaceMediaInAllLayouts');
+                    require_once('modules/' . $type . '.module.php');
+    
+                    // Create a new module as if we were assigning it for the first time
+                    if (!$module = new $type($db, $this->user, $newMediaId))
+                        return false;
+    
+                    // Sets the URI field
+                    if (!$module->SetRegionInformation($layoutId, $regionId))
+                        return false;
+    
+                    // Get the media xml string to use in the swap.
+                    $mediaXmlString = $module->AsXml();
+    
+                    // Swap the nodes
+                    if (!$region->SwapMedia($layoutId, $regionId, $lkId, $oldMediaId, $newMediaId, $mediaXmlString))
+                        return false;
+    
+                    // Update the LKID with the new media id
+                    $sth_update->execute(array(
+                        'media_id' => $newMediaId,
+                        'lklayoutmediaid' => $row['lklayoutmediaid']
+                    ));
+    
+                    $count++;
+                }
             }
         }
+        catch (Exception $e) {
+            
+            Debug::LogEntry('error', $e->getMessage());
+        
+            if (!$this->IsError())
+                $this->SetError(1, __('Unknown Error'));
+        
+            return false;
+        }
 
         Debug::LogEntry('audit', sprintf('Replaced media in %d layouts', $count), 'module', 'ReplaceMediaInAllLayouts');
     }

=== modified file 'server/lib/oauth.inc.php'
--- server/lib/oauth.inc.php	2014-01-18 09:47:41 +0000
+++ server/lib/oauth.inc.php	2014-07-15 15:37:37 +0000
@@ -33,6 +33,6 @@
 require_once('3rdparty/oauth-php/library/OAuthServer.php');
 require_once('3rdparty/oauth-php/library/OAuthStore.php');
 
-OAuthStore::instance('MySQL', array('server' => $dbhost, 'username' => $dbuser, 'password' => $dbpass, 'database' => $dbname));
+OAuthStore::instance('PDO', array('conn' => PDOConnect::init()));
 
 ?>

=== modified file 'server/lib/pages/admin.class.php'
--- server/lib/pages/admin.class.php	2014-02-15 10:32:44 +0000
+++ server/lib/pages/admin.class.php	2014-07-15 15:37:37 +0000
@@ -51,7 +51,7 @@
 
 		// Check the token
         if (!Kit::CheckToken())
-            trigger_error('Token does not match', E_USER_ERROR);
+            trigger_error(__('Sorry the form has expired. Please refresh.'), E_USER_ERROR);
 
 		$refer 		= Kit::GetParam('refer', _POST, _STRING);
 		$usertype 	= Kit::GetParam('usertype', _SESSION, _INT);

=== modified file 'server/lib/pages/campaign.class.php'
--- server/lib/pages/campaign.class.php	2014-01-18 09:47:41 +0000
+++ server/lib/pages/campaign.class.php	2014-07-15 15:37:37 +0000
@@ -154,7 +154,7 @@
     {
         // Check the token
         if (!Kit::CheckToken())
-            trigger_error('Token does not match', E_USER_ERROR);
+            trigger_error(__('Sorry the form has expired. Please refresh.'), E_USER_ERROR);
         
         $db =& $this->db;
         $response = new ResponseManager();
@@ -224,7 +224,7 @@
     {
         // Check the token
         if (!Kit::CheckToken())
-            trigger_error('Token does not match', E_USER_ERROR);
+            trigger_error(__('Sorry the form has expired. Please refresh.'), E_USER_ERROR);
         
         $db =& $this->db;
         $response = new ResponseManager();
@@ -293,7 +293,7 @@
     {
         // Check the token
         if (!Kit::CheckToken())
-            trigger_error('Token does not match', E_USER_ERROR);
+            trigger_error(__('Sorry the form has expired. Please refresh.'), E_USER_ERROR);
         
         $db =& $this->db;
         $response = new ResponseManager();
@@ -395,7 +395,7 @@
     {
         // Check the token
         if (!Kit::CheckToken())
-            trigger_error('Token does not match', E_USER_ERROR);
+            trigger_error(__('Sorry the form has expired. Please refresh.'), E_USER_ERROR);
         
         $db =& $this->db;
         $user =& $this->user;
@@ -484,7 +484,7 @@
     {
         // Check the token
         if (!Kit::CheckToken())
-            trigger_error('Token does not match', E_USER_ERROR);
+            trigger_error(__('Sorry the form has expired. Please refresh.'), E_USER_ERROR);
         
         $db =& $this->db;
         $response = new ResponseManager();

=== modified file 'server/lib/pages/dataset.class.php'
--- server/lib/pages/dataset.class.php	2014-01-18 09:47:41 +0000
+++ server/lib/pages/dataset.class.php	2014-07-15 15:37:37 +0000
@@ -167,7 +167,7 @@
     {
         // Check the token
         if (!Kit::CheckToken())
-            trigger_error('Token does not match', E_USER_ERROR);
+            trigger_error(__('Sorry the form has expired. Please refresh.'), E_USER_ERROR);
         
         $db =& $this->db;
         $user =& $this->user;
@@ -227,7 +227,7 @@
     {
         // Check the token
         if (!Kit::CheckToken())
-            trigger_error('Token does not match', E_USER_ERROR);
+            trigger_error(__('Sorry the form has expired. Please refresh.'), E_USER_ERROR);
         
         $db =& $this->db;
         $user =& $this->user;
@@ -283,7 +283,7 @@
     {
         // Check the token
         if (!Kit::CheckToken())
-            trigger_error('Token does not match', E_USER_ERROR);
+            trigger_error(__('Sorry the form has expired. Please refresh.'), E_USER_ERROR);
         
         $db =& $this->db;
         $user =& $this->user;
@@ -326,29 +326,24 @@
         $SQL .= sprintf(" WHERE DataSetID = %d ", $dataSetId);
         $SQL .= "ORDER BY ColumnOrder ";
 
+        Kit::ClassLoader('datasetcolumn');
+        $dataSetColumnObject = new DataSetColumn($db);
+
         // Load results into an array
-        $dataSetColumns = $db->GetArray($SQL);
-
-        if (!is_array($dataSetColumns)) 
-        {
-            trigger_error($db->error());
-            trigger_error(__('Error getting list of dataSetColumns'), E_USER_ERROR);
-        }
+        if (!$dataSetColumns = $dataSetColumnObject->GetColumns($dataSetId))
+            trigger_error($dataSetColumnObject->GetErrorMessage(), E_USER_ERROR);
 
         $rows = array();
 
         foreach ($dataSetColumns as $row) {
 
-            $row['heading'] = Kit::ValidateParam($row['Heading'], _STRING);
-            $row['listcontent'] = Kit::ValidateParam($row['ListContent'], _STRING);
-            $row['columnorder'] = Kit::ValidateParam($row['ColumnOrder'], _INT);
-            $row['datatype'] = __(Kit::ValidateParam($row['DataType'], _STRING));
-            $row['datasetcolumntype'] = __(Kit::ValidateParam($row['DataSetColumnType'], _STRING));
+            $row['datatype'] = __($row['datatype']);
+            $row['datasetcolumntype'] = __($row['datasetcolumntype']);
 
             // Edit        
             $row['buttons'][] = array(
                     'id' => 'dataset_button_edit',
-                    'url' => 'index.php?p=dataset&q=EditDataSetColumnForm&datasetid=' . $dataSetId . '&datasetcolumnid=' . $row['DataSetColumnID'] . '&dataset=' . $dataSet,
+                    'url' => 'index.php?p=dataset&q=EditDataSetColumnForm&datasetid=' . $dataSetId . '&datasetcolumnid=' . $row['datasetcolumnid'] . '&dataset=' . $dataSet,
                     'text' => __('Edit')
                 );
 
@@ -356,7 +351,7 @@
                 // Delete
                 $row['buttons'][] = array(
                         'id' => 'dataset_button_delete',
-                        'url' => 'index.php?p=dataset&q=DeleteDataSetColumnForm&datasetid=' . $dataSetId . '&datasetcolumnid=' . $row['DataSetColumnID'] . '&dataset=' . $dataSet,
+                        'url' => 'index.php?p=dataset&q=DeleteDataSetColumnForm&datasetid=' . $dataSetId . '&datasetcolumnid=' . $row['datasetcolumnid'] . '&dataset=' . $dataSet,
                         'text' => __('Delete')
                     );
             }
@@ -410,7 +405,7 @@
     {
         // Check the token
         if (!Kit::CheckToken())
-            trigger_error('Token does not match', E_USER_ERROR);
+            trigger_error(__('Sorry the form has expired. Please refresh.'), E_USER_ERROR);
         
         $db =& $this->db;
         $user =& $this->user;
@@ -490,7 +485,7 @@
     {
         // Check the token
         if (!Kit::CheckToken())
-            trigger_error('Token does not match', E_USER_ERROR);
+            trigger_error(__('Sorry the form has expired. Please refresh.'), E_USER_ERROR);
         
         $db =& $this->db;
         $user =& $this->user;
@@ -555,7 +550,7 @@
     {
         // Check the token
         if (!Kit::CheckToken())
-            trigger_error('Token does not match', E_USER_ERROR);
+            trigger_error(__('Sorry the form has expired. Please refresh.'), E_USER_ERROR);
         
         $db =& $this->db;
         $user =& $this->user;
@@ -863,40 +858,29 @@
         Theme::Set('form_meta', '<input type="hidden" name="datasetid" value="' . $dataSetId . '" />');
 
         // List of all Groups with a view/edit/delete checkbox
-        $SQL = '';
-        $SQL .= 'SELECT `group`.GroupID, `group`.`Group`, View, Edit, Del, `group`.IsUserSpecific ';
-        $SQL .= '  FROM `group` ';
-        $SQL .= '   LEFT OUTER JOIN lkdatasetgroup ';
-        $SQL .= '   ON lkdatasetgroup.GroupID = group.GroupID ';
-        $SQL .= '       AND lkdatasetgroup.DataSetID = %d ';
-        $SQL .= ' WHERE `group`.GroupID <> %d ';
-        $SQL .= 'ORDER BY `group`.IsEveryone DESC, `group`.IsUserSpecific, `group`.`Group` ';
-
-        $SQL = sprintf($SQL, $dataSetId, $user->getGroupFromId($user->userid, true));
-
-        if (!$results = $db->query($SQL))
-        {
-            trigger_error($db->error());
+        Kit::ClassLoader('datasetgroupsecurity');
+        $security = new DataSetGroupSecurity($this->db);
+
+        if (!$results = $security->ListSecurity($dataSetId, $user->getGroupFromId($user->userid, true))) {
             trigger_error(__('Unable to get permissions for this dataset'), E_USER_ERROR);
         }
 
         $checkboxes = array();
 
-        while ($row = $db->get_assoc_row($results))
-        {
-            $groupId = $row['GroupID'];
-            $rowClass = ($row['IsUserSpecific'] == 0) ? 'strong_text' : '';
+        foreach ($results as $row) {
+            $groupId = $row['groupid'];
+            $rowClass = ($row['isuserspecific'] == 0) ? 'strong_text' : '';
 
             $checkbox = array(
                     'id' => $groupId,
-                    'name' => Kit::ValidateParam($row['Group'], _STRING),
+                    'name' => Kit::ValidateParam($row['group'], _STRING),
                     'class' => $rowClass,
                     'value_view' => $groupId . '_view',
-                    'value_view_checked' => (($row['View'] == 1) ? 'checked' : ''),
+                    'value_view_checked' => (($row['view'] == 1) ? 'checked' : ''),
                     'value_edit' => $groupId . '_edit',
-                    'value_edit_checked' => (($row['Edit'] == 1) ? 'checked' : ''),
+                    'value_edit_checked' => (($row['edit'] == 1) ? 'checked' : ''),
                     'value_del' => $groupId . '_del',
-                    'value_del_checked' => (($row['Del'] == 1) ? 'checked' : ''),
+                    'value_del_checked' => (($row['del'] == 1) ? 'checked' : ''),
                 );
 
             $checkboxes[] = $checkbox;
@@ -917,7 +901,7 @@
     {
         // Check the token
         if (!Kit::CheckToken())
-            trigger_error('Token does not match', E_USER_ERROR);
+            trigger_error(__('Sorry the form has expired. Please refresh.'), E_USER_ERROR);
         
         $db =& $this->db;
         $user =& $this->user;
@@ -1087,14 +1071,14 @@
         if ($tmpName == '')
             trigger_error(__('Please ensure you have picked a file and it has finished uploading'), E_USER_ERROR);
 
-        // File name and extension (orignial name)
+        // File name and extension (original name)
         $fileName = Kit::GetParam('txtFileName', _POST, _STRING);
         $fileName = basename($fileName);
         $ext = strtolower(substr(strrchr($fileName, "."), 1));
 
         // Check it is a CSV file
         if ($ext != 'csv')
-            trigger_error(__('Files with a CSV extention only.'));
+            trigger_error(__('Files with a CSV extension only.'), E_USER_ERROR);
 
         // File upload directory.. get this from the settings object
         $csvFileLocation = Config::GetSetting('LIBRARY_LOCATION') . 'temp/' . $tmpName;
@@ -1122,8 +1106,10 @@
 
             $dataSetColumnId = Kit::ValidateParam($row['DataSetColumnID'], _INT);
             $spreadSheetColumn = Kit::GetParam('csvImport_' . $dataSetColumnId, _POST, _INT);
-            
-            $spreadSheetMapping[($spreadSheetColumn - 1)] = $dataSetColumnId;
+
+            // If it has been left blank, then skip
+            if ($spreadSheetColumn != 0)
+                $spreadSheetMapping[($spreadSheetColumn - 1)] = $dataSetColumnId;
         }
 
         $dataSetObject = new DataSetData($db);

=== modified file 'server/lib/pages/display.class.php'
--- server/lib/pages/display.class.php	2014-03-09 14:41:56 +0000
+++ server/lib/pages/display.class.php	2014-07-15 15:37:37 +0000
@@ -145,11 +145,22 @@
         // Configure the theme
         $id = uniqid();
         Theme::Set('id', $id);
-        Theme::Set('campaign_form_add_url', 'index.php?p=campaign&q=AddForm');
         Theme::Set('form_meta', '<input type="hidden" name="p" value="display"><input type="hidden" name="q" value="DisplayGrid">');
         Theme::Set('filter_id', 'XiboFilterPinned' . uniqid('filter'));
         Theme::Set('pager', ResponseManager::Pager($id));
 
+        // Default options
+        if (Kit::IsFilterPinned('display', 'DisplayFilter')) {
+            Theme::Set('filter_pinned', 'checked');
+            Theme::Set('filter_displaygroup', Session::Get('display', 'filter_displaygroup'));
+            Theme::Set('filter_display', Session::Get('display', 'filter_display'));
+        }
+
+        $displayGroups = $this->user->DisplayGroupList(0);
+        array_unshift($displayGroups, array('displaygroupid' => '0', 'displaygroup' => 'All'));
+
+        Theme::Set('displaygroup_field_list', $displayGroups);
+
         // Render the Theme and output
         Theme::Render('display_page');
     }
@@ -162,7 +173,7 @@
     {
         // Check the token
         if (!Kit::CheckToken())
-            trigger_error('Token does not match', E_USER_ERROR);
+            trigger_error(__('Sorry the form has expired. Please refresh.'), E_USER_ERROR);
         
         $db             =& $this->db;
         $response       = new ResponseManager();
@@ -280,7 +291,18 @@
         $user       =& $this->user;
         $response   = new ResponseManager();
 
-        $displays = $user->DisplayList();
+        // Filter by Name
+        $filter_display = Kit::GetParam('filter_display', _POST, _STRING);
+        setSession('display', 'filter_display', $filter_display);
+        
+        // Display Group
+        $filter_displaygroupid = Kit::GetParam('filter_displaygroup', _POST, _INT);
+        setSession('display', 'filter_displaygroup', $filter_displaygroupid);
+
+        // Pinned option?        
+        setSession('display', 'DisplayFilter', Kit::GetParam('XiboFilterPinned', _REQUEST, _CHECKBOX, 'off'));
+
+        $displays = $user->DisplayList(array('displayid'), array('displaygroupid' => $filter_displaygroupid, 'display' => $filter_display));
 
         if (!is_array($displays))
         {
@@ -358,6 +380,13 @@
                         'url' => 'index.php?p=displaygroup&q=FileAssociations&DisplayGroupID=' . $row['displaygroupid'],
                         'text' => __('Assign Files')
                     );
+
+                // Logs
+                $row['buttons'][] = array(
+                        'id' => 'displaygroup_button_logs',
+                        'url' => 'index.php?p=log&q=LastHundredForDisplay&displayid=' . $row['displayid'],
+                        'text' => __('Last 100 Log Messages')
+                    );
             }
 
             if ($row['del'] == 1) {
@@ -486,7 +515,7 @@
     {
         // Check the token
         if (!Kit::CheckToken())
-            trigger_error('Token does not match', E_USER_ERROR);
+            trigger_error(__('Sorry the form has expired. Please refresh.'), E_USER_ERROR);
         
         $db =& $this->db;
         $response = new ResponseManager();
@@ -550,7 +579,7 @@
     {
         // Check the token
         if (!Kit::CheckToken())
-            trigger_error('Token does not match', E_USER_ERROR);
+            trigger_error(__('Sorry the form has expired. Please refresh.'), E_USER_ERROR);
         
         $db =& $this->db;
         $response = new ResponseManager();
@@ -834,7 +863,7 @@
     {
         // Check the token
         if (!Kit::CheckToken())
-            trigger_error('Token does not match', E_USER_ERROR);
+            trigger_error(__('Sorry the form has expired. Please refresh.'), E_USER_ERROR);
         
         $db =& $this->db;
         $response = new ResponseManager();

=== modified file 'server/lib/pages/displaygroup.class.php'
--- server/lib/pages/displaygroup.class.php	2014-03-29 14:15:07 +0000
+++ server/lib/pages/displaygroup.class.php	2014-07-15 15:37:37 +0000
@@ -264,37 +264,40 @@
         $SQL .= sprintf("WHERE  lkdisplaydg.DisplayGroupID   = %d", $displayGroupID);
         $SQL .= " ORDER BY display.Display ";
         
-        $displaysAssigned = $db->GetArray($SQL);
+        $displays_assigned = $this->user->DisplayList(array('display'), array('displaygroupid' => $displayGroupID), 'edit');
 
-        if (!is_array($displaysAssigned))
-        {
-            trigger_error($db->error());
+        if (!is_array($displays_assigned))
             trigger_error(__('Error getting Displays'), E_USER_ERROR);
+
+        // Build a new available array, based on the view permissions.
+        $displaysAssigned = array();
+
+        foreach ($displays_assigned as $display) {
+            
+            // Go through each and set the appropriate fields
+            $displaysAssigned[] = array(
+                    'Display' => $display['display'],
+                    'list_id' => 'DisplayID_' . $display['displayid']
+                );
         }
 
         Theme::Set('displays_assigned', $displaysAssigned);
         
-        // Displays not in group
-        $SQL  = "";
-        $SQL .= "SELECT display.DisplayID, ";
-        $SQL .= "       display.Display, ";
-        $SQL .= "       CONCAT('DisplayID_', display.DisplayID) AS list_id ";
-        $SQL .= "FROM   display ";
-        $SQL .= " WHERE display.DisplayID NOT       IN ";
-        $SQL .= "       (SELECT display.DisplayID ";
-        $SQL .= "       FROM    display ";
-        $SQL .= "               INNER JOIN lkdisplaydg ";
-        $SQL .= "               ON      lkdisplaydg.DisplayID = display.DisplayID ";
-        $SQL .= sprintf("   WHERE  lkdisplaydg.DisplayGroupID   = %d", $displayGroupID);
-        $SQL .= "       )";
-        $SQL .= " ORDER BY display.Display ";
-
-        $displaysAvailable = $db->GetArray($SQL);
+        // All Displays 
+        $displays = $this->user->DisplayList(array('display'), array('exclude_displaygroupid' => $displayGroupID), 'edit');
         
-        if (!is_array($displaysAvailable))
-        {
-            trigger_error($db->error());
+        if (!is_array($displays))
             trigger_error(__('Error getting Displays'), E_USER_ERROR);
+
+        // Build a new available array, based on the view permissions.
+        $displaysAvailable = array();
+
+        foreach ($displays as $display) {
+            // Go through each and set the appropriate fields
+            $displaysAvailable[] = array(
+                    'Display' => $display['display'],
+                    'list_id' => 'DisplayID_' . $display['displayid']
+                );
         }
 
         Theme::Set('displays_available', $displaysAvailable);
@@ -317,7 +320,7 @@
     {
         // Check the token
         if (!Kit::CheckToken())
-            trigger_error('Token does not match', E_USER_ERROR);
+            trigger_error(__('Sorry the form has expired. Please refresh.'), E_USER_ERROR);
         
         $db =& $this->db;
         $response = new ResponseManager();
@@ -327,10 +330,16 @@
         
         $displayGroupObject = new DisplayGroup($db);
         
-        if (!$displayGroupObject->Add($displayGroup, 0, $description))
+        if (!$displayGroupId = $displayGroupObject->Add($displayGroup, 0, $description))
         {
             trigger_error($displayGroupObject->GetErrorMessage(), E_USER_ERROR);
         }
+
+        // Add full permissions for this user to this group
+        $security = new DisplayGroupSecurity($db);
+
+        if (!$security->Link($displayGroupId, $this->user->getGroupFromID($this->user->userid, true), 1, 1, 1))
+            trigger_error(__('Unable to set permissions'));
         
         $response->SetFormSubmitResponse(__('Display Group Added'), false);
         $response->Respond();
@@ -344,7 +353,7 @@
     {
         // Check the token
         if (!Kit::CheckToken())
-            trigger_error('Token does not match', E_USER_ERROR);
+            trigger_error(__('Sorry the form has expired. Please refresh.'), E_USER_ERROR);
         
         $db             =& $this->db;
         $response       = new ResponseManager();
@@ -378,7 +387,7 @@
     {
         // Check the token
         if (!Kit::CheckToken())
-            trigger_error('Token does not match', E_USER_ERROR);
+            trigger_error(__('Sorry the form has expired. Please refresh.'), E_USER_ERROR);
         
         $db             =& $this->db;   
         $response       = new ResponseManager();
@@ -550,7 +559,7 @@
     {
         // Check the token
         if (!Kit::CheckToken())
-            trigger_error('Token does not match', E_USER_ERROR);
+            trigger_error(__('Sorry the form has expired. Please refresh.'), E_USER_ERROR);
         
         $db =& $this->db;
         $user =& $this->user;

=== modified file 'server/lib/pages/fault.class.php'
--- server/lib/pages/fault.class.php	2014-01-18 09:47:41 +0000
+++ server/lib/pages/fault.class.php	2014-07-15 15:37:37 +0000
@@ -64,12 +64,6 @@
 		
 		echo "\n";
 		echo "--------------------------------------\n";
-		echo 'PHP INFO' . "\n";
-		echo "--------------------------------------\n";
-		$this->phpinfo_array();
-		
-		echo "\n";
-		echo "--------------------------------------\n";
 		echo 'LOG Dump' . "\n";
 		echo "--------------------------------------\n";
 		
@@ -83,6 +77,8 @@
 			trigger_error($db->error());
 			trigger_error("Can not query the log", E_USER_ERROR);
 		}
+
+		echo 'Date,Page,Function,Message' . PHP_EOL;
 		
 		while ($row = $db->get_row($results)) 
 		{
@@ -91,14 +87,7 @@
 			$function 	= Kit::ValidateParam($row[2], _STRING);
 			$message 	= Kit::ValidateParam($row[3], _HTMLSTRING);
 			
-			$output = <<<END
-Date: $logdate
-Page: $page
-Function: $function
-Message: $message
-\n
-END;
-			echo $output;
+			echo '"' . $logdate . '","' . $page . '","' . $function . '","' . $message . '"' . PHP_EOL;
 		}
 		
 		echo "\n";
@@ -213,50 +202,5 @@
 
 		exit;
 	}
-	
-	/**
-	 * Outputs PHP info as an array rather than HTML
-	 * Taken from: http://uk2.php.net/phpinfo
-	 * @return 
-	 * @param $return Object[optional]
-	 */
-	function phpinfo_array($return=false) 
-	{
-		ob_start();
-		phpinfo(-1);
-		
-		$pi = preg_replace(
-		array('#^.*<body>(.*)</body>.*$#ms', '#<h2>PHP License</h2>.*$#ms',
-		'#<h1>Configuration</h1>#',  "#\r?\n#", "#</(h1|h2|h3|tr)>#", '# +<#',
-		"#[ \t]+#", '#&nbsp;#', '#  +#', '# class=".*?"#', '%&#039;%',
-		'#<tr>(?:.*?)" src="(?:.*?)=(.*?)" alt="PHP Logo" /></a>'
-		.'<h1>PHP Version (.*?)</h1>(?:\n+?)</td></tr>#',
-		'#<h1><a href="(?:.*?)\?=(.*?)">PHP Credits</a></h1>#',
-		'#<tr>(?:.*?)" src="(?:.*?)=(.*?)"(?:.*?)Zend Engine (.*?),(?:.*?)</tr>#',
-		"# +#", '#<tr>#', '#</tr>#'),
-		array('$1', '', '', '', '</$1>' . "\n", '<', ' ', ' ', ' ', '', ' ',
-		'<h2>PHP Configuration</h2>'."\n".'<tr><td>PHP Version</td><td>$2</td></tr>'.
-		"\n".'<tr><td>PHP Egg</td><td>$1</td></tr>',
-		'<tr><td>PHP Credits Egg</td><td>$1</td></tr>',
-		'<tr><td>Zend Engine</td><td>$2</td></tr>' . "\n" .
-		'<tr><td>Zend Egg</td><td>$1</td></tr>', ' ', '%S%', '%E%'),
-		ob_get_clean());
-		
-		$sections = explode('<h2>', strip_tags($pi, '<h2><th><td>'));
-		unset($sections[0]);
-		
-		$pi = array();
-		foreach($sections as $section)
-		{
-			$n = substr($section, 0, strpos($section, '</h2>'));
-			preg_match_all(
-			'#%S%(?:<td>(.*?)</td>)?(?:<td>(.*?)</td>)?(?:<td>(.*?)</td>)?%E%#',
-			$section, $askapache, PREG_SET_ORDER);
-			foreach($askapache as $m)
-			$pi[$n][$m[1]]=(!isset($m[3])||$m[2]==$m[3])?$m[2]:array_slice($m,2);
-		}
-		
-		return ($return === false) ? print_r($pi) : $pi;
-	}
 }
 ?>

=== modified file 'server/lib/pages/group.class.php'
--- server/lib/pages/group.class.php	2014-01-18 09:47:41 +0000
+++ server/lib/pages/group.class.php	2014-07-15 15:37:37 +0000
@@ -355,7 +355,7 @@
 	{
         // Check the token
         if (!Kit::CheckToken())
-            trigger_error('Token does not match', E_USER_ERROR);
+            trigger_error(__('Sorry the form has expired. Please refresh.'), E_USER_ERROR);
         
         $db =& $this->db;
         $response = new ResponseManager();
@@ -379,7 +379,7 @@
 	{
         // Check the token
         if (!Kit::CheckToken())
-            trigger_error('Token does not match', E_USER_ERROR);
+            trigger_error(__('Sorry the form has expired. Please refresh.'), E_USER_ERROR);
         
 		$db =& $this->db;
 		
@@ -404,7 +404,7 @@
 	{
         // Check the token
         if (!Kit::CheckToken())
-            trigger_error('Token does not match', E_USER_ERROR);
+            trigger_error(__('Sorry the form has expired. Please refresh.'), E_USER_ERROR);
         
 		$db =& $this->db;		
 		$groupid = Kit::GetParam('groupid', _POST, _INT);
@@ -587,7 +587,7 @@
 	{
         // Check the token
         if (!Kit::CheckToken())
-            trigger_error('Token does not match', E_USER_ERROR);
+            trigger_error(__('Sorry the form has expired. Please refresh.'), E_USER_ERROR);
         
 		$db =& $this->db;
 		$groupid = Kit::GetParam('groupid', _POST, _INT);

=== modified file 'server/lib/pages/help.class.php'
--- server/lib/pages/help.class.php	2014-01-19 11:52:23 +0000
+++ server/lib/pages/help.class.php	2014-07-15 15:37:37 +0000
@@ -264,7 +264,7 @@
     {
         // Check the token
         if (!Kit::CheckToken())
-            trigger_error('Token does not match', E_USER_ERROR);
+            trigger_error(__('Sorry the form has expired. Please refresh.'), E_USER_ERROR);
         
         $db =& $this->db;
         $response = new ResponseManager();
@@ -291,7 +291,7 @@
     {
         // Check the token
         if (!Kit::CheckToken())
-            trigger_error('Token does not match', E_USER_ERROR);
+            trigger_error(__('Sorry the form has expired. Please refresh.'), E_USER_ERROR);
         
         $db =& $this->db;
         $response = new ResponseManager();
@@ -316,7 +316,7 @@
     {
         // Check the token
         if (!Kit::CheckToken())
-            trigger_error('Token does not match', E_USER_ERROR);
+            trigger_error(__('Sorry the form has expired. Please refresh.'), E_USER_ERROR);
         
         $db =& $this->db;
         $response = new ResponseManager();

=== modified file 'server/lib/pages/index.class.php'
--- server/lib/pages/index.class.php	2014-02-15 11:25:09 +0000
+++ server/lib/pages/index.class.php	2014-07-15 15:37:37 +0000
@@ -50,7 +50,7 @@
             // Split on &amp; and rejoin with &
             $params = explode('&amp;', $referingpage, 3);
             unset($params['message']);
-			$referingpage = implode('&', $params) . '&message=Token Error';
+			$referingpage = implode('&', $params) . '&message=' . __('Sorry the form has expired. Please refresh.');
 
             header('Location:index.php?' . $referingpage);
             exit;

=== modified file 'server/lib/pages/layout.class.php'
--- server/lib/pages/layout.class.php	2014-03-23 14:43:11 +0000
+++ server/lib/pages/layout.class.php	2014-07-15 15:37:37 +0000
@@ -148,6 +148,9 @@
    				// Set up the theme variables for the Layout Jump List
    				$this->LayoutJumpListFilter();
 
+   				// Set up any JavaScript translations
+   				Theme::Set('translations', json_encode(array('save_position_button' => __('Save Position'))));
+
    				// Call the render the template
    				Theme::Render('layout_designer');
 
@@ -168,7 +171,7 @@
 	{
         // Check the token
         if (!Kit::CheckToken())
-            trigger_error('Token does not match', E_USER_ERROR);
+            trigger_error(__('Sorry the form has expired. Please refresh.'), E_USER_ERROR);
         
         $db             =& $this->db;
         $response       = new ResponseManager();
@@ -199,7 +202,7 @@
 	{
         // Check the token
         if (!Kit::CheckToken())
-            trigger_error('Token does not match', E_USER_ERROR);
+            trigger_error(__('Sorry the form has expired. Please refresh.'), E_USER_ERROR);
         
 		$db 			=& $this->db;
 		$response		= new ResponseManager();
@@ -277,7 +280,7 @@
 	{
         // Check the token
         if (!Kit::CheckToken())
-            trigger_error('Token does not match', E_USER_ERROR);
+            trigger_error(__('Sorry the form has expired. Please refresh.'), E_USER_ERROR);
         
         $db =& $this->db;
         $response = new ResponseManager();
@@ -303,7 +306,7 @@
 	{
         // Check the token
         if (!Kit::CheckToken())
-            trigger_error('Token does not match', E_USER_ERROR);
+            trigger_error(__('Sorry the form has expired. Please refresh.'), E_USER_ERROR);
         
 		$db =& $this->db;
         $response = new ResponseManager();
@@ -609,7 +612,7 @@
 	{
         // Check the token
         if (!Kit::CheckToken())
-            trigger_error('Token does not match', E_USER_ERROR);
+            trigger_error(__('Sorry the form has expired. Please refresh.'), E_USER_ERROR);
         
 		$db 			=& $this->db;
 		$user 			=& $this->user;
@@ -810,7 +813,7 @@
     {
         // Check the token
         if (!Kit::CheckToken())
-            trigger_error('Token does not match', E_USER_ERROR);
+            trigger_error(__('Sorry the form has expired. Please refresh.'), E_USER_ERROR);
         
         $db =& $this->db;
         $user =& $this->user;

=== modified file 'server/lib/pages/log.class.php'
--- server/lib/pages/log.class.php	2014-01-18 09:47:41 +0000
+++ server/lib/pages/log.class.php	2014-07-15 15:37:37 +0000
@@ -164,6 +164,50 @@
 		$response->Respond();
 	}
 
+	function LastHundredForDisplay() {
+        $response = new ResponseManager();
+        $displayId = Kit::GetParam('displayid', _GET, _INT);
+
+        try {
+            $dbh = PDOConnect::init();
+        
+            $sth = $dbh->prepare('SELECT logid, logdate, page, function, message FROM log WHERE displayid = :displayid ORDER BY logid DESC LIMIT 100');
+            $sth->execute(array(
+                    'displayid' => $displayId
+                ));
+                
+            $log = $sth->fetchAll();
+
+            if (count($log) <= 0)
+                throw new Exception(__('No log messages for this display'));
+
+            $rows = array();
+   
+            foreach ($log as $row) { 
+    
+                $row['logid'] = Kit::ValidateParam($row['logid'], _INT);
+                $row['logdate'] = Kit::ValidateParam($row['logdate'], _STRING);
+                $row['page'] = Kit::ValidateParam($row['page'], _STRING);
+                $row['function'] = Kit::ValidateParam($row['function'], _STRING);
+                $row['message'] = nl2br(htmlspecialchars($row['message']));
+                
+                $rows[] = $row;
+            }
+        
+            Theme::Set('table_rows', $rows);
+                
+            $output = Theme::RenderReturn('log_form_display_last100');
+                
+            $response->initialSortOrder = 2;
+            $response->pageSize = 10;
+            $response->SetGridResponse($output);
+            $response->Respond();  
+        }
+        catch (Exception $e) {
+            trigger_error($e->getMessage(), E_USER_ERROR);
+        }
+    }
+
 	public function TruncateForm() {
 		$db =& $this->db;
         $user =& $this->user;
@@ -192,7 +236,7 @@
 	{
         // Check the token
         if (!Kit::CheckToken())
-            trigger_error('Token does not match', E_USER_ERROR);
+            trigger_error(__('Sorry the form has expired. Please refresh.'), E_USER_ERROR);
         
 		$db =& $this->db;
 

=== modified file 'server/lib/pages/module.class.php'
--- server/lib/pages/module.class.php	2014-03-02 15:53:38 +0000
+++ server/lib/pages/module.class.php	2014-07-15 15:37:37 +0000
@@ -208,7 +208,7 @@
     {
         // Check the token
         if (!Kit::CheckToken())
-            trigger_error('Token does not match', E_USER_ERROR);
+            trigger_error(__('Sorry the form has expired. Please refresh.'), E_USER_ERROR);
         
         $db =& $this->db;
         $response = new ResponseManager();

=== modified file 'server/lib/pages/oauth.class.php'
--- server/lib/pages/oauth.class.php	2014-01-18 09:47:41 +0000
+++ server/lib/pages/oauth.class.php	2014-07-15 15:37:37 +0000
@@ -218,7 +218,7 @@
     {
         // Check the token
         if (!Kit::CheckToken())
-            trigger_error('Token does not match', E_USER_ERROR);
+            trigger_error(__('Sorry the form has expired. Please refresh.'), E_USER_ERROR);
         
         $db =& $this->db;
         $user =& $this->user;

=== modified file 'server/lib/pages/resolution.class.php'
--- server/lib/pages/resolution.class.php	2014-01-18 09:47:41 +0000
+++ server/lib/pages/resolution.class.php	2014-07-15 15:37:37 +0000
@@ -197,7 +197,7 @@
     {
         // Check the token
         if (!Kit::CheckToken())
-            trigger_error('Token does not match', E_USER_ERROR);
+            trigger_error(__('Sorry the form has expired. Please refresh.'), E_USER_ERROR);
         
         $db 	=& $this->db;
         $user 	=& $this->user;
@@ -221,7 +221,7 @@
     {
         // Check the token
         if (!Kit::CheckToken())
-            trigger_error('Token does not match', E_USER_ERROR);
+            trigger_error(__('Sorry the form has expired. Please refresh.'), E_USER_ERROR);
         
         $db 	=& $this->db;
         $user 	=& $this->user;
@@ -246,7 +246,7 @@
     {
         // Check the token
         if (!Kit::CheckToken())
-            trigger_error('Token does not match', E_USER_ERROR);
+            trigger_error(__('Sorry the form has expired. Please refresh.'), E_USER_ERROR);
         
         $db 	=& $this->db;
         $user 	=& $this->user;

=== modified file 'server/lib/pages/schedule.class.php'
--- server/lib/pages/schedule.class.php	2014-03-29 11:20:40 +0000
+++ server/lib/pages/schedule.class.php	2014-07-15 15:37:37 +0000
@@ -72,7 +72,7 @@
         $groups = array();
         $displays = array();
 
-        foreach ($user->DisplayGroupList(0 /*IsDisplaySpecific*/, $filter_name) as $display) {
+        foreach ($user->DisplayGroupList(-1 /*IsDisplaySpecific*/, $filter_name) as $display) {
 
             $display['checked_text'] = (in_array($display['displaygroupid'], $displayGroupIDs)) ? 'checked' : '';
 
@@ -625,7 +625,10 @@
                 $eventDGIDs = Kit::ValidateParam($row['DisplayGroupIDs'], _STRING);
                 $eventDGIDs     = explode(',', $eventDGIDs);
 
-                if (!$user->DisplayGroupAuth($displayGroupID)) continue;
+                // Make sure this user can view this display group
+                $auth = $user->DisplayGroupAuth($displayGroupID, true);
+                if (!$auth->view) 
+                    continue;
 
                 // How many days does this event span?
                 $spanningDays   = ($toDT - $fromDT) / (60 * 60 * 24);
@@ -1083,7 +1086,7 @@
             trigger_error(__('No Display Groups'), E_USER_ERROR);
             
         if ($outputForm) $output .= '<form id="DisplayList" class="DisplayListForm">';
-                $output         .= __('Groups');
+        $output         .= __('Groups');
         $output     .= '<ul class="DisplayList">';
         $nested     = false;
         
@@ -1137,6 +1140,8 @@
             $filterName = '';
         }
 
+        $pinTranslated = __('Pin?');
+
         $form = <<<HTML
         <div class="XiboFilterInner">     
             <form onsubmit="return false">
@@ -1148,7 +1153,7 @@
                         <td>$msgName</td>
                         <td><input type="text" name="name" value="$filterName"></td>
                         <td>
-                            <label for="XiboFilterPinned">Pin?</label>
+                            <label for="XiboFilterPinned">$pinTranslated</label>
                             <input id="XiboFilterPinned" name="XiboFilterPinned" type="checkbox" class="XiboFilter" $filterPinned />
                         </td>
                     </tr>
@@ -1250,7 +1255,10 @@
             $filterPinned = '';
             $filterName = '';
         }
-        
+
+        $pinTranslated = __('Pin?');
+        $checkAllTranslated = __('Check All');
+
         // Serialize the list of display group ids
         $displayGroupIdsSerialized = "";
         foreach ($displayGroupIds as $displayGroupId)
@@ -1258,7 +1266,7 @@
 
         $form = <<<HTML
         <div class="XiboFilterInner">     
-            <div class="scheduleFormCheckAll pull-right"><label for"checkAll"><input type="checkbox" name="checkAll">Check All</label></div>
+            <div class="scheduleFormCheckAll pull-right"><label for"checkAll"><input type="checkbox" name="checkAll">$checkAllTranslated</label></div>
             <form onsubmit="return false">
                 <input type="hidden" name="p" value="schedule">
                 <input type="hidden" name="q" value="EventFormDisplay">
@@ -1268,7 +1276,7 @@
                         <td>$msgName</td>
                         <td><input type="text" name="name" value="$filterName"></td>
                         <td>
-                            <label for="XiboFilterPinned">Pin?</label>
+                            <label for="XiboFilterPinned">$pinTranslated</label>
                             <input id="XiboFilterPinned" name="XiboFilterPinned" type="checkbox" class="XiboFilter" $filterPinned />
                         </td>
                     </tr>
@@ -1305,7 +1313,7 @@
         setSession('scheduleEvent', 'DisplayName', $displayName);
         
         // Layout list
-        $displays = $user->DisplayGroupList(0, $displayName);
+        $displays = $user->DisplayGroupList(-1, $displayName);
         
         // Show a list of layouts we have permission to jump to
         $output = '<table class="table table-bordered">';
@@ -1361,89 +1369,28 @@
         $layoutFilter = $this->EventFormLayoutFilter();
         $displayFilter = $this->EventFormDisplayFilter($displayGroupIds);
 
-        $token = Kit::Token();
-        
-        $form = <<<END
-<div class="container-fluid">
-    <div class="row-fluid">
-    <div class="span6">
-        $layoutFilter
-    </div>
-    <div class="span6">
-        $displayFilter
-    </div>
-</div>
-<div class="row-fluid">
-    <div class="span12">
-<form id="AddEventForm" class="XiboScheduleForm" action="index.php?p=schedule&q=AddEvent" method="post">
-    $token
-    <table style="width:100%;">
-        <tr>
-            <td colspan="4"><center><h3>Event Schedule</h3></center></td>
-        </tr>
-        <tr>
-            <td><label for="starttime" title="Select the start time for this event">Start Time</label></td>
-            <td>
-                <div class="date-pick input-append date">
-                    <input data-format="dd/MM/yyyy hh:mm" type="text" class="input-medium" name="starttime" id="starttime" value="$dateText"></input>
-                    <span class="add-on">
-                        <i data-time-icon="icon-time" data-date-icon="icon-calendar"></i>
-                    </span>
-                </div>
-            </td>
-            <td><label for="endtime" title="Select the end time for this event">End Time</label></td>
-            <td>
-                <div class="date-pick input-append date">
-                    <input data-format="dd/MM/yyyy hh:mm" type="text" class="input-medium" name="endtime" id="endtime" value="$toDateText"></input>
-                    <span class="add-on">
-                        <i data-time-icon="icon-time" data-date-icon="icon-calendar"></i>
-                    </span>
-                </div>
-            </td>
-        </tr>
-        <tr>
-            <td><label for="DisplayOrder" title="Select the Order for this Event">Display Order</label></td>
-            <td><input type=text" name="DisplayOrder" value="0" />
-            <td><label title="Sets whether or not this event has priority. If set the event will be show in preference to other events." for="cb_is_priority">Priority</label></td>
-            <td><input type="checkbox" id="cb_is_priority" name="is_priority" value="1" title="Sets whether or not this event has priority. If set the event will be show in preference to other events."></td>
-        </tr>
-END;
-
-        //recurrance part of the form
-        $rec_type = listcontent("null|None,Hour|Hourly,Day|Daily,Week|Weekly,Month|Monthly,Year|Yearly", "rec_type");
-
-        $form .= <<<END
-        <tr>
-            <td colspan="4"><center><h3>Recurring Event</h3></center></td>
-        </tr>
-        <tr>
-            <td><label for="rec_type" title="What type of repeating is required">Repeats</label></td>
-            <td>$rec_type</td>
-            <td><label for="rec_detail" title="How often does this event repeat">Repeat every</label></td>
-            <td><input class="number" type="text" name="rec_detail" value="1" /></td>
-        </tr>
-        <tr>
-            <td><label for="rec_range" title="When should this event stop repeating?">Until</label></td>
-            <td>
-                <div class="date-pick input-append date">
-                    <input data-format="dd/MM/yyyy hh:mm" type="text" class="input-medium" name="rec_range" id="rec_range"></input>
-                    <span class="add-on">
-                        <i data-time-icon="icon-time" data-date-icon="icon-calendar"></i>
-                    </span>
-                </div>
-            </td>
-        </tr>
-END;
-
-        $form .= <<<END
-        </table>
-    </form>
-    </div>
-</div>
-</div>
-END;
-        
-        $response->SetFormRequestResponse($form, __('Schedule Event'), '800px', '600px');
+        $token_id = uniqid();
+        $token_field = '<input type="hidden" name="token_id" value="' . $token_id . '" />';
+        $token = Kit::Token($token_id);
+        
+        Theme::Set('form_id', 'AddEventForm');
+        Theme::Set('form_action', 'index.php?p=schedule&q=AddEvent');
+        Theme::Set('form_meta', $token_field . $token);
+
+        // Filter forms
+        Theme::Set('layout_filter', $layoutFilter);
+        Theme::Set('display_filter', $displayFilter);
+
+        Theme::Set('recurrence_field_list', array(
+                array('id' => 'null', 'name' => __('None')),
+                array('id' => 'Hour', 'name' => __('Hourly')),
+                array('id' => 'Day', 'name' => __('Daily')),
+                array('id' => 'Week', 'name' => __('Weekly')),
+                array('id' => 'Month', 'name' => __('Monthly')),
+                array('id' => 'Year', 'name' => __('Yearly'))
+            ));
+
+        $response->SetFormRequestResponse(Theme::RenderReturn('schedule_form_add_event'), __('Schedule Event'), '800px', '600px');
         $response->AddButton(__('Help'), "XiboHelpRender('index.php?p=help&q=Display&Topic=Schedule&Category=Add')");
         $response->AddButton(__('Cancel'), 'XiboDialogClose()');
         $response->AddButton(__('Next'), '$("#AddEventForm").attr("action", $("#AddEventForm").attr("action") + "&next=1").submit()');
@@ -1527,89 +1474,37 @@
         $layoutFilter = $this->EventFormLayoutFilter($campaignId);
         $displayFilter = $this->EventFormDisplayFilter($displayGroupIds);
 
-        $token = Kit::Token();
-        
-        $form = <<<END
-<div class="container-fluid">
-<div class="row-fluid">
-    <div class="span6">
-        $layoutFilter
-    </div>
-    <div class="span6">
-        $displayFilter
-    </div>
-</div>
-<div class="row-fluid">