Merge lp:~dangarner/xibo/xmds-logging-103 into lp:~xibo-maintainers/xibo/encke

[Dan Garner]

=== modified file '.bzrignore'
--- .bzrignore	2009-03-07 23:21:15 +0000
+++ .bzrignore	2009-06-20 10:05:53 +0000
@@ -1,3 +1,4 @@
 server/settings.php
 .project
 server/.project
+Thumbs.db

=== 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-07-30 23:01:31 +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,21 @@
 
         protected override void Dispose(bool disposing)
         {
-            if (disposing && loaded)
+            if (disposing)
             {
-                this.pictureBox.Dispose();
+                try
+                {
+                    Controls.Remove(_pictureBox);
+
+                    this._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/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-03-08 11:40:17 +0000
+++ client/dotNET/Region.cs	2009-07-30 23:01:31 +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;
@@ -124,6 +139,10 @@
                     media = new Rss(options);
                     break;
 
+                case "embedded":
+                    media = new Text(options);
+                    break;
+
                 default:
                     //do nothing
                     SetNextMediaNode();
@@ -140,14 +159,16 @@
             media.RenderMedia();
 
             // 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
+            _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;
 
             this.Controls.Add(media);
 
             System.Diagnostics.Debug.WriteLine("Showing new media", "Region - Eval Options");
-            
         }
 
         /// <summary>
@@ -176,7 +197,7 @@
                 return;
             }
 
-
+            // Move the sequence on
             currentSequence++;
 
             if (currentSequence >= options.mediaNodes.Count)
@@ -197,7 +218,10 @@
             options.text = "";
             options.documentTemplate = "";
             options.copyrightNotice = "";
+            options.scrollSpeed = 1;
+            options.updateInterval = 6;
             options.uri = "";
+            options.direction = "none";
 
             // Get a media node
             bool validNode = false;
@@ -266,6 +290,28 @@
                         {
                             options.copyrightNotice = option.InnerText;
                         }
+                        else if (option.Name == "scrollSpeed")
+                        {
+                            try
+                            {
+                                options.scrollSpeed = int.Parse(option.InnerText);
+                            }
+                            catch
+                            {
+                                System.Diagnostics.Trace.WriteLine("Non integer scrollSpeed in XLF", "Region - SetNextMediaNode");
+                            }
+                        }
+                        else if (option.Name == "updateInverval")
+                        {
+                            try
+                            {
+                                options.updateInterval = int.Parse(option.InnerText);
+                            }
+                            catch
+                            {
+                                System.Diagnostics.Trace.WriteLine("Non integer updateInterval in XLF", "Region - SetNextMediaNode");
+                            }
+                        }
                     }
 
                     // And some stuff on Raw nodes
@@ -281,6 +327,10 @@
                         {
                             options.documentTemplate = raw.InnerText;
                         }
+                        else if (raw.Name == "embedHtml")
+                        {
+                            options.text = raw.InnerText;
+                        }
                     }
 
                     // That should cover all the new options
@@ -317,8 +367,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());
+                }
             }
         }
 
@@ -334,6 +394,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)
@@ -360,16 +443,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>
@@ -398,6 +471,8 @@
         public string text;
         public string documentTemplate;
         public string copyrightNotice;
+        public int updateInterval;
+        public int scrollSpeed;
         
         //The identification for this region
         public string mediaid;

=== 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-03-13 09:21:56 +0000
+++ client/dotNET/Rss.cs	2009-06-20 10:39:40 +0000
@@ -64,6 +64,12 @@
             scheduleId = options.scheduleId;
             layoutId = options.layoutId;
 
+            // Update interval and scrolling speed
+            _updateInterval = options.updateInterval;
+            _scrollSpeed = options.scrollSpeed;
+
+            System.Diagnostics.Trace.WriteLine(String.Format("Scrolling Speed: {0}, Update Interval: {1})", _scrollSpeed.ToString(), _updateInterval.ToString()), "Rss - Constructor");
+
             // Set up the backgrounds
             backgroundTop = options.backgroundTop + "px";
             backgroundLeft = options.backgroundLeft + "px";
@@ -77,7 +83,7 @@
 
             try
             {
-                webBrowser.DocumentText = String.Format("<html><head><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 = 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());            
             }
             catch (Exception e)
             {
@@ -96,6 +102,9 @@
             try
             {
                 wc = new System.Net.WebClient();
+                wc.Encoding = System.Text.Encoding.UTF8;
+
+                System.Diagnostics.Debug.WriteLine("Created at WebClient and set the Encoding to UTF8", "RSS - Refresh local RSS");
 
                 wc.OpenReadCompleted += new System.Net.OpenReadCompletedEventHandler(wc_OpenReadCompleted);
                 
@@ -109,6 +118,8 @@
 
         void wc_OpenReadCompleted(object sender, System.Net.OpenReadCompletedEventArgs e)
         {
+            String rssContents;
+
             if (e.Error != null)
             {
                 System.Diagnostics.Trace.WriteLine(String.Format("[*]ScheduleID:{1},LayoutID:{2},MediaID:{3},Message:{0}", e.Error, scheduleId, layoutId, mediaid));
@@ -122,11 +133,14 @@
 
             try
             {
-                System.IO.StreamReader sr = new System.IO.StreamReader(data);
+                System.IO.StreamReader sr = new System.IO.StreamReader(data, Encoding.UTF8);
+                rssContents = sr.ReadToEnd();
 
                 StreamWriter sw = new StreamWriter(File.Open(rssFilePath, FileMode.Create, FileAccess.Write, FileShare.Read));
 
-                sw.Write(sr.ReadToEnd());
+                System.Diagnostics.Debug.WriteLine("Retrieved RSS - about to write it", "RSS - wc_OpenReadCompleted");
+                
+                sw.Write(rssContents);
 
                 sr.Close();
                 sw.Close();
@@ -172,16 +186,23 @@
             }
             else
             {
-                // It exists - therefore we want to get the last time it was updated
-                DateTime lastWriteDate = System.IO.File.GetLastWriteTime(rssFilePath);
-
-                if (DateTime.Now.CompareTo(lastWriteDate.AddHours(6.0)) > 0)
+                if (_updateInterval == 0)
                 {
                     refreshLocalRss();
                 }
                 else
                 {
-                    rssReady = true;
+                    // It exists - therefore we want to get the last time it was updated
+                    DateTime lastWriteDate = System.IO.File.GetLastWriteTime(rssFilePath);
+
+                    if (DateTime.Now.CompareTo(lastWriteDate.AddHours(_updateInterval * 1.0 / 60.0)) > 0)
+                    {
+                        refreshLocalRss();
+                    }
+                    else
+                    {
+                        rssReady = true;
+                    }
                 }
             }
 
@@ -330,7 +351,7 @@
                 // Call the JavaScript on the page
                 Object[] objArray = new Object[2];
                 objArray[0] = direction;
-                objArray[1] = 30;
+                objArray[1] = _scrollSpeed;
 
                 htmlDoc.InvokeScript("init", objArray);
             }
@@ -451,6 +472,8 @@
         private WebBrowser webBrowser;
         private string copyrightNotice;
         private string mediaid;
+        private int _updateInterval;
+        private int _scrollSpeed;
 
         private string rssFilePath;
 

=== modified file 'client/dotNET/Schedule.cs'
--- client/dotNET/Schedule.cs	2009-03-08 11:40:17 +0000
+++ client/dotNET/Schedule.cs	2009-08-02 15:54:18 +0000
@@ -69,6 +69,7 @@
             xmds2.RequiredFilesCompleted += new XiboClient.xmds.RequiredFilesCompletedEventHandler(xmds2_RequiredFilesCompleted);
             xmds2.ScheduleCompleted += new XiboClient.xmds.ScheduleCompletedEventHandler(xmds2_ScheduleCompleted);
 
+            System.Diagnostics.Trace.WriteLine(String.Format("Collection Interval: {0}", Properties.Settings.Default.collectInterval), "Schedule - InitializeComponents");
             //
             // The Timer for the Service call
             //
@@ -94,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
@@ -155,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;
 
@@ -167,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));
@@ -234,7 +234,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;
 
@@ -243,6 +243,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>
@@ -269,8 +272,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	2008-12-19 23:34:13 +0000
+++ client/dotNET/Text.cs	2009-06-20 10:39:40 +0000
@@ -55,11 +55,12 @@
 
             try
             {
-                webBrowser.DocumentText = String.Format("<html><head><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 = 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());
             }
             catch (Exception e)
             {
-                MessageBox.Show(e.Message);
+                System.Diagnostics.Trace.WriteLine(e.Message);
+                return;
             }
 
             webBrowser.DocumentCompleted += new WebBrowserDocumentCompletedEventHandler(webBrowser_DocumentCompleted);

=== modified file 'client/dotNET/VideoPlayer.resx'
--- client/dotNET/VideoPlayer.resx	2008-12-19 23:34:13 +0000
+++ client/dotNET/VideoPlayer.resx	2009-05-24 10:19:36 +0000
@@ -123,8 +123,8 @@
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACFTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5BeEhvc3QrU3RhdGUBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAAuQAAAAIB
         AAAAAQAAAAAAAAAAAAAAAKQAAAAAAwAACAACAAAAAAAFAAAAAAAAAPA/AwAAAAAABQAAAAAAAAAAAAgA
-        AgAAAAAAAwABAAAACwD//wMAAAAAAAsA//8IAAIAAAAAAAMAMgAAAAsAAAAIAAoAAABuAG8AbgBlAAAA
-        CwD//wsA//8LAAAACwAAAAsAAAAIAAIAAAAAAAgAAgAAAAAACAACAAAAAAAIAAIAAAAAAAsAAAATHgAA
+        AgAAAAAAAwABAAAACwD//wMAAAAAAAsAAAAIAAIAAAAAAAMAMgAAAAsAAAAIAAoAAABuAG8AbgBlAAAA
+        CwD//wsAAAALAAAACwAAAAsAAAAIAAIAAAAAAAgAAgAAAAAACAACAAAAAAAIAAIAAAAAAAsAAAATHgAA
         zRsAAAs=
 </value>
   </data>

=== 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

=== modified file 'client/dotNET/bin/Release/XiboClient.XmlSerializers.dll'
Binary files client/dotNET/bin/Release/XiboClient.XmlSerializers.dll	2009-03-28 19:13:50 +0000 and client/dotNET/bin/Release/XiboClient.XmlSerializers.dll	2009-08-02 17:13:17 +0000 differ
=== modified file 'client/dotNET/bin/Release/XiboClient.exe'
Binary files client/dotNET/bin/Release/XiboClient.exe	2009-03-28 19:13:50 +0000 and client/dotNET/bin/Release/XiboClient.exe	2009-08-02 17:13:17 +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

=== modified file 'client/dotNET/bin/Release/XiboClient.pdb'
Binary files client/dotNET/bin/Release/XiboClient.pdb	2009-03-28 19:13:50 +0000 and client/dotNET/bin/Release/XiboClient.pdb	2009-08-02 17:13:17 +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/config/config.class.php'
--- server/config/config.class.php	2009-05-02 10:10:54 +0000
+++ server/config/config.class.php	2009-06-20 10:59:41 +0000
@@ -192,7 +192,7 @@
 			$output .= $imgBad.$message.'<br />';
 			$output .= <<<END
 			<div class="check_explain">
-      			<p>Xibo requires a MySQL database.</p>
+      			<p>Xibo requires the PHP MySQL Extension to function.</p>
       		</div>
 END;
 		}

=== removed file 'server/img/Thumbs.db'
Binary files server/img/Thumbs.db	2008-12-14 14:42:52 +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	2008-12-10 23:48:58 +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	2008-12-10 23:48:58 +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	2008-12-10 23:48:58 +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	2008-12-10 23:48:58 +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	2008-12-14 14:42:52 +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	2008-12-10 23:48:58 +0000 and server/img/forms/Thumbs.db	1970-01-01 00:00:00 +0000 differ
=== added file 'server/img/forms/embedded.png'
Binary files server/img/forms/embedded.png	1970-01-01 00:00:00 +0000 and server/img/forms/embedded.png	2009-06-20 12:00:21 +0000 differ
=== removed file 'server/img/login/Thumbs.db'
Binary files server/img/login/Thumbs.db	2008-12-10 23:48:58 +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	2008-12-10 23:48:58 +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	2008-12-10 23:48:58 +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	2008-12-10 23:48:58 +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	2008-12-10 23:48:58 +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	2008-12-10 23:48:58 +0000 and server/img/weather_rss/Thumbs.db	1970-01-01 00:00:00 +0000 differ
=== modified file 'server/install.php'
--- server/install.php	2009-04-30 17:49:26 +0000
+++ server/install.php	2009-06-15 08:16:19 +0000
@@ -266,6 +266,7 @@
     // NB this is broken for 0 padded files
     // eg 01.sql would be incorrectly sorted in the above example.
     
+    $sqlStatementCount = 0;
     natcasesort($sql_files);
 
     foreach ($sql_files as $filename) {
@@ -280,10 +281,11 @@
         $sql_file = split_sql_file($sql_file, $delimiter);
     
         foreach ($sql_file as $sql) {
-          print ".";
+          print ".";
+	  $sqlStatementCount++;
           flush();
           if (! @mysql_query($sql,$db)) {
-            reportError("4", "An error occured populating the database.<br /><br />MySQL Error:<br />" . mysql_error());
+            reportError("4", "An error occured populating the database.<br /><br />MySQL Error:<br />" . mysql_error() . "<br /><br />SQL executed:<br />" . $sql . "<br /><br />Statement number: " . $sqlStatementCount);
           }
         }
         print "</p>";

=== added file 'server/install/database/6.sql'
--- server/install/database/6.sql	1970-01-01 00:00:00 +0000
+++ server/install/database/6.sql	2009-06-20 09:34:43 +0000
@@ -0,0 +1,16 @@
+INSERT INTO `module` (
+`ModuleID` ,
+`Module` ,
+`Enabled` ,
+`RegionSpecific` ,
+`Description` ,
+`ImageUri` ,
+`SchemaVersion`
+)
+VALUES (
+NULL , 'Embedded', '1', '1', 'Embedded HTML', 'img/forms/webpage.gif', '1'
+);
+
+UPDATE `version` SET `app_ver` = '1.0.2';
+UPDATE `setting` SET `value` = 0 WHERE `setting` = 'PHONE_HOME_DATE';
+UPDATE `version` SET `DBVersion` = '6';
\ No newline at end of file

=== 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 

=== 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-07-30 23:01:31 +0000
@@ -0,0 +1,44 @@
+<?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)
+	{
+		$db 		=& $this->db;
+		$statDate 	= date("Y-m-d H:i:s");
+		
+		$SQL  = "";
+		$SQL .= " INSERT INTO stat (statDate, scheduleID, displayID, layoutID, mediaID, start, end)";
+		$SQL .= sprintf("  VALUES ('%s', %d, %d, %d, '%s', '%s', '%s')", $statDate, $scheduleID, $displayID, $layoutID, $db->escape_string($mediaID), $fromDT, $toDT);
+		
+		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/pages/layout.class.php'
--- server/lib/pages/layout.class.php	2009-04-27 19:28:08 +0000
+++ server/lib/pages/layout.class.php	2009-07-30 23:01:31 +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();
@@ -1194,8 +1221,12 @@
 			$paddingTop		= $regionHeight / 2 - 16;
 			$paddingTop		= $paddingTop . "px";
 
+			$regionTransparency  = '<div class="regionTransparency" style="width:100%; height:100%;">';
+			$regionTransparency .= '</div>';
+
 			$doubleClickLink = "XiboFormRender($(this).attr('href'))";
-			$regionHtml .= "<div id='region_$regionid' regionid='$regionid' layoutid='$this->layoutid' href='index.php?p=layout&layoutid=$this->layoutid&regionid=$regionid&q=RegionOptions' ondblclick=\"$doubleClickLink\"' class='region' style=\"position:absolute; width:$regionWidth; height:$regionHeight; top: $regionTop; left: $regionLeft; background-color: #FFF; opacity: .75; filter: alpha(opacity=75); border: 1px dashed #000\">
+			$regionHtml .= "<div id='region_$regionid' regionid='$regionid' layoutid='$this->layoutid' href='index.php?p=layout&layoutid=$this->layoutid&regionid=$regionid&q=RegionOptions' ondblclick=\"$doubleClickLink\"' class='region' style=\"position:absolute; width:$regionWidth; height:$regionHeight; top: $regionTop; left: $regionLeft; border: 1px dashed #000\">
+								$regionTransparency							
 								<div class='preview' style='$previewStyle'>
 									<div class='previewContent'></div>
 									<div class='previewNav' style='display:none;'></div>
@@ -1435,7 +1466,7 @@
 		while ($modulesItem = $enabledModules->GetNextModule())
 		{
 			$mod 		= Kit::ValidateParam($modulesItem['Module'], _STRING);
-			$caption 	= 'Add ' . $mod;
+			$caption 	= '+ ' . $mod;
 			$mod		= strtolower($mod);
 			$title 		= Kit::ValidateParam($modulesItem['Description'], _STRING);
 			$img 		= Kit::ValidateParam($modulesItem['ImageUri'], _STRING);
@@ -1445,7 +1476,7 @@
 			$buttons .= <<<HTML
 			<div class="regionicons">
 				<a class="XiboFormButton" title="$title" href="$uri">
-				<img class="dash_button" src="$img" />
+				<img class="dash_button moduleButtonImage" src="$img" />
 				<span class="dash_text">$caption</span></a>
 			</div>
 HTML;
@@ -1456,7 +1487,7 @@
 			<div id="buttons">
 				<div class="regionicons">
 					<a class="XiboFormButton" href="index.php?p=content&q=LibraryAssignForm&layoutid=$this->layoutid&regionid=$regionid" title="Library">
-					<img class="region_button" src="img/forms/library.gif"/>
+					<img class="region_button moduleButtonImage" src="img/forms/library.gif"/>
 					<span class="region_text">Library</span></a>
 				</div>
 				$buttons
@@ -1635,7 +1666,7 @@
 		$type 				= (string) $node->getAttribute("type");
 		$mediaDurationText 	= (string) $node->getAttribute("duration");
 		
-		$return .= "<div class='info' style='display:none; position:absolute; top: 15px; left: 150px; background-color:#FFF; z-index: 50;'>
+		$return .= "<div class='info regionTransparency' style='display:none; position:absolute; top: 15px; left: 150px; background-color:#FFF; z-index: 50;'>
 						<h5>Media Information</h5>
 						<ul>
 							<li>Type: $type</li>

=== 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/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()) 

=== added file 'server/modules/embedded.module.php'
--- server/modules/embedded.module.php	1970-01-01 00:00:00 +0000
+++ server/modules/embedded.module.php	2009-06-20 10:05:53 +0000
@@ -0,0 +1,251 @@
+<?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/>.
+ */ 
+class embedded extends Module
+{
+	
+	public function __construct(database $db, user $user, $mediaid = '', $layoutid = '', $regionid = '')
+	{
+		// Must set the type of the class
+		$this->type = 'embedded';
+	
+		// Must call the parent class	
+		parent::__construct($db, $user, $mediaid, $layoutid, $regionid);
+	}
+	
+	/**
+	 * Return the Add Form as HTML
+	 * @return 
+	 */
+	public function AddForm()
+	{
+		$db 		=& $this->db;
+		$user		=& $this->user;
+				
+		// Would like to get the regions width / height 
+		$layoutid	= $this->layoutid;
+		$regionid	= $this->regionid;
+		$rWidth		= Kit::GetParam('rWidth', _REQUEST, _STRING);
+		$rHeight	= Kit::GetParam('rHeight', _REQUEST, _STRING);
+		
+		$form = <<<FORM
+		<form class="XiboForm" method="post" action="index.php?p=module&mod=$this->type&q=Exec&method=AddMedia">
+			<input type="hidden" name="layoutid" value="$layoutid">
+			<input type="hidden" id="iRegionId" name="regionid" value="$regionid">
+			<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>		
+				</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>
+					</td>
+				</tr>
+				<tr>
+					<td></td>
+					<td>
+						<input id="btnSave" type="submit" value="Save"  />
+						<input class="XiboFormButton" id="btnCancel" type="button" title="Return to the Region Options" href="index.php?p=layout&layoutid=$layoutid&regionid=$regionid&q=RegionOptions" value="Cancel" />
+					</td>
+				</tr>
+			</table>
+		</form>
+FORM;
+
+		$this->response->html 			= $form;
+		$this->response->dialogTitle 	= 'Add Embedded HTML';
+		$this->response->dialogSize 	= true;
+		$this->response->dialogWidth 	= '650px';
+		$this->response->dialogHeight 	= '450px';
+
+		return $this->response;
+	}
+	
+	/**
+	 * Return the Edit Form as HTML
+	 * @return 
+	 */
+	public function EditForm()
+	{
+		$db 		=& $this->db;
+		
+		$layoutid	= $this->layoutid;
+		$regionid	= $this->regionid;
+		$mediaid  	= $this->mediaid;
+		
+		// Get the embedded HTML out of RAW
+		$rawXml = new DOMDocument();
+		$rawXml->loadXML($this->GetRaw());
+		
+		Debug::LogEntry($db, 'audit', 'Raw XML returned: ' . $this->GetRaw());
+		
+		// Get the HTML Node out of this
+		$textNodes 	= $rawXml->getElementsByTagName('embedHtml');
+		$textNode 	= $textNodes->item(0);
+		$embedHtml	= $textNode->nodeValue;
+		
+		//Output the form
+		$form = <<<FORM
+		<form class="XiboForm" method="post" action="index.php?p=module&mod=$this->type&q=Exec&method=EditMedia">
+			<input type="hidden" name="layoutid" value="$layoutid">
+			<input type="hidden" name="mediaid" value="$mediaid">
+			<input type="hidden" id="iRegionId" name="regionid" value="$regionid">
+			<table>
+				<tr>
+		    		<td><label for="duration" title="The duration in seconds this webpage should be displayed (may be overridden on each layout)">Duration<span class="required">*</span></label></td>
+		    		<td><input id="duration" name="duration" value="$this->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">$embedHtml</textarea>
+					</td>
+				</tr>
+				<tr>
+					<td></td>
+					<td>
+						<input id="btnSave" type="submit" value="Save"  />
+						<input class="XiboFormButton" id="btnCancel" type="button" title="Return to the Region Options" href="index.php?p=layout&layoutid=$layoutid&regionid=$regionid&q=RegionOptions" value="Cancel" />
+					</td>
+				</tr>
+			</table>
+		</form>
+FORM;
+		
+		$this->response->html 			= $form;
+		$this->response->dialogTitle 	= 'Edit Embedded HTML';
+		$this->response->dialogSize 	= true;
+		$this->response->dialogWidth 	= '650px';
+		$this->response->dialogHeight 	= '450px';
+
+		return $this->response;		
+	}
+	
+	/**
+	 * Add Media to the Database
+	 * @return 
+	 */
+	public function AddMedia()
+	{
+		$db 		=& $this->db;
+		
+		$layoutid 	= $this->layoutid;
+		$regionid 	= $this->regionid;
+		$mediaid	= $this->mediaid;
+		
+		//Other properties
+		$embedHtml	  = Kit::GetParam('embedHtml', _POST, _HTMLSTRING);
+		$duration	  = Kit::GetParam('duration', _POST, _INT, 0);
+		
+		$url 		  = "index.php?p=layout&layoutid=$layoutid&regionid=$regionid&q=RegionOptions";
+						
+		//Validate the URL?
+		if ($embedHtml == "")
+		{
+			$this->response->SetError('Please enter some HTML to embed.');
+			$this->response->keepOpen = true;
+			return $this->response;
+		}
+		
+		if ($duration == 0)
+		{
+			$this->response->SetError('You must enter a duration.');
+			$this->response->keepOpen = true;
+			return $this->response;
+		}
+		
+		// Required Attributes
+		$this->mediaid	= md5(uniqid());
+		$this->duration = $duration;
+		
+		// Any Options
+		$this->SetRaw('<embedHtml><![CDATA[' . $embedHtml . ']]></embedHtml>');
+
+		// Should have built the media object entirely by this time
+		// This saves the Media Object to the Region
+		$this->UpdateRegion();
+		
+		//Set this as the session information
+		setSession('content', 'type', $this->type);
+		
+		// We want to load a new form
+		$this->response->loadForm	= true;
+		$this->response->loadFormUri= $url;
+		
+		return $this->response;
+	}
+	
+	/**
+	 * Edit Media in the Database
+	 * @return 
+	 */
+	public function EditMedia()
+	{
+		$db 		=& $this->db;
+		
+		$layoutid 	= $this->layoutid;
+		$regionid 	= $this->regionid;
+		$mediaid	= $this->mediaid;
+		
+		//Other properties
+		$embedHtml	  = Kit::GetParam('embedHtml', _POST, _HTMLSTRING);
+		$duration	  = Kit::GetParam('duration', _POST, _INT, 0);
+		
+		$url 		  = "index.php?p=layout&layoutid=$layoutid&regionid=$regionid&q=RegionOptions";
+						
+		//Validate the URL?
+		if ($embedHtml == "")
+		{
+			$this->response->SetError('Please enter some HTML to embed.');
+			$this->response->keepOpen = true;
+			return $this->response;
+		}
+		
+		if ($duration == 0)
+		{
+			$this->response->SetError('You must enter a duration.');
+			$this->response->keepOpen = true;
+			return $this->response;
+		}
+		
+		// Required Attributes
+		$this->duration = $duration;
+		
+		// Any Options
+		$this->SetRaw('<embedHtml><![CDATA[' . $embedHtml . ']]></embedHtml>');
+
+		// Should have built the media object entirely by this time
+		// This saves the Media Object to the Region
+		$this->UpdateRegion();
+		
+		//Set this as the session information
+		setSession('content', 'type', $this->type);
+		
+		// We want to load a new form
+		$this->response->loadForm	= true;
+		$this->response->loadFormUri= $url;
+		
+		return $this->response;	
+	}
+}
+
+?>
\ No newline at end of file

=== modified file 'server/modules/flash.module.php'
--- server/modules/flash.module.php	2009-03-10 19:29:40 +0000
+++ server/modules/flash.module.php	2009-05-24 09:59:49 +0000
@@ -300,7 +300,8 @@
 			<img src="img/loading.gif"><span style="padding-left:10px">You may fill in the form while your file is uploading.</span>
 		</div>
 		<form class="XiboForm" method="post" action="index.php?p=module&mod=$this->type&q=Exec&method=EditMedia">
-			<input type="hidden" name="MAX_FILE_SIZE" value="1048576000">
+			<input type="hidden" name="hidFileID" id="hidFileID" value="" />
+			<input type="hidden" id="txtFileName" name="txtFileName" readonly="true" />
 			<input type="hidden" name="layoutid" value="$layoutid">
 			<input type="hidden" name="regionid" value="$regionid">
 			<input type="hidden" name="mediaid" value="$mediaid">
@@ -727,8 +728,17 @@
 			
 			$SQL = sprintf($SQL, $db->escape_string($name), $this->type, $db->escape_string($duration), $db->escape_string($fileName), $permissionid, $userid);
 	
+			if (!$new_mediaid = $db->insert_query($SQL))
+			{
+				trigger_error($db->error());
+				trigger_error('Error inserting replacement media record.', E_USER_ERROR);
+			}
+			
 			//What are we going to store this media as...
 			$storedAs = $new_mediaid.".".$ext;
+			
+			// File upload directory.. get this from the settings object
+			$databaseDir = Config::GetSetting($db, "LIBRARY_LOCATION");
 			 
 			//Now we need to move the file
 			if (!$result = rename($databaseDir."/temp/".$tmpName, $databaseDir.$storedAs))
@@ -754,9 +764,11 @@
 				return $this->response;
 			}
 			
-			//Update the existing record with the new record's id
-			$SQL =  "UPDATE media SET isEdited = 1, editedMediaID = $mediaid ";
-			$SQL .= " WHERE editedMediaID = $mediaid and mediaID <> $new_mediaid ";
+			// Update the existing record with the new record's id
+			$SQL =  "UPDATE media SET isEdited = 1, editedMediaID = $new_mediaid ";
+			$SQL .= " WHERE IFNULL(editedMediaID,0) <> $new_mediaid AND mediaID = $mediaid ";
+			
+			Debug::LogEntry($db, 'audit', $SQL);
 	
 			if (!$db->query($SQL))
 			{

=== modified file 'server/modules/image.module.php'
--- server/modules/image.module.php	2009-03-08 00:23:29 +0000
+++ server/modules/image.module.php	2009-05-24 09:59:49 +0000
@@ -300,7 +300,8 @@
 			<img src="img/loading.gif"><span style="padding-left:10px">You may fill in the form while your file is uploading.</span>
 		</div>
 		<form class="XiboForm" method="post" action="index.php?p=module&mod=$this->type&q=Exec&method=EditMedia">
-			<input type="hidden" name="MAX_FILE_SIZE" value="1048576000">
+			<input type="hidden" name="hidFileID" id="hidFileID" value="" />
+			<input type="hidden" id="txtFileName" name="txtFileName" readonly="true" />
 			<input type="hidden" name="layoutid" value="$layoutid">
 			<input type="hidden" name="regionid" value="$regionid">
 			<input type="hidden" name="mediaid" value="$mediaid">
@@ -729,9 +730,18 @@
 			$SQL .= "VALUES ('%s', 'image', '%s', '%s', %d, %d, 0) ";
 			
 			$SQL = sprintf($SQL, $db->escape_string($name), $db->escape_string($duration), $db->escape_string($fileName), $permissionid, $userid);
+			
+			if (!$new_mediaid = $db->insert_query($SQL))
+			{
+				trigger_error($db->error());
+				trigger_error('Error inserting replacement media record.', E_USER_ERROR);
+			}
 	
 			//What are we going to store this media as...
 			$storedAs = $new_mediaid.".".$ext;
+			
+			// File upload directory.. get this from the settings object
+			$databaseDir = Config::GetSetting($db, "LIBRARY_LOCATION");
 			 
 			//Now we need to move the file
 			if (!$result = rename($databaseDir."/temp/".$tmpName, $databaseDir.$storedAs))
@@ -764,9 +774,11 @@
 				ResizeImage($databaseDir.$storedAs, $databaseDir."tn_".$storedAs, 80, 80);
 			}
 			
-			//Update the existing record with the new record's id
-			$SQL =  "UPDATE media SET isEdited = 1, editedMediaID = $mediaid ";
-			$SQL .= " WHERE editedMediaID = $mediaid and mediaID <> $new_mediaid ";
+			// Update the existing record with the new record's id
+			$SQL =  "UPDATE media SET isEdited = 1, editedMediaID = $new_mediaid ";
+			$SQL .= " WHERE IFNULL(editedMediaID,0) <> $new_mediaid AND mediaID = $mediaid ";
+			
+			Debug::LogEntry($db, 'audit', $SQL);
 	
 			if (!$db->query($SQL))
 			{

=== modified file 'server/modules/powerpoint.module.php'
--- server/modules/powerpoint.module.php	2009-03-10 19:29:40 +0000
+++ server/modules/powerpoint.module.php	2009-05-24 09:59:49 +0000
@@ -300,7 +300,8 @@
 			<img src="img/loading.gif"><span style="padding-left:10px">You may fill in the form while your file is uploading.</span>
 		</div>
 		<form class="XiboForm" method="post" action="index.php?p=module&mod=$this->type&q=Exec&method=EditMedia">
-			<input type="hidden" name="MAX_FILE_SIZE" value="1048576000">
+			<input type="hidden" name="hidFileID" id="hidFileID" value="" />
+			<input type="hidden" id="txtFileName" name="txtFileName" readonly="true" />
 			<input type="hidden" name="layoutid" value="$layoutid">
 			<input type="hidden" name="regionid" value="$regionid">
 			<input type="hidden" name="mediaid" value="$mediaid">
@@ -726,9 +727,18 @@
 			$SQL .= "VALUES ('%s', '%s', '%s', '%s', %d, %d, 0) ";
 			
 			$SQL = sprintf($SQL, $db->escape_string($name), $this->type, $db->escape_string($duration), $db->escape_string($fileName), $permissionid, $userid);
+			
+			if (!$new_mediaid = $db->insert_query($SQL))
+			{
+				trigger_error($db->error());
+				trigger_error('Error inserting replacement media record.', E_USER_ERROR);
+			}
 	
 			//What are we going to store this media as...
 			$storedAs = $new_mediaid.".".$ext;
+			
+			// File upload directory.. get this from the settings object
+			$databaseDir = Config::GetSetting($db, "LIBRARY_LOCATION");
 			 
 			//Now we need to move the file
 			if (!$result = rename($databaseDir."/temp/".$tmpName, $databaseDir.$storedAs))
@@ -754,9 +764,11 @@
 				return $this->response;
 			}
 			
-			//Update the existing record with the new record's id
-			$SQL =  "UPDATE media SET isEdited = 1, editedMediaID = $mediaid ";
-			$SQL .= " WHERE editedMediaID = $mediaid and mediaID <> $new_mediaid ";
+			// Update the existing record with the new record's id
+			$SQL =  "UPDATE media SET isEdited = 1, editedMediaID = $new_mediaid ";
+			$SQL .= " WHERE IFNULL(editedMediaID,0) <> $new_mediaid AND mediaID = $mediaid ";
+			
+			Debug::LogEntry($db, 'audit', $SQL);
 	
 			if (!$db->query($SQL))
 			{

=== modified file 'server/modules/ticker.module.php'
--- server/modules/ticker.module.php	2009-03-13 09:30:23 +0000
+++ server/modules/ticker.module.php	2009-06-18 18:36:21 +0000
@@ -48,7 +48,7 @@
 		$rWidth		= Kit::GetParam('rWidth', _REQUEST, _STRING);
 		$rHeight	= Kit::GetParam('rHeight', _REQUEST, _STRING);
 		
-		$direction_list = listcontent("none|None,left|Left,right|Right,up|Up,down|Down", "direction");
+		$direction_list = listcontent("none|None,left|Left,right|Right,up|Up,down|Down,single|Single", "direction");
 		
 		$form = <<<FORM
 		<form class="XiboTextForm" method="post" action="index.php?p=module&mod=ticker&q=Exec&method=AddMedia">
@@ -68,6 +68,12 @@
 		    		<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>		
+		    		<td><label for="updateInterval" title="The Interval at which the client should cache the feed.">Update Interval (mins)<span class="required">*</span></label></td>
+		    		<td><input id="updateInterval" name="updateInterval" type="text" value="360"></td>
+				</tr>
+				<tr>
 					<td colspan="4">
 						<textarea id="ta_text" name="ta_text">
 							[Title] - [Date] - [Description]
@@ -104,9 +110,11 @@
 		$regionid	= $this->regionid;
 		$mediaid  	= $this->mediaid;
 		
-		$direction	= $this->GetOption('direction');
-		$copyright	= $this->GetOption('copyright');
-		$uri		= urldecode($this->GetOption('uri'));
+		$direction		= $this->GetOption('direction');
+		$copyright		= $this->GetOption('copyright');
+		$scrollSpeed 	= $this->GetOption('scrollSpeed');
+		$updateInterval = $this->GetOption('updateInterval');
+		$uri			= urldecode($this->GetOption('uri'));
 		
 		// Get the text out of RAW
 		$rawXml = new DOMDocument();
@@ -119,7 +127,7 @@
 		$textNode 	= $textNodes->item(0);
 		$text 		= $textNode->nodeValue;
 		
-		$direction_list = listcontent("none|None,left|Left,right|Right,up|Up,down|Down", "direction", $direction);
+		$direction_list = listcontent("none|None,left|Left,right|Right,up|Up,down|Down,single|Single", "direction", $direction);
 		
 		//Output the form
 		$form = <<<FORM
@@ -141,6 +149,12 @@
 		    		<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>		
+		    		<td><label for="updateInterval" title="The Interval at which the client should cache the feed.">Update Interval (mins)<span class="required">*</span></label></td>
+		    		<td><input id="updateInterval" name="updateInterval" type="text" value="$updateInterval"></td>
+				</tr>
+				<tr>
 					<td colspan="4">
 						<textarea id="ta_text" name="ta_text">$text</textarea>
 					</td>
@@ -179,6 +193,8 @@
 		$uri		  = Kit::GetParam('uri', _POST, _URI);
 		$direction	  = Kit::GetParam('direction', _POST, _WORD, 'none');
 		$duration	  = Kit::GetParam('duration', _POST, _INT, 0);
+		$scrollSpeed  = Kit::GetParam('scrollSpeed', _POST, _INT, 30);
+		$updateInterval = Kit::GetParam('updateInterval', _POST, _INT, 360);
 		$text		  = Kit::GetParam('ta_text', _POST, _HTMLSTRING);
 		$copyright	  = Kit::GetParam('copyright', _POST, _STRING);
 		
@@ -214,6 +230,8 @@
 		// Any Options
 		$this->SetOption('direction', $direction);
 		$this->SetOption('copyright', $copyright);
+		$this->SetOption('scrollSpeed', $scrollSpeed);
+		$this->SetOption('updateInterval', $updateInterval);
 		$this->SetOption('uri', $uri);
 
 		$this->SetRaw('<template><![CDATA[' . $text . ']]></template>');
@@ -249,6 +267,8 @@
 		$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);
+		$updateInterval = Kit::GetParam('updateInterval', _POST, _INT, 360);
 		$copyright	  = Kit::GetParam('copyright', _POST, _STRING);
 		
 		$url 		  = "index.php?p=layout&layoutid=$layoutid&regionid=$regionid&q=RegionOptions";
@@ -282,6 +302,8 @@
 		// Any Options
 		$this->SetOption('direction', $direction);
 		$this->SetOption('copyright', $copyright);
+		$this->SetOption('scrollSpeed', $scrollSpeed);
+		$this->SetOption('updateInterval', $updateInterval);
 		$this->SetOption('uri', $uri);
 
 		$this->SetRaw('<template><![CDATA[' . $text . ']]></template>');

=== modified file 'server/modules/video.module.php'
--- server/modules/video.module.php	2009-04-01 18:31:33 +0000
+++ server/modules/video.module.php	2009-05-24 09:59:49 +0000
@@ -300,11 +300,12 @@
 			<img src="img/loading.gif"><span style="padding-left:10px">You may fill in the form while your file is uploading.</span>
 		</div>
 		<form class="XiboForm" method="post" action="index.php?p=module&mod=$this->type&q=Exec&method=EditMedia">
-			<input type="hidden" name="MAX_FILE_SIZE" value="1048576000">
 			<input type="hidden" name="layoutid" value="$layoutid">
 			<input type="hidden" name="regionid" value="$regionid">
 			<input type="hidden" name="mediaid" value="$mediaid">
 			<input type="hidden" name="lkid" value="$lkid">
+			<input type="hidden" name="hidFileID" id="hidFileID" value="" />
+			<input type="hidden" id="txtFileName" name="txtFileName" readonly="true" />
 			<input type="hidden" id="PHPSESSID" value="$sessionId" />
 			<input type="hidden" id="SecurityToken" value="$securityToken" />
 			<table>
@@ -713,9 +714,18 @@
 			$SQL .= "VALUES ('%s', '%s', '%s', '%s', %d, %d, 0) ";
 			
 			$SQL = sprintf($SQL, $db->escape_string($name), $this->type, $db->escape_string($duration), $db->escape_string($fileName), $permissionid, $userid);
+			
+			if (!$new_mediaid = $db->insert_query($SQL))
+			{
+				trigger_error($db->error());
+				trigger_error('Error inserting replacement media record.', E_USER_ERROR);
+			}
 	
 			//What are we going to store this media as...
 			$storedAs = $new_mediaid.".".$ext;
+			
+			// File upload directory.. get this from the settings object
+			$databaseDir = Config::GetSetting($db, "LIBRARY_LOCATION");
 			 
 			//Now we need to move the file
 			if (!$result = rename($databaseDir."/temp/".$tmpName, $databaseDir.$storedAs))
@@ -731,7 +741,7 @@
 				}
 			}
 			
-			//Update the media record to include this information
+			// Update the media record to include this information
 			$SQL = "UPDATE media SET storedAs = '$storedAs' WHERE mediaid = $new_mediaid";
 			if (!$db->query($SQL))
 			{
@@ -741,9 +751,11 @@
 				return $this->response;
 			}
 			
-			//Update the existing record with the new record's id
-			$SQL =  "UPDATE media SET isEdited = 1, editedMediaID = $mediaid ";
-			$SQL .= " WHERE editedMediaID = $mediaid and mediaID <> $new_mediaid ";
+			// Update the existing record with the new record's id
+			$SQL =  "UPDATE media SET isEdited = 1, editedMediaID = $new_mediaid ";
+			$SQL .= " WHERE IFNULL(editedMediaID,0) <> $new_mediaid AND mediaID = $mediaid ";
+			
+			Debug::LogEntry($db, 'audit', $SQL);
 	
 			if (!$db->query($SQL))
 			{

=== modified file 'server/template/css/presentation.css'
--- server/template/css/presentation.css	2009-01-04 12:59:11 +0000
+++ server/template/css/presentation.css	2009-06-20 09:34:43 +0000
@@ -1153,6 +1153,21 @@
 	margin-left:9px;
 }
 
+.timebar_embedded_left{
+	background:url(../../img/forms/green_bar.gif) no-repeat;
+	background-position:top left;
+	height:59px;
+	width:9px;
+	float:left;
+}
+
+.timebar_embedded_right{
+	background:url(../../img/forms/green_bar.gif) no-repeat;
+	background-position:top right;
+	height:59px;
+	margin-left:9px;
+}
+
 .timebar_text_left{
 	background:url(../../img/forms/yellow_bar.gif) no-repeat;
 	background-position:top left;

=== modified file 'server/template/css/xibo.css'
--- server/template/css/xibo.css	2009-03-22 17:58:21 +0000
+++ server/template/css/xibo.css	2009-06-20 12:00:21 +0000
@@ -41,3 +41,19 @@
 .ReportFault ol li {
 	display: list-item;
 }
+
+.moduleButtonImage {
+	width: 65px;
+}
+
+#embedHtml {
+	width: 500px;
+	height: 310px;
+}
+
+.regionTransparency {
+	position: absolute;
+	background-color: #FFF; 
+	opacity: .75; 
+	filter: alpha(opacity=75);
+}

=== modified file 'server/upgrade.php'
--- server/upgrade.php	2009-05-02 10:12:58 +0000
+++ server/upgrade.php	2009-06-15 08:16:19 +0000
@@ -249,6 +249,7 @@
 		backup_tables($db, '*');
 		echo '</p>';
 
+		$sqlStatementCount = 0;
 		// Now loop over the entire upgrade. Run the SQLs and PHP interleaved.
 		for ($i=$_SESSION['upgradeFrom'] + 1; (($i <= $_SESSION['upgradeTo']) && ($fault==false)) ; $i++) {
 			if (file_exists('install/database/' . $i . '.sql')) {
@@ -260,11 +261,12 @@
 			        $sql_file = split_sql_file($sql_file, $delimiter);
     
 			        foreach ($sql_file as $sql) {
-			          print ".";
+			          print ".";
+				  $sqlStatementCount++;
 			          flush();
 			          if (! $db->query($sql)) {
-			 	    $fault = true;
-			            reportError("0", "An error occured populating the database.<br /><br />MySQL Error:<br />" . $db->error());
+			 	    $fault = true;
+			            reportError("0", "An error occured populating the database.<br /><br />MySQL Error:<br />" . $db->error() . "<br /><br />SQL executed:<br />" . $sql . "<br /><br />Statement number: " . $sqlStatementCount);
 			          }
 			        }
 				echo '</p>';

=== modified file 'server/xmds.php'
--- server/xmds.php	2009-03-30 18:34:54 +0000
+++ server/xmds.php	2009-08-02 17:10:45 +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)) 
@@ -374,7 +372,12 @@
 	if (Config::GetSetting($db,'PHONE_HOME') == 'On') {
 		// Find out when we last PHONED_HOME :D
 		// If it's been > 28 days since last PHONE_HOME then
-		if (Config::GetSetting($db,'PHONE_HOME_DATE') < (time() - (60 * 60 * 24 * 28))) {
+		if (Config::GetSetting($db,'PHONE_HOME_DATE') < (time() - (60 * 60 * 24 * 28))) {
+
+			if ($displayInfo['isAuditing'] == 1) 
+			{
+				Debug::LogEntry($db, "audit", "PHONE_HOME [IN]", "xmds", "RequiredFiles");	
+			}
 
 			// Retrieve number of displays
 			$SQL = "SELECT COUNT(*)
@@ -397,9 +400,7 @@
 			if ($displayInfo['isAuditing'] == 1) 
 			{
 				Debug::LogEntry($db, "audit", "PHONE_HOME_URL " . $PHONE_HOME_URL , "xmds", "RequiredFiles");	
-			}
-		
-			@file_get_contents($PHONE_HOME_URL);
+			}
 			
 			// Set PHONE_HOME_TIME to NOW.
 			$SQL = "UPDATE `setting`
@@ -410,6 +411,13 @@
 			{
 				trigger_error($db->error());
 			}
+			
+			@file_get_contents($PHONE_HOME_URL);
+
+			if ($displayInfo['isAuditing'] == 1) 
+			{
+				Debug::LogEntry($db, "audit", "PHONE_HOME [OUT]", "xmds", "RequiredFiles");	
+			}
 		//endif
 		}
 	}
@@ -544,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;
@@ -638,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");
@@ -825,6 +736,198 @@
 	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 = "";
+		$layoutID 	= "";
+		$mediaID 	= "";
+		
+		// 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.
+		$statObject->Add($type, $fromdt, $todt, $scheduleID, $displayInfo['displayid'], $layoutID, $mediaID);
+	}
+
+	if ($displayInfo['isAuditing'] == 1) Debug::LogEntry ($db, "audit", "OUT", "xmds", "SubmitStats", "", $displayInfo['displayid']);
+	
+	return true;
+}
+
 //$debug = 1;
 $service = new soap_server();
 
@@ -889,10 +992,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