Merge lp:~alexharrington/xibo/upgrade-db-backup-switch into lp:~xibo-maintainers/xibo/encke

[Alex Harrington]

[Dan Garner (dangarner)]

Generates a Text Conflict in Upgrade.php - I am not sure how to resolve.

review: Needs Information

=== modified file 'client/dotNET/FileCollector.cs'
--- client/dotNET/FileCollector.cs	2009-03-13 09:21:56 +0000
+++ client/dotNET/FileCollector.cs	2009-07-26 11:40:59 +0000
@@ -236,6 +236,9 @@
             }
             else
             {
+                // Set the flag to indicate we have a connection to XMDS
+                Properties.Settings.Default.XmdsLastConnection = DateTime.Now;
+
                 // What file type were we getting
                 if (currentFileList.type == "layout")
                 {  

=== modified file 'client/dotNET/HardwareKey.cs'
--- client/dotNET/HardwareKey.cs	2009-03-02 23:21:22 +0000
+++ client/dotNET/HardwareKey.cs	2009-07-26 11:40:59 +0000
@@ -31,7 +31,18 @@
         {
             System.Diagnostics.Debug.WriteLine("[IN]", "HardwareKey");
 
-            hardwareKey = Hashes.MD5(GetCPUId() + GetVolumeSerial("C"));
+            // Get the key from the Settings
+            hardwareKey = Properties.Settings.Default.hardwareKey;
+
+            // Is the key empty?
+            if (hardwareKey == "")
+            {
+                // Calculate the Hardware key from the CPUID and Volume Serial
+                hardwareKey = Hashes.MD5(GetCPUId() + GetVolumeSerial("C"));
+
+                // Store the key
+                Properties.Settings.Default.hardwareKey = hardwareKey;
+            }
 
             System.Diagnostics.Debug.WriteLine("[OUT]", "HardwareKey");
         }
@@ -48,6 +59,19 @@
         }
 
         /// <summary>
+        /// Regenerates the hardware key
+        /// </summary>
+        public void Regenerate()
+        {
+            // Calculate the Hardware key from the CPUID and Volume Serial
+            hardwareKey = Hashes.MD5(GetCPUId() + GetVolumeSerial("C"));
+
+            // Store the key
+            Properties.Settings.Default.hardwareKey = hardwareKey;
+            Properties.Settings.Default.Save();
+        }
+
+        /// <summary>
         /// return Volume Serial Number from hard drive
         /// </summary>
         /// <param name="strDriveLetter">[optional] Drive letter</param>

=== modified file 'client/dotNET/Image.cs'
--- client/dotNET/Image.cs	2009-02-25 22:57:05 +0000
+++ client/dotNET/Image.cs	2009-08-03 14:09:45 +0000
@@ -27,30 +27,37 @@
 {
     class ImagePosition : Media
     {
+        private string _filePath;
+        PictureBox _pictureBox;
+        
         public ImagePosition(RegionOptions options)
             : base(options.width, options.height, options.top, options.left)
         {
-            this.filePath = options.uri;
+            _filePath = options.uri;
             
-            if (!System.IO.File.Exists(this.filePath))
+            if (!System.IO.File.Exists(_filePath))
             {
                 // Exit
-                this.loaded = false;
+                System.Diagnostics.Trace.WriteLine(new LogMessage("Image - Dispose", "Cannot Create image object. Invalid Filepath."), LogType.Error.ToString());
                 return;
             }
 
-            Bitmap img = new Bitmap(this.filePath);
- 
-            this.pictureBox = new PictureBox();
-            this.pictureBox.SizeMode = PictureBoxSizeMode.Zoom;
-            this.pictureBox.Image = img;
-            this.pictureBox.Size = new Size(width, height);
-            this.pictureBox.Location = new Point(0, 0);
-            this.pictureBox.BorderStyle = BorderStyle.None;
-            this.pictureBox.BackColor = Color.Transparent;
-            this.loaded = true;
-
-            this.Controls.Add(this.pictureBox);
+            try
+            {
+                _pictureBox = new PictureBox();
+                _pictureBox.SizeMode = PictureBoxSizeMode.Zoom;
+                _pictureBox.Image = new Bitmap(_filePath);
+                _pictureBox.Size = new Size(width, height);
+                _pictureBox.Location = new Point(0, 0);
+                _pictureBox.BorderStyle = BorderStyle.None;
+                _pictureBox.BackColor = Color.Transparent;
+                
+                this.Controls.Add(this._pictureBox);
+            }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Trace.WriteLine(new LogMessage("ImagePosition", String.Format("Cannot create Image Object with exception: {0}", ex.Message)), LogType.Error.ToString());
+            }
         }
 
         public override void RenderMedia()
@@ -60,16 +67,22 @@
 
         protected override void Dispose(bool disposing)
         {
-            if (disposing && loaded)
+            if (disposing)
             {
-                this.pictureBox.Dispose();
+                try
+                {
+                    Controls.Remove(_pictureBox);
+
+                    _pictureBox.Image.Dispose();
+                    _pictureBox.Dispose();
+                }
+                catch (Exception ex)
+                {
+                    System.Diagnostics.Trace.WriteLine(new LogMessage("Image - Dispose", String.Format("Cannot dispose Image Object with exception: {0}", ex.Message)), LogType.Error.ToString());
+                }
             }
 
             base.Dispose(disposing);
         }
-
-        private string filePath;
-        private bool loaded;
-        PictureBox pictureBox;
     }
 }

=== added file 'client/dotNET/LogMessage.cs'
--- client/dotNET/LogMessage.cs	1970-01-01 00:00:00 +0000
+++ client/dotNET/LogMessage.cs	2009-07-26 11:40:59 +0000
@@ -0,0 +1,75 @@
+/*
+ * Xibo - Digitial Signage - http://www.xibo.org.uk
+ * Copyright (C) 2009 Daniel Garner
+ *
+ * This file is part of Xibo.
+ *
+ * Xibo is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version. 
+ *
+ * Xibo is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
+ */
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace XiboClient
+{
+    class LogMessage
+    {
+        String _method;
+        String _message;
+        int _scheduleId;
+        int _layoutId;
+        int _mediaId;
+
+        public LogMessage(String method, String message)
+        {
+            _method = method;
+            _message = message;
+        }
+
+        public LogMessage(String method, String message, int scheduleId, int layoutId)
+        {
+            _method = method;
+            _message = message;
+            _scheduleId = scheduleId;
+            _layoutId = layoutId;
+        }
+
+        public LogMessage(String method, String message, int scheduleId, int layoutId, int mediaId)
+        {
+            _method = method;
+            _message = message;
+            _scheduleId = scheduleId;
+            _layoutId = layoutId;
+            _mediaId = mediaId;
+        }
+
+        public override string ToString()
+        {
+            // Format the message into the expected XML sub nodes.
+            // Just do this with a string builder rather than an XML builder.
+            String theMessage;
+
+            theMessage = String.Format("<message>{0}</message>", _message);
+            theMessage += String.Format("<method>{0}</method>", _method);
+
+            if (_scheduleId != 0) theMessage += String.Format("<scheduleid>{0}</scheduleid>", _scheduleId.ToString());
+            if (_layoutId != 0) theMessage += String.Format("<layoutid>{0}</layoutid>", _scheduleId.ToString());
+            if (_mediaId != 0) theMessage += String.Format("<mediaid>{0}</mediaid>", _scheduleId.ToString());
+
+            return theMessage;
+        }
+    }
+
+    public enum LogType { Info, Audit, Error }
+}

=== modified file 'client/dotNET/MainForm.cs'
--- client/dotNET/MainForm.cs	2009-03-08 11:40:17 +0000
+++ client/dotNET/MainForm.cs	2009-07-30 23:01:31 +0000
@@ -34,9 +34,24 @@
 {
     public partial class MainForm : Form
     {
+        private Schedule schedule;
+        private Collection<Region> regions;
+        private bool isExpired = false;
+        private int scheduleId;
+        private int layoutId;
+
+        double layoutWidth;
+        double layoutHeight;
+        double scaleFactor;
+
+        private StatLog _statLog;
+        private Stat _stat;
+
         public MainForm()
         {
             InitializeComponent();
+
+            _statLog = new StatLog();
         }
 
         private void MainForm_Load(object sender, EventArgs e)
@@ -50,7 +65,7 @@
                     Directory.CreateDirectory(Properties.Settings.Default.LibraryPath + @"\backgrounds");
                 }
                 catch (Exception ex)
-                { System.Diagnostics.Debug.WriteLine(ex.Message); }
+                { System.Diagnostics.Trace.WriteLine(ex.Message); }
             }
 
             // Hide the cursor
@@ -71,7 +86,7 @@
             }
             catch (Exception ex)
             {
-                System.Diagnostics.Debug.WriteLine(ex.Message);
+                System.Diagnostics.Debug.WriteLine(ex.Message, LogType.Error.ToString());
                 MessageBox.Show("Fatal Error initialising the application", "Fatal Error");
                 this.Close();
                 this.Dispose();
@@ -89,6 +104,15 @@
             this.scheduleId = scheduleId;
             this.layoutId = layoutId;
 
+            if (_stat != null)
+            {
+                // Log the end of the currently running layout.
+                _stat.toDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+
+                // Record this stat event in the statLog object
+                _statLog.RecordStat(_stat);
+            }
+
             try
             {
                 this.DestroyLayout();
@@ -102,9 +126,6 @@
                 System.Diagnostics.Debug.WriteLine(ex.Message);
                 isExpired = true;
             }
-
-            // Flush the TraceListener
-            System.Diagnostics.Trace.Flush();
         }
 
 
@@ -113,7 +134,12 @@
         /// </summary>
         private void PrepareLayout(string layoutPath)
         {
-            XmlLog.AppendStat("Layout Started", StatType.LayoutStart, scheduleId, layoutId, "0");
+            // Create a start record for this layout
+            _stat = new Stat();
+            _stat.type = StatType.Layout;
+            _stat.scheduleID = scheduleId;
+            _stat.layoutID = layoutId;
+            _stat.fromDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
 
             // Get this layouts XML
             XmlDocument layoutXml = new XmlDocument();
@@ -213,20 +239,6 @@
                 leftOverY = 0;
             }
 
-            // Are we licensed?
-            if (Properties.Settings.Default.licensed == 0)
-            {
-                // Show a label indicating this fact
-                notLic = new Label();
-                notLic.Location = new Point(0, 0);
-                notLic.Size = new System.Drawing.Size(500, 200);
-                notLic.Text = "This Display is not Licensed.";
-                notLic.BackColor = Color.WhiteSmoke;
-                this.Controls.Add(notLic);
-                notLic.BringToFront();
-                notLic.Show();
-            }
-
             // New region and region options objects
             regions = new Collection<Region>();
             RegionOptions options = new RegionOptions();
@@ -305,7 +317,7 @@
                 // All the media nodes for this region / layout combination
                 options.mediaNodes = region.ChildNodes;
 
-                Region temp = new Region();
+                Region temp = new Region(ref _statLog);
                 temp.DurationElapsedEvent += new Region.DurationElapsedDelegate(temp_DurationElapsedEvent);
 
                 System.Diagnostics.Debug.WriteLine("Created new region", "MainForm - Prepare Layout");
@@ -368,6 +380,8 @@
 
             foreach (Region region in regions)
             {
+                region.Clear();
+
                 this.Controls.Remove(region);
 
                 try
@@ -384,27 +398,21 @@
 
             regions.Clear();
             regions = null;
-
-            this.Controls.Remove(notLic);
-            
-            // Want a check for powerpoint instances left open by this user
-            /*foreach (System.Diagnostics.Process proc in System.Diagnostics.Process.GetProcessesByName("POWERPNT"))
-            {
-                System.Diagnostics.Debug.WriteLine("Killing leftover Powerpoint process.", "MainForm - DestoryLayout");
-                // Close them (End Process)
-                proc.Kill();
-            }*/
-        }
-
-        private Schedule schedule;
-        private Collection<Region> regions;
-        private bool isExpired = false;
-        private Label notLic;
-        private int scheduleId;
-        private int layoutId;
-
-        double layoutWidth;
-        double layoutHeight;
-        double scaleFactor;
+        }
+
+        /// <summary>
+        /// Force a flush of the stats log
+        /// </summary>
+        public void FlushStats()
+        {
+            try
+            {
+                _statLog.Flush();
+            }
+            catch
+            {
+                System.Diagnostics.Trace.WriteLine(new LogMessage("MainForm - FlushStats", "Unable to Flush Stats"), LogType.Error.ToString());
+            }
+        }
     }
 }
\ No newline at end of file

=== modified file 'client/dotNET/Media.cs'
--- client/dotNET/Media.cs	2008-12-19 23:34:13 +0000
+++ client/dotNET/Media.cs	2009-08-03 21:56:06 +0000
@@ -28,6 +28,8 @@
     {
         public Media(int width, int height, int top, int left)
         {
+            Hide();
+
             this.width = width;
             this.height = height;
             this.top = top;
@@ -45,9 +47,12 @@
             this.SetStyle(ControlStyles.SupportsTransparentBackColor, true);
             this.BackColor = System.Drawing.Color.Transparent;
             this.TransparencyKey = System.Drawing.Color.White;
+
+            SetStyle(ControlStyles.OptimizedDoubleBuffer, true);
+            SetStyle(ControlStyles.AllPaintingInWmPaint, true);
         }
 
-        public virtual void RenderMedia() 
+        protected void StartTimer()
         {
             //start the timer
             if (!timerStarted && duration != 0)
@@ -60,9 +65,15 @@
 
                 timerStarted = true;
             }
+        }
+
+        public virtual void RenderMedia() 
+        {
+            // Start the timer for this media
+            StartTimer();
 
             // Show the form
-            this.Show();
+            Show();
         }
 
         protected virtual void timer_Tick(object sender, EventArgs e)

=== modified file 'client/dotNET/OptionForm.cs'
--- client/dotNET/OptionForm.cs	2009-03-08 11:40:17 +0000
+++ client/dotNET/OptionForm.cs	2009-07-26 11:40:59 +0000
@@ -58,6 +58,9 @@
             System.Diagnostics.Debug.WriteLine("Getting the Hardware Key", "OptionForm");
             hardwareKey = new HardwareKey();
 
+            // Regenerate the key
+            hardwareKey.Regenerate();
+
             System.Diagnostics.Debug.WriteLine("Getting the Library Path", "OptionForm");
             if (Properties.Settings.Default.LibraryPath == "DEFAULT")
             {
@@ -114,6 +117,8 @@
         {
             textBoxResults.Text = "Sending Request";
 
+            this.xmds1.Url = Properties.Settings.Default.XiboClient_xmds_xmds;
+
             Properties.Settings.Default.displayName = textBoxDisplayName.Text;
             Properties.Settings.Default.Save();
 

=== modified file 'client/dotNET/Program.cs'
--- client/dotNET/Program.cs	2009-03-08 12:51:18 +0000
+++ client/dotNET/Program.cs	2009-07-26 11:40:59 +0000
@@ -35,25 +35,25 @@
             Application.SetCompatibleTextRenderingDefault(false);
 
             System.Diagnostics.Trace.Listeners.Add(new XiboTraceListener());
-            System.Diagnostics.Trace.AutoFlush = true;
+            System.Diagnostics.Trace.AutoFlush = false;
 
             Form formMain;
 
             if (arg.GetLength(0) > 0)
             {
-                System.Diagnostics.Trace.WriteLine("Options Started", "Main");
+                System.Diagnostics.Trace.WriteLine(new LogMessage("Main", "Options Started"), LogType.Info.ToString());
                 formMain = new OptionForm(); 
             }
             else
             {
-                System.Diagnostics.Trace.WriteLine("Client Started", "Main");
+                System.Diagnostics.Trace.WriteLine(new LogMessage("Main", "Client Started"), LogType.Info.ToString());
                 formMain = new MainForm();
             }
             
             Application.Run(formMain);
 
             // Always flush at the end
-            System.Diagnostics.Trace.WriteLine("Application Finished", "Main");
+            System.Diagnostics.Trace.WriteLine(new LogMessage("Main", "Application Finished"), LogType.Info.ToString());
             System.Diagnostics.Trace.Flush();
         }
     }

=== modified file 'client/dotNET/Properties/Settings.Designer.cs'
--- client/dotNET/Properties/Settings.Designer.cs	2009-03-08 11:40:17 +0000
+++ client/dotNET/Properties/Settings.Designer.cs	2009-07-30 23:01:31 +0000
@@ -47,7 +47,7 @@
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.WebServiceUrl)]
-        [global::System.Configuration.DefaultSettingValueAttribute("http://localhost/Xibo/server/xmds.php")]
+        [global::System.Configuration.DefaultSettingValueAttribute("http://localhost/1.0.0/server/xmds.php")]
         public string XiboClient_xmds_xmds {
             get {
                 return ((string)(this["XiboClient_xmds_xmds"]));
@@ -93,18 +93,6 @@
             }
         }
         
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("900")]
-        public decimal collectInterval {
-            get {
-                return ((decimal)(this["collectInterval"]));
-            }
-            set {
-                this["collectInterval"] = value;
-            }
-        }
-        
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("log.xml")]
@@ -215,5 +203,61 @@
                 return ((string)(this["Version"]));
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("")]
+        public string hardwareKey {
+            get {
+                return ((string)(this["hardwareKey"]));
+            }
+            set {
+                this["hardwareKey"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("50")]
+        public int StatsFlushCount {
+            get {
+                return ((int)(this["StatsFlushCount"]));
+            }
+            set {
+                this["StatsFlushCount"] = value;
+            }
+        }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("stats.xml")]
+        public string StatsLogFile {
+            get {
+                return ((string)(this["StatsLogFile"]));
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        public global::System.DateTime XmdsLastConnection {
+            get {
+                return ((global::System.DateTime)(this["XmdsLastConnection"]));
+            }
+            set {
+                this["XmdsLastConnection"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("900")]
+        public decimal collectInterval {
+            get {
+                return ((decimal)(this["collectInterval"]));
+            }
+            set {
+                this["collectInterval"] = value;
+            }
+        }
     }
 }

=== modified file 'client/dotNET/Properties/Settings.settings'
--- client/dotNET/Properties/Settings.settings	2009-03-08 11:40:17 +0000
+++ client/dotNET/Properties/Settings.settings	2009-07-30 23:01:31 +0000
@@ -9,7 +9,7 @@
       <Value Profile="(Default)">schedule.xml</Value>
     </Setting>
     <Setting Name="XiboClient_xmds_xmds" Type="(Web Service URL)" Scope="User">
-      <Value Profile="(Default)">http://localhost/Xibo/server/xmds.php</Value>
+      <Value Profile="(Default)">http://localhost/1.0.0/server/xmds.php</Value>
     </Setting>
     <Setting Name="ServerKey" Type="System.String" Scope="User">
       <Value Profile="(Default)">changetocustomerkey</Value>
@@ -20,9 +20,6 @@
     <Setting Name="licensed" Type="System.Int32" Scope="User">
       <Value Profile="(Default)">0</Value>
     </Setting>
-    <Setting Name="collectInterval" Type="System.Decimal" Scope="User">
-      <Value Profile="(Default)">900</Value>
-    </Setting>
     <Setting Name="logLocation" Type="System.String" Scope="Application">
       <Value Profile="(Default)">log.xml</Value>
     </Setting>
@@ -53,5 +50,20 @@
     <Setting Name="Version" Type="System.String" Scope="Application">
       <Value Profile="(Default)">1</Value>
     </Setting>
+    <Setting Name="hardwareKey" Type="System.String" Scope="User">
+      <Value Profile="(Default)" />
+    </Setting>
+    <Setting Name="StatsFlushCount" Type="System.Int32" Scope="User">
+      <Value Profile="(Default)">50</Value>
+    </Setting>
+    <Setting Name="StatsLogFile" Type="System.String" Scope="Application">
+      <Value Profile="(Default)">stats.xml</Value>
+    </Setting>
+    <Setting Name="XmdsLastConnection" Type="System.DateTime" Scope="User">
+      <Value Profile="(Default)" />
+    </Setting>
+    <Setting Name="collectInterval" Type="System.Decimal" Scope="User">
+      <Value Profile="(Default)">900</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file

=== modified file 'client/dotNET/Region.cs'
--- client/dotNET/Region.cs	2009-06-20 10:05:53 +0000
+++ client/dotNET/Region.cs	2009-08-03 21:56:06 +0000
@@ -31,9 +31,24 @@
     class Region : Panel
     {
         private BlackList blackList;
-
-        public Region()
+        public delegate void DurationElapsedDelegate();
+        public event DurationElapsedDelegate DurationElapsedEvent;
+
+        private Media media;
+        private RegionOptions options;
+        public bool hasExpired = false;
+        public bool layoutExpired = false;
+        private int currentSequence = -1;
+
+        // Stat objects
+        private StatLog _statLog;
+        private Stat _stat;
+
+        public Region(ref StatLog statLog)
         {
+            // Store the statLog
+            _statLog = statLog;
+
             //default options
             options.width = 1024;
             options.height = 768;
@@ -45,6 +60,9 @@
             this.Size = new System.Drawing.Size(options.width, options.height);
             this.BackColor = System.Drawing.Color.Transparent;
 
+            SetStyle(ControlStyles.OptimizedDoubleBuffer, true);
+            SetStyle(ControlStyles.AllPaintingInWmPaint, true);
+
             // Create a new BlackList for us to use
             blackList = new BlackList();
         }
@@ -139,19 +157,21 @@
 
             //add event handler
             media.DurationElapsedEvent += new Media.DurationElapsedDelegate(media_DurationElapsedEvent);
-          
+
             //any additional media specific render options (and starts the timer)
             media.RenderMedia();
 
+            Controls.Add(media);
+
             // This media has started and is being replaced
-            XmlLog.AppendStat("Media Start", StatType.MediaStart, options.scheduleId, options.layoutId, options.mediaid);
-
-            //media.Opacity = 0F; // Completely Opaque
-
-            this.Controls.Add(media);
+            _stat = new Stat();
+            _stat.type = StatType.Media;
+            _stat.fromDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+            _stat.scheduleID = options.scheduleId;
+            _stat.layoutID = options.layoutId;
+            _stat.mediaID = options.mediaid;
 
             System.Diagnostics.Debug.WriteLine("Showing new media", "Region - Eval Options");
-            
         }
 
         /// <summary>
@@ -180,7 +200,7 @@
                 return;
             }
 
-
+            // Move the sequence on
             currentSequence++;
 
             if (currentSequence >= options.mediaNodes.Count)
@@ -201,10 +221,11 @@
             options.text = "";
             options.documentTemplate = "";
             options.copyrightNotice = "";
-            options.scrollSpeed = 1;
+            options.scrollSpeed = 30;
             options.updateInterval = 6;
             options.uri = "";
             options.direction = "none";
+            options.javaScript = "";
 
             // Get a media node
             bool validNode = false;
@@ -284,7 +305,7 @@
                                 System.Diagnostics.Trace.WriteLine("Non integer scrollSpeed in XLF", "Region - SetNextMediaNode");
                             }
                         }
-                        else if (option.Name == "updateInverval")
+                        else if (option.Name == "updateInterval")
                         {
                             try
                             {
@@ -314,6 +335,10 @@
                         {
                             options.text = raw.InnerText;
                         }
+                        else if (raw.Name == "embedScript")
+                        {
+                            options.javaScript = raw.InnerText;
+                        }
                     }
 
                     // That should cover all the new options
@@ -350,8 +375,18 @@
                     System.Diagnostics.Debug.WriteLine(ex.Message);
                 }
 
-                // This media has expired and is being replaced
-                XmlLog.AppendStat("Media Expired", StatType.MediaEnd, options.scheduleId, options.layoutId, options.mediaid);
+                try
+                {
+                    // Here we say that this media is expired
+                    _stat.toDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+
+                    // Record this stat event in the statLog object
+                    _statLog.RecordStat(_stat);
+                }
+                catch
+                {
+                    System.Diagnostics.Trace.WriteLine("No Stat record when one was expected", LogType.Error.ToString());
+                }
             }
         }
 
@@ -367,6 +402,29 @@
         }
 
         /// <summary>
+        /// Clears the Region of anything that it shouldnt still have... 
+        /// </summary>
+        public void Clear()
+        {
+            try
+            {
+                // What happens if we are disposing this region but we have not yet completed the stat event?
+                if (String.IsNullOrEmpty(_stat.toDate))
+                {
+                    // Say that this media has ended
+                    _stat.toDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+
+                    // Record this stat event in the statLog object
+                    _statLog.RecordStat(_stat);
+                }
+            }
+            catch
+            {
+                System.Diagnostics.Trace.WriteLine(new LogMessage("Region - Clear", "Error closing off stat record"), LogType.Error.ToString());
+            }
+        }
+
+        /// <summary>
         /// Performs the disposal.
         /// </summary>
         protected override void Dispose(bool disposing)
@@ -393,16 +451,6 @@
 
             base.Dispose(disposing);
         }
-
-        public delegate void DurationElapsedDelegate();
-        public event DurationElapsedDelegate DurationElapsedEvent;
-
-        private Media media;
-        private RegionOptions options;
-        public bool hasExpired = false;
-        public bool layoutExpired = false;
-        private int currentSequence = -1;
-
     }
 
     /// <summary>
@@ -431,6 +479,7 @@
         public string text;
         public string documentTemplate;
         public string copyrightNotice;
+        public string javaScript;
         public int updateInterval;
         public int scrollSpeed;
         

=== removed file 'client/dotNET/Resources/Thumbs.db'
Binary files client/dotNET/Resources/Thumbs.db	2008-12-19 23:34:13 +0000 and client/dotNET/Resources/Thumbs.db	1970-01-01 00:00:00 +0000 differ
=== modified file 'client/dotNET/Rss.cs'
--- client/dotNET/Rss.cs	2009-06-20 10:39:40 +0000
+++ client/dotNET/Rss.cs	2009-08-03 21:56:06 +0000
@@ -81,9 +81,25 @@
             this.documentText = options.text;
             this.documentTemplate = options.documentTemplate;
 
+            // What do we want the background to look like
+            String bodyStyle;
+            String document;
+
+            if (backgroundImage == null || backgroundImage == "")
+            {
+                bodyStyle = "background-color:" + backgroundColor + " ;";
+            }
+            else
+            {
+                bodyStyle = "background-image: url('" + backgroundImage + "'); background-attachment:fixed; background-color:" + backgroundColor + " background-repeat: no-repeat; background-position: " + backgroundLeft + " " + backgroundTop + ";";
+            }
+
+            // Build the document string
+            document = String.Format("<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8' /><script type='text/javascript'>{0}</script><style type='text/css'>body {{{2}}}, p, h1, h2, h3, h4, h5 {{ margin:2px; font-size:{1}em; }}</style></head><body></body></html>", Properties.Resources.textRender, options.scaleFactor.ToString(), bodyStyle);
+
             try
             {
-                webBrowser.DocumentText = String.Format("<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8' /><script type='text/javascript'>{0}</script><style type='text/css'>p, h1, h2, h3, h4, h5 {{ margin:2px; font-size:{1}em; }}</style></head><body></body></html>", Properties.Resources.textRender, options.scaleFactor.ToString());            
+                webBrowser.DocumentText = document;            
             }
             catch (Exception e)
             {
@@ -102,9 +118,10 @@
             try
             {
                 wc = new System.Net.WebClient();
-                wc.Encoding = System.Text.Encoding.UTF8;
+                
+                //wc.Encoding = System.Text.Encoding.UTF8;
 
-                System.Diagnostics.Debug.WriteLine("Created at WebClient and set the Encoding to UTF8", "RSS - Refresh local RSS");
+                System.Diagnostics.Debug.WriteLine("Created at WebClient", "RSS - Refresh local RSS");
 
                 wc.OpenReadCompleted += new System.Net.OpenReadCompletedEventHandler(wc_OpenReadCompleted);
                 
@@ -119,6 +136,7 @@
         void wc_OpenReadCompleted(object sender, System.Net.OpenReadCompletedEventArgs e)
         {
             String rssContents;
+            System.Net.WebClient wc = (System.Net.WebClient) sender;
 
             if (e.Error != null)
             {
@@ -133,10 +151,10 @@
 
             try
             {
-                System.IO.StreamReader sr = new System.IO.StreamReader(data, Encoding.UTF8);
+                System.IO.StreamReader sr = new System.IO.StreamReader(data, wc.Encoding);
                 rssContents = sr.ReadToEnd();
 
-                StreamWriter sw = new StreamWriter(File.Open(rssFilePath, FileMode.Create, FileAccess.Write, FileShare.Read));
+                StreamWriter sw = new StreamWriter(File.Open(rssFilePath, FileMode.Create, FileAccess.Write, FileShare.Read), wc.Encoding);
 
                 System.Diagnostics.Debug.WriteLine("Retrieved RSS - about to write it", "RSS - wc_OpenReadCompleted");
                 
@@ -218,21 +236,14 @@
 
             //Add the control
             this.Controls.Add(webBrowser);
+
+            Show();
         }
 
         private void loadLoading()
         {
             HtmlDocument htmlDoc = webBrowser.Document;
 
-            if (backgroundImage == null || backgroundImage == "")
-            {
-                htmlDoc.Body.Style = "background-color:" + backgroundColor + " ;";
-            }
-            else
-            {
-                htmlDoc.Body.Style = "background-image: url('" + backgroundImage + "'); background-attachment:fixed; background-color:" + backgroundColor + " background-repeat: no-repeat; background-position: " + backgroundLeft + " " + backgroundTop + ";";
-            }
-
             htmlDoc.Body.InnerHtml = "<h1>Loading...</h1>";
         }
 
@@ -243,15 +254,6 @@
             
             htmlDoc.Body.InnerHtml = "";
 
-            if (backgroundImage == null || backgroundImage == "")
-            {
-                htmlDoc.Body.Style = "background-color:" + backgroundColor + " ;";
-            }
-            else
-            {
-                htmlDoc.Body.Style = "background-image: url('" + backgroundImage + "'); background-attachment:fixed; background-color:" + backgroundColor + " background-repeat: no-repeat; background-position: " + backgroundLeft + " " + backgroundTop + ";";
-            }
-
             //Get the RSS
             rssReader = new RssReader();
             rssReader.Url = rssFilePath;
@@ -343,7 +345,7 @@
                     textWrap = String.Format("width: {0}px;", this.width - 50);
                 }
 
-                textRender += string.Format("<div id='text' style='position:relative;overflow:hidden;width:{0}px; height:{1}px;'>", this.width, this.height);
+                textRender += string.Format("<div id='text' style='position:relative;overflow:hidden;width:{0}px; height:{1}px;'>", this.width - 10, this.height);
                 textRender += string.Format("<div id='innerText' style='position:absolute; left: 0px; top: 0px; {0}'>{1}</div></div>", textWrap, documentText);
                 
                 htmlDoc.Body.InnerHtml = textRender;
@@ -423,7 +425,7 @@
         /// </summary>
         public override void RenderMedia()
         {
-            base.RenderMedia();
+            base.StartTimer();
         }
 
         protected override void Dispose(bool disposing)

=== modified file 'client/dotNET/RssReader.cs'
--- client/dotNET/RssReader.cs	2008-12-19 23:34:13 +0000
+++ client/dotNET/RssReader.cs	2009-07-07 06:05:50 +0000
@@ -85,11 +85,8 @@
                 throw new ArgumentException("You must provide a feed URL");
             }
 
-            //start the parsing process
-            XmlReader reader = XmlReader.Create(Url);
-
             XmlDocument xmlDoc = new XmlDocument();
-            xmlDoc.Load(reader);
+            xmlDoc.Load(Url);
 
             //parse the items of the feed
             ParseDocElements(xmlDoc.SelectSingleNode("//channel"), "title", ref feedTitle);
@@ -97,8 +94,6 @@
 
             ParseRssItems(xmlDoc);
 
-            reader.Close();
-
             //return the feed items
             return feedItems;
         }

=== modified file 'client/dotNET/Schedule.cs'
--- client/dotNET/Schedule.cs	2009-06-18 18:36:21 +0000
+++ client/dotNET/Schedule.cs	2009-08-03 21:56:06 +0000
@@ -95,24 +95,25 @@
             if (e.Error != null)
             {
                 //There was an error - what do we do?
-                System.Diagnostics.Debug.WriteLine(e.Error.Message);
+                System.Diagnostics.Trace.WriteLine(e.Error.Message);
 
                 // Is it a "not licensed" error
                 if (e.Error.Message == "This display client is not licensed")
                 {
                     Properties.Settings.Default.licensed = 0;
-                    Properties.Settings.Default.Save();
                 }
 
                 xmdsProcessing = false;
             }
             else
             {
+                // Set the flag to indicate we have a connection to XMDS
+                Properties.Settings.Default.XmdsLastConnection = DateTime.Now;
+
                 // Firstly we know we are licensed if we get this far
                 if (Properties.Settings.Default.licensed == 0)
                 {
                     Properties.Settings.Default.licensed = 1;
-                    Properties.Settings.Default.Save();
                 }
 
                 try
@@ -156,11 +157,6 @@
         {
             System.Diagnostics.Debug.WriteLine("Schedule Retrival Complete.");
 
-            // Send the XML log here if necessary
-            XmlLog log = new XmlLog();
-
-            log.PrepareAndSend();
-
             // Set XMDS to no longer be processing
             xmdsProcessing = false;
 
@@ -168,13 +164,16 @@
             if (e.Error != null)
             {
                 //There was an error - what do we do?
-                System.Diagnostics.Debug.WriteLine(e.Error.Message);
+                System.Diagnostics.Trace.WriteLine(e.Error.Message);
             }
             else
             {
                 // Only update the schedule if its changed.
                 String md5CurrentSchedule = "";
 
+                // Set the flag to indicate we have a connection to XMDS
+                Properties.Settings.Default.XmdsLastConnection = DateTime.Now;
+
                 try
                 {
                     StreamReader sr = new StreamReader(File.Open(this.scheduleLocation, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.ReadWrite));
@@ -217,10 +216,17 @@
             System.Diagnostics.Debug.WriteLine("Layout file changed");
 
             // If the layout that got changed is the current layout, move on
-            if (layoutSchedule[currentLayout].layoutFile == Properties.Settings.Default.LibraryPath + @"\" + layoutPath)
-            {
-                forceChange = true;
-                NextLayout();
+            try
+            {
+                if (layoutSchedule[currentLayout].layoutFile == Properties.Settings.Default.LibraryPath + @"\" + layoutPath)
+                {
+                    forceChange = true;
+                    NextLayout();
+                }
+            }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Trace.WriteLine(new LogMessage("fileCollector_LayoutFileChanged", String.Format("Unable to determine current layout with exception {0}", ex.Message)), LogType.Error.ToString());
             }
         }
 
@@ -235,7 +241,7 @@
             }
             else
             {
-                Application.DoEvents(); // Make sure everything that is cued to render does
+                Application.DoEvents(); // Make sure everything that is queued to render does
 
                 xmdsProcessing = true;
 
@@ -244,6 +250,9 @@
                 // Fire off a get required files event - async
                 xmds2.RequiredFilesAsync(Properties.Settings.Default.ServerKey, hardwareKey.Key, Properties.Settings.Default.Version);
             }
+
+            // Flush the log
+            System.Diagnostics.Trace.Flush();
         }
 
         /// <summary>
@@ -270,8 +279,6 @@
 
             System.Diagnostics.Debug.WriteLine(String.Format("Next layout: {0}", layoutSchedule[currentLayout].layoutFile), "Schedule - Next Layout");
 
-            XmlLog.AppendStat("Layout Finished", StatType.LayoutEnd, layoutSchedule[previousLayout].scheduleid, layoutSchedule[previousLayout].id, "0");
-
             forceChange = false;
 
             //Raise the event

=== added file 'client/dotNET/StatLog.cs'
--- client/dotNET/StatLog.cs	1970-01-01 00:00:00 +0000
+++ client/dotNET/StatLog.cs	2009-08-02 15:54:18 +0000
@@ -0,0 +1,330 @@
+/*
+ * Xibo - Digitial Signage - http://www.xibo.org.uk
+ * Copyright (C) 2009 Daniel Garner
+ *
+ * This file is part of Xibo.
+ *
+ * Xibo is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version. 
+ *
+ * Xibo is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
+ */
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Text;
+using System.IO;
+using System.Windows.Forms;
+using System.Xml;
+
+namespace XiboClient
+{
+    class StatLog
+    {
+        private Collection<Stat> _stats;
+        private xmds.xmds _xmds;
+        private String _lastSubmit;
+        private HardwareKey _hardwareKey;
+        private Boolean _xmdsProcessing;
+
+        public StatLog()
+        {
+            _stats = new Collection<Stat>();
+            _xmds = new xmds.xmds();
+
+            // Register a listener for the XMDS stats
+            _xmds.SubmitStatsCompleted += new XiboClient.xmds.SubmitStatsCompletedEventHandler(_xmds_SubmitStatsCompleted);
+
+            // Get the key for this display
+            _hardwareKey = new HardwareKey();
+
+            _xmdsProcessing = false;
+        }
+
+        /// <summary>
+        /// Record a complete Layout Event
+        /// </summary>
+        /// <param name="fromDT"></param>
+        /// <param name="toDT"></param>
+        /// <param name="scheduleID"></param>
+        /// <param name="layoutID"></param>
+        public void RecordLayout(String fromDT, String toDT, int scheduleID, int layoutID)
+        {
+            if (!Properties.Settings.Default.statsEnabled) return;
+
+            Stat stat = new Stat();
+
+            stat.type = StatType.Layout;
+            stat.fromDate = fromDT;
+            stat.toDate = toDT;
+            stat.scheduleID = scheduleID;
+            stat.layoutID = layoutID;
+
+            _stats.Add(stat);
+
+            return;
+        }
+
+        /// <summary>
+        /// Record a complete Media Event
+        /// </summary>
+        /// <param name="fromDT"></param>
+        /// <param name="toDT"></param>
+        /// <param name="layoutID"></param>
+        /// <param name="mediaID"></param>
+        public void RecordMedia(String fromDT, String toDT, int layoutID, String mediaID)
+        {
+            if (!Properties.Settings.Default.statsEnabled) return;
+
+            Stat stat = new Stat();
+
+            stat.type = StatType.Media;
+            stat.fromDate = fromDT;
+            stat.toDate = toDT;
+            stat.layoutID = layoutID;
+            stat.mediaID = mediaID;
+
+            _stats.Add(stat);
+
+            return;
+        }
+
+        /// <summary>
+        /// Record a complete Event
+        /// </summary>
+        /// <param name="fromDT"></param>
+        /// <param name="toDT"></param>
+        /// <param name="tag"></param>
+        public void RecordEvent(String fromDT, String toDT, String tag)
+        {
+            if (!Properties.Settings.Default.statsEnabled) return;
+
+            Stat stat = new Stat();
+
+            stat.type = StatType.Event;
+            stat.fromDate = fromDT;
+            stat.toDate = toDT;
+            stat.tag = tag;
+
+            _stats.Add(stat);
+
+            return;
+        }
+
+        /// <summary>
+        /// RecordStat
+        /// </summary>
+        /// <param name="stat"></param>
+        public void RecordStat(Stat stat)
+        {
+            System.Diagnostics.Debug.WriteLine(String.Format("Recording a Stat Record. Current Count = {0}", _stats.Count.ToString()), LogType.Audit.ToString());
+
+            _stats.Add(stat);
+
+            // At some point we will need to flush the stats
+            if (_stats.Count >= Properties.Settings.Default.StatsFlushCount)
+            {
+                Flush();
+            }
+
+            return;
+        }
+
+        /// <summary>
+        /// Flush the stats
+        /// </summary>
+        public void Flush()
+        {
+            System.Diagnostics.Debug.WriteLine(new LogMessage("Flush", String.Format("IN")), LogType.Audit.ToString());
+
+            // Determine if there is anything to flush
+            if (_stats.Count < 1 || _xmdsProcessing) return;
+
+            int threshold = ((int)Properties.Settings.Default.collectInterval * 5);
+
+            // Determine where we want to log.
+            if (Properties.Settings.Default.XmdsLastConnection.AddSeconds(threshold) < DateTime.Now)
+            {
+                FlushToFile();
+            }
+            else
+            {
+                FlushToXmds();
+            }
+
+            System.Diagnostics.Debug.WriteLine(new LogMessage("Flush", String.Format("OUT")), LogType.Audit.ToString());
+        }
+
+        /// <summary>
+        /// Send the Stat to a File
+        /// </summary>
+        private void FlushToFile()
+        {
+            System.Diagnostics.Debug.WriteLine(new LogMessage("FlushToFile", String.Format("IN")), LogType.Audit.ToString());
+
+            // There is something to flush - we want to parse the collection adding to the TextWriter each time.
+            try
+            {
+                // Open the Text Writer
+                StreamWriter tw = new StreamWriter(File.Open(Application.UserAppDataPath + "//" + Properties.Settings.Default.StatsLogFile, FileMode.Append, FileAccess.Write, FileShare.Read), Encoding.UTF8);
+
+                try
+                {
+                    foreach (Stat stat in _stats)
+                    {
+                        tw.WriteLine(stat.ToString());
+                    }
+                }
+                catch (Exception ex)
+                {
+                    System.Diagnostics.Trace.WriteLine(new LogMessage("FlushToFile", String.Format("Error writing stats line to file with exception {0}", ex.Message)), LogType.Error.ToString());
+                }
+                finally
+                {
+                    // Close the tw.
+                    tw.Close();
+                    tw.Dispose();
+                }
+            }
+            catch (Exception ex)
+            {
+                // Log this exception
+                System.Diagnostics.Trace.WriteLine(new LogMessage("FlushToFile", String.Format("Error writing stats to file with exception {0}", ex.Message)), LogType.Error.ToString());
+            }
+            finally
+            {
+                // Always clear the stats. If the file open failed for some reason then we dont want to try again
+                _stats.Clear();
+            }
+
+            System.Diagnostics.Debug.WriteLine(new LogMessage("FlushToFile", String.Format("OUT")), LogType.Audit.ToString());
+        }
+
+        /// <summary>
+        /// Send the Stats to XMDS
+        /// </summary>
+        private void FlushToXmds()
+        {
+            System.Diagnostics.Debug.WriteLine(new LogMessage("FlushToXmds", String.Format("IN")), LogType.Audit.ToString());
+
+            String stats;
+
+            stats = "<log>";
+
+            // Load the Stats collection into a string
+            try
+            {
+                foreach (Stat stat in _stats)
+                {
+                    stats += stat.ToString();
+                }
+            }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Trace.WriteLine(new LogMessage("FlushToXmds", String.Format("Error converting stat to a string {0}", ex.Message)), LogType.Error.ToString());
+            }
+
+            stats += "</log>";
+
+            // Store the stats as the last sent (so we have a record if it fails)
+            _lastSubmit = stats;
+
+            // Clear the stats collection
+            _stats.Clear();
+            
+            // Submit the string to XMDS
+            _xmdsProcessing = true;
+
+            _xmds.SubmitStatsAsync(Properties.Settings.Default.Version, Properties.Settings.Default.ServerKey, _hardwareKey.Key, stats);
+
+            // Log out
+            System.Diagnostics.Debug.WriteLine(new LogMessage("FlushToXmds", String.Format("OUT")), LogType.Audit.ToString());
+        }
+
+        /// <summary>
+        /// Capture the XMDS call and see if it went well
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void _xmds_SubmitStatsCompleted(object sender, XiboClient.xmds.SubmitStatsCompletedEventArgs e)
+        {
+            System.Diagnostics.Debug.WriteLine(new LogMessage("_xmds_SubmitStatsCompleted", String.Format("IN")), LogType.Audit.ToString());
+
+            _xmdsProcessing = false;
+
+            // Test if we succeeded or not
+            if (e.Error != null)
+            {
+                // We had an error, log it.
+                System.Diagnostics.Trace.WriteLine(new LogMessage("_xmds_SubmitStatsCompleted", String.Format("Error during Submit to XMDS {0}", e.Error.Message)), LogType.Error.ToString());
+
+                // Dump the stats to a file instead
+                if (_lastSubmit != "")
+                {
+                    try
+                    {
+                        // Open the Text Writer
+                        StreamWriter tw = new StreamWriter(File.Open(Application.UserAppDataPath + "//" + Properties.Settings.Default.StatsLogFile, FileMode.Append, FileAccess.Write, FileShare.Read), Encoding.UTF8);
+
+                        try
+                        {
+                            tw.Write(_lastSubmit);
+                        }
+                        catch (Exception ex)
+                        {
+                            // Log this exception
+                            System.Diagnostics.Trace.WriteLine(new LogMessage("_xmds_SubmitStatsCompleted", String.Format("Error writing stats to file with exception {0}", ex.Message)), LogType.Error.ToString());
+                        }
+                        finally
+                        {
+                            tw.Close();
+                            tw.Dispose();
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        // Log this exception
+                        System.Diagnostics.Trace.WriteLine(new LogMessage("_xmds_SubmitStatsCompleted", String.Format("Could not open the file with exception {0}", ex.Message)), LogType.Error.ToString());
+                    }
+                }
+            }
+
+            // Clear the last sumbit
+            _lastSubmit = "";
+
+            System.Diagnostics.Debug.WriteLine(new LogMessage("_xmds_SubmitStatsCompleted", String.Format("OUT")), LogType.Audit.ToString());
+        }
+    }
+
+    class Stat 
+    {
+        public StatType type;
+        public String fromDate;
+        public String toDate;
+        public int layoutID;
+        public int scheduleID;
+        public String mediaID;
+        public String tag;
+
+        public override string ToString()
+        {
+            // Format the message into the expected XML sub nodes.
+            // Just do this with a string builder rather than an XML builder.
+            String theMessage;
+
+            theMessage = String.Format("<stat type=\"{0}\" fromdt=\"{1}\" todt=\"{2}\" layoutid=\"{3}\" scheduleid=\"{4}\" mediaid=\"{5}\"></stat>", type, fromDate, toDate, layoutID.ToString(), scheduleID.ToString(), mediaID);
+            
+            return theMessage;
+        }
+    }
+
+    public enum StatType { Layout, Media, Event };
+}

=== modified file 'client/dotNET/Text.cs'
--- client/dotNET/Text.cs	2009-06-20 10:39:40 +0000
+++ client/dotNET/Text.cs	2009-08-03 21:56:06 +0000
@@ -27,7 +27,17 @@
 {
     class Text : Media
     {
-        private double scaleFactor;
+        private string filePath;
+        private string direction;
+        private string backgroundImage;
+        private string backgroundColor;
+        private WebBrowser webBrowser;
+        private string _documentText;
+
+        private string backgroundTop;
+        private string backgroundLeft;
+        private double _scaleFactor;
+        private int _scrollSpeed;
 
         //<summary>
         //Creates a Text display control
@@ -41,7 +51,7 @@
             this.backgroundImage = options.backgroundImage;
             this.backgroundColor = options.backgroundColor;
             
-            scaleFactor = options.scaleFactor;
+            _scaleFactor = options.scaleFactor;
 
             backgroundTop = options.backgroundTop + "px";
             backgroundLeft = options.backgroundLeft + "px";
@@ -50,12 +60,28 @@
             webBrowser.Size = this.Size;
             webBrowser.ScrollBarsEnabled = false;
 
-            //set the text
-            documentText = options.text;
+            // set the text
+            _documentText = options.text;
+            _scrollSpeed = options.scrollSpeed;
+           
+            // What do we want the background to look like
+            String bodyStyle;
+            String document;
+
+            if (backgroundImage == null || backgroundImage == "")
+            {
+                bodyStyle = "background-color:" + backgroundColor + " ;";
+            }
+            else
+            {
+                bodyStyle = "background-image: url('" + backgroundImage + "'); background-attachment:fixed; background-color:" + backgroundColor + " background-repeat: no-repeat; background-position: " + backgroundLeft + " " + backgroundTop + ";";
+            }
+
+            document = String.Format("<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8' /><script type='text/javascript'>{0}</script>{2}<style type='text/css'>body {{{3}}}, p, h1, h2, h3, h4, h5 {{ margin:2px; font-size:{1}em; }}</style></head><body></body></html>", Properties.Resources.textRender, options.scaleFactor.ToString(), options.javaScript, bodyStyle);
 
             try
             {
-                webBrowser.DocumentText = String.Format("<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8' /><script type='text/javascript'>{0}</script><style type='text/css'>p, h1, h2, h3, h4, h5 {{ margin:2px; font-size:{1}em; }}</style></head><body></body></html>", Properties.Resources.textRender, options.scaleFactor.ToString());
+                webBrowser.DocumentText = document;
             }
             catch (Exception e)
             {
@@ -68,24 +94,14 @@
 
         void webBrowser_DocumentCompleted(object sender, WebBrowserDocumentCompletedEventArgs e)
         {
-
             HtmlDocument htmlDoc = webBrowser.Document;
-            
-            if (backgroundImage == null || backgroundImage == "")
-            {
-                htmlDoc.Body.Style = "background-color:" + backgroundColor + " ;";
-            }
-            else
-            {
-                htmlDoc.Body.Style = "background-image: url('" + backgroundImage + "'); background-attachment:fixed; background-color:" + backgroundColor + " background-repeat: no-repeat; background-position: " + backgroundLeft + " " + backgroundTop + ";";
-            }
 
             //decide whether we need a marquee or not
             if (direction == "none")
             {
                 //we dont
-                //set the body of the webBrowser to the document text (altered by the RSS feed)
-                htmlDoc.Body.InnerHtml = documentText;
+                //set the body of the webBrowser to the document text
+                htmlDoc.Body.InnerHtml = _documentText;
             }
             else
             {
@@ -93,24 +109,36 @@
                 String textWrap = "";
                 if (direction == "left" || direction == "right") textWrap = "white-space: nowrap";
 
-                textRender += string.Format("<div id='text' style='position:relative;overflow:hidden;width:{0}; height:{1};'>", this.width, this.height);
-                textRender += string.Format("<div id='innerText' style='position:absolute; left: 0px; top: 0px; {0}'>{1}</div></div>", textWrap, documentText);
+                textRender += string.Format("<div id='text' style='position:relative;overflow:hidden;width:{0}; height:{1};'>", this.width - 10, this.height);
+                textRender += string.Format("<div id='innerText' style='position:absolute; left: 0px; top: 0px; {0}'>{1}</div></div>", textWrap, _documentText);
 
                 htmlDoc.Body.InnerHtml = textRender;
 
                 Object[] objArray = new Object[2];
                 objArray[0] = direction;
-                objArray[1] = 30;
+                objArray[1] = _scrollSpeed;
 
                 htmlDoc.InvokeScript("init", objArray);
             }
 
+            System.Diagnostics.Debug.WriteLine(htmlDoc.Body.InnerHtml, LogType.Audit.ToString());
+
+            // Try to call the EmbedInit Function
+            try
+            {
+                htmlDoc.InvokeScript("EmbedInit");
+            }
+            catch { }
+
+            // Add the control
             this.Controls.Add(webBrowser);
+
+            Show();
         }
 
         public override void RenderMedia()
         {
-            base.RenderMedia();
+            base.StartTimer();
         }
 
         protected override void Dispose(bool disposing)
@@ -123,15 +151,5 @@
 
             base.Dispose(disposing);
         }
-
-        private string filePath;
-        private string direction;
-        private string backgroundImage;
-        private string backgroundColor;
-        private WebBrowser webBrowser;
-        private string documentText;
-
-        private string backgroundTop;
-        private string backgroundLeft;
     }
 }

=== modified file 'client/dotNET/Web References/xmds/Reference.cs'
--- client/dotNET/Web References/xmds/Reference.cs	2008-12-19 23:34:13 +0000
+++ client/dotNET/Web References/xmds/Reference.cs	2009-07-26 11:40:59 +0000
@@ -41,6 +41,10 @@
         
         private System.Threading.SendOrPostCallback BlackListOperationCompleted;
         
+        private System.Threading.SendOrPostCallback SubmitLogOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback SubmitStatsOperationCompleted;
+        
         private bool useDefaultCredentialsSetExplicitly;
         
         /// <remarks/>
@@ -98,6 +102,12 @@
         public event BlackListCompletedEventHandler BlackListCompleted;
         
         /// <remarks/>
+        public event SubmitLogCompletedEventHandler SubmitLogCompleted;
+        
+        /// <remarks/>
+        public event SubmitStatsCompletedEventHandler SubmitStatsCompleted;
+        
+        /// <remarks/>
         [System.Web.Services.Protocols.SoapRpcMethodAttribute("urn:xmds#RegisterDisplay", RequestNamespace="urn:xmds", ResponseNamespace="urn:xmds")]
         [return: System.Xml.Serialization.SoapElementAttribute("ActivationMessage")]
         public string RegisterDisplay(string serverKey, string hardwareKey, string displayName, string version) {
@@ -320,6 +330,78 @@
         }
         
         /// <remarks/>
+        [System.Web.Services.Protocols.SoapRpcMethodAttribute("urn:xmds#SubmitLog", RequestNamespace="urn:xmds", ResponseNamespace="urn:xmds")]
+        [return: System.Xml.Serialization.SoapElementAttribute("success")]
+        public bool SubmitLog(string version, string serverKey, string hardwareKey, string logXml) {
+            object[] results = this.Invoke("SubmitLog", new object[] {
+                        version,
+                        serverKey,
+                        hardwareKey,
+                        logXml});
+            return ((bool)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void SubmitLogAsync(string version, string serverKey, string hardwareKey, string logXml) {
+            this.SubmitLogAsync(version, serverKey, hardwareKey, logXml, null);
+        }
+        
+        /// <remarks/>
+        public void SubmitLogAsync(string version, string serverKey, string hardwareKey, string logXml, object userState) {
+            if ((this.SubmitLogOperationCompleted == null)) {
+                this.SubmitLogOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSubmitLogOperationCompleted);
+            }
+            this.InvokeAsync("SubmitLog", new object[] {
+                        version,
+                        serverKey,
+                        hardwareKey,
+                        logXml}, this.SubmitLogOperationCompleted, userState);
+        }
+        
+        private void OnSubmitLogOperationCompleted(object arg) {
+            if ((this.SubmitLogCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.SubmitLogCompleted(this, new SubmitLogCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapRpcMethodAttribute("urn:xmds#SubmitLog", RequestNamespace="urn:xmds", ResponseNamespace="urn:xmds")]
+        [return: System.Xml.Serialization.SoapElementAttribute("success")]
+        public bool SubmitStats(string version, string serverKey, string hardwareKey, string statXml) {
+            object[] results = this.Invoke("SubmitStats", new object[] {
+                        version,
+                        serverKey,
+                        hardwareKey,
+                        statXml});
+            return ((bool)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void SubmitStatsAsync(string version, string serverKey, string hardwareKey, string statXml) {
+            this.SubmitStatsAsync(version, serverKey, hardwareKey, statXml, null);
+        }
+        
+        /// <remarks/>
+        public void SubmitStatsAsync(string version, string serverKey, string hardwareKey, string statXml, object userState) {
+            if ((this.SubmitStatsOperationCompleted == null)) {
+                this.SubmitStatsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSubmitStatsOperationCompleted);
+            }
+            this.InvokeAsync("SubmitStats", new object[] {
+                        version,
+                        serverKey,
+                        hardwareKey,
+                        statXml}, this.SubmitStatsOperationCompleted, userState);
+        }
+        
+        private void OnSubmitStatsOperationCompleted(object arg) {
+            if ((this.SubmitStatsCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.SubmitStatsCompleted(this, new SubmitStatsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
         public new void CancelAsync(object userState) {
             base.CancelAsync(userState);
         }
@@ -493,6 +575,58 @@
             }
         }
     }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.1433")]
+    public delegate void SubmitLogCompletedEventHandler(object sender, SubmitLogCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.1433")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class SubmitLogCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal SubmitLogCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public bool Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((bool)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.1433")]
+    public delegate void SubmitStatsCompletedEventHandler(object sender, SubmitStatsCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.1433")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class SubmitStatsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal SubmitStatsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public bool Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((bool)(this.results[0]));
+            }
+        }
+    }
 }
 
 #pragma warning restore 1591
\ No newline at end of file

=== modified file 'client/dotNET/Web References/xmds/Reference.map'
--- client/dotNET/Web References/xmds/Reference.map	2009-01-23 20:51:50 +0000
+++ client/dotNET/Web References/xmds/Reference.map	2009-07-26 11:40:59 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <DiscoveryClientResultsFile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <Results>
-    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://localhost/Xibo/server/xmds.php?wsdl" filename="xmds.wsdl" />
+    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://localhost/1.0.0/server/xmds.php?wsdl" filename="xmds.wsdl" />
   </Results>
 </DiscoveryClientResultsFile>
\ No newline at end of file

=== modified file 'client/dotNET/Web References/xmds/xmds.wsdl'
--- client/dotNET/Web References/xmds/xmds.wsdl	2009-01-23 20:51:50 +0000
+++ client/dotNET/Web References/xmds/xmds.wsdl	2009-07-26 11:40:59 +0000
@@ -63,6 +63,24 @@
   <wsdl:message name="BlackListResponse">
     <wsdl:part name="success" type="xsd:boolean" />
   </wsdl:message>
+  <wsdl:message name="SubmitLogRequest">
+    <wsdl:part name="version" type="xsd:string" />
+    <wsdl:part name="serverKey" type="xsd:string" />
+    <wsdl:part name="hardwareKey" type="xsd:string" />
+    <wsdl:part name="logXml" type="xsd:string" />
+  </wsdl:message>
+  <wsdl:message name="SubmitLogResponse">
+    <wsdl:part name="success" type="xsd:boolean" />
+  </wsdl:message>
+  <wsdl:message name="SubmitStatsRequest">
+    <wsdl:part name="version" type="xsd:string" />
+    <wsdl:part name="serverKey" type="xsd:string" />
+    <wsdl:part name="hardwareKey" type="xsd:string" />
+    <wsdl:part name="statXml" type="xsd:string" />
+  </wsdl:message>
+  <wsdl:message name="SubmitStatsResponse">
+    <wsdl:part name="success" type="xsd:boolean" />
+  </wsdl:message>
   <wsdl:portType name="xmdsPortType">
     <wsdl:operation name="RegisterDisplay">
       <documentation>Registered the Display on the Xibo Network</documentation>
@@ -94,6 +112,16 @@
       <wsdl:input message="tns:BlackListRequest" />
       <wsdl:output message="tns:BlackListResponse" />
     </wsdl:operation>
+    <wsdl:operation name="SubmitLog">
+      <documentation>Submit Logging from the Client</documentation>
+      <wsdl:input message="tns:SubmitLogRequest" />
+      <wsdl:output message="tns:SubmitLogResponse" />
+    </wsdl:operation>
+    <wsdl:operation name="SubmitStats">
+      <documentation>Submit Display statistics from the Client</documentation>
+      <wsdl:input message="tns:SubmitStatsRequest" />
+      <wsdl:output message="tns:SubmitStatsResponse" />
+    </wsdl:operation>
   </wsdl:portType>
   <wsdl:binding name="xmdsBinding" type="tns:xmdsPortType">
     <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc" />
@@ -151,10 +179,28 @@
         <soap:body use="encoded" namespace="urn:xmds" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
       </wsdl:output>
     </wsdl:operation>
+    <wsdl:operation name="SubmitLog">
+      <soap:operation soapAction="urn:xmds#SubmitLog" style="rpc" />
+      <wsdl:input>
+        <soap:body use="encoded" namespace="urn:xmds" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="encoded" namespace="urn:xmds" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="SubmitStats">
+      <soap:operation soapAction="urn:xmds#SubmitLog" style="rpc" />
+      <wsdl:input>
+        <soap:body use="encoded" namespace="urn:xmds" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="encoded" namespace="urn:xmds" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+      </wsdl:output>
+    </wsdl:operation>
   </wsdl:binding>
   <wsdl:service name="xmds">
     <wsdl:port name="xmdsPort" binding="tns:xmdsBinding">
-      <soap:address location="http://localhost/Xibo/server/xmds.php" />
+      <soap:address location="http://localhost/1.0.0/server/xmds.php" />
     </wsdl:port>
   </wsdl:service>
 </wsdl:definitions>
\ No newline at end of file

=== modified file 'client/dotNET/XiboClient.csproj'
--- client/dotNET/XiboClient.csproj	2009-03-28 19:13:50 +0000
+++ client/dotNET/XiboClient.csproj	2009-07-26 11:40:59 +0000
@@ -141,9 +141,11 @@
     <Compile Include="RssReader.cs" />
     <Compile Include="Schedule.cs" />
     <Compile Include="Settings.cs" />
+    <Compile Include="StatLog.cs" />
     <Compile Include="Text.cs">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="LogMessage.cs" />
     <Compile Include="Video.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -163,7 +165,6 @@
     </Compile>
     <Compile Include="WindowAnimator.cs" />
     <Compile Include="XiboTraceListener.cs" />
-    <Compile Include="XmlLog.cs" />
   </ItemGroup>
   <ItemGroup>
     <COMReference Include="AxShockwaveFlashObjects">
@@ -226,10 +227,10 @@
     <WebReferences Include="Web References\" />
   </ItemGroup>
   <ItemGroup>
-    <WebReferenceUrl Include="http://localhost/Xibo/server/xmds.php%3fwsdl">
+    <WebReferenceUrl Include="http://localhost/1.0.0/server/xmds.php%3fwsdl">
       <UrlBehavior>Dynamic</UrlBehavior>
       <RelPath>Web References\xmds\</RelPath>
-      <UpdateFromURL>http://localhost/Xibo/server/xmds.php%3fwsdl</UpdateFromURL>
+      <UpdateFromURL>http://localhost/1.0.0/server/xmds.php%3fwsdl</UpdateFromURL>
       <ServiceLocationURL>
       </ServiceLocationURL>
       <CachedDynamicPropName>

=== modified file 'client/dotNET/XiboTraceListener.cs'
--- client/dotNET/XiboTraceListener.cs	2009-03-08 12:41:17 +0000
+++ client/dotNET/XiboTraceListener.cs	2009-08-02 15:54:18 +0000
@@ -30,6 +30,13 @@
 {
     class XiboTraceListener : TraceListener
     {
+        private Collection<TraceMessage> _traceMessages;
+        private String _logPath;
+        private Boolean _xmdsProcessing;
+        private xmds.xmds _xmds;
+        private String _lastSubmit;
+        private HardwareKey _hardwareKey;
+
         public XiboTraceListener()
         {
             InitializeListener();
@@ -44,8 +51,17 @@
         private void InitializeListener()
         {
             // Make a new collection of TraceMessages
-            traceMessages = new Collection<TraceMessage>();
-            logPath = Application.UserAppDataPath + @"/" + Properties.Settings.Default.logLocation;
+            _traceMessages = new Collection<TraceMessage>();
+            _logPath = Application.UserAppDataPath + @"/" + Properties.Settings.Default.logLocation;
+
+            _xmdsProcessing = false;
+            _xmds = new xmds.xmds();
+
+            // Register a listener for the XMDS stats
+            _xmds.SubmitLogCompleted += new XiboClient.xmds.SubmitLogCompletedEventHandler(_xmds_SubmitLogCompleted);
+
+            // Get the key for this display
+            _hardwareKey = new HardwareKey();
         }
 
         private void AddToCollection(string message, string category)
@@ -56,62 +72,133 @@
             traceMessage.dateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
             traceMessage.message = message;
 
-            traceMessages.Add(traceMessage);
+            _traceMessages.Add(traceMessage);
         }
 
         private void FlushToFile()
         {
+            if (_traceMessages.Count < 1) return;
+
             try
             {
-                XmlTextWriter xw = new XmlTextWriter(File.Open(logPath, FileMode.Append, FileAccess.Write, FileShare.Read), Encoding.UTF8);
-
-                foreach (TraceMessage message in traceMessages)
+                // Open the Text Writer
+                StreamWriter tw = new StreamWriter(File.Open(_logPath, FileMode.Append, FileAccess.Write, FileShare.Read), Encoding.UTF8);
+
+                String theMessage;
+
+                foreach (TraceMessage message in _traceMessages)
                 {
-                    xw.WriteStartElement("trace");
-                    xw.WriteElementString("category", message.category);
-                    xw.WriteElementString("date", message.dateTime);
-                    xw.WriteElementString("message", message.message);
-                    xw.WriteEndElement();
+                    String traceMsg = message.message.ToString();
+
+                    theMessage = String.Format("<trace date=\"{0}\" category=\"{1}\">{2}</trace>", message.dateTime, message.category, traceMsg);
+                    tw.WriteLine(theMessage);
                 }
 
-                xw.Close();
+                // Close the tw.
+                tw.Close();
+                tw.Dispose();
 
                 // Remove the messages we have just added
-                traceMessages.Clear();
+                _traceMessages.Clear();
             }
-            catch (Exception e)
+            catch
             {
                 // What can we do?
             }
-
-            // Test the size of the XML file
-            FileInfo fileInfo = new FileInfo(logPath);
-
-            // If its greater than a certain size - send it to the WebService
-            if (fileInfo.Length > 6000)
-            {
-                // Move the current log file to a ready file
-                try
-                {
-                    String logPathTemp = Application.UserAppDataPath + @"/" + String.Format("{0}.ready", DateTime.Now.ToFileTime().ToString());
-                    
-                    File.Move(logPath, logPathTemp);
-                }
-                catch (Exception ex)
-                {
-                   
-                }
-            }
+            finally
+            {
+                _traceMessages.Clear();
+            }
+        }
+
+        /// <summary>
+        /// Flush the log to XMDS
+        /// </summary>
+        private void FlushToXmds()
+        {
+            String log;
+
+            log = "<log>";
+
+            // Load the Stats collection into a string
+            try
+            {
+                foreach (TraceMessage traceMessage in _traceMessages)
+                {
+                    String traceMsg = traceMessage.message.ToString();
+
+                    log += String.Format("<trace date=\"{0}\" category=\"{1}\">{2}</trace>", traceMessage.dateTime, traceMessage.category, traceMsg);
+                }
+            }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Trace.WriteLine(new LogMessage("FlushToXmds", String.Format("Error converting stat to a string {0}", ex.Message)), LogType.Error.ToString());
+            }
+
+            log += "</log>";
+
+            // Store the stats as the last sent (so we have a record if it fails)
+            _lastSubmit = log;
+
+            // Clear the stats collection
+            _traceMessages.Clear();
+
+            // Submit the string to XMDS
+            _xmdsProcessing = true;
+
+            _xmds.SubmitLogAsync(Properties.Settings.Default.Version, Properties.Settings.Default.ServerKey, _hardwareKey.Key, log);
+        }
+
+        /// <summary>
+        /// Capture the XMDS call and see if it went well
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void _xmds_SubmitLogCompleted(object sender, XiboClient.xmds.SubmitLogCompletedEventArgs e)
+        {
+            _xmdsProcessing = false;
+
+            // Test if we succeeded or not
+            if (e.Error != null)
+            {
+                // We had an error, log it.
+                System.Diagnostics.Trace.WriteLine(new LogMessage("_xmds_SubmitLogCompleted", String.Format("Error during Submit to XMDS {0}", e.Error.Message)), LogType.Error.ToString());
+
+                // Dump the stats to a file instead
+                if (_lastSubmit != "")
+                {
+                    try
+                    {
+                        // Open the Text Writer
+                        StreamWriter tw = new StreamWriter(File.Open(_logPath, FileMode.Append, FileAccess.Write, FileShare.Read), Encoding.UTF8);
+
+                        try
+                        {
+                            tw.Write(_lastSubmit);
+                        }
+                        catch {}
+                        finally
+                        {
+                            tw.Close();
+                            tw.Dispose();
+                        }
+                    }
+                    catch {}
+                }
+            }
+
+            // Clear the last sumbit
+            _lastSubmit = "";
         }
 
         public override void Write(string message)
         {
-            AddToCollection(message, "");
+            AddToCollection(message, "Audit");
         }
 
         public override void Write(object o)
         {
-            AddToCollection(o.ToString(), "");
+            AddToCollection(o.ToString(), "Audit");
         }
 
         public override void Write(string message, string category)
@@ -162,16 +249,47 @@
 
         public override void Close()
         {
-            FlushToFile();
+            // Determine if there is anything to flush
+            if (_traceMessages.Count < 1) return;
+
+            // As we are closing if XMDS is already busy just log to file.
+            if (_xmdsProcessing)
+            {
+                FlushToFile();
+            }
+            else
+            {
+                int threshold = ((int)Properties.Settings.Default.collectInterval * 5);
+
+                // Determine where we want to log.
+                if (Properties.Settings.Default.XmdsLastConnection.AddSeconds(threshold) < DateTime.Now)
+                {
+                    FlushToFile();
+                }
+                else
+                {
+                    FlushToXmds();
+                }
+            }
         }
 
         public override void Flush()
         {
-            FlushToFile();
+            // Determine if there is anything to flush
+            if (_traceMessages.Count < 1 || _xmdsProcessing) return;
+
+            int threshold = ((int)Properties.Settings.Default.collectInterval * 5);
+
+            // Determine where we want to log.
+            if (Properties.Settings.Default.XmdsLastConnection.AddSeconds(threshold) < DateTime.Now)
+            {
+                FlushToFile();
+            }
+            else
+            {
+                FlushToXmds();
+            }
         }
-
-        private Collection<TraceMessage> traceMessages;
-        private String logPath;
     }
 
     [Serializable]

=== removed file 'client/dotNET/XmlLog.cs'
--- client/dotNET/XmlLog.cs	2009-03-08 12:51:18 +0000
+++ client/dotNET/XmlLog.cs	1970-01-01 00:00:00 +0000
@@ -1,172 +0,0 @@
-/*
- * Xibo - Digitial Signage - http://www.xibo.org.uk
- * Copyright (C) 2006,2007,2008 Daniel Garner and James Packer
- *
- * This file is part of Xibo.
- *
- * Xibo is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * any later version. 
- *
- * Xibo is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
- */
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-using System.Windows.Forms;
-using System.Xml;
-
-namespace XiboClient
-{
-    class XmlLog
-    {
-        /// <summary>
-        /// Creates a new XmlLog Class used for sending the log
-        /// </summary>
-        /// <param name="logPath"></param>
-        public XmlLog()
-        {
-            logPath = Application.UserAppDataPath + @"/" + Properties.Settings.Default.logLocation;
-            
-            // Get the key for this display
-            hardwareKey = new HardwareKey();
-
-            // Setup the WebService call
-            xmds1 = new XiboClient.xmds.xmds();
-            xmds1.RecieveXmlLogCompleted += new XiboClient.xmds.RecieveXmlLogCompletedEventHandler(xmds1_RecieveXmlLogCompleted);
-
-            return;
-        }
-
-        /// <summary>
-        /// Prepares the log for sending
-        /// </summary>
-        public void PrepareAndSend()
-        {
-            currentFile = 0;
-
-            // Get a list of all the log files avaiable to process
-            DirectoryInfo di = new DirectoryInfo(Application.UserAppDataPath);
-
-            files = di.GetFiles("*.ready");
-
-            // There thought never be no files
-            if (files.Length == 0) return;
-
-            // Send them (one by one)
-            SendLog(files[currentFile].FullName);
-
-            return;
-        }
-
-        /// <summary>
-        /// Sends and XmlLog files that are ready to send
-        /// Binds a xmds1.RecieveXmlLogCompleted event
-        /// </summary>
-        public void SendLog(string filePath)
-        {
-            // Read the Xml
-            try
-            {
-                StreamReader tr = new StreamReader(File.Open(filePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite));
-                xmds1.RecieveXmlLogAsync(Properties.Settings.Default.ServerKey, hardwareKey.Key, tr.ReadToEnd(), Properties.Settings.Default.Version);
-                tr.Close();
-            }
-            catch (Exception ex)
-            {
-                System.Diagnostics.Debug.WriteLine(ex.Message);
-            }
-        }
-
-        /// <summary>
-        /// Completed sending the XML Log
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        void xmds1_RecieveXmlLogCompleted(object sender, XiboClient.xmds.RecieveXmlLogCompletedEventArgs e)
-        {
-            // Delete the Log File if success
-            if (e.Error != null)
-            {
-                System.Diagnostics.Debug.WriteLine(e.Error.Message);
-            }
-            else
-            {
-                if (e.Result)
-                {
-                    try
-                    {
-                        // Do the delete
-                        File.Delete(files[currentFile].FullName);
-                    }
-                    catch (Exception ex)
-                    {
-                        System.Diagnostics.Debug.WriteLine(ex.Message);
-                    }
-                }
-            }
-
-            // Process the next file in the que
-            currentFile++;
-
-            if (currentFile < files.Length)
-            {
-                SendLog(files[currentFile].FullName);
-            }
-
-            return;
-        }
-
-        /// <summary>
-        /// Appends a Stats XML message to the current Log
-        /// </summary>
-        /// <param name="message"></param>
-        /// <param name="cat"></param>
-        /// <param name="type"></param>
-        /// <param name="scheduleID"></param>
-        /// <param name="layoutID"></param>
-        /// <param name="mediaID"></param>
-        public static void AppendStat(String message, StatType type, int scheduleID, int layoutID, string mediaID)
-        {
-            if (!Properties.Settings.Default.statsEnabled) return;
-
-            try
-            {
-                XmlTextWriter xw = new XmlTextWriter(File.Open(Application.UserAppDataPath + "//" + Properties.Settings.Default.logLocation, FileMode.Append, FileAccess.Write, FileShare.Read), Encoding.UTF8);
-
-                xw.WriteStartElement("stat");
-                
-                xw.WriteElementString("date", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
-                xw.WriteElementString("message", message);
-                xw.WriteElementString("type", type.ToString());
-                xw.WriteElementString("scheduleID", scheduleID.ToString());
-                xw.WriteElementString("layoutID", layoutID.ToString());
-                if (mediaID != "0") xw.WriteElementString("mediaID", mediaID.ToString());
-                
-                xw.WriteEndElement();
-
-                xw.Close();
-            }
-            catch (Exception ex)
-            {
-            }
-        }
-
-        private XiboClient.xmds.xmds xmds1;
-        private HardwareKey hardwareKey;
-        string logPath;
-
-        FileInfo[] files;
-        int currentFile;
-    }
-
-    public enum StatType { LayoutStart, LayoutEnd, MediaStart, MediaEnd };
-}

=== modified file 'client/dotNET/app.config'
--- client/dotNET/app.config	2009-03-08 11:40:17 +0000
+++ client/dotNET/app.config	2009-07-30 23:01:31 +0000
@@ -14,7 +14,7 @@
                 <value>DEFAULT</value>
             </setting>
             <setting name="XiboClient_xmds_xmds" serializeAs="String">
-                <value>http://localhost/Xibo/server/xmds.php</value>
+                <value>http://localhost/1.0.0/server/xmds.php</value>
             </setting>
             <setting name="ServerKey" serializeAs="String">
                 <value>changetocustomerkey</value>
@@ -25,9 +25,6 @@
             <setting name="licensed" serializeAs="String">
                 <value>0</value>
             </setting>
-            <setting name="collectInterval" serializeAs="String">
-                <value>900</value>
-            </setting>
             <setting name="powerpointEnabled" serializeAs="String">
                 <value>False</value>
             </setting>
@@ -49,6 +46,18 @@
             <setting name="ProxyPort" serializeAs="String">
                 <value />
             </setting>
+            <setting name="hardwareKey" serializeAs="String">
+                <value />
+            </setting>
+            <setting name="StatsFlushCount" serializeAs="String">
+                <value>50</value>
+            </setting>
+            <setting name="XmdsLastConnection" serializeAs="String">
+                <value />
+            </setting>
+            <setting name="collectInterval" serializeAs="String">
+                <value>900</value>
+            </setting>
         </XiboClient.Properties.Settings>
     </userSettings>
     <applicationSettings>
@@ -65,6 +74,9 @@
             <setting name="Version" serializeAs="String">
                 <value>1</value>
             </setting>
+            <setting name="StatsLogFile" serializeAs="String">
+                <value>stats.xml</value>
+            </setting>
         </XiboClient.Properties.Settings>
     </applicationSettings>
 </configuration>
\ No newline at end of file

=== removed file 'client/dotNET/bin/Release/XiboClient.XmlSerializers.dll'
Binary files client/dotNET/bin/Release/XiboClient.XmlSerializers.dll	2009-06-20 10:39:40 +0000 and client/dotNET/bin/Release/XiboClient.XmlSerializers.dll	1970-01-01 00:00:00 +0000 differ
=== removed file 'client/dotNET/bin/Release/XiboClient.exe'
Binary files client/dotNET/bin/Release/XiboClient.exe	2009-06-20 10:39:40 +0000 and client/dotNET/bin/Release/XiboClient.exe	1970-01-01 00:00:00 +0000 differ
=== modified file 'client/dotNET/bin/Release/XiboClient.exe.config'
--- client/dotNET/bin/Release/XiboClient.exe.config	2009-03-08 12:41:17 +0000
+++ client/dotNET/bin/Release/XiboClient.exe.config	2009-07-30 23:01:31 +0000
@@ -14,7 +14,7 @@
                 <value>DEFAULT</value>
             </setting>
             <setting name="XiboClient_xmds_xmds" serializeAs="String">
-                <value>http://localhost/Xibo/server/xmds.php</value>
+                <value>http://localhost/1.0.0/server/xmds.php</value>
             </setting>
             <setting name="ServerKey" serializeAs="String">
                 <value>changetocustomerkey</value>
@@ -25,9 +25,6 @@
             <setting name="licensed" serializeAs="String">
                 <value>0</value>
             </setting>
-            <setting name="collectInterval" serializeAs="String">
-                <value>900</value>
-            </setting>
             <setting name="powerpointEnabled" serializeAs="String">
                 <value>False</value>
             </setting>
@@ -49,6 +46,18 @@
             <setting name="ProxyPort" serializeAs="String">
                 <value />
             </setting>
+            <setting name="hardwareKey" serializeAs="String">
+                <value />
+            </setting>
+            <setting name="StatsFlushCount" serializeAs="String">
+                <value>50</value>
+            </setting>
+            <setting name="XmdsLastConnection" serializeAs="String">
+                <value />
+            </setting>
+            <setting name="collectInterval" serializeAs="String">
+                <value>900</value>
+            </setting>
         </XiboClient.Properties.Settings>
     </userSettings>
     <applicationSettings>
@@ -65,6 +74,9 @@
             <setting name="Version" serializeAs="String">
                 <value>1</value>
             </setting>
+            <setting name="StatsLogFile" serializeAs="String">
+                <value>stats.xml</value>
+            </setting>
         </XiboClient.Properties.Settings>
     </applicationSettings>
 </configuration>
\ No newline at end of file

=== removed file 'client/dotNET/bin/Release/XiboClient.pdb'
Binary files client/dotNET/bin/Release/XiboClient.pdb	2009-06-20 10:39:40 +0000 and client/dotNET/bin/Release/XiboClient.pdb	1970-01-01 00:00:00 +0000 differ
=== modified file 'client/dotNET/bin/Release/XiboClient.vshost.exe.config'
--- client/dotNET/bin/Release/XiboClient.vshost.exe.config	2009-03-08 12:41:17 +0000
+++ client/dotNET/bin/Release/XiboClient.vshost.exe.config	2009-07-30 23:01:31 +0000
@@ -14,7 +14,7 @@
                 <value>DEFAULT</value>
             </setting>
             <setting name="XiboClient_xmds_xmds" serializeAs="String">
-                <value>http://localhost/Xibo/server/xmds.php</value>
+                <value>http://localhost/1.0.0/server/xmds.php</value>
             </setting>
             <setting name="ServerKey" serializeAs="String">
                 <value>changetocustomerkey</value>
@@ -25,9 +25,6 @@
             <setting name="licensed" serializeAs="String">
                 <value>0</value>
             </setting>
-            <setting name="collectInterval" serializeAs="String">
-                <value>900</value>
-            </setting>
             <setting name="powerpointEnabled" serializeAs="String">
                 <value>False</value>
             </setting>
@@ -49,6 +46,18 @@
             <setting name="ProxyPort" serializeAs="String">
                 <value />
             </setting>
+            <setting name="hardwareKey" serializeAs="String">
+                <value />
+            </setting>
+            <setting name="StatsFlushCount" serializeAs="String">
+                <value>50</value>
+            </setting>
+            <setting name="XmdsLastConnection" serializeAs="String">
+                <value />
+            </setting>
+            <setting name="collectInterval" serializeAs="String">
+                <value>900</value>
+            </setting>
         </XiboClient.Properties.Settings>
     </userSettings>
     <applicationSettings>
@@ -65,6 +74,9 @@
             <setting name="Version" serializeAs="String">
                 <value>1</value>
             </setting>
+            <setting name="StatsLogFile" serializeAs="String">
+                <value>stats.xml</value>
+            </setting>
         </XiboClient.Properties.Settings>
     </applicationSettings>
 </configuration>
\ No newline at end of file

=== modified file 'server/3rdparty/fckeditor/editor/css/fck_editorarea.css'
--- server/3rdparty/fckeditor/editor/css/fck_editorarea.css	2008-12-14 14:41:09 +0000
+++ server/3rdparty/fckeditor/editor/css/fck_editorarea.css	2009-08-03 12:54:45 +0000
@@ -40,7 +40,7 @@
 
 body, td
 {
-	font-family: Arial, Verdana, sans-serif;
+	font-family: "Times New Roman", Times, serif;
 	font-size: 12px;
 }
 

=== modified file 'server/3rdparty/jQuery/jquery.tablesorter.pack.js'
--- server/3rdparty/jQuery/jquery.tablesorter.pack.js	2008-12-14 14:42:52 +0000
+++ server/3rdparty/jQuery/jquery.tablesorter.pack.js	2009-06-27 10:56:12 +0000
@@ -1,8 +1,7 @@
 /*
  * 
  * TableSorter 2.0 - Client-side table sorting with ease!
- * Version 2.0
- * @requires jQuery v1.1.3
+ * Version 2.0.3
  * 
  * Copyright (c) 2007 Christian Bach
  * Examples and docs at: http://tablesorter.com
@@ -11,4 +10,4 @@
  * http://www.gnu.org/licenses/gpl.html
  * 
  */
-eval(function(p,a,c,k,e,r){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('(6($){$.1z({w:y 6(){7 k=[],12=[];u.2r={2g:"3c",2s:"2V",1P:"3L",2G:"3E",2x:"3w",1y:14,1l:"3b",1q:{},12:[],19:{16:["1X","1U"]},K:{},1Q:F,2I:W,H:[],1t:[],1g:"2u",L:F};6 1f(a,b){18(a+","+(y T().15()-b.15())+"3h")}6 18(s){q(1o 1O!="26"&&1o 1O.L!="26"){1O.18(s)}M{30(s)}}6 23(a,b){q(a.8.L){7 c=""}7 d=[],V=a.13[0].N[0].V,l=V.x;B(7 i=0;i<l;i++){7 p=F;q($.1w&&($(b[i]).Y()&&$(b[i]).Y().17)){p=1L($(b[i]).Y().17)}M q((a.8.K[i]&&a.8.K[i].17)){p=1L(a.8.K[i].17)}q(!p){p=2E(a.8,V[i])}q(a.8.L){c+="1u:"+i+" 3C:"+p.C+"\\n"}d.O(p)}q(a.8.L){18(c)}m d};6 2E(a,b){7 l=k.x;B(7 i=1;i<l;i++){q(k[i].I($.1G(1F(a,b)))){m k[i]}}m k[0]}6 1L(a){7 l=k.x;B(7 i=0;i<l;i++){q(k[i].C.Z()==a.Z()){m k[i]}}m F}6 1K(a){q(a.8.L){7 b=y T()}7 d=(a.13[0]&&a.13[0].N.x)||0,2m=a.13[0].N[0].V.x,k=a.8.1q,R={1x:[],1k:[]};B(7 i=0;i<d;++i){7 c=a.13[0].N[i],1d=[];R.1x.O($(c));B(7 j=0;j<2m;++j){1d.O(k[j].D(1F(a.8,c.V[j]),a,c.V[j]))}1d.O(i);R.1k.O(1d);1d=14};q(a.8.L){1f("3i R B "+d+" N:",b)}m R};6 1F(a,b){q(!b)m"";7 t="";q(1o(a.1l)=="6"){t=a.1l(b)}M q(a.1l=="3e"){t=$(b).1b()}M{q(b.1A[0]&&b.1A[0].3a()){t=b.1A[0].2a}M{t=b.2a}}m t}6 1n(a,b){q(a.8.L){7 d=y T()}7 c=b,r=c.1x,n=c.1k,29=n.x,1B=(n[0].x-1),2d=$("1p:1c",a).32();N=[];B(7 i=0;i<29;i++){N.O(r[n[i][1B]]);q(a.8.1D==14){2d.2k(r[n[i][1B]])}}q(a.8.1D!=14){a.8.1D(a,N)}N=14;1E(a);q(a.8.L){1f("2X 1h:",d)}};6 20(b){q(b.8.L){7 c=y T()}7 d=($.1w)?W:F,1H=[];B(7 i=0;i<b.1e.N.x;i++){1H[i]=0};$1s=$(1J(b,1H,0,b.1e.N[0].V.x));$1s.1r(6(a){u.11=0;u.1u=a;u.1j=1T(b.8.2G);q(1S(u)||1R(b,a))u.1i=W;q(!u.1i){$(u).1m(b.8.2g)}b.8.1t[a]=u});q(b.8.L){1f("2O K:",c);18($1s)}m $1s};6 1J(a,b,d){7 e=[],r=a.1e.N,c=r[d].V;B(7 i=b[d];i<c.x;i++){7 f=c[i];q(f.2N>1){e=e.3K(1J(a,b,d+f.2K))}M{q(a.1e.x==1||(f.2K>1||!r[d+1])){e.O(f)}b[d]=(i+d)}}m e};6 1S(a){q(($.1w)&&($(a).Y().17===F)){m W};m F}6 1R(a,i){q((a.8.K[i])&&(a.8.K[i].17===F)){m W};m F}6 1E(a){7 c=a.8.12;7 l=c.x;B(7 i=0;i<l;i++){2J(c[i]).D(a)}}6 2J(a){7 l=12.x;B(7 i=0;i<l;i++){q(12[i].C.Z()==a.Z()){m 12[i]}}};6 1T(v){q(1o(v)!="3J"){i=(v.Z()=="3I")?1:0}M{i=(v==(0||1))?v:0}m i}6 2H(v,a){7 l=a.x;B(7 i=0;i<l;i++){q(a[i][0]==v){m W}}m F}6 1N(b,c,d,e){c.1v(e[0]).1v(e[1]);7 h=[];c.1r(6(a){q(!u.1i){h[u.1u]=$(u)}});7 l=d.x;B(7 i=0;i<l;i++){h[d[i][0]].1m(e[d[i][1]])}}6 2F(a,b){7 c=a.8;q(c.1Q){7 d=$(\'<3H>\');$("1p:1c 1M:1c 3G",a).1r(6(){d.2k($(\'<3F>\').16(\'2D\',$(u).2D()))});$(a).3D(d)}}6 2B(a,b){7 c=a.8,l=b.x;B(7 i=0;i<l;i++){7 s=b[i],o=c.1t[s[0]];o.11=s[1];o.11++}}6 1I(a,b,d){q(a.8.L){7 f=y T()}7 g="7 2A = 6(a,b) {",l=b.x;B(7 i=0;i<l;i++){7 c=b[i][0];7 h=b[i][1];7 s=(2z(a.8.1q,c)=="1b")?((h==0)?"2y":"2w"):((h==0)?"2v":"2t");7 e="e"+i;g+="7 "+e+" = "+s+"(a["+c+"],b["+c+"]); ";g+="q("+e+") { m "+e+"; } ";g+="M { "}B(7 i=0;i<l;i++){g+="}; "}g+="m 0; ";g+="}; ";3B(g);d.1k.3A(2A);q(a.8.L){1f("3z 3y "+b.3x()+" 3v 3u "+h+" 2q:",f)}m d};6 2y(a,b){m((a<b)?-1:((a>b)?1:0))};6 2w(a,b){m((b<a)?-1:((b>a)?1:0))};6 2v(a,b){m a-b};6 2t(a,b){m b-a};6 2z(a,i){m a[i].J};u.2o=6(f){m u.1r(6(){7 c,$3t,$K,R,8,3s=0,3r;u.8={};8=$.1z(u.8,$.w.2r,f);q(!u.1e||!u.13)m W;c=$(u);$K=20(u);u.8.1q=23(u,$K);R=1K(u);7 d=[8.1P,8.2s];2F(u);$K.3p(6(e){q(!u.1i){7 b=$(u);7 i=u.1u;u.1j=u.11++%2;q(!e[8.2x]){8.H=[];q(8.1y!=14){7 a=8.1y;B(7 j=0;j<a.x;j++){8.H.O(a[j])}}8.H.O([i,u.1j])}M{q(2H(i,8.H)){B(7 j=0;j<8.H.x;j++){7 s=8.H[j],o=8.1t[s[0]];q(s[0]==i){o.11=s[1];o.11++;s[1]=o.11%2}}}M{8.H.O([i,u.1j])}};1N(c[0],$K,8.H,d);1n(c[0],1I(c[0],8.H,R));m F}}).3o(6(){q(8.2I){u.3n=6(){m F};m F}});c.1C("3m",6(){R=1K(u)}).1C("2j",6(e,a){7 b=8.H=a;2B(u,b);1N(u,$K,b,d);1n(u,1I(u,b,R))}).1C("3l",6(){1n(u,R)});q($.1w&&($(u).Y()&&$(u).Y().2i)){8.H=$(u).Y().2i}q(8.H.x>0){c.3k("2j",[8.H])}1E(u)})};u.G=6(b){7 l=k.x,a=W;B(7 i=0;i<l;i++){q(k[i].C.Z()==b.C.Z()){a=F}}q(a){k.O(b)}};u.2h=6(a){12.O(a)};u.S=6(s){7 i=3j(s);m(2f(i))?0:i};u.24=6(s){7 i=3g(s);m(2f(i))?0:i}}});$.3f.1z({w:$.w.2o});$.w.G({C:"1b",I:6(s){m W},D:6(s){m $.1G(s.Z())},J:"1b"});$.w.G({C:"2c",I:6(s){m s.25(y Q(/^\\d+$/))},D:6(s){m $.w.24(s)},J:"P"});$.w.G({C:"3d",I:6(s){m/^[£$€?.]/.U(s)},D:6(s){m $.w.S(s.X(y Q(/[^0-9.]/g),""))},J:"P"});$.w.G({C:"2c",I:6(s){m/^\\d+$/.U(s)},D:6(s){m $.w.S(s)},J:"P"});$.w.G({C:"39",I:6(s){m s.25(y Q(/^(\\+|-)?[0-9]+\\.[0-9]+((E|e)(\\+|-)?[0-9]+)?$/))},D:6(s){m $.w.S(s.X(y Q(/,/),""))},J:"P"});$.w.G({C:"38",I:6(s){m/^\\d{2,3}[\\.]\\d{2,3}[\\.]\\d{2,3}[\\.]\\d{2,3}$/.U(s)},D:6(s){7 a=s.37(".");7 r="";B(7 i=0,1a;1a=a[i];i++){q(1a.x==2){r+="0"+1a}M{r+=1a}}m $.w.S(s)},J:"P"});$.w.G({C:"36",I:6(s){m/^(28?|27|2e):\\/\\/$/.U(s)},D:6(s){m 2b.1G(s.X(y Q(/(28?|27|2e):\\/\\//),\'\'))},J:"1b"});$.w.G({C:"35",I:6(s){m/^\\d{4}[\\/-]\\d{1,2}[\\/-]\\d{1,2}$/.U(s)},D:6(s){m $.w.S((s!="")?y T(s.X(y Q(/-/g),"/")).15():"0")},J:"P"});$.w.G({C:"34",I:6(s){m/^\\d{1,3}%$/.U(s)},D:6(s){m $.w.S(s.X(y Q(/%/g),""))},J:"P"});$.w.G({C:"33",I:6(s){m/^[A-31-z]{3,10}\\.?[0-9]{1,2},([0-9]{4}|\\\'?[0-9]{2}) (([0-2]?[0-9]:[0-5][0-9])|([0-1]?[0-9]:[0-5][0-9]\\s(2Z|3q)))$/.U(s);\n		},\n		D: 6(s) {\n			m $.w.S(y T(s).15());\n		},\n		J: "P"\n	});\n	\n	$.w.G({\n		C: "2Y",\n		I: 6(s) {\n			m /\\d{1,2}[\\/-]\\d{1,2}[\\/-]\\d{2,4}/.U(s);\n		},\n		D: 6(s,1h) {\n			7 c = 1h.8;\n			s = s.X(y Q(/-/g),"/");\n			q(c.1g == "2u") {\n				/** 2l 22 2p 21 2n D */\n				s = s.X(y Q(/(\\d{1,2})[\\/-](\\d{1,2})[\\/-](\\d{4})/), "$3/$1/$2");\n			} M q(c.1g == "2W") {\n				/** 2l 22 2p 21 2n D */\n				s = s.X(y Q(/(\\d{1,2})[\\/-](\\d{1,2})[\\/-](\\d{4})/), "$3/$2/$1");\n			} M q(c.1g == "2C/1Z/1Y" || c.1g == "2C-1Z-1Y") {\n				s = s.X(y Q(/(\\d{1,2})[\\/-](\\d{1,2})[\\/-](\\d{2})/), "$1/$2/$3");	\n			}\n			m $.w.S(y T(s).15());\n		},\n		J: "P"\n	});\n	\n	$.w.G({\n	    C: "2q",\n	    I: 6(s) {\n	        m /^(([0-2]?[0-9]:[0-5][0-9])|([0-1]?[0-9]:[0-5][0-9]\\s(2U|2T)))$/.U(s);\n	    },\n	    D: 6(s) {\n	        m $.w.S(y T("2S/1W/1W " + s).15());\n	    },\n	  J: "P"\n	});\n	\n	\n	$.w.G({\n	    C: "2R",\n	    I: 6(s) {\n	        m F;\n	    },\n	    D: 6(s,1h,2M) {\n			7 c = 1h.8, p = (!c.1V) ? \'2Q\':c.1V;m $(2M).Y()[p]},J:"P"});$.w.2h({C:"2P",D:6(a){$("> 1p:1c/1M:2L:1X",a).1v(a.8.19.16[1]).1m(a.8.19.16[0]);$("> 1p:1c/1M:2L:1U",a).1v(a.8.19.16[0]).1m(a.8.19.16[1])}})})(2b);',62,234,'||||||function|var|config||||||||||||||return||||if||||this||tablesorter|length|new|||for|id|format||false|addParser|sortList|is|type|headers|debug|else|rows|push|numeric|RegExp|cache|formatFloat|Date|test|cells|true|replace|data|toLowerCase||count|widgets|tBodies|null|getTime|css|sorter|log|widgetZebra|item|text|first|cols|tHead|benchmark|dateFormat|table|sortDisabled|order|normalized|textExtraction|addClass|appendToTable|typeof|tbody|parsers|each|tableHeaders|headerList|column|removeClass|meta|row|sortForce|extend|childNodes|checkCell|bind|appender|applyWidget|getElementText|trim|tableHeadersRows|multisort|checkCellColSpan|buildCache|getParserById|tr|setHeadersCss|console|cssDesc|widthFixed|checkHeaderOptions|checkHeaderMetadata|formatSortingOrder|odd|parserMetadataName|01|even|yy|mm|buildHeaders|in|the|buildParserCache|formatInt|match|undefined|ftp|https|totalRows|innerHTML|jQuery|integer|tableBody|file|isNaN|cssHeader|addWidget|sortlist|sorton|append|reformat|totalCells|ISO|construct|string|time|defaults|cssAsc|sortNumericDesc|us|sortNumeric|sortTextDesc|sortMultiSortKey|sortText|getCachedSortType|sortWrapper|updateHeaderSortCount|dd|width|detectParserForColumn|fixColumnWidth|sortInitialOrder|isValueInArray|cancelSelection|getWidgetById|rowSpan|visible|cell|colSpan|Built|zebra|sortValue|metadata|2000|pm|am|headerSortUp|uk|Rebuilt|shortDate|AM|alert|Za|empty|usLongDate|percent|isoDate|url|split|ipAddress|floating|hasChildNodes|simple|header|currency|complex|fn|parseInt|ms|Building|parseFloat|trigger|appendCache|update|onselectstart|mousedown|click|PM|sortOrder|shiftDown|document|dir|and|shiftKey|toString|on|Sorting|sort|eval|parser|prepend|asc|col|td|colgroup|desc|Number|concat|headerSortDown'.split('|'),0,{}))
\ No newline at end of file
+(function($){$.extend({tablesorter:new function(){var parsers=[],widgets=[];this.defaults={cssHeader:"header",cssAsc:"headerSortUp",cssDesc:"headerSortDown",sortInitialOrder:"asc",sortMultiSortKey:"shiftKey",sortForce:null,sortAppend:null,textExtraction:"simple",parsers:{},widgets:[],widgetZebra:{css:["even","odd"]},headers:{},widthFixed:false,cancelSelection:true,sortList:[],headerList:[],dateFormat:"us",decimal:'.',debug:false};function benchmark(s,d){log(s+","+(new Date().getTime()-d.getTime())+"ms");}this.benchmark=benchmark;function log(s){if(typeof console!="undefined"&&typeof console.debug!="undefined"){console.log(s);}else{alert(s);}}function buildParserCache(table,$headers){if(table.config.debug){var parsersDebug="";}var rows=table.tBodies[0].rows;if(table.tBodies[0].rows[0]){var list=[],cells=rows[0].cells,l=cells.length;for(var i=0;i<l;i++){var p=false;if($.metadata&&($($headers[i]).metadata()&&$($headers[i]).metadata().sorter)){p=getParserById($($headers[i]).metadata().sorter);}else if((table.config.headers[i]&&table.config.headers[i].sorter)){p=getParserById(table.config.headers[i].sorter);}if(!p){p=detectParserForColumn(table,cells[i]);}if(table.config.debug){parsersDebug+="column:"+i+" parser:"+p.id+"\n";}list.push(p);}}if(table.config.debug){log(parsersDebug);}return list;};function detectParserForColumn(table,node){var l=parsers.length;for(var i=1;i<l;i++){if(parsers[i].is($.trim(getElementText(table.config,node)),table,node)){return parsers[i];}}return parsers[0];}function getParserById(name){var l=parsers.length;for(var i=0;i<l;i++){if(parsers[i].id.toLowerCase()==name.toLowerCase()){return parsers[i];}}return false;}function buildCache(table){if(table.config.debug){var cacheTime=new Date();}var totalRows=(table.tBodies[0]&&table.tBodies[0].rows.length)||0,totalCells=(table.tBodies[0].rows[0]&&table.tBodies[0].rows[0].cells.length)||0,parsers=table.config.parsers,cache={row:[],normalized:[]};for(var i=0;i<totalRows;++i){var c=table.tBodies[0].rows[i],cols=[];cache.row.push($(c));for(var j=0;j<totalCells;++j){cols.push(parsers[j].format(getElementText(table.config,c.cells[j]),table,c.cells[j]));}cols.push(i);cache.normalized.push(cols);cols=null;};if(table.config.debug){benchmark("Building cache for "+totalRows+" rows:",cacheTime);}return cache;};function getElementText(config,node){if(!node)return"";var t="";if(config.textExtraction=="simple"){if(node.childNodes[0]&&node.childNodes[0].hasChildNodes()){t=node.childNodes[0].innerHTML;}else{t=node.innerHTML;}}else{if(typeof(config.textExtraction)=="function"){t=config.textExtraction(node);}else{t=$(node).text();}}return t;}function appendToTable(table,cache){if(table.config.debug){var appendTime=new Date()}var c=cache,r=c.row,n=c.normalized,totalRows=n.length,checkCell=(n[0].length-1),tableBody=$(table.tBodies[0]),rows=[];for(var i=0;i<totalRows;i++){rows.push(r[n[i][checkCell]]);if(!table.config.appender){var o=r[n[i][checkCell]];var l=o.length;for(var j=0;j<l;j++){tableBody[0].appendChild(o[j]);}}}if(table.config.appender){table.config.appender(table,rows);}rows=null;if(table.config.debug){benchmark("Rebuilt table:",appendTime);}applyWidget(table);setTimeout(function(){$(table).trigger("sortEnd");},0);};function buildHeaders(table){if(table.config.debug){var time=new Date();}var meta=($.metadata)?true:false,tableHeadersRows=[];for(var i=0;i<table.tHead.rows.length;i++){tableHeadersRows[i]=0;};$tableHeaders=$("thead th",table);$tableHeaders.each(function(index){this.count=0;this.column=index;this.order=formatSortingOrder(table.config.sortInitialOrder);if(checkHeaderMetadata(this)||checkHeaderOptions(table,index))this.sortDisabled=true;if(!this.sortDisabled){$(this).addClass(table.config.cssHeader);}table.config.headerList[index]=this;});if(table.config.debug){benchmark("Built headers:",time);log($tableHeaders);}return $tableHeaders;};function checkCellColSpan(table,rows,row){var arr=[],r=table.tHead.rows,c=r[row].cells;for(var i=0;i<c.length;i++){var cell=c[i];if(cell.colSpan>1){arr=arr.concat(checkCellColSpan(table,headerArr,row++));}else{if(table.tHead.length==1||(cell.rowSpan>1||!r[row+1])){arr.push(cell);}}}return arr;};function checkHeaderMetadata(cell){if(($.metadata)&&($(cell).metadata().sorter===false)){return true;};return false;}function checkHeaderOptions(table,i){if((table.config.headers[i])&&(table.config.headers[i].sorter===false)){return true;};return false;}function applyWidget(table){var c=table.config.widgets;var l=c.length;for(var i=0;i<l;i++){getWidgetById(c[i]).format(table);}}function getWidgetById(name){var l=widgets.length;for(var i=0;i<l;i++){if(widgets[i].id.toLowerCase()==name.toLowerCase()){return widgets[i];}}};function formatSortingOrder(v){if(typeof(v)!="Number"){i=(v.toLowerCase()=="desc")?1:0;}else{i=(v==(0||1))?v:0;}return i;}function isValueInArray(v,a){var l=a.length;for(var i=0;i<l;i++){if(a[i][0]==v){return true;}}return false;}function setHeadersCss(table,$headers,list,css){$headers.removeClass(css[0]).removeClass(css[1]);var h=[];$headers.each(function(offset){if(!this.sortDisabled){h[this.column]=$(this);}});var l=list.length;for(var i=0;i<l;i++){h[list[i][0]].addClass(css[list[i][1]]);}}function fixColumnWidth(table,$headers){var c=table.config;if(c.widthFixed){var colgroup=$('<colgroup>');$("tr:first td",table.tBodies[0]).each(function(){colgroup.append($('<col>').css('width',$(this).width()));});$(table).prepend(colgroup);};}function updateHeaderSortCount(table,sortList){var c=table.config,l=sortList.length;for(var i=0;i<l;i++){var s=sortList[i],o=c.headerList[s[0]];o.count=s[1];o.count++;}}function multisort(table,sortList,cache){if(table.config.debug){var sortTime=new Date();}var dynamicExp="var sortWrapper = function(a,b) {",l=sortList.length;for(var i=0;i<l;i++){var c=sortList[i][0];var order=sortList[i][1];var s=(getCachedSortType(table.config.parsers,c)=="text")?((order==0)?"sortText":"sortTextDesc"):((order==0)?"sortNumeric":"sortNumericDesc");var e="e"+i;dynamicExp+="var "+e+" = "+s+"(a["+c+"],b["+c+"]); ";dynamicExp+="if("+e+") { return "+e+"; } ";dynamicExp+="else { ";}var orgOrderCol=cache.normalized[0].length-1;dynamicExp+="return a["+orgOrderCol+"]-b["+orgOrderCol+"];";for(var i=0;i<l;i++){dynamicExp+="}; ";}dynamicExp+="return 0; ";dynamicExp+="}; ";eval(dynamicExp);cache.normalized.sort(sortWrapper);if(table.config.debug){benchmark("Sorting on "+sortList.toString()+" and dir "+order+" time:",sortTime);}return cache;};function sortText(a,b){return((a<b)?-1:((a>b)?1:0));};function sortTextDesc(a,b){return((b<a)?-1:((b>a)?1:0));};function sortNumeric(a,b){return a-b;};function sortNumericDesc(a,b){return b-a;};function getCachedSortType(parsers,i){return parsers[i].type;};this.construct=function(settings){return this.each(function(){if(!this.tHead||!this.tBodies)return;var $this,$document,$headers,cache,config,shiftDown=0,sortOrder;this.config={};config=$.extend(this.config,$.tablesorter.defaults,settings);$this=$(this);$headers=buildHeaders(this);this.config.parsers=buildParserCache(this,$headers);cache=buildCache(this);var sortCSS=[config.cssDesc,config.cssAsc];fixColumnWidth(this);$headers.click(function(e){$this.trigger("sortStart");var totalRows=($this[0].tBodies[0]&&$this[0].tBodies[0].rows.length)||0;if(!this.sortDisabled&&totalRows>0){var $cell=$(this);var i=this.column;this.order=this.count++%2;if(!e[config.sortMultiSortKey]){config.sortList=[];if(config.sortForce!=null){var a=config.sortForce;for(var j=0;j<a.length;j++){if(a[j][0]!=i){config.sortList.push(a[j]);}}}config.sortList.push([i,this.order]);}else{if(isValueInArray(i,config.sortList)){for(var j=0;j<config.sortList.length;j++){var s=config.sortList[j],o=config.headerList[s[0]];if(s[0]==i){o.count=s[1];o.count++;s[1]=o.count%2;}}}else{config.sortList.push([i,this.order]);}};setTimeout(function(){setHeadersCss($this[0],$headers,config.sortList,sortCSS);appendToTable($this[0],multisort($this[0],config.sortList,cache));},1);return false;}}).mousedown(function(){if(config.cancelSelection){this.onselectstart=function(){return false};return false;}});$this.bind("update",function(){this.config.parsers=buildParserCache(this,$headers);cache=buildCache(this);}).bind("sorton",function(e,list){$(this).trigger("sortStart");config.sortList=list;var sortList=config.sortList;updateHeaderSortCount(this,sortList);setHeadersCss(this,$headers,sortList,sortCSS);appendToTable(this,multisort(this,sortList,cache));}).bind("appendCache",function(){appendToTable(this,cache);}).bind("applyWidgetId",function(e,id){getWidgetById(id).format(this);}).bind("applyWidgets",function(){applyWidget(this);});if($.metadata&&($(this).metadata()&&$(this).metadata().sortlist)){config.sortList=$(this).metadata().sortlist;}if(config.sortList.length>0){$this.trigger("sorton",[config.sortList]);}applyWidget(this);});};this.addParser=function(parser){var l=parsers.length,a=true;for(var i=0;i<l;i++){if(parsers[i].id.toLowerCase()==parser.id.toLowerCase()){a=false;}}if(a){parsers.push(parser);};};this.addWidget=function(widget){widgets.push(widget);};this.formatFloat=function(s){var i=parseFloat(s);return(isNaN(i))?0:i;};this.formatInt=function(s){var i=parseInt(s);return(isNaN(i))?0:i;};this.isDigit=function(s,config){var DECIMAL='\\'+config.decimal;var exp='/(^[+]?0('+DECIMAL+'0+)?$)|(^([-+]?[1-9][0-9]*)$)|(^([-+]?((0?|[1-9][0-9]*)'+DECIMAL+'(0*[1-9][0-9]*)))$)|(^[-+]?[1-9]+[0-9]*'+DECIMAL+'0+$)/';return RegExp(exp).test($.trim(s));};this.clearTableBody=function(table){if($.browser.msie){function empty(){while(this.firstChild)this.removeChild(this.firstChild);}empty.apply(table.tBodies[0]);}else{table.tBodies[0].innerHTML="";}};}});$.fn.extend({tablesorter:$.tablesorter.construct});var ts=$.tablesorter;ts.addParser({id:"text",is:function(s){return true;},format:function(s){return $.trim(s.toLowerCase());},type:"text"});ts.addParser({id:"digit",is:function(s,table){var c=table.config;return $.tablesorter.isDigit(s,c);},format:function(s){return $.tablesorter.formatFloat(s);},type:"numeric"});ts.addParser({id:"currency",is:function(s){return/^[£$€?.]/.test(s);},format:function(s){return $.tablesorter.formatFloat(s.replace(new RegExp(/[^0-9.]/g),""));},type:"numeric"});ts.addParser({id:"ipAddress",is:function(s){return/^\d{2,3}[\.]\d{2,3}[\.]\d{2,3}[\.]\d{2,3}$/.test(s);},format:function(s){var a=s.split("."),r="",l=a.length;for(var i=0;i<l;i++){var item=a[i];if(item.length==2){r+="0"+item;}else{r+=item;}}return $.tablesorter.formatFloat(r);},type:"numeric"});ts.addParser({id:"url",is:function(s){return/^(https?|ftp|file):\/\/$/.test(s);},format:function(s){return jQuery.trim(s.replace(new RegExp(/(https?|ftp|file):\/\//),''));},type:"text"});ts.addParser({id:"isoDate",is:function(s){return/^\d{4}[\/-]\d{1,2}[\/-]\d{1,2}$/.test(s);},format:function(s){return $.tablesorter.formatFloat((s!="")?new Date(s.replace(new RegExp(/-/g),"/")).getTime():"0");},type:"numeric"});ts.addParser({id:"percent",is:function(s){return/\%$/.test($.trim(s));},format:function(s){return $.tablesorter.formatFloat(s.replace(new RegExp(/%/g),""));},type:"numeric"});ts.addParser({id:"usLongDate",is:function(s){return s.match(new RegExp(/^[A-Za-z]{3,10}\.? [0-9]{1,2}, ([0-9]{4}|'?[0-9]{2}) (([0-2]?[0-9]:[0-5][0-9])|([0-1]?[0-9]:[0-5][0-9]\s(AM|PM)))$/));},format:function(s){return $.tablesorter.formatFloat(new Date(s).getTime());},type:"numeric"});ts.addParser({id:"shortDate",is:function(s){return/\d{1,2}[\/\-]\d{1,2}[\/\-]\d{2,4}/.test(s);},format:function(s,table){var c=table.config;s=s.replace(/\-/g,"/");if(c.dateFormat=="us"){s=s.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{4})/,"$3/$1/$2");}else if(c.dateFormat=="uk"){s=s.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{4})/,"$3/$2/$1");}else if(c.dateFormat=="dd/mm/yy"||c.dateFormat=="dd-mm-yy"){s=s.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{2})/,"$1/$2/$3");}return $.tablesorter.formatFloat(new Date(s).getTime());},type:"numeric"});ts.addParser({id:"time",is:function(s){return/^(([0-2]?[0-9]:[0-5][0-9])|([0-1]?[0-9]:[0-5][0-9]\s(am|pm)))$/.test(s);},format:function(s){return $.tablesorter.formatFloat(new Date("2000/01/01 "+s).getTime());},type:"numeric"});ts.addParser({id:"metadata",is:function(s){return false;},format:function(s,table,cell){var c=table.config,p=(!c.parserMetadataName)?'sortValue':c.parserMetadataName;return $(cell).metadata()[p];},type:"numeric"});ts.addWidget({id:"zebra",format:function(table){if(table.config.debug){var time=new Date();}$("tr:visible",table.tBodies[0]).filter(':even').removeClass(table.config.widgetZebra.css[1]).addClass(table.config.widgetZebra.css[0]).end().filter(':odd').removeClass(table.config.widgetZebra.css[0]).addClass(table.config.widgetZebra.css[1]);if(table.config.debug){$.tablesorter.benchmark("Applying Zebra widget",time);}}});})(jQuery);
\ No newline at end of file

=== removed file 'server/img/Thumbs.db'
Binary files server/img/Thumbs.db	2009-06-20 12:00:21 +0000 and server/img/Thumbs.db	1970-01-01 00:00:00 +0000 differ
=== removed file 'server/img/bodys/Thumbs.db'
Binary files server/img/bodys/Thumbs.db	2009-06-20 12:00:21 +0000 and server/img/bodys/Thumbs.db	1970-01-01 00:00:00 +0000 differ
=== removed file 'server/img/dashboard/Thumbs.db'
Binary files server/img/dashboard/Thumbs.db	2009-06-20 12:00:21 +0000 and server/img/dashboard/Thumbs.db	1970-01-01 00:00:00 +0000 differ
=== removed file 'server/img/dialogs/Thumbs.db'
Binary files server/img/dialogs/Thumbs.db	2009-06-20 12:00:21 +0000 and server/img/dialogs/Thumbs.db	1970-01-01 00:00:00 +0000 differ
=== removed file 'server/img/fades/Thumbs.db'
Binary files server/img/fades/Thumbs.db	2009-06-20 12:00:21 +0000 and server/img/fades/Thumbs.db	1970-01-01 00:00:00 +0000 differ
=== removed file 'server/img/filterform/Thumbs.db'
Binary files server/img/filterform/Thumbs.db	2009-06-20 12:00:21 +0000 and server/img/filterform/Thumbs.db	1970-01-01 00:00:00 +0000 differ
=== removed file 'server/img/forms/Thumbs.db'
Binary files server/img/forms/Thumbs.db	2009-06-20 12:00:21 +0000 and server/img/forms/Thumbs.db	1970-01-01 00:00:00 +0000 differ
=== removed file 'server/img/login/Thumbs.db'
Binary files server/img/login/Thumbs.db	2009-06-20 12:00:21 +0000 and server/img/login/Thumbs.db	1970-01-01 00:00:00 +0000 differ
=== removed file 'server/img/logos/Thumbs.db'
Binary files server/img/logos/Thumbs.db	2009-06-20 12:00:21 +0000 and server/img/logos/Thumbs.db	1970-01-01 00:00:00 +0000 differ
=== removed file 'server/img/tables/Thumbs.db'
Binary files server/img/tables/Thumbs.db	2009-06-20 12:00:21 +0000 and server/img/tables/Thumbs.db	1970-01-01 00:00:00 +0000 differ
=== removed file 'server/img/tabs/Thumbs.db'
Binary files server/img/tabs/Thumbs.db	2009-06-20 12:00:21 +0000 and server/img/tabs/Thumbs.db	1970-01-01 00:00:00 +0000 differ
=== removed file 'server/img/titles/Thumbs.db'
Binary files server/img/titles/Thumbs.db	2009-06-20 12:00:21 +0000 and server/img/titles/Thumbs.db	1970-01-01 00:00:00 +0000 differ
=== removed file 'server/img/weather_rss/Thumbs.db'
Binary files server/img/weather_rss/Thumbs.db	2009-06-20 12:00:21 +0000 and server/img/weather_rss/Thumbs.db	1970-01-01 00:00:00 +0000 differ
=== added file 'server/install/database/7.sql'
--- server/install/database/7.sql	1970-01-01 00:00:00 +0000
+++ server/install/database/7.sql	2009-08-08 13:39:17 +0000
@@ -0,0 +1,24 @@
+
+INSERT INTO `pages` (
+`pageID` ,
+`name` ,
+`pagegroupID`
+)
+VALUES (
+NULL , 'stats', '9'
+);
+
+INSERT INTO `menuitem` (`MenuID`, `PageID`, `Args`, `Text`, `Class`, `Img`, `Sequence`) 
+SELECT '4', pageID, NULL, 'Statistics', NULL, NULL, '9' FROM pages WHERE name = 'stats';
+
+ALTER TABLE `stat` ADD `Tag` VARCHAR( 254 ) NULL ;
+
+ALTER TABLE `stat` ADD `Type` VARCHAR( 20 ) NOT NULL DEFAULT 'Media' AFTER `statID` ;
+
+ALTER TABLE `stat` CHANGE `Type` `Type` VARCHAR( 20 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;
+
+ALTER TABLE `stat` CHANGE `mediaID` `mediaID` VARCHAR( 50 ) CHARACTER SET utf8 COLLATE utf8_general_ci NULL;
+
+UPDATE `version` SET `app_ver` = '1.0.3';
+UPDATE `setting` SET `value` = 0 WHERE `setting` = 'PHONE_HOME_DATE';
+UPDATE `version` SET `DBVersion` = '7';

=== modified file 'server/lib/app/app_functions.php'
--- server/lib/app/app_functions.php	2009-02-21 17:52:52 +0000
+++ server/lib/app/app_functions.php	2009-07-28 21:08:19 +0000
@@ -325,105 +325,6 @@
 	return $hms;
 }
 
-define('STAT_LAYOUT_START', 'LayoutStart');
-define('STAT_LAYOUT_END', 'LayoutEnd');
-define('STAT_MEDIA_START', 'MediaStart');
-define('STAT_MEDIA_END', 'MediaEnd');
-
-/**
- * Records a Stat Record
- * @return 
- * @param $statType Object
- * @param $statDate Object
- * @param $scheduleID Object
- * @param $displayID Object
- * @param $layoutID Object
- * @param $mediaID Object
- * @param $start Object
- * @param $end Object
- */
-function StatRecord($statType, $statDate, $scheduleID, $displayID, $layoutID, $mediaID, $start, $end) 
-{
-	global $db;
-	
-	$infinityDate = "2050-12-31 00:00:00";
-	
-	// Look up the stat type
-	switch ($statType)
-	{
-		case STAT_LAYOUT_START:
-			// If its a layout start
-			//	Check for an open Layout which has this schedule & close it
-			$SQL  = "";
-			$SQL .= " UPDATE stat SET end = '$end' WHERE scheduleID = '$scheduleID' AND layoutID = '$layoutID' AND end = '$infinityDate' ";
-			
-			if (!$db->query($SQL)) 
-			{
-				trigger_error($db->error());
-				return false;
-			}
-			
-			//	Insert a new stat record for this layout
-			$SQL  = "";
-			$SQL .= " INSERT INTO stat (statDate, scheduleID, displayID, layoutID, start, end)";
-			$SQL .= "  VALUES ('$statDate', '$scheduleID', '$displayID', '$layoutID', '$start', '$infinityDate')";
-			
-			if (!$db->query($SQL)) 
-			{
-				trigger_error($db->error());
-				return false;
-			}
-			
-			break;
-			
-		case STAT_LAYOUT_END:
-			// If its a layout end
-			// Close the layout stat record for this schedule (by updating the end time)
-			// Also close any open media records (they should all be shut anyway)
-			$SQL  = "";
-			$SQL .= " UPDATE stat SET end = '$end' WHERE scheduleID = '$scheduleID' AND layoutID = '$layoutID' AND end = '$infinityDate' ";
-			
-			if (!$db->query($SQL)) 
-			{
-				trigger_error($db->error());
-				return false;
-			}
-			break;
-			
-		case STAT_MEDIA_START:
-			// If its a media start
-			// Create a new media stat record for this layout 
-			$SQL  = "";
-			$SQL .= " INSERT INTO stat (statDate, scheduleID, displayID, layoutID, mediaID, start, end)";
-			$SQL .= "  VALUES ('$statDate', '$scheduleID', '$displayID', '$layoutID', '$mediaID', '$start', '$infinityDate')";
-			
-			if (!$db->query($SQL)) 
-			{
-				trigger_error($db->error());
-				return false;
-			}
-			break;
-			
-		case STAT_MEDIA_END:
-			// If its a media end
-			// Close the stat record
-			$SQL  = "";
-			$SQL .= " UPDATE stat SET end = '$end' WHERE scheduleID = '$scheduleID' AND layoutID = '$layoutID' AND mediaID = '$mediaID' AND end = '$infinityDate' ";
-			
-			if (!$db->query($SQL)) 
-			{
-				trigger_error($db->error());
-				return false;
-			}
-			break;
-			
-		default:
-			return false;
-	}
-
-	return true;
-}
-
 /**
  * Gets web safe colors
  * @return 

=== modified file 'server/lib/app/session.class.php'
--- server/lib/app/session.class.php	2008-12-19 22:10:39 +0000
+++ server/lib/app/session.class.php	2009-07-07 20:01:49 +0000
@@ -29,7 +29,8 @@
 	
 	public $isExpired = 1;
 
-	function __construct(database $db) {
+	function __construct(database $db) 
+	{
 		$this->db =& $db;
 		
 		session_set_save_handler(array(&$this, 'open'),
@@ -64,38 +65,27 @@
 	{
 		$db =& $this->db;
 		
-		$userAgent		= $_SERVER['HTTP_USER_AGENT'];
-		$remoteAddr		= $_SERVER['REMOTE_ADDR'];
+		$userAgent		= Kit::GetParam('HTTP_USER_AGENT', $_SERVER, _STRING, 'No user agent');
+		$remoteAddr		= Kit::GetParam('REMOTE_ADDR', $_SERVER, _STRING);
+		$securityToken	= Kit::GetParam('SecurityToken', _POST, _STRING, null);
 		
 		$this->key 		= $key;
 		$newExp 		= time() + $this->max_lifetime;
 		
 		$this->gc($this->max_lifetime);
 		
-		if(isset($_POST['SecurityToken'])) 
-		{		
-			$securityToken = validate($_POST['SecurityToken']);
-			
-			if (!$securityToken)
-			{
-				log_entry($db, "error", "Invalid Security Token");
-				$securityToken = null;
-			}
-		}
-		else
-		{
-			$securityToken = null;
-		}
-		
+		// Get this session		
 		$SQL  = " SELECT session_data, IsExpired, SecurityToken FROM session ";
-		$SQL .= " WHERE session_id = '$key' ";
-		$SQL .= " AND RemoteAddr = '$remoteAddr' ";
-		
-		if (!$result = $db->query($SQL));
+		$SQL .= " WHERE session_id = '%s' ";
+		$SQL .= " AND UserAgent = '%s' ";
+		
+		$SQL 	= sprintf($SQL, $db->escape_string($key), $db->escape_string($userAgent));
+		
+		$result = $db->query($SQL);
 		
 		if ($db->num_rows($result) != 0) 
 		{
-			
+			// Get the row
 			$row = $db->get_row($result);
 			
 			// We have the Key and the Remote Address.
@@ -109,10 +99,10 @@
 				// We have a security token, so dont require a login
 				$this->isExpired = 0;
 				
-				if (!$db->query("UPDATE session SET session_expiration = $newExp, isExpired = 0 WHERE session_id = '$key' "))
+				if (!$db->query(sprintf("UPDATE session SET session_expiration = $newExp, isExpired = 0 WHERE session_id = '%s' ", $db->escape_string($key))))
 				{
 					log_entry($db, "error", $db->error());
-				}			
+				}
 			}
 			else
 			{
@@ -123,49 +113,55 @@
 			}
 			
 			// Either way - update this SESSION so that the security token is NULL
-			$db->query("UPDATE session SET SecurityToken = NULL WHERE session_id = '$key' ");
+			$db->query(sprintf("UPDATE session SET SecurityToken = NULL WHERE session_id = '%s' ", $db->escape_string($key)));
 			
 			return($row[0]);
 		}
-		else {
+		else 
+		{
 			$empty = '';
 			return settype($empty, "string");
 		}
 	}
 	
-	function write($key, $val) {
-		
-		$db =& $this->db;
-		
-		$val = addslashes($val);
+	function write($key, $val) 
+	{
+		$db 			=& $this->db;
 		
 		$newExp 		= time() + $this->max_lifetime;
 		$lastaccessed 	= date("Y-m-d H:i:s");
-		$userAgent		= $_SERVER['HTTP_USER_AGENT'];
-		$remoteAddr		= $_SERVER['REMOTE_ADDR'];
+		$userAgent		= Kit::GetParam('HTTP_USER_AGENT', $_SERVER, _STRING, 'No user agent');
+		$remoteAddr		= Kit::GetParam('REMOTE_ADDR', $_SERVER, _STRING);
 		
-		$result = $db->query("SELECT session_id FROM session WHERE session_id = '$key'");
+		$result = $db->query(sprintf("SELECT session_id FROM session WHERE session_id = '%s'", $db->escape_string($key)));
 		
 		if ($db->num_rows($result) == 0) 
 		{
 			//INSERT
 			$SQL = "INSERT INTO session (session_id, session_data, session_expiration, LastAccessed, LastPage, userID, IsExpired, UserAgent, RemoteAddr) 
-					VALUES ('$key','$val',$newExp,'$lastaccessed','login', NULL, 0, '$userAgent', '$remoteAddr')";
+					VALUES ('%s', '%s', %d, '%s', 'login', NULL, 0, '%s', '%s')";
+					
+			$SQL = sprintf($SQL, $db->escape_string($key), $db->escape_string($val), $newExp, $db->escape_string($lastaccessed), $db->escape_string($userAgent), $db->escape_string($remoteAddr));
 		}
 		else 
 		{
 			//UPDATE
 			$SQL = "UPDATE session SET ";
-			$SQL .= " session_data = '$val', ";
-			$SQL .= " session_expiration = '$newExp', ";
-			$SQL .= " lastaccessed 	= '$lastaccessed' ";
-			$SQL .= " WHERE session_id = '$key' ";
+			$SQL .= " session_data = '%s', ";
+			$SQL .= " session_expiration = %d, ";
+			$SQL .= " lastaccessed 	= '%s', ";
+			$SQL .= " RemoteAddr 	= '%s' ";
+			$SQL .= " WHERE session_id = '%s' ";
+			
+			$SQL = sprintf($SQL, $db->escape_string($val), $newExp, $db->escape_string($lastaccessed), $db->escape_string($remoteAddr), $db->escape_string($key));
 		}
 		
-		if(!$db->query($SQL)) {
+		if(!$db->query($SQL)) 
+		{
 			log_entry($db, "error", $db->error());
 			return(false);
 		}
+		
 		return true;
 	}
 
@@ -173,7 +169,7 @@
 	{
 		$db =& $this->db;
 		
-		$SQL = "UPDATE session SET IsExpired = 1 WHERE session_id = '$key'";
+		$SQL = sprintf("UPDATE session SET IsExpired = 1 WHERE session_id = '%s'", $db->escape_string($key));
 		
 		$result = $db->query("$SQL"); 
 		
@@ -193,26 +189,32 @@
 	{
 		$db =& $this->db;
 		
-		$SQL = "UPDATE session SET userID = $userid WHERE session_id = '$key' ";
+		$SQL = sprintf("UPDATE session SET userID = %d WHERE session_id = '%s' ",$userid, $db->escape_string($key));
 		
-		if(!$db->query($SQL)) {
+		if(!$db->query($SQL)) 
+		{
 			trigger_error($db->error(), E_USER_NOTICE);
 			return(false);
 		}
 		return true;
 	}
 	
-	// Update the session (after login)
-	static function RegenerateSessionID() 
+	/**
+	 * Updates the session ID with a new one
+	 * @return 
+	 */
+	public function RegenerateSessionID($oldSessionID) 
 	{
-	    $old_sess_id = session_id();
+		$db =& $this->db;
 		
 	    session_regenerate_id(false);
 		
 	    $new_sess_id = session_id();
+		
+		$this->key = $new_sess_id;
 	       
-	    $query = "UPDATE `session` SET `session_id` = '$new_sess_id' WHERE session_id = '$old_sess_id'";
-	        mysql_query($query);
+	    $query = sprintf("UPDATE session SET session_id = '%s' WHERE session_id = '%s'", $db->escape_string($new_sess_id), $db->escape_string($oldSessionID));
+	    $db->query($query);
 	}
 	
 	function set_page($key, $lastpage) 
@@ -221,9 +223,10 @@
 		
 		$_SESSION['pagename'] = $lastpage;
 		
-		$SQL = "UPDATE session SET LastPage = '$lastpage' WHERE session_id = '$key' ";
+		$SQL = sprintf("UPDATE session SET LastPage = '%s' WHERE session_id = '%s' ", $db->escape_string($lastpage), $db->escape_string($key));
 		
-		if(!$db->query($SQL)) {
+		if(!$db->query($SQL)) 
+		{
 			trigger_error($db->error(), E_USER_NOTICE);
 			return(false);
 		}
@@ -236,7 +239,7 @@
 
 		$this->isExpired = $isExpired;
 		
-		$SQL = "UPDATE session SET IsExpired = $this->isExpired WHERE session_id = '$this->key'";
+		$SQL = sprintf("UPDATE session SET IsExpired = $this->isExpired WHERE session_id = '%s'", $db->escape_string($this->key));
 		
 		if (!$db->query($SQL))
 		{
@@ -248,7 +251,7 @@
 	{
 		$db =& $this->db;
 		
-		$SQL = "UPDATE session SET securityToken = '$token' WHERE session_id = '$this->key'";
+		$SQL = sprintf("UPDATE session SET securityToken = '%s' WHERE session_id = '%s'", $db->escape_string($token), $db->escape_string($this->key));
 		
 		if (!$db->query($SQL))
 		{

=== added file 'server/lib/data/layout.data.class.php'
--- server/lib/data/layout.data.class.php	1970-01-01 00:00:00 +0000
+++ server/lib/data/layout.data.class.php	2009-07-30 23:01:31 +0000
@@ -0,0 +1,185 @@
+<?php
+/*
+ * Xibo - Digitial Signage - http://www.xibo.org.uk
+ * Copyright (C) 2009 Daniel Garner
+ *
+ * This file is part of Xibo.
+ *
+ * Xibo is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version. 
+ *
+ * Xibo is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
+ */ 
+defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
+
+class Layout extends Data
+{
+	private $xml;
+	
+	public function EditTags($layoutID, $tags)
+	{
+		$db =& $this->db;
+		
+		Debug::LogEntry($db, 'audit', 'IN', 'Layout', 'EditTags');
+		
+		// Make sure we get an array
+		if(!is_array($tags))
+		{
+			$this->SetError(25000, 'Must pass EditTags an array');
+			return false;
+		}
+		
+		// Set the XML
+		if (!$this->SetXml($layoutID))
+		{
+			Debug::LogEntry($db, 'audit', 'Failed to Set the layout Xml.', 'Layout', 'EditTags');
+			return false;
+		}
+		
+		Debug::LogEntry($db, 'audit', 'Got the XML from the DB. Now creating the tags.', 'Layout', 'EditTags');
+		
+		// Create the tags XML
+		$tagsXml = '<tags>';
+
+		foreach($tags as $tag)
+		{
+			$tagsXml .= sprintf('<tag>%s</tag>', $tag);
+		}
+
+		$tagsXml .= '</tags>';
+		
+		Debug::LogEntry($db, 'audit', 'Tags XML is:' . $tagsXml, 'Layout', 'EditTags');
+		
+		// Load the tags XML into a document
+		$tagsXmlDoc = new DOMDocument('1.0');
+		$tagsXmlDoc->loadXML($tagsXml);
+		
+		
+		// Load the XML for this layout
+		$xml = new DOMDocument("1.0");
+		$xml->loadXML($this->xml);
+		
+		// Import the new node into this document
+		$newTagsNode = $xml->importNode($tagsXmlDoc->documentElement, true);
+		
+		// Xpath for an existing tags node
+		$xpath 		= new DOMXPath($xml);
+		$tagsNode 	= $xpath->query("//tags");
+		
+		// Does the tags node exist?
+		if ($tagsNode->length < 1) 
+		{
+			// We need to append our new node to the layout node
+			$layoutXpath	= new DOMXPath($xml);
+			$layoutNode 	= $xpath->query("//layout");
+			$layoutNode 	= $layoutNode->item(0);
+			
+			$layoutNode->appendChild($newTagsNode);
+		}
+		else
+		{
+			// We need to swap our new node with the existing one
+			$tagsNode = $tagsNode->item(0);
+			
+			// Replace the node
+			$tagsNode->parentNode->replaceChild($newTagsNode, $tagsNode);
+		}
+		
+		// Format the output a bit nicer for Alex
+		$xml->formatOutput = true;
+		
+		// Convert back to XML
+		$xml = $xml->saveXML();
+		
+		Debug::LogEntry($db, 'audit', $xml, 'layout', 'EditTags');
+		
+		// Save it
+		if (!$this->SetLayoutXml($layoutID, $xml)) return false;
+		
+		Debug::LogEntry($db, 'audit', 'OUT', 'Layout', 'EditTags');
+		
+		return true;
+	}
+	
+	/**
+	 * Sets the Layout XML for this layoutid
+	 * @return 
+	 * @param $layoutID Object
+	 */
+	private function SetXml($layoutID)
+	{
+		if(!$this->xml = $this->GetLayoutXml($layoutID))
+		{
+			return false;
+		}
+		
+		return true;
+	}
+	
+	/**
+	 * Gets the Xml for the specified layout
+	 * @return 
+	 * @param $layoutid Object
+	 */
+	private function GetLayoutXml($layoutid)
+	{
+		$db =& $this->db;
+		
+		Debug::LogEntry($db, 'audit', 'IN', 'Layout', 'GetLayoutXml');
+		
+		//Get the Xml for this Layout from the DB
+		$SQL = sprintf("SELECT xml FROM layout WHERE layoutID = %d ", $layoutid);
+		
+		if (!$results = $db->query($SQL)) 
+		{
+			trigger_error($db->error());
+			$this->SetError(25000, 'Layout does not exist.');
+			return false;
+		}
+		
+		$row = $db->get_row($results) ;
+		
+		Debug::LogEntry($db, 'audit', 'OUT', 'Layout', 'GetLayoutXml');
+		
+		return $row[0];
+	}
+	
+	/**
+	 * Sets the Layout Xml and writes it back to the database
+	 * @return 
+	 * @param $layoutid Object
+	 * @param $xml Object
+	 */
+	private function SetLayoutXml($layoutid, $xml)
+	{
+		$db =& $this->db;
+		
+		Debug::LogEntry($db, 'audit', 'IN', 'Layout', 'SetLayoutXml');
+		
+		$xml = addslashes($xml);
+		
+		// Write it back to the database
+		$SQL = sprintf("UPDATE layout SET xml = '%s' WHERE layoutID = %d ", $xml, $layoutid);
+		
+		
+		if (!$db->query($SQL)) 
+		{
+			trigger_error($db->error());
+			$this->SetError(25000, 'Unable to Update Layout.');
+			return false;
+		}
+		
+		Debug::LogEntry($db, 'audit', 'OUT', 'Layout', 'SetLayoutXml');
+		
+		return true;
+	}
+}
+?>
\ No newline at end of file

=== added file 'server/lib/data/stat.data.class.php'
--- server/lib/data/stat.data.class.php	1970-01-01 00:00:00 +0000
+++ server/lib/data/stat.data.class.php	2009-08-08 11:04:39 +0000
@@ -0,0 +1,74 @@
+<?php
+/*
+ * Xibo - Digitial Signage - http://www.xibo.org.uk
+ * Copyright (C) 2009 Daniel Garner
+ *
+ * This file is part of Xibo.
+ *
+ * Xibo is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version. 
+ *
+ * Xibo is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
+ */
+defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
+
+class Stat extends data
+{
+	public function Add($type, $fromDT, $toDT, $scheduleID, $displayID, $layoutID, $mediaID, $tag)
+	{
+		$db 		=& $this->db;
+		$statDate 	= date("Y-m-d H:i:s");
+		$SQL		= '';
+		
+		$type		= $db->escape_string($type);
+		
+		// We should run different SQL depending on what Type we are
+		switch ($type)
+		{
+			case 'Media':
+			case 'media':
+				$SQL .= " INSERT INTO stat (Type, statDate, scheduleID, displayID, layoutID, mediaID, start, end)";
+				$SQL .= sprintf("  VALUES ('%s', '%s', %d, %d, %d, '%s', '%s', '%s')", $type, $statDate, $scheduleID, $displayID, $layoutID, $db->escape_string($mediaID), $fromDT, $toDT);
+		
+				break;
+				
+			case 'Layout':
+			case 'layout':
+				$SQL .= " INSERT INTO stat (Type, statDate, scheduleID, displayID, layoutID, start, end)";
+				$SQL .= sprintf("  VALUES ('%s', '%s', %d, %d, %d, '%s', '%s')", $type, $statDate, $scheduleID, $displayID, $layoutID, $fromDT, $toDT);
+
+				break;
+				
+			case 'Event':
+			case 'event':
+			
+				$SQL .= " INSERT INTO stat (Type, statDate, scheduleID, displayID, layoutID, start, end, Tag)";
+				$SQL .= sprintf("  VALUES ('%s', '%s', %d, %d, %d, '%s', '%s', '%s')", $type, $statDate, $scheduleID, $displayID, 0, $fromDT, $toDT, $db->escape_string($tag));
+			
+				break;
+				
+			default:
+				// Nothing to do, just exit
+				return true;
+		}
+		
+		// We only get here if we have some SQL to run
+		if (!$db->query($SQL)) 
+		{
+			trigger_error($db->error());
+			$this->SetError(25000, 'Stat Insert Failed.');
+			return false;
+		}
+		
+		return true;
+	}
+}
+?>
\ No newline at end of file

=== modified file 'server/lib/modules/module.class.php'
--- server/lib/modules/module.class.php	2009-04-27 19:28:08 +0000
+++ server/lib/modules/module.class.php	2009-08-03 10:54:29 +0000
@@ -61,7 +61,7 @@
 		$this->user 	=& $user;
 		
 		$this->mediaid 	= $mediaid;
-		$this->name 	= "";
+		$this->name 	= '';
 		$this->layoutid = $layoutid;
 		$this->regionid = $regionid;
 		
@@ -175,7 +175,7 @@
 		}
 		else
 		{
-			if ($this->mediaid != '')
+			if ($this->mediaid != '' && $this->regionSpecific == 0)
 			{
 				// We do not have a region or a layout
 				// But this is some existing media
@@ -183,7 +183,9 @@
 				$this->existingMedia = true;
 				
 				// Load what we know about this media into the object
-				$SQL = "SELECT duration,name FROM media WHERE mediaID = '$mediaid'";
+				$SQL = "SELECT duration, name FROM media WHERE mediaID = '$mediaid'";
+				
+				Debug::LogEntry($db, 'audit', $SQL, 'Module', 'SetMediaInformation');
 				
 				if (!$result = $db->query($SQL))
 				{
@@ -194,7 +196,7 @@
 				{
 					$row 				= $db->get_row($result);
 					$this->duration		= $row[0];
-					$this->name		= $row[1];
+					$this->name			= $row[1];
 				}
 			}
 			
@@ -262,7 +264,10 @@
 	 */
 	final protected function SetOption($name, $value)
 	{
-		if ($name == '' || $value == '') return;
+		$db =& $this->db;
+		if ($name == '') return;
+		
+		Debug::LogEntry($db, 'audit', sprintf('IN with Name=%s and value=%s', $name, $value), 'module', 'Set Option');		
 		
 		// Get the options node from this document
 		$optionNodes = $this->xml->getElementsByTagName('options');
@@ -272,6 +277,7 @@
 		// Create a new option node
 		$newNode = $this->xml->createElement($name, $value);
 		
+		Debug::LogEntry($db, 'audit', sprintf('Created a new Option Node with Name=%s and value=%s', $name, $value), 'module', 'Set Option');
 		
 		// Check to see if we already have this option or not
 		$xpath = new DOMXPath($this->xml);
@@ -535,8 +541,11 @@
 	 */
 	public function GetName()
 	{
+		$db =& $this->db;
+		
+		Debug::LogEntry($db, 'audit', sprintf('Module name returned for MediaID: %s is %s', $this->mediaid, $this->name), 'Module', 'GetName');
+		
 		return $this->name;
 	}
-	 
 }
 ?>

=== modified file 'server/lib/pages/layout.class.php'
--- server/lib/pages/layout.class.php	2009-06-20 12:00:21 +0000
+++ server/lib/pages/layout.class.php	2009-08-03 10:54:29 +0000
@@ -57,6 +57,9 @@
 		$ajax			= Kit::GetParam('ajax', _GET, _WORD, 'false');
 		
 		$this->layoutid	= Kit::GetParam('layoutid', _REQUEST, _INT);
+
+		// Include the layout data class		
+		include_once("lib/data/layout.data.class.php");
 		
 		//set the information that we know
 		if ($usertype == 1) $this->isadmin = true;
@@ -289,6 +292,18 @@
 			$response->SetError("Unknown error adding layout.");
 			$response->Respond();
 		}
+		
+		// Create an array out of the tags
+		$tagsArray = split(' ', $tags);
+		
+		// Add the tags XML to the layout
+		$layoutObject = new Layout($db);
+		
+		if (!$layoutObject->EditTags($id, $tagsArray))
+		{
+			//there was an ERROR
+			trigger_error($layoutObject->GetErrorMessage(), E_USER_ERROR);
+		}
 
 		$response->SetFormSubmitResponse('Layout Details Changed.', true, sprintf("index.php?p=layout&layoutid=%d&modify=true", $id));
 		$response->Respond();
@@ -399,6 +414,18 @@
 			$response->SetError(sprintf("Unknown error editing %s", $layout));
 			$response->Respond();
 		}
+		
+		// Create an array out of the tags
+		$tagsArray = split(' ', $tags);
+		
+		// Add the tags XML to the layout
+		$layoutObject = new Layout($db);
+		
+		if (!$layoutObject->EditTags($this->layoutid, $tagsArray))
+		{
+			//there was an ERROR
+			trigger_error($layoutObject->GetErrorMessage(), E_USER_ERROR);
+		}
 
 		$response->SetFormSubmitResponse('Layout Details Changed.');
 		$response->Respond();
@@ -1320,18 +1347,22 @@
 			$count++;
 			
 			//Build up a button with position information
+			$mediaName		= '';
+			$mediaType		= '';
 			$mediaid 		= $mediaNode->getAttribute('id');
 			$lkid 			= $mediaNode->getAttribute('lkid');
 			$mediaType 		= $mediaNode->getAttribute('type');
 			$mediaFileName 	= $mediaNode->getAttribute('filename');
 			$mediaDuration  = $mediaNode->getAttribute('duration');
 
-			//Get media name
+			// Get media name
 			require_once("modules/$mediaType.module.php");
 			
 			// Create the media object without any region and layout information
-			$tmpModule = new $mediaType($db, $user, $mediaid);
-			$mediaName = $tmpModule->GetName();
+			$tmpModule 		= new $mediaType($db, $user, $mediaid);
+			$mediaName 		= $tmpModule->GetName();
+			
+			Debug::LogEntry($db, 'audit', sprintf('Module name returned for MediaID: %s is %s', $mediaid, $mediaName), 'layout', 'RegionOptions');
 						
 			//Do we have a thumbnail for this media?
 			if ($mediaType == "image" && file_exists($libraryLocation."tn_$mediaFileName"))

=== modified file 'server/lib/pages/region.class.php'
--- server/lib/pages/region.class.php	2009-01-23 19:29:48 +0000
+++ server/lib/pages/region.class.php	2009-07-30 23:01:31 +0000
@@ -404,7 +404,7 @@
 			$mediaNodeList = $xpath->query("//region[@id='$regionid']/media[@lkid='$lkid']");
 		}
 		
-		//Get the old media node (the one we are to replace)
+		// Get the old media node (the one we are to replace)
 		$oldMediaNode = $mediaNodeList->item(0);
 		
 		//Get the LkId of the current record... if its not blank we want to update this link with the new id

=== modified file 'server/lib/pages/report.class.php'
--- server/lib/pages/report.class.php	2009-03-13 10:10:07 +0000
+++ server/lib/pages/report.class.php	2009-08-03 10:54:29 +0000
@@ -210,9 +210,7 @@
 			<td>$ip</td>
 			<td>$browser</td>
 			<td>
-				<div class="buttons">
-					<a class="neutral" href="index.php?p=report&q=ConfirmLogout&userid=$userID" onclick="return init_button(this,'Logout User', exec_filter_callback, set_form_size(450,150))"><span>Logout</span></a>
-				</div>
+				<button class="XiboFormButton" href="index.php?p=report&q=ConfirmLogout&userid=$userID"><span>Logout</span></a>
 			</td>
 			</tr>
 END;
@@ -234,14 +232,15 @@
 		$userID = Kit::GetParam('userid', _GET, _INT);
 		
 		$form = <<<END
-		<form class="dialog_form" method="post" action="index.php?p=report&q=LogoutUser">
+		<form class="XiboForm" method="post" action="index.php?p=report&q=LogoutUser">
 			<input type="hidden" name="userid" value="userid" />
 			<p>Are you sure you want to logout this user?</p>
 			<input type="submit" value="Yes">
 			<input type="submit" value="No" onclick="$('#div_dialog').dialog('close');return false; ">
 		</form>
 END;
-		$arh->SetFormSubmitResponse($form);
+
+		$arh->SetFormRequestResponse($form, 'Logout User', '450px', '300px');
 		$arh->Respond();
 	}
 	
@@ -424,6 +423,7 @@
 		$output .=  '</tbody></table></div>';
 		
 		$response->SetGridResponse($output);
+		$response->sortable = false;
 		$response->Respond();
 	}
 	

=== added file 'server/lib/pages/stats.class.php'
--- server/lib/pages/stats.class.php	1970-01-01 00:00:00 +0000
+++ server/lib/pages/stats.class.php	2009-08-08 11:04:39 +0000
@@ -0,0 +1,152 @@
+<?php
+/*
+ * Xibo - Digitial Signage - http://www.xibo.org.uk
+ * Copyright (C) 2009 Daniel Garner
+ *
+ * This file is part of Xibo.
+ *
+ * Xibo is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version. 
+ *
+ * Xibo is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
+ */
+defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
+
+class statsDAO
+{
+	private $db;
+	private $user;
+	
+	function __construct(database $db, user $user) 
+	{
+		$this->db 	=& $db;
+		$this->user =& $user;
+	}
+	
+	function displayPage() 
+	{
+	
+		include("template/pages/stats_view.php");
+		
+		return false;
+	}
+	
+	function on_page_load() 
+	{
+		return '';
+	}
+	
+	function echo_page_heading() 
+	{
+		echo 'Display Statistics';
+		return true;
+	}
+	
+	public function StatsForm()
+	{
+		$db 	=& $this->db;
+		$user 	=& $this->user;
+		$output = '';
+		
+		$fromdt			= date("Y-m-d H:i:s", time() - 86400);
+		$todt			= date("Y-m-d H:i:s");
+		$display_list 	= dropdownlist("SELECT 'All', 'All' UNION SELECT displayID, display FROM display WHERE licensed = 1 ORDER BY 2", "displayid");
+		
+		// We want to build a form which will sit on the page and allow a button press to generate a CSV file.
+		$output	.= '<script type="text/javascript">$(document).onload(function(){$(".date-pick").datepicker({dateFormat: "dd/mm/yy"})});</script>';
+		$output	.= '<form action="index.php?p=stats&q=OutputCSV" method="post">';
+		$output	.= ' <table>';
+		$output	.= '  <tr>';
+		$output	.= '   <td>From Date</td>';
+		$output	.= '   <td><input type="text" class="date-pick" name="fromdt" value="' . $fromdt . '"/></td>';
+		$output	.= '   <td>To Date</td>';
+		$output	.= '   <td><input type="text" class="date-pick" name="todt" value="' . $todt . '" /></td>';
+		$output	.= '  </tr>';
+		$output	.= '  <tr>';
+		$output	.= '   <td>Display</td>';
+		$output	.= '   <td>' . $display_list . '</td>';
+		$output	.= '  </tr>';
+		
+		$output	.= '  <tr>';
+		$output	.= '   <td><input type="submit" value="Export" /></td>';
+		$output	.= '  </tr>';
+		$output	.= ' </table>';
+		$output	.= '</form>';
+		
+		echo $output;
+	}
+	
+	/**
+	 * Outputs a CSV of stats
+	 * @return 
+	 */
+	public function OutputCSV()
+	{
+		$db 		=& $this->db;
+		$output		= '';
+		
+		// We are expecting some parameters
+		$fromdt		= Kit::GetParam('fromdt', _POST, _STRING);
+		$todt		= Kit::GetParam('todt', _POST, _STRING);
+		$displayID	= Kit::GetParam('displayid', _POST, _INT);
+		
+		// We want to output a load of stuff to the browser as a text file.
+		header('Content-Type: text/csv');
+		header('Content-Disposition: attachment; filename="stats.csv"');
+		header("Content-Transfer-Encoding: binary");
+		header('Accept-Ranges: bytes');
+		
+		$SQL =  'SELECT stat.*, display.Display, layout.Layout, media.Name AS MediaName ';
+		$SQL .= '  FROM stat ';
+		$SQL .= '  INNER JOIN display ON stat.DisplayID = display.DisplayID ';
+		$SQL .= '  INNER JOIN layout ON layout.LayoutID = stat.LayoutID ';
+		$SQL .= '  LEFT OUTER JOIN media ON media.mediaID = stat.mediaID ';
+		$SQL .= ' WHERE 1=1 ';
+		$SQL .= sprintf("  AND stat.end > '%s' ", $fromdt);
+		$SQL .= sprintf("  AND stat.start <= '%s' ", $todt);
+
+		if ($displayID != 0)
+		{
+			$SQL .= sprintf("  AND stat.displayID = %d ", $displayID);
+		}
+		
+		Debug::LogEntry($db, 'audit', $SQL, 'Stats', 'OutputCSV');
+		
+		if (!$result = $db->query($SQL))
+		{
+			trigger_error($db->error());
+			trigger_error('Failed to query for Stats.', E_USER_ERROR);
+		}
+		
+		// Header row
+		$output		.= "Type, FromDT, ToDT, Layout, Display, Media, Tag\n";
+		
+		while($row = $db->get_assoc_row($result))
+		{
+			// Read the columns
+			$type		= Kit::ValidateParam($row['type'], _STRING);
+			$fromdt		= Kit::ValidateParam($row['start'], _STRING);
+			$todt		= Kit::ValidateParam($row['end'], _STRING);
+			$layout		= Kit::ValidateParam($row['Layout'], _STRING);
+			$display	= Kit::ValidateParam($row['Display'], _STRING);
+			$media		= Kit::ValidateParam($row['MediaName'], _STRING);
+			$tag		= Kit::ValidateParam($row['Tag'], _STRING);
+			
+			$output		.= "$type, $fromdt, $todt, $layout, $display, $media, $tag\n";
+		}
+		
+		//Debug::LogEntry($db, 'audit', 'Output: ' . $output, 'Stats', 'OutputCSV');
+		
+		echo $output;
+		exit;
+	}
+}
+?>
\ No newline at end of file

=== modified file 'server/lib/xmds.inc.php'
--- server/lib/xmds.inc.php	2009-03-22 12:06:30 +0000
+++ server/lib/xmds.inc.php	2009-07-28 21:08:19 +0000
@@ -27,9 +27,9 @@
 require_once("lib/app/app_functions.php");
 require_once("lib/app/debug.class.php");
 require_once("lib/app/kit.class.php");
-
+require_once("lib/data/data.class.php");
 require_once("config/db_config.php");
-require_once("config/config.class.php");

+require_once("config/config.class.php");
include_once('lib/data/stat.data.class.php');
 
 // Sort out magic quotes
 if (get_magic_quotes_gpc()) 

=== modified file 'server/modules/embedded.module.php'
--- server/modules/embedded.module.php	2009-06-20 10:05:53 +0000
+++ server/modules/embedded.module.php	2009-08-03 12:10:12 +0000
@@ -52,12 +52,29 @@
 			<table>
 				<tr>
 		    		<td><label for="duration" title="The duration in seconds this webpage should be displayed">Duration<span class="required">*</span></label></td>
-		    		<td><input id="duration" name="duration" type="text"></td>		
+		    		<td><input id="duration" name="duration" type="text"></td>	
 				</tr>
 				<tr>
 		    		<td colspan="2">
 						<label for="embedHtml" title="The HTML you want to Embed in this Layout.">Embed HTML<span class="required">*</span></label><br />
-		    			<textarea id="embedHtml" name="embedHtml"></textarea>
+<textarea id="embedHtml" name="embedHtml">
+
+</textarea>
+					</td>
+				</tr>
+				<tr>
+		    		<td colspan="2">
+						<label for="embedScript" title="The JavaScript you want to Embed in this Layout.">Embed Script<span class="required">*</span></label><br />
+<textarea id="embedScript" name="embedScript">
+<script type="text/javascript">
+function EmbedInit()
+{
+	// Init will be called when this page is loaded in the client.
+	
+	return;
+}
+</script>
+</textarea>
 					</td>
 				</tr>
 				<tr>
@@ -103,6 +120,10 @@
 		$textNode 	= $textNodes->item(0);
 		$embedHtml	= $textNode->nodeValue;
 		
+		$textNodes 	= $rawXml->getElementsByTagName('embedScript');
+		$textNode 	= $textNodes->item(0);
+		$embedScript= $textNode->nodeValue;
+		
 		//Output the form
 		$form = <<<FORM
 		<form class="XiboForm" method="post" action="index.php?p=module&mod=$this->type&q=Exec&method=EditMedia">
@@ -121,6 +142,12 @@
 					</td>
 				</tr>
 				<tr>
+		    		<td colspan="2">
+						<label for="embedScript" title="The JavaScript you want to Embed in this Layout.">Embed Script<span class="required">*</span></label><br />
+						<textarea id="embedScript" name="embedScript">$embedScript</textarea>
+					</td>
+				</tr>				
+				<tr>
 					<td></td>
 					<td>
 						<input id="btnSave" type="submit" value="Save"  />
@@ -154,6 +181,7 @@
 		
 		//Other properties
 		$embedHtml	  = Kit::GetParam('embedHtml', _POST, _HTMLSTRING);
+		$embedScript  = Kit::GetParam('embedScript', _POST, _HTMLSTRING);
 		$duration	  = Kit::GetParam('duration', _POST, _INT, 0);
 		
 		$url 		  = "index.php?p=layout&layoutid=$layoutid&regionid=$regionid&q=RegionOptions";
@@ -178,7 +206,7 @@
 		$this->duration = $duration;
 		
 		// Any Options
-		$this->SetRaw('<embedHtml><![CDATA[' . $embedHtml . ']]></embedHtml>');
+		$this->SetRaw('<embedHtml><![CDATA[' . $embedHtml . ']]></embedHtml><embedScript><![CDATA[' . $embedScript . ']]></embedScript>');
 
 		// Should have built the media object entirely by this time
 		// This saves the Media Object to the Region
@@ -208,11 +236,12 @@
 		
 		//Other properties
 		$embedHtml	  = Kit::GetParam('embedHtml', _POST, _HTMLSTRING);
+		$embedScript  = Kit::GetParam('embedScript', _POST, _HTMLSTRING);
 		$duration	  = Kit::GetParam('duration', _POST, _INT, 0);
 		
 		$url 		  = "index.php?p=layout&layoutid=$layoutid&regionid=$regionid&q=RegionOptions";
 						
-		//Validate the URL?
+		// Validate the URL?
 		if ($embedHtml == "")
 		{
 			$this->response->SetError('Please enter some HTML to embed.');
@@ -231,7 +260,7 @@
 		$this->duration = $duration;
 		
 		// Any Options
-		$this->SetRaw('<embedHtml><![CDATA[' . $embedHtml . ']]></embedHtml>');
+		$this->SetRaw('<embedHtml><![CDATA[' . $embedHtml . ']]></embedHtml><embedScript><![CDATA[' . $embedScript . ']]></embedScript>');
 
 		// Should have built the media object entirely by this time
 		// This saves the Media Object to the Region

=== modified file 'server/modules/flash.module.php'
--- server/modules/flash.module.php	2009-05-24 09:59:49 +0000
+++ server/modules/flash.module.php	2009-06-28 10:47:06 +0000
@@ -784,8 +784,11 @@
 			// Editing the existing record
 			$new_mediaid = $mediaid;
 			
-			$SQL =  "UPDATE media SET name = '$name', duration = '$duration', permissionID = $permissionid";
-			$SQL .= " WHERE mediaID = $mediaid ";
+			$SQL =  "UPDATE media SET name = '%s', duration = %d, permissionID = %d";
+			$SQL .= " WHERE mediaID = %d ";
+			$SQL = sprintf($SQL, $db->escape_string($name), $duration, $permissionid, $mediaid);
+			
+			Debug::LogEntry($db, 'audit', $SQL);
 	
 			if (!$db->query($SQL))
 			{

=== modified file 'server/modules/image.module.php'
--- server/modules/image.module.php	2009-05-24 09:59:49 +0000
+++ server/modules/image.module.php	2009-06-28 10:47:06 +0000
@@ -794,8 +794,11 @@
 			// Editing the existing record
 			$new_mediaid = $mediaid;
 			
-			$SQL =  "UPDATE media SET name = '$name', duration = '$duration', permissionID = $permissionid";
-			$SQL .= " WHERE mediaID = $mediaid ";
+			$SQL =  "UPDATE media SET name = '%s', duration = %d, permissionID = %d";
+			$SQL .= " WHERE mediaID = %d ";
+			$SQL = sprintf($SQL, $db->escape_string($name), $duration, $permissionid, $mediaid);
+			
+			Debug::LogEntry($db, 'audit', $SQL);
 	
 			if (!$db->query($SQL))
 			{

=== modified file 'server/modules/module_user_general.php'
--- server/modules/module_user_general.php	2009-03-25 19:36:36 +0000
+++ server/modules/module_user_general.php	2009-07-07 20:01:49 +0000
@@ -89,8 +89,6 @@
 		
 		$sql = sprintf("SELECT UserID, UserName, UserPassword, usertypeid, groupID FROM user WHERE UserName = '%s' AND UserPassword = '%s'", $db->escape_string($username), $db->escape_string($password));
 		
-		Debug::LogEntry($db, 'audit', $sql);
-		
 		if(!$result = $db->query($sql)) trigger_error('A database error occurred while checking your login details.', E_USER_ERROR);
 
 		if ($db->num_rows($result)==0) 
@@ -122,6 +120,7 @@
 		$db->query($SQL) or trigger_error("Can not write last accessed info.", E_USER_ERROR);
 
 		$session->setIsExpired(0);
+		$session->RegenerateSessionID(session_id());
 
 		return true;
 	}

=== modified file 'server/modules/powerpoint.module.php'
--- server/modules/powerpoint.module.php	2009-05-24 09:59:49 +0000
+++ server/modules/powerpoint.module.php	2009-06-28 10:47:06 +0000
@@ -784,8 +784,11 @@
 			// Editing the existing record
 			$new_mediaid = $mediaid;
 			
-			$SQL =  "UPDATE media SET name = '$name', duration = '$duration', permissionID = $permissionid";
-			$SQL .= " WHERE mediaID = $mediaid ";
+			$SQL =  "UPDATE media SET name = '%s', duration = %d, permissionID = %d";
+			$SQL .= " WHERE mediaID = %d ";
+			$SQL = sprintf($SQL, $db->escape_string($name), $duration, $permissionid, $mediaid);
+			
+			Debug::LogEntry($db, 'audit', $SQL);
 	
 			if (!$db->query($SQL))
 			{

=== modified file 'server/modules/text.module.php'
--- server/modules/text.module.php	2009-02-27 19:30:45 +0000
+++ server/modules/text.module.php	2009-08-03 12:10:12 +0000
@@ -62,6 +62,10 @@
 		    		<td><input id="duration" name="duration" type="text"></td>		
 				</tr>
 				<tr>
+					<td><label for="scrollSpeed" title="The scroll speed of the ticker.">Scroll Speed<span class="required">*</span> (lower is faster)</label></td>
+		    		<td><input id="scrollSpeed" name="scrollSpeed" type="text" value="30"></td>
+				</tr>
+				<tr>
 					<td colspan="4">
 						<textarea id="ta_text" name="ta_text"></textarea>
 					</td>
@@ -95,11 +99,12 @@
 	{
 		$db 		=& $this->db;
 		
-		$layoutid	= $this->layoutid;
-		$regionid	= $this->regionid;
-		$mediaid  	= $this->mediaid;
+		$layoutid		= $this->layoutid;
+		$regionid		= $this->regionid;
+		$mediaid  		= $this->mediaid;
 		
-		$direction	= $this->GetOption('direction');
+		$direction		= $this->GetOption('direction');
+		$scrollSpeed 	= $this->GetOption('scrollSpeed');
 		
 		// Get the text out of RAW
 		$rawXml = new DOMDocument();
@@ -128,6 +133,10 @@
 		    		<td><input id="duration" name="duration" value="$this->duration" type="text"></td>		
 				</tr>
 				<tr>
+					<td><label for="scrollSpeed" title="The scroll speed of the ticker.">Scroll Speed<span class="required">*</span> (lower is faster)</label></td>
+		    		<td><input id="scrollSpeed" name="scrollSpeed" type="text" value="$scrollSpeed"></td>
+				</tr>
+				<tr>
 					<td colspan="4">
 						<textarea id="ta_text" name="ta_text">$text</textarea>
 					</td>
@@ -169,6 +178,7 @@
 		$direction	  = Kit::GetParam('direction', _POST, _WORD, 'none');
 		$duration	  = Kit::GetParam('duration', _POST, _INT, 0);
 		$text		  = Kit::GetParam('ta_text', _POST, _HTMLSTRING);
+		$scrollSpeed  = Kit::GetParam('scrollSpeed', _POST, _INT, 30);
 		
 		$url 		  = "index.php?p=layout&layoutid=$layoutid&regionid=$regionid&q=RegionOptions";
 						
@@ -193,6 +203,7 @@
 		
 		// Any Options
 		$this->SetOption('direction', $direction);
+		$this->SetOption('scrollSpeed', $scrollSpeed);
 		$this->SetRaw('<text><![CDATA[' . $text . ']]></text>');
 		
 		// Should have built the media object entirely by this time
@@ -225,6 +236,7 @@
 		$direction	  = Kit::GetParam('direction', _POST, _WORD, 'none');
 		$duration	  = Kit::GetParam('duration', _POST, _INT, 0);
 		$text		  = Kit::GetParam('ta_text', _POST, _HTMLSTRING);
+		$scrollSpeed  = Kit::GetParam('scrollSpeed', _POST, _INT, 30);
 		
 		$url 		  = "index.php?p=layout&layoutid=$layoutid&regionid=$regionid&q=RegionOptions";
 						
@@ -248,6 +260,7 @@
 		
 		// Any Options
 		$this->SetOption('direction', $direction);
+		$this->SetOption('scrollSpeed', $scrollSpeed);
 		$this->SetRaw('<text><![CDATA[' . $text . ']]></text>');
 		
 		// Should have built the media object entirely by this time

=== modified file 'server/modules/ticker.module.php'
--- server/modules/ticker.module.php	2009-06-18 18:36:21 +0000
+++ server/modules/ticker.module.php	2009-07-05 20:56:48 +0000
@@ -272,7 +272,7 @@
 		$copyright	  = Kit::GetParam('copyright', _POST, _STRING);
 		
 		$url 		  = "index.php?p=layout&layoutid=$layoutid&regionid=$regionid&q=RegionOptions";
-						
+		
 		//validation
 		if ($text == '')
 		{

=== modified file 'server/modules/video.module.php'
--- server/modules/video.module.php	2009-05-24 09:59:49 +0000
+++ server/modules/video.module.php	2009-06-28 10:47:06 +0000
@@ -771,8 +771,11 @@
 			// Editing the existing record
 			$new_mediaid = $mediaid;
 			
-			$SQL =  "UPDATE media SET name = '$name', duration = '$duration', permissionID = $permissionid";
-			$SQL .= " WHERE mediaID = $mediaid ";
+			$SQL =  "UPDATE media SET name = '%s', duration = %d, permissionID = %d";
+			$SQL .= " WHERE mediaID = %d ";
+			$SQL = sprintf($SQL, $db->escape_string($name), $duration, $permissionid, $mediaid);
+			
+			Debug::LogEntry($db, 'audit', $SQL);
 	
 			if (!$db->query($SQL))
 			{

=== modified file 'server/template/css/xibo.css'
--- server/template/css/xibo.css	2009-06-20 12:00:21 +0000
+++ server/template/css/xibo.css	2009-08-03 12:10:12 +0000
@@ -48,7 +48,12 @@
 
 #embedHtml {
 	width: 500px;
-	height: 310px;
+	height: 140px;
+}
+
+#embedScript {
+	width: 500px;
+	height: 140px;
 }
 
 .regionTransparency {

=== added file 'server/template/pages/stats_view.php'
--- server/template/pages/stats_view.php	1970-01-01 00:00:00 +0000
+++ server/template/pages/stats_view.php	2009-08-03 16:42:20 +0000
@@ -0,0 +1,42 @@
+<?php
+/*
+ * Xibo - Digitial Signage - http://www.xibo.org.uk
+ * Copyright (C) 2009 Daniel Garner
+ *
+ * This file is part of Xibo.
+ *
+ * Xibo is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version. 
+ *
+ * Xibo is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
+ */ 
+ defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
+?>
+<div id="form_container">
+	<div id="form_header">
+		<div id="form_header_left"></div>
+		<div id="form_header_right"></div>
+	</div>
+	
+	<div id="form_body">
+		<div class="SecondNav">
+			
+		</div>
+		<?php $this->StatsForm(); ?>
+	</div>
+		
+	<div id="form_footer">
+		<div id="form_footer_left">
+		</div>
+		<div id="form_footer_right">
+		</div>
+	</div>
+</div>	
\ No newline at end of file

=== modified file 'server/upgrade.php'
--- server/upgrade.php	2009-06-15 08:16:19 +0000
+++ server/upgrade.php	2009-09-21 22:58:45 +0000
@@ -205,6 +205,12 @@
 		}
 	}
 
+    echo '<div class="info"><p>';
+	echo "Perform automatic database upgrade?";
+	echo '</p></div><div class="install-table">';
+    echo '<input type="checkbox" name="doBackup" checked />';
+	echo '</div><hr width="25%" />';
+
 	$_SESSION['step'] = 3;
 	echo '<input type="hidden" name="includes" value="true" />';
 	echo '<p><input type="submit" value="Next >" /></p>';
@@ -242,11 +248,18 @@
 		echo "FAIL: " . $fault_string;
 	}
 	else {
+        $doBackup = Kit::GetParam("doBackup", $_POST, _BOOL);
+
 		set_time_limit(0);
 		// Backup the database
-		echo '<div class="info">';
-		echo '<p>Backing up your database';
-		backup_tables($db, '*');
+		echo '<div class="info"><p>';
+        if ($doBackup) {
+		    echo 'Backing up your database';
+		    backup_tables($db, '*');
+        }
+        else {
+            echo 'Skipping database backup';
+        }
 		echo '</p>';
 
 		$sqlStatementCount = 0;

=== modified file 'server/xmds.php'
--- server/xmds.php	2009-06-03 11:55:05 +0000
+++ server/xmds.php	2009-08-08 11:04:39 +0000
@@ -30,8 +30,6 @@
 {
 	global $db;
 	
-	if (eregi('[^A-Za-z0-9]', $hardwareKey)) return false;
-	
 	//check in the database for this hardwareKey
 	$SQL = "SELECT licensed, inc_schedule, isAuditing, displayID FROM display WHERE license = '$hardwareKey'";
 	if (!$result = $db->query($SQL)) 
@@ -554,6 +552,7 @@
 	$SQL .= " INNER JOIN schedule_detail ON schedule_detail.layoutID = layout.layoutID ";
 	$SQL .= " INNER JOIN display ON schedule_detail.displayID = display.displayID ";
 	$SQL .= " WHERE display.license = '$hardwareKey'  ";
+	$SQL .= "   AND layout.retired = 0  ";
 	
 	// Store the Base SQL for this display
 	$SQLBase = $SQL;
@@ -648,105 +647,7 @@
 {
 	global $db;
 	
-	// Sanitize
-	$serverKey 		= Kit::ValidateParam($serverKey, _STRING);
-	$hardwareKey 	= Kit::ValidateParam($hardwareKey, _STRING);
-	$version 		= Kit::ValidateParam($version, _STRING);
-	
-	// Make sure we are talking the same language
-	if (!CheckVersion($version))
-	{
-		return new soap_fault("SOAP-ENV:Client", "", "Your client is not of the correct version for communication with this server. You can get the latest from http://www.xibo.org.uk", $serverKey);
-	}
-
-	//auth this request...
-	if (!$displayInfo = Auth($hardwareKey))
-	{
-		return new soap_fault("SOAP-ENV:Client", "", "This display client is not licensed", $hardwareKey);
-	}
-		
-	if ($displayInfo['isAuditing'] == 1) Debug::LogEntry ($db, "audit", "[IN]", "xmds", "RecieveXmlLog", "", $displayInfo['displayid']);
-	if ($displayInfo['isAuditing'] == 1) Debug::LogEntry ($db, "audit", "$xml", "xmds", "RecieveXmlLog", "", $displayInfo['displayid']);
-	
-	$document = new DOMDocument("1.0");
-	$document->loadXML("<log>".$xml."</log>");
-	
-	foreach ($document->documentElement->childNodes as $node)
-	{
-		//Zero out the common vars
-		$date 		= "";
-		$message 	= "";
-		$scheduleID = "";
-		$layoutID 	= "";
-		$mediaID 	= "";
-		$type		= "";
-		$cat		= '';
-			
-		// Get the date and the message (all log types have these)
-		foreach ($node->childNodes as $nodeElements)
-		{			
-			if ($nodeElements->nodeName == "date")
-			{
-				$date = $nodeElements->textContent;
-			}
-			else if ($nodeElements->nodeName == "message")
-			{
-				$message = $nodeElements->textContent;
-			}
-			else if ($nodeElements->nodeName == "scheduleID")
-			{
-				$scheduleID = $nodeElements->textContent;
-			}
-			else if ($nodeElements->nodeName == "layoutID")
-			{
-				$layoutID = $nodeElements->textContent;
-			}
-			else if ($nodeElements->nodeName == "mediaID")
-			{
-				$mediaID = $nodeElements->textContent;
-			}
-			else if ($nodeElements->nodeName == "type")
-			{
-				$type = $nodeElements->textContent;
-			}
-			else if ($nodeElements->nodeName == "category")
-			{
-				$cat = $nodeElements->textContent;
-			}
-		}
-		
-		switch ($node->nodeName)
-		{
-			case "stat":
-				if ($mediaID == '') $mediaID = 0;
-			
-				StatRecord($type, $date, $scheduleID, $displayInfo['displayid'], $layoutID, $mediaID, $date, $date);
-				break;
-				
-			case "trace":
-				
-				// We have a trace message
-				// Either Audit or Error (if *)
-				if (substr($message, 0, 3) == '[*]')
-				{
-					Debug::LogEntry($db, "error", $message, ".NET Client", $cat, $date, $displayInfo['displayid'], $scheduleID, $layoutID, $mediaID);
-				}
-				else
-				{
-					Debug::LogEntry($db, "audit", $message, ".NET Client", $cat, $date, $displayInfo['displayid'], $scheduleID, $layoutID, $mediaID);
-				}
-				
-				break;
-				
-			default:
-				Debug::LogEntry($db, "audit", "Unknown entry in client log " . $node->nodeName, "xmds", "RecieveXmlLog", $date, $displayInfo['displayid'], $scheduleID, $layoutID, $mediaID);
-				break;
-		}
-	}
-
-	if ($displayInfo['isAuditing'] == 1) Debug::LogEntry ($db, "audit", "[OUT]", "xmds", "RecieveXmlLog", "", $displayInfo['displayid']);
-	
-	return true;
+	return new soap_fault("SOAP-ENV:Client", "", "This is a depricated service call. You should instead call either SubmitLog or SubmitStats", $serverKey);
 }
 
 define('BLACKLIST_ALL', "All");
@@ -835,6 +736,203 @@
 	return true;
 }
 
+/**
+ * Submit client logging
+ * @return 
+ * @param $version Object
+ * @param $serverKey Object
+ * @param $hardwareKey Object
+ * @param $logXml Object
+ */
+function SubmitLog($version, $serverKey, $hardwareKey, $logXml)
+{
+	global $db;
+	
+	// Sanitize
+	$serverKey 		= Kit::ValidateParam($serverKey, _STRING);
+	$hardwareKey 	= Kit::ValidateParam($hardwareKey, _STRING);
+	$version 		= Kit::ValidateParam($version, _STRING);
+	$logXml 		= Kit::ValidateParam($logXml, _HTMLSTRING);
+	
+	// Make sure we are talking the same language
+	if (!CheckVersion($version))
+	{
+		return new soap_fault("SOAP-ENV:Client", "", "Your client is not of the correct version for communication with this server. You can get the latest from http://www.xibo.org.uk", $serverKey);
+	}
+
+	// Auth this request...
+	if (!$displayInfo = Auth($hardwareKey))
+	{
+		return new soap_fault("SOAP-ENV:Client", "", "This display client is not licensed", $hardwareKey);
+	}
+		
+	if ($displayInfo['isAuditing'] == 1) Debug::LogEntry ($db, "audit", "IN", "xmds", "SubmitLog", "", $displayInfo['displayid']);
+	if ($displayInfo['isAuditing'] == 1) Debug::LogEntry ($db, "audit", 'XML [' . $logXml . ']', "xmds", "SubmitLog", "", $displayInfo['displayid']);
+	
+	// Load the XML into a DOMDocument
+	$document = new DOMDocument("1.0");
+	
+	if (!$document->loadXML($logXml))
+	{
+		return new soap_fault("SOAP-ENV:Client", "", "XML Cannot be loaded into DOM Document.", $hardwareKey);
+	}
+	
+	foreach ($document->documentElement->childNodes as $node)
+	{	
+		//Zero out the common vars
+		$date 		= "";
+		$message 	= "";
+		$scheduleID = "";
+		$layoutID 	= "";
+		$mediaID 	= "";
+		$cat		= '';
+		$method		= '';
+		
+		// This will be a bunch of trace nodes
+		$message = $node->textContent;
+		
+		// Each element should have a category and a date 
+		$date	= $node->getAttribute('date');
+		$cat	= $node->getAttribute('category');
+		
+		if ($date == '' || $cat == '') 
+		{
+			trigger_error('Log submitted without a date or category attribute');
+			continue;
+		}
+			
+		// Get the date and the message (all log types have these)
+		foreach ($node->childNodes as $nodeElements)
+		{			
+			if ($nodeElements->nodeName == "scheduleID")
+			{
+				$scheduleID = $nodeElements->textContent;
+			}
+			else if ($nodeElements->nodeName == "layoutID")
+			{
+				$layoutID = $nodeElements->textContent;
+			}
+			else if ($nodeElements->nodeName == "mediaID")
+			{
+				$mediaID = $nodeElements->textContent;
+			}
+			else if ($nodeElements->nodeName == "type")
+			{
+				$type = $nodeElements->textContent;
+			}
+			else if ($nodeElements->nodeName == "method")
+			{
+				$method	= $nodeElements->textContent;
+			}
+		}
+		
+		// We should have enough information to log this now.
+		if ($cat == 'error' || $cat == 'Error')
+		{
+			Debug::LogEntry($db, $cat, $message, 'Client', $method, $date, $displayInfo['displayid'], $scheduleID, $layoutID, $mediaID);						
+		}
+		else
+		{
+			Debug::LogEntry($db, 'audit', $message, 'Client', $method, $date, $displayInfo['displayid'], $scheduleID, $layoutID, $mediaID);			
+		}
+	}
+
+	if ($displayInfo['isAuditing'] == 1) Debug::LogEntry ($db, "audit", "OUT", "xmds", "SubmitLog", "", $displayInfo['displayid']);
+	
+	return true;
+}
+
+/**
+ * Submit display statistics to the server
+ * @return 
+ * @param $version Object
+ * @param $serverKey Object
+ * @param $hardwareKey Object
+ * @param $statXml Object
+ */
+function SubmitStats($version, $serverKey, $hardwareKey, $statXml)
+{
+	global $db;
+	
+	// Sanitize
+	$serverKey 		= Kit::ValidateParam($serverKey, _STRING);
+	$hardwareKey 	= Kit::ValidateParam($hardwareKey, _STRING);
+	$version 		= Kit::ValidateParam($version, _STRING);
+	$statXml 		= Kit::ValidateParam($statXml, _HTMLSTRING);
+	
+	// Make sure we are talking the same language
+	if (!CheckVersion($version))
+	{
+		return new soap_fault("SOAP-ENV:Client", "", "Your client is not of the correct version for communication with this server. You can get the latest from http://www.xibo.org.uk", $serverKey);
+	}
+
+	// Auth this request...
+	if (!$displayInfo = Auth($hardwareKey))
+	{
+		return new soap_fault("SOAP-ENV:Client", "", "This display client is not licensed", $hardwareKey);
+	}
+		
+	if ($displayInfo['isAuditing'] == 1) Debug::LogEntry ($db, "audit", "IN", "xmds", "SubmitStats", "", $displayInfo['displayid']);
+	if ($displayInfo['isAuditing'] == 1) Debug::LogEntry ($db, "audit", "StatXml: [" . $statXml . "]", "xmds", "SubmitStats", "", $displayInfo['displayid']);
+	
+	if ($statXml == "")
+	{
+		return new soap_fault("SOAP-ENV:Client", "", "Stat XML is empty.", $hardwareKey);
+	}
+	
+	// Log
+	if ($displayInfo['isAuditing'] == 1) Debug::LogEntry ($db, "audit", "About to create Stat Object.", "xmds", "SubmitStats", "", $displayInfo['displayid']);
+	
+	$statObject = new Stat($db);
+	
+	// Log
+	if ($displayInfo['isAuditing'] == 1) Debug::LogEntry ($db, "audit", "About to Create DOMDocument.", "xmds", "SubmitStats", "", $displayInfo['displayid']);
+	
+	// Load the XML into a DOMDocument
+	$document = new DOMDocument("1.0");
+	$document->loadXML($statXml);
+	
+	foreach ($document->documentElement->childNodes as $node)
+	{	
+		//Zero out the common vars
+		$fromdt		= '';
+		$todt		= '';
+		$type		= '';
+		
+		$scheduleID = 0;
+		$layoutID 	= 0;
+		$mediaID 	= '';
+		$tag		= '';
+		
+		// Each element should have these attributes
+		$fromdt	= $node->getAttribute('fromdt');
+		$todt	= $node->getAttribute('todt');
+		$type	= $node->getAttribute('type');
+		
+		if ($fromdt == '' || $todt == '' || $type == '') 
+		{
+			trigger_error('Stat submitted without the fromdt, todt or type attributes.');
+			continue;
+		}
+			
+		$scheduleID	= $node->getAttribute('scheduleid');
+		$layoutID	= $node->getAttribute('layoutid');
+		$mediaID	= $node->getAttribute('mediaid');
+		$tag		= $node->getAttribute('tag');
+		
+		// Write the stat record with the information we have available to us.
+		if (!$statObject->Add($type, $fromdt, $todt, $scheduleID, $displayInfo['displayid'], $layoutID, $mediaID, $tag))
+		{
+			trigger_error(sprintf('Stat Add failed with error: %s', $statObject->GetErrorMessage()));
+			continue;
+		}
+	}
+
+	if ($displayInfo['isAuditing'] == 1) Debug::LogEntry ($db, "audit", "OUT", "xmds", "SubmitStats", "", $displayInfo['displayid']);
+	
+	return true;
+}
+
 //$debug = 1;
 $service = new soap_server();
 
@@ -899,10 +997,32 @@
 		'encoded',
 		'Set media to be blacklisted'
 	);
+	
+$service->register("SubmitLog",
+		array('version' => 'xsd:string', 'serverKey' => 'xsd:string', 'hardwareKey' => 'xsd:string', 'logXml' => 'xsd:string'),
+		array('success' => 'xsd:boolean'),
+		'urn:xmds',
+		'urn:xmds#SubmitLog',
+		'rpc',
+		'encoded',
+		'Submit Logging from the Client'
+	);
+	
+$service->register("SubmitStats",
+		array('version' => 'xsd:string', 'serverKey' => 'xsd:string', 'hardwareKey' => 'xsd:string', 'statXml' => 'xsd:string'),
+		array('success' => 'xsd:boolean'),
+		'urn:xmds',
+		'urn:xmds#SubmitLog',
+		'rpc',
+		'encoded',
+		'Submit Display statistics from the Client'
+	);
+	
+
 		
 $HTTP_RAW_POST_DATA = isset($HTTP_RAW_POST_DATA) ? $HTTP_RAW_POST_DATA : '';
 $service->service($HTTP_RAW_POST_DATA);
 
-Debug::LogEntry($db, 'audit',$service->debug_str);
+//Debug::LogEntry($db, 'audit', $service->debug_str, "xmds", "NuSOAP");
 
 ?>
\ No newline at end of file