Merge lp:~dangarner/xibo/396735 into lp:~xibo-maintainers/xibo/encke

[Dan Garner]

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

=== modified file 'client/dotNET/Region.cs'
--- client/dotNET/Region.cs	2009-03-08 11:40:17 +0000
+++ client/dotNET/Region.cs	2009-06-20 10:05:53 +0000
@@ -124,6 +124,10 @@
                     media = new Rss(options);
                     break;
 
+                case "embedded":
+                    media = new Text(options);
+                    break;
+
                 default:
                     //do nothing
                     SetNextMediaNode();
@@ -197,7 +201,10 @@
             options.text = "";
             options.documentTemplate = "";
             options.copyrightNotice = "";
+            options.scrollSpeed = 1;
+            options.updateInterval = 6;
             options.uri = "";
+            options.direction = "none";
 
             // Get a media node
             bool validNode = false;
@@ -266,6 +273,28 @@
                         {
                             options.copyrightNotice = option.InnerText;
                         }
+                        else if (option.Name == "scrollSpeed")
+                        {
+                            try
+                            {
+                                options.scrollSpeed = int.Parse(option.InnerText);
+                            }
+                            catch
+                            {
+                                System.Diagnostics.Trace.WriteLine("Non integer scrollSpeed in XLF", "Region - SetNextMediaNode");
+                            }
+                        }
+                        else if (option.Name == "updateInverval")
+                        {
+                            try
+                            {
+                                options.updateInterval = int.Parse(option.InnerText);
+                            }
+                            catch
+                            {
+                                System.Diagnostics.Trace.WriteLine("Non integer updateInterval in XLF", "Region - SetNextMediaNode");
+                            }
+                        }
                     }
 
                     // And some stuff on Raw nodes
@@ -281,6 +310,10 @@
                         {
                             options.documentTemplate = raw.InnerText;
                         }
+                        else if (raw.Name == "embedHtml")
+                        {
+                            options.text = raw.InnerText;
+                        }
                     }
 
                     // That should cover all the new options
@@ -398,6 +431,8 @@
         public string text;
         public string documentTemplate;
         public string copyrightNotice;
+        public int updateInterval;
+        public int scrollSpeed;
         
         //The identification for this region
         public string mediaid;

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

=== modified file 'client/dotNET/Schedule.cs'
--- client/dotNET/Schedule.cs	2009-03-08 11:40:17 +0000
+++ client/dotNET/Schedule.cs	2009-06-18 18:36:21 +0000
@@ -69,6 +69,7 @@
             xmds2.RequiredFilesCompleted += new XiboClient.xmds.RequiredFilesCompletedEventHandler(xmds2_RequiredFilesCompleted);
             xmds2.ScheduleCompleted += new XiboClient.xmds.ScheduleCompletedEventHandler(xmds2_ScheduleCompleted);
 
+            System.Diagnostics.Trace.WriteLine(String.Format("Collection Interval: {0}", Properties.Settings.Default.collectInterval), "Schedule - InitializeComponents");
             //
             // The Timer for the Service call
             //

=== modified file 'client/dotNET/Text.cs'
--- client/dotNET/Text.cs	2008-12-19 23:34:13 +0000
+++ client/dotNET/Text.cs	2009-06-20 10:39:40 +0000
@@ -55,11 +55,12 @@
 
             try
             {
-                webBrowser.DocumentText = String.Format("<html><head><script type='text/javascript'>{0}</script><style type='text/css'>p, h1, h2, h3, h4, h5 {{ margin:2px; font-size:{1}em; }}</style></head><body></body></html>", Properties.Resources.textRender, options.scaleFactor.ToString());
+                webBrowser.DocumentText = String.Format("<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8' /><script type='text/javascript'>{0}</script><style type='text/css'>p, h1, h2, h3, h4, h5 {{ margin:2px; font-size:{1}em; }}</style></head><body></body></html>", Properties.Resources.textRender, options.scaleFactor.ToString());
             }
             catch (Exception e)
             {
-                MessageBox.Show(e.Message);
+                System.Diagnostics.Trace.WriteLine(e.Message);
+                return;
             }
 
             webBrowser.DocumentCompleted += new WebBrowserDocumentCompletedEventHandler(webBrowser_DocumentCompleted);

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

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

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

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

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

=== modified file 'server/lib/pages/layout.class.php'
--- server/lib/pages/layout.class.php	2009-04-27 19:28:08 +0000
+++ server/lib/pages/layout.class.php	2009-06-20 12:00:21 +0000
@@ -1194,8 +1194,12 @@
 			$paddingTop		= $regionHeight / 2 - 16;
 			$paddingTop		= $paddingTop . "px";
 
+			$regionTransparency  = '<div class="regionTransparency" style="width:100%; height:100%;">';
+			$regionTransparency .= '</div>';
+
 			$doubleClickLink = "XiboFormRender($(this).attr('href'))";
-			$regionHtml .= "<div id='region_$regionid' regionid='$regionid' layoutid='$this->layoutid' href='index.php?p=layout&layoutid=$this->layoutid&regionid=$regionid&q=RegionOptions' ondblclick=\"$doubleClickLink\"' class='region' style=\"position:absolute; width:$regionWidth; height:$regionHeight; top: $regionTop; left: $regionLeft; background-color: #FFF; opacity: .75; filter: alpha(opacity=75); border: 1px dashed #000\">
+			$regionHtml .= "<div id='region_$regionid' regionid='$regionid' layoutid='$this->layoutid' href='index.php?p=layout&layoutid=$this->layoutid&regionid=$regionid&q=RegionOptions' ondblclick=\"$doubleClickLink\"' class='region' style=\"position:absolute; width:$regionWidth; height:$regionHeight; top: $regionTop; left: $regionLeft; border: 1px dashed #000\">
+								$regionTransparency							
 								<div class='preview' style='$previewStyle'>
 									<div class='previewContent'></div>
 									<div class='previewNav' style='display:none;'></div>
@@ -1435,7 +1439,7 @@
 		while ($modulesItem = $enabledModules->GetNextModule())
 		{
 			$mod 		= Kit::ValidateParam($modulesItem['Module'], _STRING);
-			$caption 	= 'Add ' . $mod;
+			$caption 	= '+ ' . $mod;
 			$mod		= strtolower($mod);
 			$title 		= Kit::ValidateParam($modulesItem['Description'], _STRING);
 			$img 		= Kit::ValidateParam($modulesItem['ImageUri'], _STRING);
@@ -1445,7 +1449,7 @@
 			$buttons .= <<<HTML
 			<div class="regionicons">
 				<a class="XiboFormButton" title="$title" href="$uri">
-				<img class="dash_button" src="$img" />
+				<img class="dash_button moduleButtonImage" src="$img" />
 				<span class="dash_text">$caption</span></a>
 			</div>
 HTML;
@@ -1456,7 +1460,7 @@
 			<div id="buttons">
 				<div class="regionicons">
 					<a class="XiboFormButton" href="index.php?p=content&q=LibraryAssignForm&layoutid=$this->layoutid&regionid=$regionid" title="Library">
-					<img class="region_button" src="img/forms/library.gif"/>
+					<img class="region_button moduleButtonImage" src="img/forms/library.gif"/>
 					<span class="region_text">Library</span></a>
 				</div>
 				$buttons
@@ -1635,7 +1639,7 @@
 		$type 				= (string) $node->getAttribute("type");
 		$mediaDurationText 	= (string) $node->getAttribute("duration");
 		
-		$return .= "<div class='info' style='display:none; position:absolute; top: 15px; left: 150px; background-color:#FFF; z-index: 50;'>
+		$return .= "<div class='info regionTransparency' style='display:none; position:absolute; top: 15px; left: 150px; background-color:#FFF; z-index: 50;'>
 						<h5>Media Information</h5>
 						<ul>
 							<li>Type: $type</li>

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

=== added file 'server/modules/embedded.module.php'
--- server/modules/embedded.module.php	1970-01-01 00:00:00 +0000
+++ server/modules/embedded.module.php	2009-06-20 10:05:53 +0000
@@ -0,0 +1,251 @@
+<?php
+/*
+ * Xibo - Digitial Signage - http://www.xibo.org.uk
+ * Copyright (C) 2009 Daniel Garner
+ *
+ * This file is part of Xibo.
+ *
+ * Xibo is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version. 
+ *
+ * Xibo is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
+ */ 
+class embedded extends Module
+{
+	
+	public function __construct(database $db, user $user, $mediaid = '', $layoutid = '', $regionid = '')
+	{
+		// Must set the type of the class
+		$this->type = 'embedded';
+	
+		// Must call the parent class	
+		parent::__construct($db, $user, $mediaid, $layoutid, $regionid);
+	}
+	
+	/**
+	 * Return the Add Form as HTML
+	 * @return 
+	 */
+	public function AddForm()
+	{
+		$db 		=& $this->db;
+		$user		=& $this->user;
+				
+		// Would like to get the regions width / height 
+		$layoutid	= $this->layoutid;
+		$regionid	= $this->regionid;
+		$rWidth		= Kit::GetParam('rWidth', _REQUEST, _STRING);
+		$rHeight	= Kit::GetParam('rHeight', _REQUEST, _STRING);
+		
+		$form = <<<FORM
+		<form class="XiboForm" method="post" action="index.php?p=module&mod=$this->type&q=Exec&method=AddMedia">
+			<input type="hidden" name="layoutid" value="$layoutid">
+			<input type="hidden" id="iRegionId" name="regionid" value="$regionid">
+			<table>
+				<tr>
+		    		<td><label for="duration" title="The duration in seconds this webpage should be displayed">Duration<span class="required">*</span></label></td>
+		    		<td><input id="duration" name="duration" type="text"></td>		
+				</tr>
+				<tr>
+		    		<td colspan="2">
+						<label for="embedHtml" title="The HTML you want to Embed in this Layout.">Embed HTML<span class="required">*</span></label><br />
+		    			<textarea id="embedHtml" name="embedHtml"></textarea>
+					</td>
+				</tr>
+				<tr>
+					<td></td>
+					<td>
+						<input id="btnSave" type="submit" value="Save"  />
+						<input class="XiboFormButton" id="btnCancel" type="button" title="Return to the Region Options" href="index.php?p=layout&layoutid=$layoutid&regionid=$regionid&q=RegionOptions" value="Cancel" />
+					</td>
+				</tr>
+			</table>
+		</form>
+FORM;
+
+		$this->response->html 			= $form;
+		$this->response->dialogTitle 	= 'Add Embedded HTML';
+		$this->response->dialogSize 	= true;
+		$this->response->dialogWidth 	= '650px';
+		$this->response->dialogHeight 	= '450px';
+
+		return $this->response;
+	}
+	
+	/**
+	 * Return the Edit Form as HTML
+	 * @return 
+	 */
+	public function EditForm()
+	{
+		$db 		=& $this->db;
+		
+		$layoutid	= $this->layoutid;
+		$regionid	= $this->regionid;
+		$mediaid  	= $this->mediaid;
+		
+		// Get the embedded HTML out of RAW
+		$rawXml = new DOMDocument();
+		$rawXml->loadXML($this->GetRaw());
+		
+		Debug::LogEntry($db, 'audit', 'Raw XML returned: ' . $this->GetRaw());
+		
+		// Get the HTML Node out of this
+		$textNodes 	= $rawXml->getElementsByTagName('embedHtml');
+		$textNode 	= $textNodes->item(0);
+		$embedHtml	= $textNode->nodeValue;
+		
+		//Output the form
+		$form = <<<FORM
+		<form class="XiboForm" method="post" action="index.php?p=module&mod=$this->type&q=Exec&method=EditMedia">
+			<input type="hidden" name="layoutid" value="$layoutid">
+			<input type="hidden" name="mediaid" value="$mediaid">
+			<input type="hidden" id="iRegionId" name="regionid" value="$regionid">
+			<table>
+				<tr>
+		    		<td><label for="duration" title="The duration in seconds this webpage should be displayed (may be overridden on each layout)">Duration<span class="required">*</span></label></td>
+		    		<td><input id="duration" name="duration" value="$this->duration" type="text"></td>		
+				</tr>
+				<tr>
+		    		<td colspan="2">
+						<label for="embedHtml" title="The HTML you want to Embed in this Layout.">Embed HTML<span class="required">*</span></label><br />
+		    			<textarea id="embedHtml" name="embedHtml">$embedHtml</textarea>
+					</td>
+				</tr>
+				<tr>
+					<td></td>
+					<td>
+						<input id="btnSave" type="submit" value="Save"  />
+						<input class="XiboFormButton" id="btnCancel" type="button" title="Return to the Region Options" href="index.php?p=layout&layoutid=$layoutid&regionid=$regionid&q=RegionOptions" value="Cancel" />
+					</td>
+				</tr>
+			</table>
+		</form>
+FORM;
+		
+		$this->response->html 			= $form;
+		$this->response->dialogTitle 	= 'Edit Embedded HTML';
+		$this->response->dialogSize 	= true;
+		$this->response->dialogWidth 	= '650px';
+		$this->response->dialogHeight 	= '450px';
+
+		return $this->response;		
+	}
+	
+	/**
+	 * Add Media to the Database
+	 * @return 
+	 */
+	public function AddMedia()
+	{
+		$db 		=& $this->db;
+		
+		$layoutid 	= $this->layoutid;
+		$regionid 	= $this->regionid;
+		$mediaid	= $this->mediaid;
+		
+		//Other properties
+		$embedHtml	  = Kit::GetParam('embedHtml', _POST, _HTMLSTRING);
+		$duration	  = Kit::GetParam('duration', _POST, _INT, 0);
+		
+		$url 		  = "index.php?p=layout&layoutid=$layoutid&regionid=$regionid&q=RegionOptions";
+						
+		//Validate the URL?
+		if ($embedHtml == "")
+		{
+			$this->response->SetError('Please enter some HTML to embed.');
+			$this->response->keepOpen = true;
+			return $this->response;
+		}
+		
+		if ($duration == 0)
+		{
+			$this->response->SetError('You must enter a duration.');
+			$this->response->keepOpen = true;
+			return $this->response;
+		}
+		
+		// Required Attributes
+		$this->mediaid	= md5(uniqid());
+		$this->duration = $duration;
+		
+		// Any Options
+		$this->SetRaw('<embedHtml><![CDATA[' . $embedHtml . ']]></embedHtml>');
+
+		// Should have built the media object entirely by this time
+		// This saves the Media Object to the Region
+		$this->UpdateRegion();
+		
+		//Set this as the session information
+		setSession('content', 'type', $this->type);
+		
+		// We want to load a new form
+		$this->response->loadForm	= true;
+		$this->response->loadFormUri= $url;
+		
+		return $this->response;
+	}
+	
+	/**
+	 * Edit Media in the Database
+	 * @return 
+	 */
+	public function EditMedia()
+	{
+		$db 		=& $this->db;
+		
+		$layoutid 	= $this->layoutid;
+		$regionid 	= $this->regionid;
+		$mediaid	= $this->mediaid;
+		
+		//Other properties
+		$embedHtml	  = Kit::GetParam('embedHtml', _POST, _HTMLSTRING);
+		$duration	  = Kit::GetParam('duration', _POST, _INT, 0);
+		
+		$url 		  = "index.php?p=layout&layoutid=$layoutid&regionid=$regionid&q=RegionOptions";
+						
+		//Validate the URL?
+		if ($embedHtml == "")
+		{
+			$this->response->SetError('Please enter some HTML to embed.');
+			$this->response->keepOpen = true;
+			return $this->response;
+		}
+		
+		if ($duration == 0)
+		{
+			$this->response->SetError('You must enter a duration.');
+			$this->response->keepOpen = true;
+			return $this->response;
+		}
+		
+		// Required Attributes
+		$this->duration = $duration;
+		
+		// Any Options
+		$this->SetRaw('<embedHtml><![CDATA[' . $embedHtml . ']]></embedHtml>');
+
+		// Should have built the media object entirely by this time
+		// This saves the Media Object to the Region
+		$this->UpdateRegion();
+		
+		//Set this as the session information
+		setSession('content', 'type', $this->type);
+		
+		// We want to load a new form
+		$this->response->loadForm	= true;
+		$this->response->loadFormUri= $url;
+		
+		return $this->response;	
+	}
+}
+
+?>
\ No newline at end of file

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

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

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

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

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

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

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

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

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

=== modified file 'server/xmds.php'
--- server/xmds.php	2009-03-30 18:34:54 +0000
+++ server/xmds.php	2009-06-03 11:55:05 +0000
@@ -374,7 +374,12 @@
 	if (Config::GetSetting($db,'PHONE_HOME') == 'On') {
 		// Find out when we last PHONED_HOME :D
 		// If it's been > 28 days since last PHONE_HOME then
-		if (Config::GetSetting($db,'PHONE_HOME_DATE') < (time() - (60 * 60 * 24 * 28))) {
+		if (Config::GetSetting($db,'PHONE_HOME_DATE') < (time() - (60 * 60 * 24 * 28))) {
+
+			if ($displayInfo['isAuditing'] == 1) 
+			{
+				Debug::LogEntry($db, "audit", "PHONE_HOME [IN]", "xmds", "RequiredFiles");	
+			}
 
 			// Retrieve number of displays
 			$SQL = "SELECT COUNT(*)
@@ -397,9 +402,7 @@
 			if ($displayInfo['isAuditing'] == 1) 
 			{
 				Debug::LogEntry($db, "audit", "PHONE_HOME_URL " . $PHONE_HOME_URL , "xmds", "RequiredFiles");	
-			}
-		
-			@file_get_contents($PHONE_HOME_URL);
+			}
 			
 			// Set PHONE_HOME_TIME to NOW.
 			$SQL = "UPDATE `setting`
@@ -410,6 +413,13 @@
 			{
 				trigger_error($db->error());
 			}
+			
+			@file_get_contents($PHONE_HOME_URL);
+
+			if ($displayInfo['isAuditing'] == 1) 
+			{
+				Debug::LogEntry($db, "audit", "PHONE_HOME [OUT]", "xmds", "RequiredFiles");	
+			}
 		//endif
 		}
 	}