Merge lp:~dangarner/xibo/105-client-test into lp:~xibo-maintainers/xibo/encke

[Dan Garner]

[lp:~dangarner/xibo/105-client-test]

91. By Dan Garner on 2009-12-30

[server] Incorrect case on a column in the stats download
[dotnetclient] Dispose of the WebClient on Rss

92. By Dan Garner on 2009-12-31

[dotnetclient] Text Scaling improvements - now matches Python Client. Single Layout now expires correctly. RSS Cleans up temporary HTML.

93. By Dan Garner on 2009-12-31

[dotnetclient] Updated the default settings for new installs.

=== modified file 'client/dotNET/About.cs'
--- client/dotNET/About.cs	2009-11-29 12:44:35 +0000
+++ client/dotNET/About.cs	2009-12-31 11:13:17 +0000
@@ -34,7 +34,7 @@
             InitializeComponent();
 
             label1.Text = Application.ProductName;
-            label2.Text = Application.ProductVersion;
+            label2.Text = Properties.Settings.Default.ClientVersion;
         }
 
         private void buttonHelp_Click(object sender, EventArgs e)

=== modified file 'client/dotNET/BlackList.cs'
--- client/dotNET/BlackList.cs	2009-03-08 11:40:17 +0000
+++ client/dotNET/BlackList.cs	2009-12-31 11:13:17 +0000
@@ -23,6 +23,7 @@
 using System.Text;
 using System.Xml;
 using System.Windows.Forms;
+using System.Diagnostics;
 
 namespace XiboClient
 {
@@ -89,6 +90,8 @@
         /// <param name="items">The XMLNodeList containing the blacklist items. Each node must have an "id".</param>
         public void Add(XmlNodeList items)
         {
+            Trace.WriteLine(new LogMessage("Blacklist - Add", "Adding XMLNodeList to Blacklist"), LogType.Info.ToString());
+
             foreach (XmlNode node in items)
             {
                 XmlAttributeCollection attributes = node.Attributes;

=== modified file 'client/dotNET/CacheManager.cs'
--- client/dotNET/CacheManager.cs	2009-11-26 22:01:46 +0000
+++ client/dotNET/CacheManager.cs	2009-12-31 11:13:17 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 /*
  * Xibo - Digitial Signage - http://www.xibo.org.uk
  * Copyright (C) 2009 Daniel Garner
@@ -94,3 +95,163 @@
         public DateTime cacheDate;
     }
 }
+=======
+/*
+ * 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.Serialization;
+using System.Diagnostics;
+
+namespace XiboClient
+{
+    public class CacheManager
+    {
+        public Collection<Md5Resource> _files;
+
+        public CacheManager()
+        {
+            _files = new Collection<Md5Resource>();
+        }
+
+        /// <summary>
+        /// Gets the MD5 for the given path
+        /// </summary>
+        /// <param name="path"></param>
+        /// <returns></returns>
+        public String GetMD5(String path)
+        {
+            // Either we already have the MD5 stored
+            foreach (Md5Resource file in _files)
+            {
+                if (file.path == path)
+                {
+                    // Check to see if this file has been modified since the MD5 cache
+                    DateTime lastWrite = File.GetLastWriteTime(Properties.Settings.Default.LibraryPath + @"\" + path);
+
+                    if (lastWrite > file.cacheDate)
+                    {
+                        // Get the MD5 again
+                        return CalcMD5(path);
+                    }
+
+                    return file.md5;
+                }
+            }
+
+            return CalcMD5(path);
+        }
+
+        /// <summary>
+        /// Calculates the MD5 for a path
+        /// </summary>
+        /// <param name="path"></param>
+        /// <returns></returns>
+        private string CalcMD5(String path)
+        {
+            // Open the file and get the MD5
+            using (FileStream md5Fs = new FileStream(Properties.Settings.Default.LibraryPath + @"\" + path, FileMode.Open, FileAccess.Read))
+            {
+                return Hashes.MD5(md5Fs);
+            }
+        }
+
+        /// <summary>
+        /// Adds a MD5 to the CacheManager
+        /// </summary>
+        /// <param name="path"></param>
+        /// <param name="md5"></param>
+        public void Add(String path, String md5)
+        {
+            // First check to see if this path is in the collection
+            foreach (Md5Resource file in _files)
+            {
+                if (file.path == path)
+                    return;
+            }
+
+            // We need to generate the MD5 and store it for later
+            Md5Resource md5Resource = new Md5Resource();
+
+            md5Resource.path = path;
+            md5Resource.md5 = md5;
+            md5Resource.cacheDate = DateTime.Now;
+
+            // Add the resource to the collection
+            _files.Add(md5Resource);
+
+            System.Diagnostics.Debug.WriteLine(new LogMessage("Add", "Adding new MD5 to CacheManager"), LogType.Info.ToString());
+        }
+
+        /// <summary>
+        /// Removes the MD5 resource associated with the Path given
+        /// </summary>
+        /// <param name="path"></param>
+        public void Remove(String path)
+        {
+            // Loop through all MD5s and remove any that match the path
+            for (int i = 0; i < _files.Count; i++)
+            {
+                Md5Resource file = _files[i];
+
+                if (file.path == path)
+                {
+                    _files.Remove(file);
+
+                    System.Diagnostics.Debug.WriteLine(new LogMessage("Remove", "Removing stale MD5 from the CacheManager"), LogType.Info.ToString());
+                }
+            }
+        }
+
+        /// <summary>
+        /// Writes the CacheManager to disk
+        /// </summary>
+        public void WriteCacheManager()
+        {
+            Debug.WriteLine(new LogMessage("CacheManager - WriteCacheManager", "About to Write the Cache Manager"), LogType.Info.ToString());
+
+            try
+            {
+                using (StreamWriter streamWriter = new StreamWriter(Application.UserAppDataPath + "\\" + Properties.Settings.Default.CacheManagerFile))
+                {
+                    XmlSerializer xmlSerializer = new XmlSerializer(typeof(CacheManager));
+
+                    xmlSerializer.Serialize(streamWriter, this);
+                }
+            }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Trace.WriteLine(new LogMessage("MainForm_FormClosing", "Unable to write CacheManager to disk because: " + ex.Message));
+            }
+        }
+    }
+
+    public struct Md5Resource
+    {
+        public String md5;
+        public String path;
+        public DateTime cacheDate;
+    }
+}
+>>>>>>> MERGE-SOURCE

=== modified file 'client/dotNET/FileCollector.cs'
--- client/dotNET/FileCollector.cs	2009-11-28 10:39:06 +0000
+++ client/dotNET/FileCollector.cs	2009-12-31 11:13:17 +0000
@@ -89,15 +89,34 @@
                     // Does this file exist?
                     if (File.Exists(Properties.Settings.Default.LibraryPath + @"\" + path + ".xlf"))
                     {
+<<<<<<< TREE
                         // Read the current layout into a string
                         String md5 = _cacheManager.GetMD5(path + ".xlf");
 
                         System.Diagnostics.Debug.WriteLine(String.Format("Comparing current MD5 [{0}] with given MD5 [{1}]", md5, attributes["md5"].Value));
+=======
+                        // Calculate a MD5 for the current file
+                        String md5 = _cacheManager.GetMD5(path + ".xlf");
+
+                        System.Diagnostics.Debug.WriteLine(String.Format("Comparing current MD5 [{0}] with given MD5 [{1}]", md5, attributes["md5"].Value));
+>>>>>>> MERGE-SOURCE
 
                         // Now we have the md5, compare it to the md5 in the xml
                         if (attributes["md5"].Value != md5)
                         {
-                            // They are different 
+                            // They are different
+                            _cacheManager.Remove(path + ".xlf");
+
+                            //TODO: This might be bad! Delete the old layout as it is wrong
+                            try
+                            {
+                                File.Delete(Properties.Settings.Default.LibraryPath + @"\" + path + ".xlf");
+                            }
+                            catch (Exception ex)
+                            {
+                                Trace.WriteLine(new LogMessage("CompareAndCollect", "Unable to delete incorrect file because: " + ex.Message));
+                            }
+
                             // Get the file and save it
                             fileList.chunkOffset = 0;
                             fileList.chunkSize = 0;
@@ -110,6 +129,12 @@
 
                             files.Add(fileList);
                         }
+                        else
+                        {
+                            // The MD5 of the current file and the MD5 in RequiredFiles are the same.
+                            // Therefore make sure this MD5 is in the CacheManager
+                            _cacheManager.Add(path + ".xlf", md5);
+                        }
                     }
                     else
                     {
@@ -132,30 +157,76 @@
                     string path = attributes["path"].Value;
 
                     // Does this media exist?
-                    if (File.Exists(Properties.Settings.Default.LibraryPath + @"\" + path))
-                    {
-                        String md5 = _cacheManager.GetMD5(path);
-
-                        System.Diagnostics.Debug.WriteLine(String.Format("Comparing current MD5 [{0}] with given MD5 [{1}]", md5, attributes["md5"].Value));
-
-                        // MD5 the file to make sure it is the same.
-                        if (md5 != attributes["md5"].Value)
-                        {
-                            // File changed
-                            fileList.chunkOffset = 0;
-                            fileList.chunkSize = 512000;
-                            fileList.complete = false;
-                            fileList.downloading = false;
-                            fileList.path = path;
-                            fileList.type = "media";
-                            fileList.size = int.Parse(attributes["size"].Value);
-                            fileList.md5 = attributes["md5"].Value;
-                            fileList.retrys = 0;
-
-                            files.Add(fileList);
-                        }
-                    }
-                    else
+<<<<<<< TREE
+                    if (File.Exists(Properties.Settings.Default.LibraryPath + @"\" + path))
+                    {
+                        String md5 = _cacheManager.GetMD5(path);
+
+                        System.Diagnostics.Debug.WriteLine(String.Format("Comparing current MD5 [{0}] with given MD5 [{1}]", md5, attributes["md5"].Value));
+
+                        // MD5 the file to make sure it is the same.
+                        if (md5 != attributes["md5"].Value)
+                        {
+                            // File changed
+                            fileList.chunkOffset = 0;
+                            fileList.chunkSize = 512000;
+                            fileList.complete = false;
+                            fileList.downloading = false;
+                            fileList.path = path;
+                            fileList.type = "media";
+                            fileList.size = int.Parse(attributes["size"].Value);
+                            fileList.md5 = attributes["md5"].Value;
+                            fileList.retrys = 0;
+
+                            files.Add(fileList);
+                        }
+                    }
+                    else
+=======
+                    if (File.Exists(Properties.Settings.Default.LibraryPath + @"\" + path))
+                    {
+                        String md5 = _cacheManager.GetMD5(path);
+
+                        System.Diagnostics.Debug.WriteLine(String.Format("Comparing current MD5 [{0}] with given MD5 [{1}]", md5, attributes["md5"].Value));
+
+                        // MD5 the file to make sure it is the same.
+                        if (md5 != attributes["md5"].Value)
+                        {
+                            // File changed
+                            _cacheManager.Remove(path);
+
+                            // Delete the old media as it is wrong
+                            try
+                            {
+                                File.Delete(Properties.Settings.Default.LibraryPath + @"\" + path);
+                            }
+                            catch (Exception ex)
+                            {
+                                Trace.WriteLine(new LogMessage("CompareAndCollect", "Unable to delete incorrect file because: " + ex.Message));
+                            }
+
+                            // Add to queue
+                            fileList.chunkOffset = 0;
+                            fileList.chunkSize = 512000;
+                            fileList.complete = false;
+                            fileList.downloading = false;
+                            fileList.path = path;
+                            fileList.type = "media";
+                            fileList.size = int.Parse(attributes["size"].Value);
+                            fileList.md5 = attributes["md5"].Value;
+                            fileList.retrys = 0;
+
+                            files.Add(fileList);
+                        }
+                        else
+                        {
+                            // The MD5 of the current file and the MD5 in RequiredFiles are the same.
+                            // Therefore make sure this MD5 is in the CacheManager
+                            _cacheManager.Add(path, md5);
+                        }
+                    }
+                    else
+>>>>>>> MERGE-SOURCE
                     {
                         // No - Get it (async call - with chunks... through another class?)
                         fileList.chunkOffset = 0;
@@ -218,6 +289,7 @@
 
         void xmdsFile_GetFileCompleted(object sender, XiboClient.xmds.GetFileCompletedEventArgs e)
         {
+<<<<<<< TREE
             try
             {
                 // Expect new schedule XML
@@ -363,19 +435,195 @@
 
                     // Before we get the next file render any waiting events
                     System.Windows.Forms.Application.DoEvents();
-                }
-            }
-            catch (Exception ex)
-            {
-                Trace.WriteLine(new LogMessage("xmdsFile_GetFileCompleted", "Unable to get the file. Exception: " + ex.Message));
-
-                // Consider this file complete because we couldn't write it....
-                _currentFileList.complete = true;
-                _currentFile++;
-            }
-
-            // Get the next file
-            GetFile();
+=======
+            try
+            {
+                // Expect new schedule XML
+                if (e.Error != null)
+                {
+                    //There was an error - what do we do?
+                    // Log it
+                    System.Diagnostics.Debug.WriteLine(e.Error.Message, "WS Error");
+
+                    System.Diagnostics.Trace.WriteLine(String.Format("Error From WebService Get File. File=[{1}], Error=[{0}], Try No [{2}]", e.Error.Message, _currentFileList.path, _currentFileList.retrys));
+
+                    // Retry?
+                    //TODO: What if we are disconnected from XMDS?
+                    if (_currentFileList.retrys < 5)
+                    {
+                        // Increment the Retrys
+                        _currentFileList.retrys++;
+
+                        // Try again
+                        GetFile();
+                    }
+                    else
+                    {
+                        // Blacklist this file
+                        string[] mediaPath = _currentFileList.path.Split('.');
+                        string mediaId = mediaPath[0];
+
+                        BlackList blackList = new BlackList();
+                        blackList.Add(_currentFileList.path, BlackListType.All, String.Format("Max number of retrys failed. BlackListing for all displays. Error {0}", e.Error.Message));
+
+                        // Move on
+                        _currentFile++;
+                    }
+                }
+                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")
+                    {
+                        // Decode this byte[] into a string and stick it in the file.
+                        string layoutXml = Encoding.UTF8.GetString(e.Result);
+                       
+
+                        // We know it is finished and that we need to write to a file
+                        try
+                        {
+                            string fullPath = Properties.Settings.Default.LibraryPath + @"\" + _currentFileList.path + ".xlf";
+
+                            StreamWriter sw = new StreamWriter(File.Open(fullPath, FileMode.Create, FileAccess.Write, FileShare.Read), Encoding.Default);
+                            sw.Write(layoutXml);
+                            sw.Close();
+
+                            // This file is complete
+                            _currentFileList.complete = true;
+                        }
+                        catch (IOException ex)
+                        {
+                            //What do we do if we cant open the file stream?
+                            System.Diagnostics.Debug.WriteLine(ex.Message, "FileCollector - GetFileCompleted");
+                        }
+
+                        // Check it
+                        String md5sum = _cacheManager.GetMD5(_currentFileList.path + ".xlf");
+
+                        System.Diagnostics.Debug.WriteLine(String.Format("Comparing MD5 of completed download [{0}] with given MD5 [{1}]", md5sum, _currentFileList.md5));
+
+                        // TODO: What if the MD5 is different?
+                        if (md5sum != _currentFileList.md5)
+                        {
+                            // Error
+                            System.Diagnostics.Trace.WriteLine(new LogMessage("xmdsFile_GetFileCompleted", String.Format("Incorrect MD5 for file: {0}", _currentFileList.path)));
+                        }
+                        else
+                        {
+                            // Add to the CacheManager
+                            _cacheManager.Add(_currentFileList.path + ".xlf", md5sum);
+                        }
+
+                        // Fire a layout complete event
+                        LayoutFileChanged(_currentFileList.path + ".xlf");
+
+                        System.Diagnostics.Trace.WriteLine(String.Format("File downloaded: {0}", _currentFileList.path), "xmdsFile_GetFileCompleted");
+
+                        _currentFile++;
+                    }
+                    else
+                    {
+                        // Need to write to the file - in append mode
+                        FileStream fs = new FileStream(Properties.Settings.Default.LibraryPath + @"\" + _currentFileList.path, FileMode.Append, FileAccess.Write);
+
+                        fs.Write(e.Result, 0, e.Result.Length);
+                        fs.Close();
+                        fs.Dispose();
+
+                        // Increment the chunkOffset by the amount we just asked for
+                        _currentFileList.chunkOffset = _currentFileList.chunkOffset + _currentFileList.chunkSize;
+
+                        // Has the offset reached the total size?
+                        if (_currentFileList.size > _currentFileList.chunkOffset)
+                        {
+                            int remaining = _currentFileList.size - _currentFileList.chunkOffset;
+                            // There is still more to come
+                            if (remaining < _currentFileList.chunkSize)
+                            {
+                                // Get the remaining
+                                _currentFileList.chunkSize = remaining;
+                            }
+                        }
+                        else
+                        {
+                            String md5sum = _cacheManager.GetMD5(_currentFileList.path);
+
+                            System.Diagnostics.Debug.WriteLine(String.Format("Comparing MD5 of completed download [{0}] with given MD5 [{1}]", md5sum, _currentFileList.md5));
+
+                            if (md5sum != _currentFileList.md5)
+                            {
+                                // We need to get this file again
+                                try
+                                {
+                                    File.Delete(Properties.Settings.Default.LibraryPath + @"\" + _currentFileList.path);
+                                }
+                                catch (Exception ex)
+                                {
+                                    // Unable to delete incorrect file
+                                    //TODO: Should we black list this file?
+                                    System.Diagnostics.Debug.WriteLine(ex.Message);
+                                }
+
+                                // Reset the chunk offset (otherwise we will try to get this file again - but from the beginning (no so good)
+                                _currentFileList.chunkOffset = 0;
+
+                                System.Diagnostics.Trace.WriteLine(String.Format("Error getting file {0}, HASH failed. Starting again", _currentFileList.path));
+                            }
+                            else
+                            {
+                                // Add the MD5 to the CacheManager
+                                _cacheManager.Add(_currentFileList.path, md5sum);
+
+                                // This file is complete
+                                _currentFileList.complete = true;
+
+                                // Fire the File Complete event
+                                MediaFileChanged(_currentFileList.path);
+
+                                System.Diagnostics.Debug.WriteLine(string.Format("File downloaded: {0}", _currentFileList.path));
+
+                                // All the file has been recieved. Move on to the next file.
+                                _currentFile++;
+                            }
+                        }
+                    }
+
+                    // Before we get the next file render any waiting events
+                    System.Windows.Forms.Application.DoEvents();
+>>>>>>> MERGE-SOURCE
+                }
+<<<<<<< TREE
+            }
+            catch (Exception ex)
+            {
+                Trace.WriteLine(new LogMessage("xmdsFile_GetFileCompleted", "Unable to get the file. Exception: " + ex.Message));
+
+                // Consider this file complete because we couldn't write it....
+                _currentFileList.complete = true;
+                _currentFile++;
+            }
+
+            // Get the next file
+            GetFile();
+=======
+            }
+            catch (Exception ex)
+            {
+                Trace.WriteLine(new LogMessage("xmdsFile_GetFileCompleted", "Unable to get the file. Exception: " + ex.Message));
+
+                // TODO: Blacklist the file?
+
+                // Consider this file complete because we couldn't write it....
+                _currentFileList.complete = true;
+                _currentFile++;
+            }
+
+            // Get the next file
+            GetFile();
+>>>>>>> MERGE-SOURCE
         }
 
         /// <summary>

=== modified file 'client/dotNET/MainForm.cs'
--- client/dotNET/MainForm.cs	2009-11-02 21:13:29 +0000
+++ client/dotNET/MainForm.cs	2009-12-31 11:13:17 +0000
@@ -29,7 +29,13 @@
 using System.Xml;
 using System.Net;
 using System.IO;
-using System.Drawing.Imaging;
+<<<<<<< TREE
+using System.Drawing.Imaging;
+=======
+using System.Drawing.Imaging;
+using System.Xml.Serialization;
+using System.Diagnostics;
+>>>>>>> MERGE-SOURCE
 
 namespace XiboClient
 {
@@ -47,12 +53,17 @@
 
         private StatLog _statLog;
         private Stat _stat;
+        private CacheManager _cacheManager;
 
         public MainForm()
         {
             InitializeComponent();
 
             _statLog = new StatLog();
+
+            SetCacheManager();
+
+            this.FormClosing += new FormClosingEventHandler(MainForm_FormClosing);
         }
 
         private void MainForm_Load(object sender, EventArgs e)
@@ -76,8 +87,11 @@
             // Change the default Proxy class
             OptionForm.SetGlobalProxy();
 
+            // UserApp data
+            Debug.WriteLine(new LogMessage("MainForm_Load", "User AppData Path: " + Application.UserAppDataPath), LogType.Info.ToString());
+
             // Create the Schedule
-            schedule = new Schedule(Application.UserAppDataPath + "\\" + Properties.Settings.Default.ScheduleFile);
+            schedule = new Schedule(Application.UserAppDataPath + "\\" + Properties.Settings.Default.ScheduleFile, ref _cacheManager);
 
             schedule.ScheduleChangeEvent += new Schedule.ScheduleChangeDelegate(schedule_ScheduleChangeEvent);
 
@@ -94,6 +108,44 @@
             }
         }
 
+
+        private void MainForm_FormClosing(object sender, FormClosingEventArgs e)
+        {
+            // We want to tidy up some stuff as this form closes.
+
+            // Flush the stats
+            _statLog.Flush();
+
+            // Write the CacheManager to disk
+            _cacheManager.WriteCacheManager();
+
+            // Flush the logs
+            System.Diagnostics.Trace.Flush();
+        }
+
+        /// <summary>
+        /// Sets the CacheManager
+        /// </summary>
+        private void SetCacheManager()
+        {
+            try
+            {
+                using (FileStream fileStream = File.Open(Application.UserAppDataPath + "\\" + Properties.Settings.Default.CacheManagerFile, FileMode.Open))
+                {
+                    XmlSerializer xmlSerializer = new XmlSerializer(typeof(CacheManager));
+
+                    _cacheManager = (CacheManager)xmlSerializer.Deserialize(fileStream);
+                }
+            }
+            catch (Exception ex)
+            {
+                Trace.WriteLine(new LogMessage("Schedule", "Unable to reuse the Cache Manager because: " + ex.Message));
+
+                // Create a new cache manager
+                _cacheManager = new CacheManager();
+            }
+        }
+
         /// <summary>
         /// Handles the ScheduleChange event
         /// </summary>
@@ -373,7 +425,7 @@
                 }
             }
 
-            if (isExpired && (schedule.ActiveLayouts > 1))
+            if (isExpired)
             {
                 // Inform each region that the layout containing it has expired
                 foreach (Region temp in regions)

=== modified file 'client/dotNET/Properties/Settings.Designer.cs'
--- client/dotNET/Properties/Settings.Designer.cs	2009-11-02 22:27:17 +0000
+++ client/dotNET/Properties/Settings.Designer.cs	2009-12-31 11:13:18 +0000
@@ -12,7 +12,7 @@
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "8.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -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/1.0.0/server/xmds.php")]
+        [global::System.Configuration.DefaultSettingValueAttribute("http://localhost/xibo/xmds.php")]
         public string XiboClient_xmds_xmds {
             get {
                 return ((string)(this["XiboClient_xmds_xmds"]));
@@ -59,7 +59,7 @@
         
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("changetocustomerkey")]
+        [global::System.Configuration.DefaultSettingValueAttribute("yourserverkey")]
         public string ServerKey {
             get {
                 return ((string)(this["ServerKey"]));
@@ -128,7 +128,7 @@
         
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("https://www.xibo.co.uk/changetocustomersite")]
+        [global::System.Configuration.DefaultSettingValueAttribute("http://localhost/xibo")]
         public string serverURI {
             get {
                 return ((string)(this["serverURI"]));
@@ -259,5 +259,23 @@
                 this["collectInterval"] = value;
             }
         }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("cacheManager.xml")]
+        public string CacheManagerFile {
+            get {
+                return ((string)(this["CacheManagerFile"]));
+            }
+        }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("1.0.5")]
+        public string ClientVersion {
+            get {
+                return ((string)(this["ClientVersion"]));
+            }
+        }
     }
 }

=== modified file 'client/dotNET/Properties/Settings.settings'
--- client/dotNET/Properties/Settings.settings	2009-07-30 23:01:31 +0000
+++ client/dotNET/Properties/Settings.settings	2009-12-31 11:13:18 +0000
@@ -9,10 +9,10 @@
       <Value Profile="(Default)">schedule.xml</Value>
     </Setting>
     <Setting Name="XiboClient_xmds_xmds" Type="(Web Service URL)" Scope="User">
-      <Value Profile="(Default)">http://localhost/1.0.0/server/xmds.php</Value>
+      <Value Profile="(Default)">http://localhost/xibo/xmds.php</Value>
     </Setting>
     <Setting Name="ServerKey" Type="System.String" Scope="User">
-      <Value Profile="(Default)">changetocustomerkey</Value>
+      <Value Profile="(Default)">yourserverkey</Value>
     </Setting>
     <Setting Name="displayName" Type="System.String" Scope="User">
       <Value Profile="(Default)">COMPUTERNAME</Value>
@@ -30,7 +30,7 @@
       <Value Profile="(Default)">True</Value>
     </Setting>
     <Setting Name="serverURI" Type="System.String" Scope="User">
-      <Value Profile="(Default)">https://www.xibo.co.uk/changetocustomersite</Value>
+      <Value Profile="(Default)">http://localhost/xibo</Value>
     </Setting>
     <Setting Name="ProxyUser" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
@@ -65,5 +65,11 @@
     <Setting Name="collectInterval" Type="System.Decimal" Scope="User">
       <Value Profile="(Default)">900</Value>
     </Setting>
+    <Setting Name="CacheManagerFile" Type="System.String" Scope="Application">
+      <Value Profile="(Default)">cacheManager.xml</Value>
+    </Setting>
+    <Setting Name="ClientVersion" Type="System.String" Scope="Application">
+      <Value Profile="(Default)">1.0.5</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file

=== modified file 'client/dotNET/Region.cs'
--- client/dotNET/Region.cs	2009-12-28 14:38:48 +0000
+++ client/dotNET/Region.cs	2009-12-31 11:13:17 +0000
@@ -22,6 +22,7 @@
 using System.Text;
 using System.Windows.Forms;
 using System.Xml;
+using System.Diagnostics;
 
 namespace XiboClient
 {
@@ -107,61 +108,69 @@
             }
 
             System.Diagnostics.Debug.WriteLine(String.Format("Creating new media: {0}, {1}", options.type, options.mediaid), "Region - EvalOptions");
-            
-            switch (options.type)
-            {
-                case "image":
-                    options.uri = Properties.Settings.Default.LibraryPath + @"\" + options.uri;
-                    media = new ImagePosition(options);
-                    break;
-
-                case "text":
-                    media = new Text(options);
-                    break;
-
-                case "powerpoint":
-                    options.uri = Properties.Settings.Default.LibraryPath + @"\" + options.uri;
-                    media = new WebContent(options);
-                    break;
-
-                case "video":
-                    options.uri = Properties.Settings.Default.LibraryPath + @"\" + options.uri;
-                    media = new Video(options);
-                    break;
-
-                case "webpage":
-                    media = new WebContent(options);
-                    break;
-
-                case "flash":
-                    options.uri = Properties.Settings.Default.LibraryPath + @"\" + options.uri;
-                    media = new Flash(options);
-                    break;
-
-                case "ticker":
-                    media = new Rss(options);
-                    break;
-
-                case "embedded":
-                    media = new Text(options);
-                    break;
-
-                default:
-                    //do nothing
-                    SetNextMediaNode();
-                    return;
-            }
-
-            //sets up the timer for this media
-            media.Duration = options.duration;
-
-            //add event handler
-            media.DurationElapsedEvent += new Media.DurationElapsedDelegate(media_DurationElapsedEvent);
-
-            //any additional media specific render options (and starts the timer)
-            media.RenderMedia();
-
-            Controls.Add(media);
+
+            try
+            {
+                switch (options.type)
+                {
+                    case "image":
+                        options.uri = Properties.Settings.Default.LibraryPath + @"\" + options.uri;
+                        media = new ImagePosition(options);
+                        break;
+
+                    case "text":
+                        media = new Text(options);
+                        break;
+
+                    case "powerpoint":
+                        options.uri = Properties.Settings.Default.LibraryPath + @"\" + options.uri;
+                        media = new WebContent(options);
+                        break;
+
+                    case "video":
+                        options.uri = Properties.Settings.Default.LibraryPath + @"\" + options.uri;
+                        media = new Video(options);
+                        break;
+
+                    case "webpage":
+                        media = new WebContent(options);
+                        break;
+
+                    case "flash":
+                        options.uri = Properties.Settings.Default.LibraryPath + @"\" + options.uri;
+                        media = new Flash(options);
+                        break;
+
+                    case "ticker":
+                        media = new Rss(options);
+                        break;
+
+                    case "embedded":
+                        media = new Text(options);
+                        break;
+
+                    default:
+                        //do nothing
+                        SetNextMediaNode();
+                        return;
+                }
+
+                //sets up the timer for this media
+                media.Duration = options.duration;
+
+                //add event handler
+                media.DurationElapsedEvent += new Media.DurationElapsedDelegate(media_DurationElapsedEvent);
+
+                //any additional media specific render options (and starts the timer)
+                media.RenderMedia();
+
+                Controls.Add(media);
+            }
+            catch (Exception ex)
+            {
+                Trace.WriteLine(new LogMessage("EvalOptions", "Unable to start media. " + ex.Message), LogType.Error.ToString());
+                SetNextMediaNode();
+            }
 
             // This media has started and is being replaced
             _stat = new Stat();
@@ -230,7 +239,7 @@
             // Get a media node
             bool validNode = false;
             int numAttempts = 0;
-
+            
             while (!validNode)
             {
                 numAttempts++;
@@ -253,6 +262,15 @@
                     if (currentSequence >= options.mediaNodes.Count)
                     {
                         currentSequence = 0; //zero it
+
+                        hasExpired = true; //we have expired (want to raise an expired event to the parent)
+
+                        System.Diagnostics.Debug.WriteLine("Media Expired:" + options.ToString() + " . Reached the end of the sequence. Starting from the beginning.", "Region - SetNextMediaNode");
+
+                        DurationElapsedEvent();
+
+                        // We want to continue on to show the next media (unless the duration elapsed event triggers a region change)
+                        if (layoutExpired) return;
                     }
                 }
                 else
@@ -265,6 +283,8 @@
 
                     // Type and Duration will always be on the media node
                     options.type        = nodeAttributes["type"].Value;
+
+                    //TODO: Check the type of node we have, and make sure it is supported.
                     
                     if (nodeAttributes["duration"].Value != "")
                     {
@@ -341,7 +361,11 @@
                         }
                     }
 
-                    // That should cover all the new options
+                    // TODO: What if the file isnt there?
+                    // Do we need to have access to the CacheManager here... if we did then we could store whether or not a file
+                    // existed in there, instead of having to check it here...
+                    // we could also do away with the BlackList at the top and build it into here (at the moment its file based, we write
+                    // the cachemanager to file anyway)
                 }
 
                 if (numAttempts > options.mediaNodes.Count)

=== modified file 'client/dotNET/Rss.cs'
--- client/dotNET/Rss.cs	2009-12-28 14:38:48 +0000
+++ client/dotNET/Rss.cs	2009-12-31 11:13:18 +0000
@@ -23,7 +23,12 @@
 using System.IO;
 using System.Windows.Forms;
 using System.Xml;
-using System.Net;
+<<<<<<< TREE
+using System.Net;
+=======
+using System.Net;
+using System.Diagnostics;
+>>>>>>> MERGE-SOURCE
 
 namespace XiboClient
 {
@@ -101,7 +106,10 @@
             _updateInterval = options.updateInterval;
             _scrollSpeed = options.scrollSpeed;
 
-            System.Diagnostics.Trace.WriteLine(String.Format("Scrolling Speed: {0}, Update Interval: {1})", _scrollSpeed.ToString(), _updateInterval.ToString()), "Rss - Constructor");
+            System.Diagnostics.Debug.WriteLine(String.Format("Scrolling Speed: {0}, Update Interval: {1})", _scrollSpeed.ToString(), _updateInterval.ToString()), "Rss - Constructor");
+
+            // Generate a temporary file to store the rendered object in.
+            _tempHtml = new TemporaryHtml();
 
             // Generate a temporary file to store the rendered object in.
             _tempHtml = new TemporaryHtml();
@@ -186,6 +194,7 @@
             }
             else
             {
+<<<<<<< TREE
                 bodyStyle = "background-image: url('" + _backgroundImage + "'); background-attachment:fixed; background-color:" + _backgroundColor + " background-repeat: no-repeat; background-position: " + _backgroundLeft + " " + _backgroundTop + ";";
             }
 
@@ -229,6 +238,51 @@
 
             // Store the document text in the temporary HTML space
             _tempHtml.HeadContent = _headText;
+=======
+                bodyStyle = "background-image: url('" + _backgroundImage + "'); background-attachment:fixed; background-color:" + _backgroundColor + " background-repeat: no-repeat; background-position: " + _backgroundLeft + " " + _backgroundTop + ";";
+            }
+
+            // Do we need to include the init function to kick off the text render?
+            String initFunction = "";
+
+            if (_direction == "single")
+            {
+                initFunction = @"
+<script type='text/javascript'>
+function init() 
+{
+    var totalDuration = " + _duration.ToString() + @" * 1000;
+    var itemCount = $('.XiboRssItem').size();
+
+    var itemTime = totalDuration / itemCount;
+
+    if (itemTime < 2000) itemTime = 2000;
+
+   // Try to get the itemTime from an element we expect to be in the HTML 
+ 
+   $('#text').cycle({fx: 'fade', timeout:itemTime});
+}
+</script>";
+            }
+            else if (_direction != "none")
+            {
+                initFunction = @"
+<script type='text/javascript'>
+function init() 
+{ 
+    tr = new TextRender('text', 'innerText', '" + _direction + @"');
+
+    var timer = 0;
+    timer = setInterval('tr.TimerTick()', " + _scrollSpeed.ToString() + @");
+}
+</script>";
+            }
+
+            _headText = initFunction + "<style type='text/css'>body {" + bodyStyle + " font-size:" + _scaleFactor.ToString() + "em; }</style>";
+
+            // Store the document text in the temporary HTML space
+            _tempHtml.HeadContent = _headText;
+>>>>>>> MERGE-SOURCE
         }
 
         /// <summary>
@@ -241,15 +295,28 @@
             {
                 System.Diagnostics.Debug.WriteLine("Created at WebClient", "RSS - Refresh local RSS");
 
-                _wc = new System.Net.WebClient();
-                _wc.UseDefaultCredentials = true;
-                _wc.OpenReadCompleted += new System.Net.OpenReadCompletedEventHandler(wc_OpenReadCompleted);
-                
-                _wc.OpenReadAsync(new Uri(_filePath));
-            }
-            catch (Exception ex)
-            {
-                System.Diagnostics.Trace.WriteLine(String.Format("[*]ScheduleID:{1},LayoutID:{2},MediaID:{3},Message:{0}", ex.Message, _scheduleId, _layoutId, _mediaid));
+<<<<<<< TREE
+                _wc = new System.Net.WebClient();
+                _wc.UseDefaultCredentials = true;
+                _wc.OpenReadCompleted += new System.Net.OpenReadCompletedEventHandler(wc_OpenReadCompleted);
+                
+                _wc.OpenReadAsync(new Uri(_filePath));
+            }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Trace.WriteLine(String.Format("[*]ScheduleID:{1},LayoutID:{2},MediaID:{3},Message:{0}", ex.Message, _scheduleId, _layoutId, _mediaid));
+=======
+                _wc = new System.Net.WebClient();
+                _wc.UseDefaultCredentials = true;
+                
+                _wc.OpenReadCompleted += new System.Net.OpenReadCompletedEventHandler(wc_OpenReadCompleted);
+                
+                _wc.OpenReadAsync(new Uri(_filePath));
+            }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Trace.WriteLine(String.Format("[*]ScheduleID:{1},LayoutID:{2},MediaID:{3},Message:{0}", ex.Message, _scheduleId, _layoutId, _mediaid));
+>>>>>>> MERGE-SOURCE
             }
         }
 
@@ -487,6 +554,25 @@
                 {
                     System.Diagnostics.Debug.WriteLine("Web browser control already disposed", "Rss - Dispose");
                 }
+
+                try
+                {
+                    _wc.Dispose();
+                }
+                catch
+                {
+                    System.Diagnostics.Debug.WriteLine("Web Client control already disposed", "Rss - Dispose");
+                }
+
+                // Remove the temporary file we created
+                try
+                {
+                    _tempHtml.Dispose();
+                }
+                catch (Exception ex)
+                {
+                    Trace.WriteLine(new LogMessage("Dispose", String.Format("Unable to dispose TemporaryHtml with exception {0}", ex.Message)));
+                }
             }
 
             base.Dispose(disposing);

=== modified file 'client/dotNET/Schedule.cs'
--- client/dotNET/Schedule.cs	2009-11-26 21:21:08 +0000
+++ client/dotNET/Schedule.cs	2009-12-31 11:13:18 +0000
@@ -25,6 +25,8 @@
 using System.Text;
 using System.Windows.Forms;
 using System.Xml;
+using System.Xml.Serialization;
+using System.Diagnostics;
 
 namespace XiboClient
 {
@@ -33,6 +35,7 @@
     /// </summary>
     class Schedule
     {
+<<<<<<< TREE
         public delegate void ScheduleChangeDelegate(string layoutPath, int scheduleId, int layoutId);
         public event ScheduleChangeDelegate ScheduleChangeEvent;
 
@@ -56,15 +59,46 @@
         /// </summary>
         /// <param name="scheduleLocation"></param>
         public Schedule(string scheduleLocation)
+=======
+        public delegate void ScheduleChangeDelegate(string layoutPath, int scheduleId, int layoutId);
+        public event ScheduleChangeDelegate ScheduleChangeEvent;
+
+        private Collection<LayoutSchedule> layoutSchedule;
+        private int currentLayout = 0;
+        private string scheduleLocation;
+
+        //FileCollector
+        private XiboClient.xmds.xmds xmds2;
+        private bool xmdsProcessing;
+        private bool forceChange = false;
+
+        // Key
+        private HardwareKey hardwareKey;
+
+        // Cache Manager
+        private CacheManager _cacheManager;
+
+        /// <summary>
+        /// Create a schedule
+        /// </summary>
+        /// <param name="scheduleLocation"></param>
+        public Schedule(string scheduleLocation, ref CacheManager cacheManager)
+>>>>>>> MERGE-SOURCE
         {
             // Save the schedule location
             this.scheduleLocation = scheduleLocation;
 
             // Create a new collection for the layouts in the schedule
             layoutSchedule = new Collection<LayoutSchedule>();
+<<<<<<< TREE
             
             // Create a new cache manager
             _cacheManager = new CacheManager();
+=======
+            
+            // Set cachemanager
+            _cacheManager = cacheManager;
+>>>>>>> MERGE-SOURCE
 
             // Create a new Xmds service object
             xmds2 = new XiboClient.xmds.xmds();
@@ -119,8 +153,8 @@
 
             if (e.Error != null)
             {
-                //There was an error - what do we do?
-                System.Diagnostics.Trace.WriteLine(e.Error.Message);
+                // There was an error - what do we do?
+                System.Diagnostics.Trace.WriteLine(new LogMessage("Schedule - RequiredFilesCompleted", e.Error.Message), LogType.Error.ToString());
 
                 // Is it a "not licensed" error
                 if (e.Error.Message == "This display client is not licensed")
@@ -158,9 +192,10 @@
                     xmdsProcessing = false;
 
                     // Log and move on
-                    System.Diagnostics.Debug.WriteLine("Error Comparing and Collecting", "Schedule - RequiredFilesCompleted");
-                    System.Diagnostics.Debug.WriteLine(ex.Message, "Schedule - RequiredFilesCompleted");
+                    System.Diagnostics.Trace.WriteLine(new LogMessage("Schedule - RequiredFilesCompleted", "Error Comparing and Collecting: " + ex.Message), LogType.Error.ToString());
                 }
+
+                _cacheManager.WriteCacheManager();
             }
         }
 
@@ -298,8 +333,7 @@
 
             if (layoutSchedule.Count == 1 && !forceChange)
             {
-                //dont bother raising the event, just keep on this until the schedule gets changed
-                return;
+                Debug.WriteLine(new LogMessage("Schedule - NextLayout", "Only 1 layout showing, refreshing it"), LogType.Info.ToString());
             }
 
             System.Diagnostics.Debug.WriteLine(String.Format("Next layout: {0}", layoutSchedule[currentLayout].layoutFile), "Schedule - Next Layout");

=== modified file 'client/dotNET/TemporaryHtml.cs'
--- client/dotNET/TemporaryHtml.cs	2009-11-01 11:28:23 +0000
+++ client/dotNET/TemporaryHtml.cs	2009-12-31 11:13:18 +0000
@@ -1,106 +1,217 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-using System.Reflection;
-using System.Diagnostics;
-
-namespace XiboClient
-{
-    /// <summary>
-    /// A temporary html object.
-    /// Once FileContent is set it will contain the complete HTML page
-    /// </summary>
-    class TemporaryHtml : IDisposable
-    {
-        private String _fileContent;
-        private String _headContent;
-        private String _resourceTemplate;
-        private String _filePath;
-
-        public TemporaryHtml()
-        {            
-            // Load the resource file
-
-            
-        }
-
-        /// <summary>
-        /// The File content - can only be set once.
-        /// </summary>
-        public String BodyContent
-        {
-            set
-            {
-                // Set the contents of the file
-                _fileContent = value;
-
-                // Create the temporary file
-                Store();
-            }
-        }
-
-        /// <summary>
-        /// The Head content - must be added before the body
-        /// </summary>
-        public String HeadContent
-        {
-            set
-            {
-                // Set the head content
-                _headContent = value;
-            }
-        }
-
-        public String Path
-        {
-            get
-            {
-                return _filePath;
-            }
-        }
-
-        /// <summary>
-        /// Stores the file
-        /// </summary>
-        private void Store()
-        {
-            // Create a temporary file
-            _filePath = System.IO.Path.GetTempFileName();
-
-            // Open the resource file
-            Assembly assembly = System.Reflection.Assembly.GetExecutingAssembly();
-            
-            // Use the assembly to get the HtmlTemplate resource
-            using (Stream resourceStream = assembly.GetManifestResourceStream("XiboClient.Resources.HtmlTemplate.htm"))
-            {
-                using (TextReader tw = new StreamReader(resourceStream))
-                {
-                    _resourceTemplate = tw.ReadToEnd();
-                }
-            }
-
-            // Insert the file content into the resource file
-            _resourceTemplate = _resourceTemplate.Replace("<!--[[[HEADCONTENT]]]-->", _headContent);
-            _resourceTemplate = _resourceTemplate.Replace("<!--[[[BODYCONTENT]]]-->", _fileContent);
-
-            // Write it to the file
-            using (StreamWriter sw = new StreamWriter(File.Open(_filePath, FileMode.Create, FileAccess.Write, FileShare.Read), Encoding.UTF8))
-            {
-                sw.Write(_resourceTemplate);
-                sw.Close();
-            }
-        }
-
-
-        #region IDisposable Members
-
-        public void Dispose()
-        {
-            // Remove the temporary file
-            File.Delete(_filePath);
-        }
-
-        #endregion
-    }
-}
+<<<<<<< TREE
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Reflection;
+using System.Diagnostics;
+
+namespace XiboClient
+{
+    /// <summary>
+    /// A temporary html object.
+    /// Once FileContent is set it will contain the complete HTML page
+    /// </summary>
+    class TemporaryHtml : IDisposable
+    {
+        private String _fileContent;
+        private String _headContent;
+        private String _resourceTemplate;
+        private String _filePath;
+
+        public TemporaryHtml()
+        {            
+            // Load the resource file
+
+            
+        }
+
+        /// <summary>
+        /// The File content - can only be set once.
+        /// </summary>
+        public String BodyContent
+        {
+            set
+            {
+                // Set the contents of the file
+                _fileContent = value;
+
+                // Create the temporary file
+                Store();
+            }
+        }
+
+        /// <summary>
+        /// The Head content - must be added before the body
+        /// </summary>
+        public String HeadContent
+        {
+            set
+            {
+                // Set the head content
+                _headContent = value;
+            }
+        }
+
+        public String Path
+        {
+            get
+            {
+                return _filePath;
+            }
+        }
+
+        /// <summary>
+        /// Stores the file
+        /// </summary>
+        private void Store()
+        {
+            // Create a temporary file
+            _filePath = System.IO.Path.GetTempFileName();
+
+            // Open the resource file
+            Assembly assembly = System.Reflection.Assembly.GetExecutingAssembly();
+            
+            // Use the assembly to get the HtmlTemplate resource
+            using (Stream resourceStream = assembly.GetManifestResourceStream("XiboClient.Resources.HtmlTemplate.htm"))
+            {
+                using (TextReader tw = new StreamReader(resourceStream))
+                {
+                    _resourceTemplate = tw.ReadToEnd();
+                }
+            }
+
+            // Insert the file content into the resource file
+            _resourceTemplate = _resourceTemplate.Replace("<!--[[[HEADCONTENT]]]-->", _headContent);
+            _resourceTemplate = _resourceTemplate.Replace("<!--[[[BODYCONTENT]]]-->", _fileContent);
+
+            // Write it to the file
+            using (StreamWriter sw = new StreamWriter(File.Open(_filePath, FileMode.Create, FileAccess.Write, FileShare.Read), Encoding.UTF8))
+            {
+                sw.Write(_resourceTemplate);
+                sw.Close();
+            }
+        }
+
+
+        #region IDisposable Members
+
+        public void Dispose()
+        {
+            // Remove the temporary file
+            File.Delete(_filePath);
+        }
+
+        #endregion
+    }
+}
+=======
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Reflection;
+using System.Diagnostics;
+
+namespace XiboClient
+{
+    /// <summary>
+    /// A temporary html object.
+    /// Once FileContent is set it will contain the complete HTML page
+    /// </summary>
+    class TemporaryHtml : IDisposable
+    {
+        private String _fileContent;
+        private String _headContent;
+        private String _resourceTemplate;
+        private String _filePath;
+
+        public TemporaryHtml()
+        {            
+            // Load the resource file
+
+            
+        }
+
+        /// <summary>
+        /// The File content - can only be set once.
+        /// </summary>
+        public String BodyContent
+        {
+            set
+            {
+                // Set the contents of the file
+                _fileContent = value;
+
+                // Create the temporary file
+                Store();
+            }
+        }
+
+        /// <summary>
+        /// The Head content - must be added before the body
+        /// </summary>
+        public String HeadContent
+        {
+            set
+            {
+                // Set the head content
+                _headContent = value;
+            }
+        }
+
+        public String Path
+        {
+            get
+            {
+                return _filePath;
+            }
+        }
+
+        /// <summary>
+        /// Stores the file
+        /// </summary>
+        private void Store()
+        {
+            // Create a temporary file
+            _filePath = System.IO.Path.GetTempFileName();
+
+            Debug.WriteLine(_filePath);
+
+            // Open the resource file
+            Assembly assembly = System.Reflection.Assembly.GetExecutingAssembly();
+            
+            // Use the assembly to get the HtmlTemplate resource
+            using (Stream resourceStream = assembly.GetManifestResourceStream("XiboClient.Resources.HtmlTemplate.htm"))
+            {
+                using (TextReader tw = new StreamReader(resourceStream))
+                {
+                    _resourceTemplate = tw.ReadToEnd();
+                }
+            }
+
+            // Insert the file content into the resource file
+            _resourceTemplate = _resourceTemplate.Replace("<!--[[[HEADCONTENT]]]-->", _headContent);
+            _resourceTemplate = _resourceTemplate.Replace("<!--[[[BODYCONTENT]]]-->", _fileContent);
+
+            // Write it to the file
+            using (StreamWriter sw = new StreamWriter(File.Open(_filePath, FileMode.Create, FileAccess.Write, FileShare.Read), Encoding.UTF8))
+            {
+                sw.Write(_resourceTemplate);
+                sw.Close();
+            }
+        }
+
+
+        #region IDisposable Members
+
+        public void Dispose()
+        {
+            // Remove the temporary file
+            File.Delete(_filePath);
+        }
+
+        #endregion
+    }
+}
+>>>>>>> MERGE-SOURCE

=== modified file 'client/dotNET/Text.cs'
--- client/dotNET/Text.cs	2009-11-30 20:52:08 +0000
+++ client/dotNET/Text.cs	2009-12-31 11:13:18 +0000
@@ -108,6 +108,7 @@
                 if (_direction == "left" || _direction == "right") textWrap = "white-space: nowrap";
 
                 textRender += string.Format("<div id='text' style='position:relative;overflow:hidden;width:{0}; height:{1};'>", this.width - 10, this.height);
+<<<<<<< TREE
                 textRender += string.Format("<div id='innerText' style='position:absolute; left: 0px; top: 0px; width:{2} {0}'>{1}</div></div>", textWrap, _documentText, this.width - 10);
 
                 _tempHtml.BodyContent = textRender;
@@ -157,6 +158,57 @@
         /// <summary>
         /// Render media
         /// </summary>
+=======
+                textRender += string.Format("<div id='innerText' style='position:absolute; left: 0px; top: 0px; width:{2} {0}'>{1}</div></div>", textWrap, _documentText, this.width - 10);
+
+                _tempHtml.BodyContent = textRender;
+            }
+        }
+
+        /// <summary>
+        /// Generates the Head Html for this Document
+        /// </summary>
+        private void GenerateHeadHtml()
+        {
+            // Handle the background
+            String bodyStyle;
+
+            if (_backgroundImage == null || _backgroundImage == "")
+            {
+                bodyStyle = "background-color:" + _backgroundColor + " ;";
+            }
+            else
+            {
+                bodyStyle = "background-image: url('" + _backgroundImage + "'); background-attachment:fixed; background-color:" + _backgroundColor + " background-repeat: no-repeat; background-position: " + _backgroundLeft + " " + _backgroundTop + ";";
+            }
+
+            // Do we need to include the init function to kick off the text render?
+            String initFunction = "";
+
+            if (_direction != "none")
+            {
+                initFunction = @"
+<script type='text/javascript'>
+function init() 
+{ 
+    tr = new TextRender('text', 'innerText', '" + _direction + @"');
+
+    var timer = 0;
+    timer = setInterval('tr.TimerTick()', " + _scrollSpeed.ToString() + @");
+}
+</script>";
+            }
+
+            _headText = _headJavaScript + initFunction + "<style type='text/css'>body {" + bodyStyle + " font-size:" + _scaleFactor.ToString() + "em; }</style>";
+
+            // Store the document text in the temporary HTML space
+            _tempHtml.HeadContent = _headText;
+        }
+
+        /// <summary>
+        /// Render media
+        /// </summary>
+>>>>>>> MERGE-SOURCE
         public override void RenderMedia()
         {
             base.StartTimer();

=== modified file 'client/dotNET/Video.cs'
--- client/dotNET/Video.cs	2009-11-30 20:52:08 +0000
+++ client/dotNET/Video.cs	2009-12-31 11:13:18 +0000
@@ -81,6 +81,7 @@
         {
             if (disposing)
             {
+<<<<<<< TREE
                 // Dispose of managed resources
             }
             
@@ -89,13 +90,31 @@
 
             try
             {
+=======
+               
+            }
+
+            try
+            {
+>>>>>>> MERGE-SOURCE
                 videoPlayer.Hide();
+<<<<<<< TREE
+=======
+                Controls.Remove(videoPlayer);
+>>>>>>> MERGE-SOURCE
                 videoPlayer.Dispose();
             }
+<<<<<<< TREE
             catch
             {
                 System.Diagnostics.Debug.WriteLine("Unable to dispose of video player", "Dispose");
             }
+=======
+            catch
+            {
+
+            }
+>>>>>>> MERGE-SOURCE
 
             base.Dispose(disposing);
         }

=== modified file 'client/dotNET/VideoPlayer.cs'
--- client/dotNET/VideoPlayer.cs	2009-12-03 20:50:32 +0000
+++ client/dotNET/VideoPlayer.cs	2009-12-31 11:13:18 +0000
@@ -60,6 +60,7 @@
         {
             if (e.newState == 8)
             {
+<<<<<<< TREE
                 // indicate we are stopped
                 axWindowsMediaPlayer1.Visible = false;
 
@@ -67,6 +68,10 @@
 
                 // Fire an event to say we have elapsed
                 VideoPlayerElapsedEvent();
+=======
+                // indicate we are stopped
+                finished = true;
+>>>>>>> MERGE-SOURCE
             }
         }
 

=== modified file 'client/dotNET/Web References/xmds/Reference.cs'
--- client/dotNET/Web References/xmds/Reference.cs	2009-07-26 11:40:59 +0000
+++ client/dotNET/Web References/xmds/Reference.cs	2009-12-31 11:13:18 +0000
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.1433
+//     Runtime Version:2.0.50727.4927
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -9,7 +9,7 @@
 //------------------------------------------------------------------------------
 
 // 
-// This source code was auto-generated by Microsoft.VSDesigner, Version 2.0.50727.1433.
+// This source code was auto-generated by Microsoft.VSDesigner, Version 2.0.50727.4927.
 // 
 #pragma warning disable 1591
 
@@ -23,7 +23,7 @@
     
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.1433")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4918")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     [System.Web.Services.WebServiceBindingAttribute(Name="xmdsBinding", Namespace="urn:xmds")]
@@ -421,11 +421,11 @@
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.1433")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4918")]
     public delegate void RegisterDisplayCompletedEventHandler(object sender, RegisterDisplayCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.1433")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4918")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class RegisterDisplayCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -447,11 +447,11 @@
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.1433")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4918")]
     public delegate void RequiredFilesCompletedEventHandler(object sender, RequiredFilesCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.1433")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4918")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class RequiredFilesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -473,11 +473,11 @@
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.1433")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4918")]
     public delegate void GetFileCompletedEventHandler(object sender, GetFileCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.1433")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4918")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class GetFileCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -499,11 +499,11 @@
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.1433")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4918")]
     public delegate void ScheduleCompletedEventHandler(object sender, ScheduleCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.1433")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4918")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class ScheduleCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -525,11 +525,11 @@
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.1433")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4918")]
     public delegate void RecieveXmlLogCompletedEventHandler(object sender, RecieveXmlLogCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.1433")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4918")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class RecieveXmlLogCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -551,11 +551,11 @@
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.1433")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4918")]
     public delegate void BlackListCompletedEventHandler(object sender, BlackListCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.1433")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4918")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class BlackListCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -577,11 +577,11 @@
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.1433")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4918")]
     public delegate void SubmitLogCompletedEventHandler(object sender, SubmitLogCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.1433")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4918")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class SubmitLogCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -603,11 +603,11 @@
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.1433")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4918")]
     public delegate void SubmitStatsCompletedEventHandler(object sender, SubmitStatsCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.1433")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4918")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class SubmitStatsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {

=== modified file 'client/dotNET/XiboClient.csproj'
--- client/dotNET/XiboClient.csproj	2009-12-28 14:38:48 +0000
+++ client/dotNET/XiboClient.csproj	2009-12-31 11:13:18 +0000
@@ -1,8 +1,8 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9E6CFE88-0171-4360-BDF4-84D74A90FD55}</ProjectGuid>
     <OutputType>WinExe</OutputType>
@@ -16,6 +16,14 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <StartupObject>XiboClient.Program</StartupObject>
     <TargetZone>LocalIntranet</TargetZone>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <TargetFrameworkSubset>
+    </TargetFrameworkSubset>
     <PublishUrl>T:\Development\Version 2\Client\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -26,8 +34,9 @@
     <UpdatePeriodically>false</UpdatePeriodically>
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
-    <CreateWebPageOnPublish>false</CreateWebPageOnPublish>
+    <ApplicationRevision>0</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -211,11 +220,31 @@
     </COMReference>
   </ItemGroup>
   <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
     <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
       <Visible>False</Visible>
-      <ProductName>.NET Framework 2.0</ProductName>
+      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
       <Install>true</Install>
     </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
     <WebReferences Include="Web References\" />

=== modified file 'client/dotNET/app.config'
--- client/dotNET/app.config	2009-07-30 23:01:31 +0000
+++ client/dotNET/app.config	2009-12-31 11:13:18 +0000
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0"?>
 <configuration>
     <configSections>
-        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
-            <section name="XiboClient.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+            <section name="XiboClient.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
         </sectionGroup>
-        <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
-            <section name="XiboClient.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+        <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+            <section name="XiboClient.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
         </sectionGroup>
     </configSections>
     <userSettings>
@@ -14,10 +14,10 @@
                 <value>DEFAULT</value>
             </setting>
             <setting name="XiboClient_xmds_xmds" serializeAs="String">
-                <value>http://localhost/1.0.0/server/xmds.php</value>
+                <value>http://localhost/xibo/xmds.php</value>
             </setting>
             <setting name="ServerKey" serializeAs="String">
-                <value>changetocustomerkey</value>
+                <value>yourserverkey</value>
             </setting>
             <setting name="displayName" serializeAs="String">
                 <value>COMPUTERNAME</value>
@@ -32,7 +32,7 @@
                 <value>True</value>
             </setting>
             <setting name="serverURI" serializeAs="String">
-                <value>https://www.xibo.co.uk/changetocustomersite</value>
+                <value>http://localhost/xibo</value>
             </setting>
             <setting name="ProxyUser" serializeAs="String">
                 <value />
@@ -77,6 +77,12 @@
             <setting name="StatsLogFile" serializeAs="String">
                 <value>stats.xml</value>
             </setting>
+            <setting name="CacheManagerFile" serializeAs="String">
+                <value>cacheManager.xml</value>
+            </setting>
+            <setting name="ClientVersion" serializeAs="String">
+                <value>1.0.5</value>
+            </setting>
         </XiboClient.Properties.Settings>
     </applicationSettings>
-</configuration>
\ No newline at end of file
+<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>

=== renamed file 'client/dotNET/bin/Release/AxInterop.ShockwaveFlashObjects.dll' => 'client/dotNET/bin/Release/AxInterop.ShockwaveFlashObjects.dll.OTHER'
Binary files client/dotNET/bin/Release/AxInterop.ShockwaveFlashObjects.dll	2009-11-01 23:23:15 +0000 and client/dotNET/bin/Release/AxInterop.ShockwaveFlashObjects.dll.OTHER	2009-12-31 11:13:18 +0000 differ
=== renamed file 'client/dotNET/bin/Release/AxInterop.WMPLib.dll' => 'client/dotNET/bin/Release/AxInterop.WMPLib.dll.OTHER'
Binary files client/dotNET/bin/Release/AxInterop.WMPLib.dll	2009-11-01 23:23:15 +0000 and client/dotNET/bin/Release/AxInterop.WMPLib.dll.OTHER	2009-12-31 11:13:18 +0000 differ
=== renamed file 'client/dotNET/bin/Release/Interop.ShockwaveFlashObjects.dll' => 'client/dotNET/bin/Release/Interop.ShockwaveFlashObjects.dll.OTHER'
Binary files client/dotNET/bin/Release/Interop.ShockwaveFlashObjects.dll	2009-11-01 23:23:15 +0000 and client/dotNET/bin/Release/Interop.ShockwaveFlashObjects.dll.OTHER	2009-12-31 11:13:18 +0000 differ
=== renamed file 'client/dotNET/bin/Release/Interop.WMPLib.dll' => 'client/dotNET/bin/Release/Interop.WMPLib.dll.OTHER'
Binary files client/dotNET/bin/Release/Interop.WMPLib.dll	2009-11-01 23:23:15 +0000 and client/dotNET/bin/Release/Interop.WMPLib.dll.OTHER	2009-12-31 11:13:18 +0000 differ
=== modified file 'client/dotNET/bin/Release/XiboClient.exe.config'
--- client/dotNET/bin/Release/XiboClient.exe.config	2009-07-30 23:01:31 +0000
+++ client/dotNET/bin/Release/XiboClient.exe.config	2009-12-31 11:13:18 +0000
@@ -77,6 +77,12 @@
             <setting name="StatsLogFile" serializeAs="String">
                 <value>stats.xml</value>
             </setting>
+            <setting name="CacheManagerFile" serializeAs="String">
+                <value>cacheManager.xml</value>
+            </setting>
+            <setting name="ClientVersion" serializeAs="String">
+                <value>1.0.5</value>
+            </setting>
         </XiboClient.Properties.Settings>
     </applicationSettings>
 </configuration>
\ No newline at end of file

=== modified file 'client/dotNET/bin/Release/XiboClient.vshost.exe.config'
--- client/dotNET/bin/Release/XiboClient.vshost.exe.config	2009-07-30 23:01:31 +0000
+++ client/dotNET/bin/Release/XiboClient.vshost.exe.config	2009-12-31 11:13:18 +0000
@@ -77,6 +77,12 @@
             <setting name="StatsLogFile" serializeAs="String">
                 <value>stats.xml</value>
             </setting>
+            <setting name="CacheManagerFile" serializeAs="String">
+                <value>cacheManager.xml</value>
+            </setting>
+            <setting name="ClientVersion" serializeAs="String">
+                <value>1.0.5</value>
+            </setting>
         </XiboClient.Properties.Settings>
     </applicationSettings>
 </configuration>
\ No newline at end of file

=== modified file 'server/install/database/9.sql'
--- server/install/database/9.sql	2009-12-28 14:45:26 +0000
+++ server/install/database/9.sql	2009-12-31 11:13:18 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 INSERT INTO `pages` (
 `pageID` ,
 `name` ,
@@ -11,4 +12,17 @@
 
 
 INSERT INTO `menuitem` (`MenuItemID`, `MenuID`, `PageID`, `Args`, `Text`, `Class`, `Img`, `Sequence`)
-VALUES (NULL, 2, 28, 'http://wiki.xibo.org.uk/wiki/Manual:TOC', 'Manual', 'help_button', 'img/dashboard/help.png', '10');
\ No newline at end of file
+VALUES (NULL, 2, 28, 'http://wiki.xibo.org.uk/wiki/Manual:TOC', 'Manual', 'help_button', 'img/dashboard/help.png', '10');=======
+INSERT INTO `pages` (
+`pageID` ,
+`name` ,
+`pagegroupID`
+)
+VALUES (
+28 , 'manual', '2'
+);
+
+INSERT INTO `menuitem` (`MenuItemID`, `MenuID`, `PageID`, `Args`, `Text`, `Class`, `Img`, `Sequence`)
+VALUES (NULL, 2, 28, 'http://wiki.xibo.org.uk/wiki/Manual:TOC', 'Manual', 'help_button', 'img/dashboard/help.png', '10');
+
+UPDATE `module` SET `ValidExtensions` = 'ppt,pps,pptx' WHERE `module`.`ModuleID` =4 LIMIT 1 ;>>>>>>> MERGE-SOURCE

=== modified file 'server/lib/pages/content.class.php'
--- server/lib/pages/content.class.php	2009-12-28 14:36:27 +0000
+++ server/lib/pages/content.class.php	2009-12-31 11:13:18 +0000
@@ -60,6 +60,7 @@
 	 */	
 	function LibraryFilter() 
 	{
+<<<<<<< TREE
 		$db =& $this->db;
 		
 		$mediatype = ""; //1
@@ -128,21 +129,85 @@
 					</table>
 			</form>
 		</div>
+=======
+            $db =& $this->db;
+
+            $mediatype = ""; //1
+            $usertype = 0; //3
+            $playlistid = ""; //4
+
+            if (isset($_SESSION['content']['mediatype'])) $mediatype = $_SESSION['content']['mediatype'];
+            if (isset($_SESSION['content']['usertype'])) $usertype = $_SESSION['content']['usertype'];
+            if (isset($_SESSION['content']['playlistid'])) $playlistid = $_SESSION['content']['playlistid'];
+
+            //shared list
+            $shared = "All";
+            if (isset($_SESSION['content']['shared'])) $shared = $_SESSION['content']['shared'];
+            $shared_list = dropdownlist("SELECT 'all','All' UNION SELECT permissionID, permission FROM permission", "shared", $shared);
+
+            $filter_userid = "";
+            if (isset($_SESSION['content']['filter_userid'])) $filter_userid = $_SESSION['content']['filter_userid'];
+
+            $user_list = listcontent("all|All,".userlist("SELECT DISTINCT userid FROM layout"),"filter_userid", $filter_userid);
+
+            //retired list
+            $retired = "0";
+            if(isset($_SESSION['playlist']['filter_retired'])) $retired = $_SESSION['playlist']['retired'];
+            $retired_list = listcontent("all|All,1|Yes,0|No","filter_retired",$retired);
+
+            //type list query to get all playlists that are in the database which have NOT been assigned to the display
+            $sql = "SELECT 'all', 'all' ";
+            $sql .= "UNION ";
+            $sql .= "SELECT type, type ";
+            $sql .= "FROM media ";
+            $sql .= "GROUP BY type ";
+
+            $type_list =  dropdownlist($sql,"mediatype",$mediatype);
+
+            $filterForm = <<<END
+                <div class="FilterDiv" id="LibraryFilter">
+                    <form>
+                        <input type="hidden" name="p" value="content">
+                        <input type="hidden" name="q" value="LibraryGrid">
+                        <input type="hidden" name="pages" id="pages">
+
+                        <table id="content_filterform" class="filterform">
+                                <tr>
+                                        <td>Name</td>
+                                        <td><input type='text' name='2' id='2' /></td>
+                                        <td>Type</td>
+                                        <td>$type_list</td>
+                                        <td>Retired</td>
+                                        <td>$retired_list</td>
+                                </tr>
+                                <tr>
+                                        <td>Owner</td>
+                                        <td>$user_list</td>
+                                        <td></td>
+                                        <td></td>
+                                        <td>Shared</td>
+                                        <td>$shared_list</td>
+
+                                </tr>
+                        </table>
+                    </form>
+                </div>
+>>>>>>> MERGE-SOURCE
 END;
-		
-		$id = uniqid();
-		
-		$xiboGrid = <<<HTML
-		<div class="XiboGrid" id="$id">
-			<div class="XiboFilter">
-				$filterForm
-			</div>
-			<div class="XiboData">
-			
-			</div>
-		</div>
+
+            $id = uniqid();
+
+            $xiboGrid = <<<HTML
+            <div class="XiboGrid" id="$id">
+                <div class="XiboFilter">
+                        $filterForm
+                </div>
+                <div class="XiboData">
+
+                </div>
+            </div>
 HTML;
-		echo $xiboGrid;
+            echo $xiboGrid;
 	}
 	
 	/**

=== modified file 'server/lib/pages/layout.class.php'
=== modified file 'server/lib/pages/module.class.php'
=== modified file 'server/lib/pages/stats.class.php'
--- server/lib/pages/stats.class.php	2009-08-08 11:04:39 +0000
+++ server/lib/pages/stats.class.php	2009-12-31 11:13:18 +0000
@@ -132,7 +132,7 @@
 		while($row = $db->get_assoc_row($result))
 		{
 			// Read the columns
-			$type		= Kit::ValidateParam($row['type'], _STRING);
+			$type		= Kit::ValidateParam($row['Type'], _STRING);
 			$fromdt		= Kit::ValidateParam($row['start'], _STRING);
 			$todt		= Kit::ValidateParam($row['end'], _STRING);
 			$layout		= Kit::ValidateParam($row['Layout'], _STRING);

=== modified file 'server/modules/powerpoint.module.php'
=== modified file 'server/template/pages/dashboard.php'
--- server/template/pages/dashboard.php	2009-12-28 14:45:26 +0000
+++ server/template/pages/dashboard.php	2009-12-31 11:13:18 +0000
@@ -43,7 +43,16 @@
 						$title 	= __($title);
 						$img 	= Kit::ValidateParam($menuItem['Img'], _STRING);
 						
+<<<<<<< TREE
 						$href = 'index.php?p=' . $uri . '&' . $args;
+=======
+                                                
+                                                $href = 'index.php?p=' . $uri . '&' . $args;
+                                                
+                                                // Override the HREF for the Manual Button
+                                                if ($uri == 'manual')
+                                                    $href = $args;
+>>>>>>> MERGE-SOURCE
 						
 						// Override the HREF for the Manual Button
 						if ($uri == 'manual')

=== modified file 'server/template/pages/login_box.php'
--- server/template/pages/login_box.php	2009-12-28 14:35:16 +0000
+++ server/template/pages/login_box.php	2009-12-31 11:13:18 +0000
@@ -85,8 +85,20 @@
 				<?php displayMessage(); ?>
 				<br />
 				<p><a href="http://www.xibo.org.uk"><img src='img/login/complogo.png'></a></p>
+<<<<<<< TREE
 
 				<p>Version <?php echo VERSION; ?> | <a href="https://code.launchpad.net/~xibo-maintainers/xibo/encke">Source</a> | <a class="XiboFormButton" href="index.php?p=index&q=About" title="<?php echo __('About Xibo'); ?>"><?php echo __('About'); ?></a></p>
+=======
+				<p>Version <?php echo VERSION; ?> | <a href="https://code.launchpad.net/~xibo-maintainers/xibo/halley">Source</a></p>
+                                
+				<div id="forgotten_details" style="display:none">
+					<?php
+						/*global $user;
+						
+						$user->forget_details();*/
+					?>
+				</div>				
+>>>>>>> MERGE-SOURCE
 			</div>
 			
 			<div class="login_foot">

=== added file 'server/upgrade.php.OTHER'
--- server/upgrade.php.OTHER	1970-01-01 00:00:00 +0000
+++ server/upgrade.php.OTHER	2009-12-31 11:13:18 +0000
@@ -0,0 +1,598 @@
+<?php
+/*
+ * Xibo - Digitial Signage - http://www.xibo.org.uk
+ * Copyright (C) 2009 Alex Harrington
+ *
+ * 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/>.
+ */ 
+
+DEFINE('XIBO', true);
+
+include('lib/app/kit.class.php');
+include('config/db_config.php');
+include('config/config.class.php');
+require('settings.php');
+
+// Once we've calculated the upgrade in step 2 below, we need
+// to have included the appropriate upgrade php files
+// before we restore the session, so objects get recreated properly.
+//
+// Check to see if we've passed that point, and if so look at what was posted
+// to include those classes.
+
+if (Kit::GetParam("includes", _POST, _BOOL)) {
+	foreach ($_POST as $key => $post) {
+		// $key should be like 1-2, 1-3 etc
+		// Split $key on - character.
+
+		$parts = explode('-', $key);
+		if (count($parts) == 2) {
+			$step = Kit::ValidateParam($parts[0], _INT);
+			if (file_exists('install/database/' . $step . '.php')) {
+				include_once('install/database/' . $step . '.php');
+			}
+		}
+	}
+}
+
+session_start();
+
+define('_CHECKBOX', "checkbox");
+define('_INPUTBOX', "inputbox");
+define('_PASSWORDBOX', "password");
+
+// create a database class instance
+$db = new database();
+
+if (!$db->connect_db($dbhost, $dbuser, $dbpass)) reportError(0, "Unable to connect to the MySQL database using the settings stored in settings.php.<br /><br />MySQL Error:<br />" . $db->error());
+if (!$db->select_db($dbname)) reportError(0, "Unable to select the MySQL database using the settings stored in settings.php.<br /><br />MySQL Error:<br />" . $db->error());
+
+include('install/header_upgrade.inc');
+
+if (! $_SESSION['step']) {
+	$_SESSION['step'] = 0;
+}
+
+if (Kit::GetParam('skipstep',_POST,_INT) == 1) {
+	// Cheat the $_SESSION['step'] variable if required
+	// Used if there are environment warnings and we want to retest.
+	$_SESSION['step'] = 1;
+}
+
+if ($_SESSION['step'] == 0) {
+
+  $_SESSION['step'] = 1;
+
+  # First step of the process.
+  # Show a welcome screen and authenticate the user
+  ?>
+  Welcome to the Xibo Upgrade!<br /><br />
+  The upgrade program will take you through the process one step at a time.<br /><br />
+  Lets get started!<br /><br />
+  Please enter your xibo_admin password:<br /><br />
+  <form action="upgrade.php" method="POST">
+    <div class="install_table">
+	<input type="password" name="password" length="12" />
+    </div>
+    <div class="loginbutton"><button type="submit">Next ></button></div>
+  </form>
+  <?php
+}
+elseif ($_SESSION['step'] == 1) {
+  $_SESSION['step'] = 2;
+  
+  if (! $_SESSION['auth']) {
+
+	# Check password
+
+	$password = Kit::GetParam('password',_POST,_PASSWORD);
+	$password_hash = md5($password);
+
+	$SQL = sprintf("SELECT `UserID` FROM `user` WHERE UserPassword='%s' AND UserName='xibo_admin'",
+        	            $db->escape_string($password_hash));
+    	if (! $result = $db->query($SQL)) {
+      	reportError("0", "An error occured checking your password.<br /><br />MySQL Error:<br />" . mysql_error());    
+    	}
+ 
+	if ($db->num_rows($result) == 0) {	
+      		$_SESSION['auth'] = false;
+       		reportError("0", "Password incorrect. Please try again.");
+   	}
+   	else {
+		$_SESSION['auth'] = true;
+		$_SESSION['db'] = $db;
+    	}
+
+   }
+## Check server meets specs (as specs might have changed in this release)
+  ?>
+  <p>First we need to check if your server meets Xibo's requirements.</p>
+  <?php
+    $db = new Database();
+    $cObj = new Config($db);
+    echo $cObj->CheckEnvironment();
+    if ($cObj->EnvironmentFault()) {
+	$_SESSION['step'] = 1;
+    ?>
+      <form action="upgrade.php" method="POST">
+        <div class="loginbutton"><button type="submit">Retest</button></div>
+      </form>
+    <?php
+    }
+    else if ($cObj->EnvironmentWarning()) {
+    ?>
+      <form action="upgrade.php" method="POST">
+	<input type="hidden" name="skipstep" value="1">
+        <div class="loginbutton"><button type="submit">Retest</button></div>
+      </form>
+      <form action="upgrade.php" method="POST">
+        <div class="loginbutton"><button type="submit">Next ></button></div>
+      </form>
+    <?php
+    }
+    else {
+    ?>
+      <form action="upgrade.php" method="POST">
+        <div class="loginbutton"><button type="submit">Next ></button></div>
+      </form>
+    <?php
+    }    
+}
+elseif ($_SESSION['step'] == 2) {
+	checkAuth();
+# Calculate the upgrade
+      
+	$_SESSION['upgradeFrom'] = Config::Version($db, 'DBVersion');
+
+	if ($_SESSION['upgradeFrom'] < 1) {
+		$_SESSION['upgradeFrom'] = 1;
+	}
+
+	// Get a list of .sql and .php files for the upgrade
+	$sql_files = ls('*.sql','install/database',false,array('return_files'));
+	$php_files = ls('*.php','install/database',false,array('return_files'));
+    
+	// Sort by natural filename (eg 10 is bigger than 2)
+	natcasesort($sql_files);
+	natcasesort($php_files);
+
+	$_SESSION['phpFiles'] = $php_files;
+	$_SESSION['sqlFiles'] = $sql_files;
+
+	$max_sql = Kit::ValidateParam(substr(end($sql_files),0,-4),_INT);
+	$max_php = Kit::ValidateParam(substr(end($php_files),0,-4),_INT);
+	$_SESSION['upgradeTo'] = max($max_sql, $max_php);
+
+	if (! $_SESSION['upgradeTo']) {
+		reportError("2", "Unable to calculate the upgradeTo value. Check for non-numeric SQL and PHP files in the 'install/datbase' directory.", "Retry");
+	}
+
+	echo '<div class="info">';
+	echo '<p>Upgrading from database version ' . $_SESSION['upgradeFrom'] . ' to ' . $_SESSION['upgradeTo'];
+	echo '</p></div><hr width="25%"/>';
+	echo '<form action="upgrade.php" method="POST">';
+
+	// Loop for $i between upgradeFrom + 1 and upgradeTo.
+	// If a php file exists for that upgrade, make an instance of it and call Questions so we can
+	// Ask the user for input.
+	for ($i=$_SESSION['upgradeFrom'] + 1; $i <= $_SESSION['upgradeTo']; $i++) {
+		if (file_exists('install/database/' . $i . '.php')) {
+			include_once('install/database/' . $i . '.php');
+			$stepName = 'Step' . $i;
+			
+			// Check that a class called Step$i exists
+			if (class_exists($stepName)) {
+				$_SESSION['Step' . $i] = new $stepName($db);
+				// Call Questions on the object and send the resulting hash to createQuestions routine
+				createQuestions($i, $_SESSION['Step' . $i]->Questions());
+			}
+			else {
+				print "Warning: We included $i.php, but it did not include a class of appropriate name.";
+			}						
+		}
+	}
+
+    echo '<div class="info"><p>';
+	echo "Perform automatic database backup?";
+	echo '</p></div><div class="install-table">';
+    echo '<input type="checkbox" name="doBackup" checked />';
+	echo '</div><hr width="25%" />';
+
+	$_SESSION['step'] = 3;
+	echo '<input type="hidden" name="includes" value="true" />';
+	echo '<p><input type="submit" value="Next >" /></p>';
+	echo '</form>';
+
+?>
+  <?php
+}
+elseif ($_SESSION['step'] == 3) {
+	// $_SESSION['step'] = 0;
+	$fault = false;
+	$fault_string = "";
+
+	foreach ($_POST as $key => $post) {
+		// $key should be like 1-2, 1-3 etc
+		// Split $key on - character.
+
+		$parts = explode('-', $key);
+		if (count($parts) == 2) {
+			$step_num = 'Step' . $parts[0];
+			include_once('install/database/' . $parts[0] . '.php');
+			// $_SESSION['q'][$step_num] = unserialize($_SESSION['q'][$step_num]);
+;
+			$response = $_SESSION[$step_num]->ValidateQuestion($parts[1], $post);
+			if (! $response == true) {
+				// The upgrade routine for this step wasn't happy.
+				$fault = true;
+				$fault_string .= $response . "<br />\n";
+			}
+		}
+	}
+
+	if ($fault) {
+		// Report the error, and a back button
+		echo "FAIL: " . $fault_string;
+	}
+	else {
+        $doBackup = Kit::GetParam("doBackup", $_POST, _BOOL);
+
+		set_time_limit(0);
+		// Backup the database
+		echo '<div class="info"><p>';
+        if ($doBackup) {
+		    echo 'Backing up your database';
+		    backup_tables($db, '*');
+        }
+        else {
+            echo 'Skipping database backup';
+        }
+		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')) {
+				echo '<p>' . $i . '.sql ';
+				flush();
+				$delimiter = ';';
+			        $sql_file = @file_get_contents('install/database/' . $i . '.sql');
+			        $sql_file = remove_remarks($sql_file);
+			        $sql_file = split_sql_file($sql_file, $delimiter);
+    
+			        foreach ($sql_file as $sql) {
+			          print ".";
+				  $sqlStatementCount++;
+			          flush();
+			          if (! $db->query($sql)) {
+			 	    $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>';
+			}
+			if (file_exists('install/database/' . $i . '.php')) {
+				$stepName = 'Step' . $i;
+				echo '<p>' . $i . '.php ';
+				flush();
+				if (! $_SESSION[$stepName]->Boot()) {
+					$fault = true;
+				}
+				echo '</p>';
+			}
+		}
+		echo '</div>';
+		if (! $fault) {
+			if (! unlink('install.php')) {
+    				echo "Unable to delete install.php. Please remove this file manually.";
+  			}
+			if (! unlink('upgrade.php')) {
+				echo "Unable to delete upgrade.php. Please remove this file manually.";
+			}
+
+			echo '<b>Upgrade is complete!</b><br /><br />';
+			echo '<form method="POST" action="index.php">';
+			echo '<input type="submit" value="Login" />';
+			echo '</form>';
+		}
+		else {
+			echo '<b>There was an error during the upgrade. Please take a screenshot of this page and seek help!</b>';
+		}
+		session_destroy();
+	}
+}
+else {
+  reportError("0","A required parameter was missing. Please go through the installer sequentially!","Start Again");
+}
+ 
+include('install/footer.inc');
+
+# Functions
+function checkPHP() {
+  # Check PHP version > 5
+  return (version_compare("5.1.0",phpversion(), "<="));
+}
+
+function reportError($step, $message, $button_text="&lt; Back") {
+	$_SESSION['step'] = $step;
+?>
+    <div class="info">
+      <?php print $message; ?>
+    </div>
+    <form action="upgrade.php" method="POST">
+      <button type="submit"><?php print $button_text; ?></button>
+    </form>
+  <?php
+  include('install/footer.inc');
+  die();
+} 
+
+function checkAuth() {
+	if (! $_SESSION['auth']) {
+		reportError(1, "You must authenticate to run the upgrade.");
+	}
+}
+
+// Taken from http://forums.devshed.com/php-development-5/php-wont-load-sql-from-file-515902.html
+// By Crackster 
+/**
+ * remove_remarks will strip the sql comment lines out of an uploaded sql file
+ */
+function remove_remarks($sql){
+  $sql = preg_replace('/\n{2,}/', "\n", preg_replace('/^[-].*$/m', "\n", $sql));
+  $sql = preg_replace('/\n{2,}/', "\n", preg_replace('/^#.*$/m', "\n", $sql));
+  return $sql;
+}
+
+// Taken from http://forums.devshed.com/php-development-5/php-wont-load-sql-from-file-515902.html
+// By Crackster              
+/**
+ * split_sql_file will split an uploaded sql file into single sql statements.
+ * Note: expects trim() to have already been run on $sql.
+ */
+function split_sql_file($sql, $delimiter){
+  $sql = str_replace("\r" , '', $sql);
+  $data = preg_split('/' . preg_quote($delimiter, '/') . '$/m', $sql);
+  $data = array_map('trim', $data);
+  // The empty case
+  $end_data = end($data);
+  if (empty($end_data))
+  {
+    unset($data[key($data)]);
+  }
+  return $data;
+}
+ 
+/**
+ * This funtion will take a pattern and a folder as the argument and go thru it(recursivly if needed)and return the list of 
+ *               all files in that folder.
+ * Link             : http://www.bin-co.com/php/scripts/filesystem/ls/
+ * License	: BSD
+ * Arguments     :  $pattern - The pattern to look out for [OPTIONAL]
+ *                    $folder - The path of the directory of which's directory list you want [OPTIONAL]
+ *                    $recursivly - The funtion will traverse the folder tree recursivly if this is true. Defaults to false. [OPTIONAL]
+ *                    $options - An array of values 'return_files' or 'return_folders' or both
+ * Returns       : A flat list with the path of all the files(no folders) that matches the condition given.
+ */
+function ls($pattern="*", $folder="", $recursivly=false, $options=array('return_files','return_folders')) {
+    if($folder) {
+        $current_folder = realpath('.');
+        if(in_array('quiet', $options)) { // If quiet is on, we will suppress the 'no such folder' error
+            if(!file_exists($folder)) return array();
+        }
+        
+        if(!chdir($folder)) return array();
+    }
+    
+    
+    $get_files    = in_array('return_files', $options);
+    $get_folders= in_array('return_folders', $options);
+    $both = array();
+    $folders = array();
+    
+    // Get the all files and folders in the given directory.
+    if($get_files) $both = glob($pattern, GLOB_BRACE + GLOB_MARK);
+    if($recursivly or $get_folders) $folders = glob("*", GLOB_ONLYDIR + GLOB_MARK);
+    
+    //If a pattern is specified, make sure even the folders match that pattern.
+    $matching_folders = array();
+    if($pattern !== '*') $matching_folders = glob($pattern, GLOB_ONLYDIR + GLOB_MARK);
+    
+    //Get just the files by removing the folders from the list of all files.
+    $all = array_values(array_diff($both,$folders));
+        
+    if($recursivly or $get_folders) {
+        foreach ($folders as $this_folder) {
+            if($get_folders) {
+                //If a pattern is specified, make sure even the folders match that pattern.
+                if($pattern !== '*') {
+                    if(in_array($this_folder, $matching_folders)) array_push($all, $this_folder);
+                }
+                else array_push($all, $this_folder);
+            }
+            
+            if($recursivly) {
+                // Continue calling this function for all the folders
+                $deep_items = ls($pattern, $this_folder, $recursivly, $options); # :RECURSION:
+                foreach ($deep_items as $item) {
+                    array_push($all, $this_folder . $item);
+                }
+            }
+        }
+    }
+    
+    if($folder) chdir($current_folder);
+    return $all;
+}
+
+// Taken from http://davidwalsh.name/backup-mysql-database-php
+// No explicit license. Assumed public domain.
+// Ammended to use a database object by Alex Harrington.
+// If this is your code, and wish for us to remove it, please contact
+// [e-mail]
+/* backup the db OR just a table */
+function backup_tables($db,$tables = '*')
+{
+	//get all of the tables
+	if($tables == '*')
+	{
+		$tables = array();
+		$result = $db->query('SHOW TABLES');
+		while($row = $db->get_row($result))
+		{
+			$tables[] = $row[0];
+		}
+	}
+	else
+	{
+		$tables = is_array($tables) ? $tables : explode(',',$tables);
+	}
+
+	// Open file for writing at length 0.
+	$handle = fopen(Config::GetSetting($db,'LIBRARY_LOCATION') . 'db-backup-'.time().'-'.(md5(implode(',',$tables))).'.sql','w+');
+	
+	//cycle through
+	foreach($tables as $table)
+	{
+		echo '.';
+		flush();
+		$result = $db->query('SELECT * FROM `'.$table .'`');
+		$num_fields = $db->num_fields($result);
+		
+		$return = 'DROP TABLE IF EXISTS `'.$table.'`;';
+		fwrite($handle, $return);
+
+		$row2 = $db->get_row($db->query('SHOW CREATE TABLE `'.$table.'`'));
+		$return = "\n\n".$row2[1].";\n\n";
+		fwrite($handle,$return);
+		
+		for ($i = 0; $i < $num_fields; $i++) 
+		{
+			while($row = $db->get_row($result))
+			{
+				$return = 'INSERT INTO `'.$table.'` VALUES(';
+				fwrite($handle, $return);
+				for($j=0; $j<$num_fields; $j++) 
+				{
+					$return = '';
+					$row[$j] = addslashes($row[$j]);
+					$row[$j] = ereg_replace("\n","\\n",$row[$j]);
+					if (isset($row[$j])) { $return.= '"'.$row[$j].'"' ; } else { $return.= '""'; }
+					if ($j<($num_fields-1)) { $return.= ','; }
+					fwrite($handle, $return);
+				}
+				$return = ");\n";
+				fwrite($handle, $return);
+			}
+		}
+		$return ="\n\n\n";
+		fwrite ($handle, $return);
+	}
+	
+	fclose($handle);
+}
+
+
+function gen_secret() {
+  # Generates a random 12 character alphanumeric string to use as a salt
+  mt_srand((double)microtime()*1000000);
+  $key = "";
+  for ($i=0; $i < 12; $i++) {
+    $c = mt_rand(0,2);
+    if ($c == 0) {
+      $key .= chr(mt_rand(65,90));
+    }
+    elseif ($c == 1) {
+      $key .= chr(mt_rand(97,122));
+    }
+    else {
+      $key .= chr(mt_rand(48,57));
+    }
+  } 
+  
+  return $key;
+}
+
+function createQuestions($step, $questions) {
+	// Takes a multi-dimensional array eg:
+	// $q[0]['question'] = "May we collect anonymous usage statistics?";
+	// $q[0]['type'] = _CHECKBOX;
+	// $q[0]['default'] = true;
+	//
+	// And turns it in to an HTML form for the user to complete.
+	foreach ($questions as $qnum => $question) {
+		echo '<div class="info"><p>';
+		echo $question['question'];
+		echo '</p></div><div class="install-table">';
+
+		if (($question['type'] == _INPUTBOX) || ($question['type'] == _PASSWORD)) {
+			echo '<input type="';
+			if ($question['type'] == _INPUTBOX) {
+				echo 'text';
+			}
+			else {
+				echo 'password';
+			}
+			echo '" name="' . $step . '-' . $qnum .'" value="'. $question['default'] .'" length="12" />';
+		}
+		elseif ($question['type'] == _CHECKBOX) {
+			echo '<input type="checkbox" name="' . $step . '-' . $qnum . '" ';
+			if ($question['default']) {
+				echo 'checked ';
+			}
+			echo '/>';
+		}
+		echo '</div><hr width="25%" />';
+	}
+}
+
+//function __autoload($class_name) {
+//    if (substr($class_name,0,4) == "Step") {
+//	    $class_name = substr($class_name,4);
+//	    require_once install/database/$class_name . '.php';
+//    }
+//}
+
+class UpgradeStep 
+{
+	protected $db;
+	protected $q;
+	protected $a;
+
+	public function __construct($db)
+	{
+		$this->db 	=& $db;
+		$this->q	= array();
+		$this->a	= array();
+	}
+
+	public function Boot()
+	{
+
+	}
+
+	public function Questions()
+	{
+		return array();
+	}
+
+	public function ValidateQuestion($questionNumber,$response)
+	{
+		return true;
+	}
+}
+
+?>

=== modified file 'server/xmds.php'