Merge lp:~dangarner/xibo/store-media-md5 into lp:~xibo-maintainers/xibo/encke

[Dan Garner]

=== added file 'server/install/database/8.sql'
--- server/install/database/8.sql	1970-01-01 00:00:00 +0000
+++ server/install/database/8.sql	2009-09-29 22:15:22 +0000
@@ -0,0 +1,7 @@
+/* Add the MD5 and FileSize as columns to the media table */
+ALTER TABLE `media` ADD `MD5` VARCHAR( 32 ) NULL AFTER `storedAs` ,
+ADD `FileSize` BIGINT NULL AFTER `MD5` ;
+
+UPDATE `version` SET `app_ver` = '1.0.4';
+UPDATE `setting` SET `value` = 0 WHERE `setting` = 'PHONE_HOME_DATE';
+UPDATE `version` SET `DBVersion` = '8';
 
=== modified file 'server/modules/flash.module.php'
--- server/modules/flash.module.php	2009-06-28 10:47:06 +0000
+++ server/modules/flash.module.php	2009-09-29 22:15:22 +0000
@@ -8,7 +8,7 @@
  * 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. 
+ * any later version.
  *
  * Xibo is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,31 +17,31 @@
  *
  * 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 flash extends Module
 {
 	// Custom Media information
 	private $uri;
 	private $maxFileSize;
 	private $maxFileSizeBytes;
-	
+
 	public function __construct(database $db, user $user, $mediaid = '', $layoutid = '', $regionid = '')
 	{
 		// Must set the type of the class
 		$this->type 			= 'flash';
-		
+
 		// Get the max upload size from PHP
 		$this->maxFileSize 		= ini_get('upload_max_filesize');
 		$this->maxFileSizeBytes = convertBytes($this->maxFileSize);
-	
-		// Must call the parent class	
+
+		// Must call the parent class
 		parent::__construct($db, $user, $mediaid, $layoutid, $regionid);
 	}
-	
+
 	/**
 	 * Sets the Layout and Region Information
 	 *  it will then fill in any blanks it has about this media if it can
-	 * @return 
+	 * @return
 	 * @param $layoutid Object
 	 * @param $regionid Object
 	 * @param $mediaid Object
@@ -53,75 +53,75 @@
 		$this->regionid 		= $regionid;
 		$mediaid			 	= $this->mediaid;
 		$this->existingMedia 	= false;
-		
+
 		if ($this->regionSpecific == 1) return;
-		
+
 		// Load what we know about this media into the object
 		$SQL = "SELECT name, type, duration, originalFilename, userID, permissionID, retired, storedAs, isEdited, editedMediaID FROM media WHERE mediaID = $mediaid ";
-		
+
 		if (!$result = $db->query($SQL))
 		{
 			trigger_error($db->error()); //log the error
 			return false;
 		}
-		
+
 		if ($db->num_rows($result) != 1)
 		{
 			trigger_error("More than one row for mediaId [$mediaid] How can this be?");
 			return false;
 		}
-		
+
 		$row 				= $db->get_row($result);
 		$duration			= $row[2];
 		$storedAs			= $row[7];
-		
+
 		// Required Attributes
 		$this->duration = $duration;
-		
+
 		// Any Options
 		$this->SetOption('uri', $storedAs);
-		
+
 		return true;
 	}
-	
+
 	/**
 	 * Return the Add Form as HTML
-	 * @return 
+	 * @return
 	 */
 	public function AddForm()
 	{
 		global $session;
 		$db 			=& $this->db;
 		$user			=& $this->user;
-				
-		// Would like to get the regions width / height 
+
+		// Would like to get the regions width / height
 		$layoutid		= $this->layoutid;
 		$regionid		= $this->regionid;
-		
+
 		// Set the Session / Security information
 		$sessionId 		= session_id();
 		$securityToken 	= CreateFormToken();
-		
+
 		$session->setSecurityToken($securityToken);
-		
+
 		//Get the default value for the shared list
 		$default = Config::GetSetting($db,"defaultMedia");
 
 		$permissionid = 0;
 
-		if($default=="private") 
+		if($default=="private")
 		{
 			$permissionid = 1;
 		}
-		
+
 		//shared list
 		$shared_list = dropdownlist("SELECT permissionID, permission FROM permission", "permissionid", $permissionid);
-		
+
 		//Save button is different depending on if we are on a region or not
 		if ($regionid != "")
 		{
 			setSession('content','mediatype','flash');
-			
+
 			$save_button = <<<END
 			<input id="btnSave" type="submit" value="Save" disabled />
 			<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" />
@@ -135,7 +135,7 @@
 			<input class="XiboFormButton" id="btnCancel" type="button" title="Close" href="index.php?p=content&q=displayForms&sp=add" value="Cancel" />
 END;
 		}
-		
+
 		$form = <<<FORM
 		<div style="display:none"><iframe name="fileupload" width="1px" height="1px"></iframe></div>
 		<div>
@@ -144,7 +144,7 @@
 				<input type="hidden" id="SecurityToken" value="$securityToken" />
 				<input type="hidden" name="MAX_FILE_SIZE" value="$this->maxFileSizeBytes" />
 				<table>
-					<tr> 
+					<tr>
 						<td><label for="file">Flash File<span class="required">*</span></label></td>
 						<td colspan="3">
 							<input type="file" name="media_file" onchange="fileFormSubmit();this.form.submit();" />
@@ -172,7 +172,7 @@
 					<td><label for="permissionid">Sharing<span class="required">*</span></label></td>
 					<td>
 					$shared_list
-					</td>			
+					</td>
 				</tr>
 				<tr>
 					<td></td>
@@ -194,49 +194,49 @@
 
 		return $this->response;
 	}
-	
+
 	/**
 	 * Return the Edit Form as HTML
-	 * @return 
+	 * @return
 	 */
 	public function EditForm()
 	{
 		global $session;
 		$db 			=& $this->db;
 		$user			=& $this->user;
-				
-		// Would like to get the regions width / height 
+
+		// Would like to get the regions width / height
 		$layoutid		= $this->layoutid;
 		$regionid		= $this->regionid;
 		$mediaid		= $this->mediaid;
 		$lkid			= $this->lkid;
 		$userid			= Kit::GetParam('userid', _SESSION, _INT);
-		
+
 		// Set the Session / Security information
 		$sessionId 		= session_id();
 		$securityToken 	= CreateFormToken();
-		
+
 		$session->setSecurityToken($securityToken);
-		
+
 		// Load what we know about this media into the object
 		$SQL = "SELECT name, originalFilename, userID, permissionID, retired, storedAs, isEdited, editedMediaID FROM media WHERE mediaID = $mediaid ";
-		
+
 		if (!$result = $db->query($SQL))
 		{
 			trigger_error($db->error()); //log the error
-			
+
 			$this->message = "Error querying for the Media information with media ID [$mediaid] ";
 			return false;
 		}
-		
+
 		if ($db->num_rows($result) != 1)
 		{
 			trigger_error("More than one row for mediaId [$mediaid] How can this be?");
-			
+
 			$this->message = "Error querying for the Media information with media ID [$mediaid] ";
 			return false;
 		}
-		
+
 		$row 				= $db->get_row($result);
 		$name 				= $row[0];
 		$originalFilename 	= $row[1];
@@ -246,23 +246,23 @@
 		$storedAs			= $row[5];
 		$isEdited			= $row[6];
 		$editedMediaID		= $row[7];
-		
+
 		// derive the ext
 		$ext				= strtolower(substr(strrchr($originalFilename, "."), 1));
-		
+
 		//Calc the permissions on it aswell
 		list($see_permissions , $edit_permissions) = $user->eval_permission($userid, $permissionid);
-		
+
 		//shared list
 		$shared_list = dropdownlist("SELECT permissionID, permission FROM permission", "permissionid", $permissionid);
-		
+
 		//Save button is different depending on if we are on a region or not
 		if ($regionid != "")
 		{
 			setSession('content','mediatype','flash');
-			
+
 			$extraNotes = '<em>Note: Uploading a new media item here will replace it on this layout only.</em>';
-			
+
 			$save_button = <<<END
 			<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" />
@@ -272,13 +272,13 @@
 		else
 		{
 			$extraNotes = '<em>Note: As you editing from the library uploading a new media item will not replace the old one from any layouts. To do this nagivate to the layout and edit the media from there.</em>';
-			
+
 			$save_button = <<<END
 			<input id="btnSave" type="submit" value="Save" />
 			<input id="btnCancel" type="button" title="Close" onclick="$('#div_dialog').dialog('close')" value="Cancel" />
 END;
 		}
-		
+
 		$form = <<<FORM
 		<div style="display:none"><iframe name="fileupload" width="1px" height="1px"></iframe></div>
 		<div>
@@ -287,7 +287,7 @@
 				<input type="hidden" id="SecurityToken" value="$securityToken" />
 				<input type="hidden" name="MAX_FILE_SIZE" value="$this->maxFileSizeBytes" />
 				<table>
-					<tr> 
+					<tr>
 						<td><label for="file">New Flash File<span class="required">*</span></label></td>
 						<td colspan="3">
 							<input type="file" name="media_file" onchange="fileFormSubmit();this.form.submit();" />
@@ -319,7 +319,7 @@
 					<td><label for="permissionid">Sharing<span class="required">*</span></label></td>
 					<td>
 					$shared_list
-					</td>			
+					</td>
 				</tr>
 				<tr>
 					<td></td>
@@ -343,50 +343,50 @@
 		$this->response->dialogWidth 	= '450px';
 		$this->response->dialogHeight 	= '280px';
 
-		return $this->response;		
+		return $this->response;
 	}
-	
+
 	/**
 	 * Return the Delete Form as HTML
-	 * @return 
+	 * @return
 	 */
 	public function DeleteForm()
 	{
 		$db 			=& $this->db;
 		$user			=& $this->user;
-				
-		// Would like to get the regions width / height 
+
+		// Would like to get the regions width / height
 		$layoutid		= $this->layoutid;
 		$regionid		= $this->regionid;
 		$mediaid		= $this->mediaid;
 		$lkid			= $this->lkid;
 		$userid			= Kit::GetParam('userid', _SESSION, _INT);
-		
+
 		$options = "";
 		//Always have the abilty to unassign from the region
 		$options .= "unassign|Unassign from this region only";
-		
+
 		// Load what we know about this media into the object
 		$SQL = "SELECT name, type, duration, originalFilename, userID, permissionID, retired, storedAs, isEdited, editedMediaID FROM media WHERE mediaID = $mediaid ";
-		
+
 		if (!$result = $db->query($SQL))
 		{
 			trigger_error($db->error()); //log the error
-			
+
 			$this->response->SetError('Error querying for the Media information with media ID [$mediaid]');
 			$this->response->keepOpen = true;
 			return $this->response;
 		}
-		
+
 		if ($db->num_rows($result) != 1)
 		{
 			trigger_error("More than one row for mediaId [$mediaid] How can this be?");
-			
+
 			$this->response->SetError('Error querying for the Media information with media ID [$mediaid]');
 			$this->response->keepOpen = true;
 			return $this->response;
 		}
-		
+
 		$row 				= $db->get_row($result);
 		$name 				= $row[0];
 		$duration			= $row[2];
@@ -397,18 +397,18 @@
 		$storedAs			= $row[7];
 		$isEdited			= $row[8];
 		$editedMediaID		= $row[9];
-		
+
 		// derive the ext
 		$ext				= strtolower(substr(strrchr($originalFilename, "."), 1));
-		
+
 		//Calc the permissions on it aswell
 		list($see_permissions , $edit_permissions) = $user->eval_permission($userid, $permissionid);
-		
+
 		//Is this user allowed to edit this media?
 		if ($edit_permissions)
 		{
 			$options .= ",retire|Unassign from this region and retire";
-		
+
 			//Is this media retired?
 			if ($editedMediaID != "")
 			{
@@ -418,7 +418,7 @@
 			{
 				$revised = false;
 			}
-		
+
 			//Is this media being used anywhere else?
 			if ($layoutid == "")
 			{
@@ -429,8 +429,8 @@
 			{
 				$SQL = "SELECT layoutID FROM lklayoutmedia WHERE mediaID = $mediaid AND layoutid <> $layoutid AND regionID <> '$regionid' ";
 			}
-			
-			if (!$results = $db->query($SQL)) 
+
+			if (!$results = $db->query($SQL))
 			{
 				trigger_error($db->error());
 
@@ -457,9 +457,9 @@
 				return $this->response;
 			}
 		}
-		
+
 		$options = ltrim($options, ",");
-		
+
 		$deleteOptions = listcontent($options,"options");
 
 		//we can delete
@@ -474,19 +474,19 @@
 			<input id="btnCancel" type="button" title="No / Cancel" href="index.php?p=layout&layoutid=$layoutid&regionid=$regionid&q=RegionOptions" onclick="$('#div_dialog').dialog('close');return false; " value="No" />
 		</form>
 END;
-		
+
 		$this->response->html 			= $form;
 		$this->response->dialogTitle 	= 'Delete Flash';
 		$this->response->dialogSize 	= true;
 		$this->response->dialogWidth 	= '450px';
 		$this->response->dialogHeight 	= '280px';
 
-		return $this->response;	
+		return $this->response;
 	}
-	
+
 	/**
 	 * Add Media to the Database
-	 * @return 
+	 * @return
 	 */
 	public function AddMedia()
 	{
@@ -495,29 +495,29 @@
 		$regionid 	= $this->regionid;
 		$mediaid	= $this->mediaid;
 		$userid		= Kit::GetParam('userid', _SESSION, _INT);
-		
+
 		// File data
 		$tmpName	= Kit::GetParam('hidFileID', _POST, _STRING);
-		
+
 		if ($tmpName == '')
 		{
 			$this->response->SetError('Cannot save Flash details. <br/> You must have picked a file.');
 			$this->response->keepOpen = true;
 			return $this->response;
 		}
-		
+
 		// File name and extension (orignial name)
 		$fileName		= Kit::GetParam('txtFileName', _POST, _STRING);
 		$fileName 		= basename($fileName);
 		$ext 			= strtolower(substr(strrchr($fileName, "."), 1));
-			
+
 		// Other properties
 		$name	  		= Kit::GetParam('name', _POST, _STRING);
 		$duration	  	= Kit::GetParam('duration', _POST, _INT, 0);
 		$permissionid 	= Kit::GetParam('permissionid', _POST, _INT, 1);
-		
+
 		if ($name == '') $name = Kit::ValidateParam($fileName, _FILENAME);
-		
+
 		// Validation
 		if ($ext != "swf")
 		{
@@ -525,32 +525,32 @@
 			$this->response->keepOpen = true;
 			return $this->response;
 		}
-		
+
 		// Make sure the name isnt too long
-		if (strlen($name) > 100) 
+		if (strlen($name) > 100)
 		{
 			$this->response->SetError('The name cannot be longer than 100 characters');
 			$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;
 		}
-		
+
 		// Ensure the name is not already in the database
 		$SQL = sprintf("SELECT name FROM media WHERE name = '%s' AND userid = %d", $db->escape_string($name), $userid);
 
-		if(!$result = $db->query($SQL)) 
+		if(!$result = $db->query($SQL))
 		{
 			trigger_error($db->error());
 			$this->response->SetError('Error checking whether the media name is ok. Try choosing a different name.');
 			$this->response->keepOpen = true;
 			return $this->response;
-		} 
+		}
 
 		if ($db->num_rows($result) != 0)
 		{
@@ -558,11 +558,11 @@
 			$this->response->keepOpen = true;
 			return $this->response;
 		}
-		
+
 		// All OK to insert this record
 		$SQL  = "INSERT INTO media (name, type, duration, originalFilename, permissionID, userID, retired ) ";
 		$SQL .= "VALUES ('%s', 'flash', '%s', '%s', %d, %d, 0) ";
-		
+
 		$SQL = sprintf($SQL, $db->escape_string($name), $db->escape_string($duration), $db->escape_string($fileName), $permissionid, $userid);
 
 		if (!$mediaid = $db->insert_query($SQL))
@@ -572,19 +572,19 @@
 			$this->response->keepOpen = true;
 			return $this->response;
 		}
-				
+
 		// File upload directory.. get this from the settings object
 		$databaseDir = Config::GetSetting($db, "LIBRARY_LOCATION");
-		
+
 		// What are we going to store this media as...
 		$storedAs = $mediaid.".".$ext;
-		 
+
 		// Now we need to move the file
 		if (!$result = rename($databaseDir."temp/".$tmpName, $databaseDir.$storedAs))
 		{
 			// If we couldnt move it - we need to delete the media record we just added
 			$SQL = sprintf("DELETE FROM media WHERE mediaID = %d ", $mediaid);
-			
+
 			if (!$db->query($SQL))
 			{
 				trigger_error($db->error());
@@ -593,23 +593,27 @@
 				return $this->response;
 			}
 		}
-		
+
+		// Calculate the MD5 and the file size
+		$md5 		= md5_file($databaseDir.$storedAs);
+		$fileSize 	= filesize($databaseDir.$storedAs);
+
 		// Update the media record to include this information
-		$SQL = sprintf("UPDATE media SET storedAs = '%s' WHERE mediaid = %d", $storedAs, $mediaid);
-		
+		$SQL = sprintf("UPDATE media SET storedAs = '%s', `MD5` = '%s', FileSize = %d WHERE mediaid = %d", $storedAs, $md5, $fileSize, $mediaid);
+
 		if (!$db->query($SQL))
 		{
 			trigger_error($db->error());
 			return true;
 		}
-		
+
 		// Required Attributes
 		$this->mediaid	= $mediaid;
 		$this->duration = $duration;
-		
+
 		// Any Options
 		$this->SetOption('uri', $storedAs);
-		
+
 		// Should have built the media object entirely by this time
 		if ($regionid != '')
 		{
@@ -619,18 +623,18 @@
 		}
 		else
 		{
-			$this->response->loadFormUri = "index.php?p=content&q=displayForms&sp=add";			
+			$this->response->loadFormUri = "index.php?p=content&q=displayForms&sp=add";
 		}
-				
+
 		// We want to load a new form
 		$this->response->loadForm	= true;
-		
+
 		return $this->response;
 	}
-	
+
 	/**
 	 * Edit Media in the Database
-	 * @return 
+	 * @return
 	 */
 	public function EditMedia()
 	{
@@ -639,13 +643,13 @@
 		$regionid 	= $this->regionid;
 		$mediaid	= $this->mediaid;
 		$userid		= Kit::GetParam('userid', _SESSION, _INT);
-		
+
 		// Stored As from the XML
 		$storedAs	= $this->GetOption('uri');
-		
+
 		// File data
 		$tmpName	= Kit::GetParam('hidFileID', _POST, _STRING);
-		
+
 		if ($tmpName == '')
 		{
 			$fileRevision = false;
@@ -653,12 +657,12 @@
 		else
 		{
 			$fileRevision = true;
-			
+
 			// File name and extension (orignial name)
 			$fileName		= Kit::GetParam('txtFileName', _POST, _STRING);
 			$fileName 		= basename($fileName);
 			$ext 			= strtolower(substr(strrchr($fileName, "."), 1));
-			
+
 			if ($ext != "swf")
 			{
 				$this->response->SetError('Only SWF files are accepted - Are you sure this is an flash?');
@@ -666,17 +670,17 @@
 				return $this->response;
 			}
 		}
-			
+
 		// Other properties
 		$name	  		= Kit::GetParam('name', _POST, _STRING);
 		$duration	  	= Kit::GetParam('duration', _POST, _INT, 0);
 		$permissionid 	= Kit::GetParam('permissionid', _POST, _INT, 1);
-		
+
 		if ($name == '')
 		{
 			if ($fileRevision)
 			{
-				$name = Kit::ValidateParam($fileName, _FILENAME);			
+				$name = Kit::ValidateParam($fileName, _FILENAME);
 			}
 			else
 			{
@@ -684,33 +688,33 @@
 				$this->response->keepOpen = true;
 				return $this->response;
 			}
-		} 
-		
+		}
+
 		// Make sure the name isnt too long
-		if (strlen($name) > 100) 
+		if (strlen($name) > 100)
 		{
 			$this->response->SetError('The name cannot be longer than 100 characters');
 			$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;
 		}
-		
+
 		// Ensure the name is not already in the database
 		$SQL = sprintf("SELECT name FROM media WHERE name = '%s' AND userid = %d AND mediaid <> %d ", $db->escape_string($name), $userid, $mediaid);
 
-		if(!$result = $db->query($SQL)) 
+		if(!$result = $db->query($SQL))
 		{
 			trigger_error($db->error());
 			$this->response->SetError('Error checking whether the media name is ok. Try choosing a different name.');
 			$this->response->keepOpen = true;
 			return $this->response;
-		} 
+		}
 
 		if ($db->num_rows($result) != 0)
 		{
@@ -718,34 +722,34 @@
 			$this->response->keepOpen = true;
 			return $this->response;
 		}
-		
+
 		//Are we revising this media - or just plain editing
 		if ($fileRevision)
 		{
 			// All OK to insert this record
 			$SQL  = "INSERT INTO media (name, type, duration, originalFilename, permissionID, userID, retired ) ";
 			$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))
 			{
 				//If we couldnt move it - we need to delete the media record we just added
 				$SQL = "DELETE FROM media WHERE mediaID = $new_mediaid ";
-				
+
 				if (!$db->insert_query($SQL))
 				{
 					$this->response->SetError('Error rolling back transcation.');
@@ -753,9 +757,14 @@
 					return $this->response;
 				}
 			}
-			
-			//Update the media record to include this information
-			$SQL = "UPDATE media SET storedAs = '$storedAs' WHERE mediaid = $new_mediaid";
+
+			// Calculate the MD5 and the file size
+			$md5 		= md5_file($databaseDir.$storedAs);
+			$fileSize 	= filesize($databaseDir.$storedAs);
+
+			// Update the media record to include this information
+			$SQL = sprintf("UPDATE media SET storedAs = '%s', `MD5` = '%s', FileSize = %d WHERE mediaid = %d", $storedAs, $md5, $fileSize, $new_mediaid);
+
 			if (!$db->query($SQL))
 			{
 				trigger_error($db->error());
@@ -763,13 +772,13 @@
 				$this->response->keepOpen = true;
 				return $this->response;
 			}
-			
+
 			// 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))
 			{
 				trigger_error($db->error());
@@ -783,54 +792,54 @@
 		{
 			// Editing the existing record
 			$new_mediaid = $mediaid;
-			
+
 			$SQL =  "UPDATE media SET name = '%s', duration = %d, permissionID = %d";
 			$SQL .= " WHERE mediaID = %d ";
 			$SQL = sprintf($SQL, $db->escape_string($name), $duration, $permissionid, $mediaid);
-			
+
 			Debug::LogEntry($db, 'audit', $SQL);
-	
+
 			if (!$db->query($SQL))
 			{
 				trigger_error($db->error());
-				
+
 				$this->response->SetError('Database error editing this media record.');
 				$this->response->keepOpen = true;
 				return $this->response;
 			}
 		}
-		
+
 		// Required Attributes
 		$this->mediaid	= $new_mediaid;
 		$this->duration = $duration;
-		
+
 		// Any Options
 		$this->SetOption('uri', $storedAs);
-		
+
 		// Should have built the media object entirely by this time
 		if ($regionid != '')
 		{
 			// This saves the Media Object to the Region
 			$this->UpdateRegion();
-			
+
 			$this->response->loadForm	 = true;
 			$this->response->loadFormUri = "index.php?p=layout&layoutid=$layoutid&regionid=$regionid&q=RegionOptions";;
 		}
 		else
 		{
-			$this->response->loadFormUri = "index.php?p=content&q=displayForms&sp=add";			
+			$this->response->loadFormUri = "index.php?p=content&q=displayForms&sp=add";
 			$this->response->message = 'Edited the Flash.';
-			
+
 		}
-		
+
 		return $this->response;
 	}
-	
+
 	/**
 	 * Delete Media from the Database
-	 * @return 
+	 * @return
 	 */
-	public function DeleteMedia() 
+	public function DeleteMedia()
 	{
 		$db 		=& $this->db;
 		$layoutid 	= $this->layoutid;
@@ -838,10 +847,10 @@
 		$mediaid	= $this->mediaid;
 		$userid		= Kit::GetParam('userid', _SESSION, _INT);
 		$options  	= Kit::GetParam('options', _POST, _WORD);
-		
+
 		// Stored As from the XML
 		$this->uri	= $this->GetOption('uri');
-		
+
 		// Do we need to remove this from a layout?
 		if ($layoutid != '')
 		{
@@ -853,72 +862,72 @@
 			// Set this message now in preparation
 			$this->response->message = 'Deleted the Media.';
 		}
-				
+
 		// If we are set to retire we retire
 		if ($options == "retire")
 		{
 			//Update the media record to say it is retired
 			$SQL = "UPDATE media SET retired = 1 WHERE mediaid = $mediaid ";
-			
+
 			if (!$db->query($SQL))
 			{
 				trigger_error($db->error());
-				
+
 				$this->response->SetError('Database error retiring this media record.');
 				$this->response->keepOpen = true;
 				return $this->response;
 			}
 		}
-		
+
 		//If we are set to delete, we delete
 		if ($options == "delete")
 		{
 			//Update the media record to say it is retired
 			$SQL = "DELETE FROM media WHERE mediaid = $mediaid ";
-			
+
 			if (!$db->query($SQL))
 			{
 				trigger_error($db->error());
-				
+
 				$this->response->SetError('Database error deleting this media record.');
 				$this->response->keepOpen = true;
 				return $this->response;
 			}
-			
+
 			$this->DeleteMediaFiles();
 		}
 
 		return $this->response;
 	}
-	
+
 	/**
 	 * Deletes the media files associated with this record
-	 * @return 
+	 * @return
 	 */
 	private function DeleteMediaFiles()
 	{
 		$db =& $this->db;
-		
+
 		//Library location
 		$databaseDir = Config::GetSetting($db, "LIBRARY_LOCATION");
-		
+
 		//3 things to check for..
 		//the actual file, the thumbnail, the background
 		if (file_exists($databaseDir.$this->uri))
 		{
 			unlink($databaseDir.$this->uri);
 		}
-		
+
 		if (file_exists($databaseDir."tn_".$this->uri))
 		{
 			unlink($databaseDir."tn_".$this->uri);
 		}
-		
+
 		if (file_exists($databaseDir."bg_".$this->uri))
 		{
 			unlink($databaseDir."bg_".$this->uri);
 		}
-		
+
 		return true;
 	}
 }
 
=== modified file 'server/modules/image.module.php'
--- server/modules/image.module.php	2009-06-28 10:47:06 +0000
+++ server/modules/image.module.php	2009-09-29 22:15:22 +0000
@@ -8,7 +8,7 @@
  * 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. 
+ * any later version.
  *
  * Xibo is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,31 +17,31 @@
  *
  * 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 image extends Module
 {
 	// Custom Media information
 	private $uri;
 	private $maxFileSize;
 	private $maxFileSizeBytes;
-	
+
 	public function __construct(database $db, user $user, $mediaid = '', $layoutid = '', $regionid = '')
 	{
 		// Must set the type of the class
 		$this->type 			= 'image';
-		
+
 		// Get the max upload size from PHP
 		$this->maxFileSize 		= ini_get('upload_max_filesize');
 		$this->maxFileSizeBytes = convertBytes($this->maxFileSize);
-	
-		// Must call the parent class	
+
+		// Must call the parent class
 		parent::__construct($db, $user, $mediaid, $layoutid, $regionid);
 	}
-	
+
 	/**
 	 * Sets the Layout and Region Information
 	 *  it will then fill in any blanks it has about this media if it can
-	 * @return 
+	 * @return
 	 * @param $layoutid Object
 	 * @param $regionid Object
 	 * @param $mediaid Object
@@ -53,75 +53,75 @@
 		$this->regionid 		= $regionid;
 		$mediaid			 	= $this->mediaid;
 		$this->existingMedia 	= false;
-		
+
 		if ($this->regionSpecific == 1) return;
-		
+
 		// Load what we know about this media into the object
 		$SQL = "SELECT name, type, duration, originalFilename, userID, permissionID, retired, storedAs, isEdited, editedMediaID FROM media WHERE mediaID = $mediaid ";
-		
+
 		if (!$result = $db->query($SQL))
 		{
 			trigger_error($db->error()); //log the error
 			return false;
 		}
-		
+
 		if ($db->num_rows($result) != 1)
 		{
 			trigger_error("More than one row for mediaId [$mediaid] How can this be?");
 			return false;
 		}
-		
+
 		$row 				= $db->get_row($result);
 		$duration			= $row[2];
 		$storedAs			= $row[7];
-		
+
 		// Required Attributes
 		$this->duration = $duration;
-		
+
 		// Any Options
 		$this->SetOption('uri', $storedAs);
-		
+
 		return true;
 	}
-	
+
 	/**
 	 * Return the Add Form as HTML
-	 * @return 
+	 * @return
 	 */
 	public function AddForm()
 	{
 		global $session;
 		$db 			=& $this->db;
 		$user			=& $this->user;
-				
-		// Would like to get the regions width / height 
+
+		// Would like to get the regions width / height
 		$layoutid		= $this->layoutid;
 		$regionid		= $this->regionid;
-		
+
 		// Set the Session / Security information
 		$sessionId 		= session_id();
 		$securityToken 	= CreateFormToken();
-		
+
 		$session->setSecurityToken($securityToken);
-		
+
 		//Get the default value for the shared list
 		$default = Config::GetSetting($db,"defaultMedia");
 
 		$permissionid = 0;
 
-		if($default=="private") 
+		if($default=="private")
 		{
 			$permissionid = 1;
 		}
-		
+
 		//shared list
 		$shared_list = dropdownlist("SELECT permissionID, permission FROM permission", "permissionid", $permissionid);
-		
+
 		//Save button is different depending on if we are on a region or not
 		if ($regionid != "")
 		{
 			setSession('content','mediatype','image');
-			
+
 			$save_button = <<<END
 			<input id="btnSave" type="submit" value="Save" disabled />
 			<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" />
@@ -135,7 +135,7 @@
 			<input class="XiboFormButton" id="btnCancel" type="button" title="Close" href="index.php?p=content&q=displayForms&sp=add" value="Cancel" />
 END;
 		}
-		
+
 		$form = <<<FORM
 		<div style="display:none"><iframe name="fileupload" width="1px" height="1px"></iframe></div>
 		<div>
@@ -144,7 +144,7 @@
 				<input type="hidden" id="SecurityToken" value="$securityToken" />
 				<input type="hidden" name="MAX_FILE_SIZE" value="$this->maxFileSizeBytes" />
 				<table>
-					<tr> 
+					<tr>
 						<td><label for="file">Image File<span class="required">*</span></label></td>
 						<td colspan="3">
 							<input type="file" name="media_file" onchange="fileFormSubmit();this.form.submit();" />
@@ -172,7 +172,7 @@
 					<td><label for="permissionid">Sharing<span class="required">*</span></label></td>
 					<td>
 					$shared_list
-					</td>			
+					</td>
 				</tr>
 				<tr>
 					<td></td>
@@ -194,49 +194,49 @@
 
 		return $this->response;
 	}
-	
+
 	/**
 	 * Return the Edit Form as HTML
-	 * @return 
+	 * @return
 	 */
 	public function EditForm()
 	{
 		global $session;
 		$db 			=& $this->db;
 		$user			=& $this->user;
-				
-		// Would like to get the regions width / height 
+
+		// Would like to get the regions width / height
 		$layoutid		= $this->layoutid;
 		$regionid		= $this->regionid;
 		$mediaid		= $this->mediaid;
 		$lkid			= $this->lkid;
 		$userid			= Kit::GetParam('userid', _SESSION, _INT);
-		
+
 		// Set the Session / Security information
 		$sessionId 		= session_id();
 		$securityToken 	= CreateFormToken();
-		
+
 		$session->setSecurityToken($securityToken);
-		
+
 		// Load what we know about this media into the object
 		$SQL = "SELECT name, originalFilename, userID, permissionID, retired, storedAs, isEdited, editedMediaID FROM media WHERE mediaID = $mediaid ";
-		
+
 		if (!$result = $db->query($SQL))
 		{
 			trigger_error($db->error()); //log the error
-			
+
 			$this->message = "Error querying for the Media information with media ID [$mediaid] ";
 			return false;
 		}
-		
+
 		if ($db->num_rows($result) != 1)
 		{
 			trigger_error("More than one row for mediaId [$mediaid] How can this be?");
-			
+
 			$this->message = "Error querying for the Media information with media ID [$mediaid] ";
 			return false;
 		}
-		
+
 		$row 				= $db->get_row($result);
 		$name 				= $row[0];
 		$originalFilename 	= $row[1];
@@ -246,23 +246,23 @@
 		$storedAs			= $row[5];
 		$isEdited			= $row[6];
 		$editedMediaID		= $row[7];
-		
+
 		// derive the ext
 		$ext				= strtolower(substr(strrchr($originalFilename, "."), 1));
-		
+
 		//Calc the permissions on it aswell
 		list($see_permissions , $edit_permissions) = $user->eval_permission($userid, $permissionid);
-		
+
 		//shared list
 		$shared_list = dropdownlist("SELECT permissionID, permission FROM permission", "permissionid", $permissionid);
-		
+
 		//Save button is different depending on if we are on a region or not
 		if ($regionid != "")
 		{
 			setSession('content','mediatype','image');
-			
+
 			$extraNotes = '<em>Note: Uploading a new media item here will replace it on this layout only.</em>';
-			
+
 			$save_button = <<<END
 			<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" />
@@ -272,13 +272,13 @@
 		else
 		{
 			$extraNotes = '<em>Note: As you editing from the library uploading a new media item will not replace the old one from any layouts. To do this nagivate to the layout and edit the media from there.</em>';
-			
+
 			$save_button = <<<END
 			<input id="btnSave" type="submit" value="Save" />
 			<input id="btnCancel" type="button" title="Close" onclick="$('#div_dialog').dialog('close')" value="Cancel" />
 END;
 		}
-		
+
 		$form = <<<FORM
 		<div style="display:none"><iframe name="fileupload" width="1px" height="1px"></iframe></div>
 		<div>
@@ -287,7 +287,7 @@
 				<input type="hidden" id="SecurityToken" value="$securityToken" />
 				<input type="hidden" name="MAX_FILE_SIZE" value="$this->maxFileSizeBytes" />
 				<table>
-					<tr> 
+					<tr>
 						<td><label for="file">New Image File<span class="required">*</span></label></td>
 						<td colspan="3">
 							<input type="file" name="media_file" onchange="fileFormSubmit();this.form.submit();" />
@@ -319,7 +319,7 @@
 					<td><label for="permissionid">Sharing<span class="required">*</span></label></td>
 					<td>
 					$shared_list
-					</td>			
+					</td>
 				</tr>
 				<tr>
 					<td></td>
@@ -343,50 +343,50 @@
 		$this->response->dialogWidth 	= '450px';
 		$this->response->dialogHeight 	= '280px';
 
-		return $this->response;		
+		return $this->response;
 	}
-	
+
 	/**
 	 * Return the Delete Form as HTML
-	 * @return 
+	 * @return
 	 */
 	public function DeleteForm()
 	{
 		$db 			=& $this->db;
 		$user			=& $this->user;
-				
-		// Would like to get the regions width / height 
+
+		// Would like to get the regions width / height
 		$layoutid		= $this->layoutid;
 		$regionid		= $this->regionid;
 		$mediaid		= $this->mediaid;
 		$lkid			= $this->lkid;
 		$userid			= Kit::GetParam('userid', _SESSION, _INT);
-		
+
 		$options = "";
 		//Always have the abilty to unassign from the region
 		$options .= "unassign|Unassign from this region only";
-		
+
 		// Load what we know about this media into the object
 		$SQL = "SELECT name, type, duration, originalFilename, userID, permissionID, retired, storedAs, isEdited, editedMediaID FROM media WHERE mediaID = $mediaid ";
-		
+
 		if (!$result = $db->query($SQL))
 		{
 			trigger_error($db->error()); //log the error
-			
+
 			$this->response->SetError('Error querying for the Media information with media ID [$mediaid]');
 			$this->response->keepOpen = true;
 			return $this->response;
 		}
-		
+
 		if ($db->num_rows($result) != 1)
 		{
 			trigger_error("More than one row for mediaId [$mediaid] How can this be?");
-			
+
 			$this->response->SetError('Error querying for the Media information with media ID [$mediaid]');
 			$this->response->keepOpen = true;
 			return $this->response;
 		}
-		
+
 		$row 				= $db->get_row($result);
 		$name 				= $row[0];
 		$duration			= $row[2];
@@ -397,18 +397,18 @@
 		$storedAs			= $row[7];
 		$isEdited			= $row[8];
 		$editedMediaID		= $row[9];
-		
+
 		// derive the ext
 		$ext				= strtolower(substr(strrchr($originalFilename, "."), 1));
-		
+
 		//Calc the permissions on it aswell
 		list($see_permissions , $edit_permissions) = $user->eval_permission($userid, $permissionid);
-		
+
 		//Is this user allowed to edit this media?
 		if ($edit_permissions)
 		{
 			$options .= ",retire|Unassign from this region and retire";
-		
+
 			//Is this media retired?
 			if ($editedMediaID != "")
 			{
@@ -418,7 +418,7 @@
 			{
 				$revised = false;
 			}
-		
+
 			//Is this media being used anywhere else?
 			if ($layoutid == "")
 			{
@@ -429,8 +429,8 @@
 			{
 				$SQL = "SELECT layoutID FROM lklayoutmedia WHERE mediaID = $mediaid AND layoutid <> $layoutid AND regionID <> '$regionid' ";
 			}
-			
-			if (!$results = $db->query($SQL)) 
+
+			if (!$results = $db->query($SQL))
 			{
 				trigger_error($db->error());
 
@@ -457,9 +457,9 @@
 				return $this->response;
 			}
 		}
-		
+
 		$options = ltrim($options, ",");
-		
+
 		$deleteOptions = listcontent($options,"options");
 
 		//we can delete
@@ -474,19 +474,19 @@
 			<input id="btnCancel" type="button" title="No / Cancel" href="index.php?p=layout&layoutid=$layoutid&regionid=$regionid&q=RegionOptions" onclick="$('#div_dialog').dialog('close');return false; " value="No" />
 		</form>
 END;
-		
+
 		$this->response->html 			= $form;
 		$this->response->dialogTitle 	= 'Delete Image';
 		$this->response->dialogSize 	= true;
 		$this->response->dialogWidth 	= '450px';
 		$this->response->dialogHeight 	= '280px';
 
-		return $this->response;	
+		return $this->response;
 	}
-	
+
 	/**
 	 * Add Media to the Database
-	 * @return 
+	 * @return
 	 */
 	public function AddMedia()
 	{
@@ -495,29 +495,29 @@
 		$regionid 	= $this->regionid;
 		$mediaid	= $this->mediaid;
 		$userid		= Kit::GetParam('userid', _SESSION, _INT);
-		
+
 		// File data
 		$tmpName	= Kit::GetParam('hidFileID', _POST, _STRING);
-		
+
 		if ($tmpName == '')
 		{
 			$this->response->SetError('Cannot save Image details. <br/> You must have picked a file.');
 			$this->response->keepOpen = true;
 			return $this->response;
 		}
-		
+
 		// File name and extension (orignial name)
 		$fileName		= Kit::GetParam('txtFileName', _POST, _STRING);
 		$fileName 		= basename($fileName);
 		$ext 			= strtolower(substr(strrchr($fileName, "."), 1));
-			
+
 		// Other properties
 		$name	  		= Kit::GetParam('name', _POST, _STRING);
 		$duration	  	= Kit::GetParam('duration', _POST, _INT, 0);
 		$permissionid 	= Kit::GetParam('permissionid', _POST, _INT, 1);
-		
+
 		if ($name == '') $name = Kit::ValidateParam($fileName, _FILENAME);
-		
+
 		// Validation
 		if ($ext != "jpeg" && $ext != "jpg" && $ext != "png" && $ext != "gif")
 		{
@@ -525,32 +525,32 @@
 			$this->response->keepOpen = true;
 			return $this->response;
 		}
-		
+
 		// Make sure the name isnt too long
-		if (strlen($name) > 100) 
+		if (strlen($name) > 100)
 		{
 			$this->response->SetError('The name cannot be longer than 100 characters');
 			$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;
 		}
-		
+
 		// Ensure the name is not already in the database
 		$SQL = sprintf("SELECT name FROM media WHERE name = '%s' AND userid = %d", $db->escape_string($name), $userid);
 
-		if(!$result = $db->query($SQL)) 
+		if(!$result = $db->query($SQL))
 		{
 			trigger_error($db->error());
 			$this->response->SetError('Error checking whether the media name is ok. Try choosing a different name.');
 			$this->response->keepOpen = true;
 			return $this->response;
-		} 
+		}
 
 		if ($db->num_rows($result) != 0)
 		{
@@ -558,11 +558,11 @@
 			$this->response->keepOpen = true;
 			return $this->response;
 		}
-		
+
 		// All OK to insert this record
 		$SQL  = "INSERT INTO media (name, type, duration, originalFilename, permissionID, userID, retired ) ";
 		$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 (!$mediaid = $db->insert_query($SQL))
@@ -572,19 +572,19 @@
 			$this->response->keepOpen = true;
 			return $this->response;
 		}
-				
+
 		// File upload directory.. get this from the settings object
 		$databaseDir = Config::GetSetting($db, "LIBRARY_LOCATION");
-		
+
 		// What are we going to store this media as...
 		$storedAs = $mediaid.".".$ext;
-		 
+
 		// Now we need to move the file
 		if (!$result = rename($databaseDir."temp/".$tmpName, $databaseDir.$storedAs))
 		{
 			// If we couldnt move it - we need to delete the media record we just added
 			$SQL = sprintf("DELETE FROM media WHERE mediaID = %d ", $mediaid);
-			
+
 			if (!$db->query($SQL))
 			{
 				trigger_error($db->error());
@@ -593,26 +593,30 @@
 				return $this->response;
 			}
 		}
-		
+
+		// Calculate the MD5 and the file size
+		$md5 		= md5_file($databaseDir.$storedAs);
+		$fileSize 	= filesize($databaseDir.$storedAs);
+
 		// Update the media record to include this information
-		$SQL = sprintf("UPDATE media SET storedAs = '%s' WHERE mediaid = %d", $storedAs, $mediaid);
-		
+		$SQL = sprintf("UPDATE media SET storedAs = '%s', `MD5` = '%s', FileSize = %d WHERE mediaid = %d", $storedAs, $md5, $fileSize, $mediaid);
+
 		if (!$db->query($SQL))
 		{
 			trigger_error($db->error());
 			return true;
 		}
-		
+
 		// Create the thumb nail
 		ResizeImage($databaseDir.$storedAs, $databaseDir."tn_".$storedAs, 80, 80);
-		
+
 		// Required Attributes
 		$this->mediaid	= $mediaid;
 		$this->duration = $duration;
-		
+
 		// Any Options
 		$this->SetOption('uri', $storedAs);
-		
+
 		// Should have built the media object entirely by this time
 		if ($regionid != '')
 		{
@@ -622,18 +626,18 @@
 		}
 		else
 		{
-			$this->response->loadFormUri = "index.php?p=content&q=displayForms&sp=add";			
+			$this->response->loadFormUri = "index.php?p=content&q=displayForms&sp=add";
 		}
-				
+
 		// We want to load a new form
 		$this->response->loadForm	= true;
-		
+
 		return $this->response;
 	}
-	
+
 	/**
 	 * Edit Media in the Database
-	 * @return 
+	 * @return
 	 */
 	public function EditMedia()
 	{
@@ -642,13 +646,13 @@
 		$regionid 	= $this->regionid;
 		$mediaid	= $this->mediaid;
 		$userid		= Kit::GetParam('userid', _SESSION, _INT);
-		
+
 		// Stored As from the XML
 		$storedAs	= $this->GetOption('uri');
-		
+
 		// File data
 		$tmpName	= Kit::GetParam('hidFileID', _POST, _STRING);
-		
+
 		if ($tmpName == '')
 		{
 			$fileRevision = false;
@@ -656,12 +660,12 @@
 		else
 		{
 			$fileRevision = true;
-			
+
 			// File name and extension (orignial name)
 			$fileName		= Kit::GetParam('txtFileName', _POST, _STRING);
 			$fileName 		= basename($fileName);
 			$ext 			= strtolower(substr(strrchr($fileName, "."), 1));
-			
+
 			if ($ext != "jpeg" && $ext != "jpg" && $ext != "png" && $ext != "gif")
 			{
 				$this->response->SetError('Only images are accepted - Are you sure this is an image?');
@@ -669,17 +673,17 @@
 				return $this->response;
 			}
 		}
-			
+
 		// Other properties
 		$name	  		= Kit::GetParam('name', _POST, _STRING);
 		$duration	  	= Kit::GetParam('duration', _POST, _INT, 0);
 		$permissionid 	= Kit::GetParam('permissionid', _POST, _INT, 1);
-		
+
 		if ($name == '')
 		{
 			if ($fileRevision)
 			{
-				$name = Kit::ValidateParam($fileName, _FILENAME);			
+				$name = Kit::ValidateParam($fileName, _FILENAME);
 			}
 			else
 			{
@@ -687,33 +691,33 @@
 				$this->response->keepOpen = true;
 				return $this->response;
 			}
-		} 
-		
+		}
+
 		// Make sure the name isnt too long
-		if (strlen($name) > 100) 
+		if (strlen($name) > 100)
 		{
 			$this->response->SetError('The name cannot be longer than 100 characters');
 			$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;
 		}
-		
+
 		// Ensure the name is not already in the database
 		$SQL = sprintf("SELECT name FROM media WHERE name = '%s' AND userid = %d AND mediaid <> %d ", $db->escape_string($name), $userid, $mediaid);
 
-		if(!$result = $db->query($SQL)) 
+		if(!$result = $db->query($SQL))
 		{
 			trigger_error($db->error());
 			$this->response->SetError('Error checking whether the media name is ok. Try choosing a different name.');
 			$this->response->keepOpen = true;
 			return $this->response;
-		} 
+		}
 
 		if ($db->num_rows($result) != 0)
 		{
@@ -721,34 +725,34 @@
 			$this->response->keepOpen = true;
 			return $this->response;
 		}
-		
+
 		//Are we revising this media - or just plain editing
 		if ($fileRevision)
 		{
 			// All OK to insert this record
 			$SQL  = "INSERT INTO media (name, type, duration, originalFilename, permissionID, userID, retired ) ";
 			$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))
 			{
 				//If we couldnt move it - we need to delete the media record we just added
 				$SQL = "DELETE FROM media WHERE mediaID = $new_mediaid ";
-				
+
 				if (!$db->insert_query($SQL))
 				{
 					$this->response->SetError('Error rolling back transcation.');
@@ -756,9 +760,14 @@
 					return $this->response;
 				}
 			}
-			
-			//Update the media record to include this information
-			$SQL = "UPDATE media SET storedAs = '$storedAs' WHERE mediaid = $new_mediaid";
+
+			// Calculate the MD5 and the file size
+			$md5 		= md5_file($databaseDir.$storedAs);
+			$fileSize 	= filesize($databaseDir.$storedAs);
+
+			// Update the media record to include this information
+			$SQL = sprintf("UPDATE media SET storedAs = '%s', `MD5` = '%s', FileSize = %d WHERE mediaid = %d", $storedAs, $md5, $fileSize, $new_mediaid);
+
 			if (!$db->query($SQL))
 			{
 				trigger_error($db->error());
@@ -766,20 +775,20 @@
 				$this->response->keepOpen = true;
 				return $this->response;
 			}
-			
+
 			//Thumb
 			if ($ext == "jpeg" || $ext == "jpg" || $ext == "png")
 			{
 				//Create the thumbnail
 				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 = $new_mediaid ";
 			$SQL .= " WHERE IFNULL(editedMediaID,0) <> $new_mediaid AND mediaID = $mediaid ";
-			
+
 			Debug::LogEntry($db, 'audit', $SQL);
-	
+
 			if (!$db->query($SQL))
 			{
 				trigger_error($db->error());
@@ -793,54 +802,54 @@
 		{
 			// Editing the existing record
 			$new_mediaid = $mediaid;
-			
+
 			$SQL =  "UPDATE media SET name = '%s', duration = %d, permissionID = %d";
 			$SQL .= " WHERE mediaID = %d ";
 			$SQL = sprintf($SQL, $db->escape_string($name), $duration, $permissionid, $mediaid);
-			
+
 			Debug::LogEntry($db, 'audit', $SQL);
-	
+
 			if (!$db->query($SQL))
 			{
 				trigger_error($db->error());
-				
+
 				$this->response->SetError('Database error editing this media record.');
 				$this->response->keepOpen = true;
 				return $this->response;
 			}
 		}
-		
+
 		// Required Attributes
 		$this->mediaid	= $new_mediaid;
 		$this->duration = $duration;
-		
+
 		// Any Options
 		$this->SetOption('uri', $storedAs);
-		
+
 		// Should have built the media object entirely by this time
 		if ($regionid != '')
 		{
 			// This saves the Media Object to the Region
 			$this->UpdateRegion();
-			
+
 			$this->response->loadForm	 = true;
 			$this->response->loadFormUri = "index.php?p=layout&layoutid=$layoutid&regionid=$regionid&q=RegionOptions";;
 		}
 		else
 		{
-			$this->response->loadFormUri = "index.php?p=content&q=displayForms&sp=add";			
+			$this->response->loadFormUri = "index.php?p=content&q=displayForms&sp=add";
 			$this->response->message = 'Edited the Image.';
-			
+
 		}
-		
+
 		return $this->response;
 	}
-	
+
 	/**
 	 * Delete Media from the Database
-	 * @return 
+	 * @return
 	 */
-	public function DeleteMedia() 
+	public function DeleteMedia()
 	{
 		$db 		=& $this->db;
 		$layoutid 	= $this->layoutid;
@@ -848,10 +857,10 @@
 		$mediaid	= $this->mediaid;
 		$userid		= Kit::GetParam('userid', _SESSION, _INT);
 		$options  	= Kit::GetParam('options', _POST, _WORD);
-		
+
 		// Stored As from the XML
 		$this->uri	= $this->GetOption('uri');
-		
+
 		// Do we need to remove this from a layout?
 		if ($layoutid != '')
 		{
@@ -863,72 +872,72 @@
 			// Set this message now in preparation
 			$this->response->message = 'Deleted the Media.';
 		}
-				
+
 		// If we are set to retire we retire
 		if ($options == "retire")
 		{
 			//Update the media record to say it is retired
 			$SQL = "UPDATE media SET retired = 1 WHERE mediaid = $mediaid ";
-			
+
 			if (!$db->query($SQL))
 			{
 				trigger_error($db->error());
-				
+
 				$this->response->SetError('Database error retiring this media record.');
 				$this->response->keepOpen = true;
 				return $this->response;
 			}
 		}
-		
+
 		//If we are set to delete, we delete
 		if ($options == "delete")
 		{
 			//Update the media record to say it is retired
 			$SQL = "DELETE FROM media WHERE mediaid = $mediaid ";
-			
+
 			if (!$db->query($SQL))
 			{
 				trigger_error($db->error());
-				
+
 				$this->response->SetError('Database error deleting this media record.');
 				$this->response->keepOpen = true;
 				return $this->response;
 			}
-			
+
 			$this->DeleteMediaFiles();
 		}
-		
+
 		return $this->response;
 	}
-	
+
 	/**
 	 * Deletes the media files associated with this record
-	 * @return 
+	 * @return
 	 */
 	private function DeleteMediaFiles()
 	{
 		$db =& $this->db;
-		
+
 		//Library location
 		$databaseDir = Config::GetSetting($db, "LIBRARY_LOCATION");
-		
+
 		//3 things to check for..
 		//the actual file, the thumbnail, the background
 		if (file_exists($databaseDir.$this->uri))
 		{
 			unlink($databaseDir.$this->uri);
 		}
-		
+
 		if (file_exists($databaseDir."tn_".$this->uri))
 		{
 			unlink($databaseDir."tn_".$this->uri);
 		}
-		
+
 		if (file_exists($databaseDir."bg_".$this->uri))
 		{
 			unlink($databaseDir."bg_".$this->uri);
 		}
-		
+
 		return true;
 	}
 }
 
=== modified file 'server/modules/powerpoint.module.php'
--- server/modules/powerpoint.module.php	2009-06-28 10:47:06 +0000
+++ server/modules/powerpoint.module.php	2009-09-29 22:15:22 +0000
@@ -8,7 +8,7 @@
  * 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. 
+ * any later version.
  *
  * Xibo is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,31 +17,31 @@
  *
  * 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 powerpoint extends Module
 {
 	// Custom Media information
 	private $uri;
 	private $maxFileSize;
 	private $maxFileSizeBytes;
-	
+
 	public function __construct(database $db, user $user, $mediaid = '', $layoutid = '', $regionid = '')
 	{
 		// Must set the type of the class
 		$this->type 			= 'powerpoint';
-		
+
 		// Get the max upload size from PHP
 		$this->maxFileSize 		= ini_get('upload_max_filesize');
 		$this->maxFileSizeBytes = convertBytes($this->maxFileSize);
-	
-		// Must call the parent class	
+
+		// Must call the parent class
 		parent::__construct($db, $user, $mediaid, $layoutid, $regionid);
 	}
-	
+
 	/**
 	 * Sets the Layout and Region Information
 	 *  it will then fill in any blanks it has about this media if it can
-	 * @return 
+	 * @return
 	 * @param $layoutid Object
 	 * @param $regionid Object
 	 * @param $mediaid Object
@@ -53,75 +53,75 @@
 		$this->regionid 		= $regionid;
 		$mediaid			 	= $this->mediaid;
 		$this->existingMedia 	= false;
-		
+
 		if ($this->regionSpecific == 1) return;
-		
+
 		// Load what we know about this media into the object
 		$SQL = "SELECT name, type, duration, originalFilename, userID, permissionID, retired, storedAs, isEdited, editedMediaID FROM media WHERE mediaID = $mediaid ";
-		
+
 		if (!$result = $db->query($SQL))
 		{
 			trigger_error($db->error()); //log the error
 			return false;
 		}
-		
+
 		if ($db->num_rows($result) != 1)
 		{
 			trigger_error("More than one row for mediaId [$mediaid] How can this be?");
 			return false;
 		}
-		
+
 		$row 				= $db->get_row($result);
 		$duration			= $row[2];
 		$storedAs			= $row[7];
-		
+
 		// Required Attributes
 		$this->duration = $duration;
-		
+
 		// Any Options
 		$this->SetOption('uri', $storedAs);
-		
+
 		return true;
 	}
-	
+
 	/**
 	 * Return the Add Form as HTML
-	 * @return 
+	 * @return
 	 */
 	public function AddForm()
 	{
 		global $session;
 		$db 			=& $this->db;
 		$user			=& $this->user;
-				
-		// Would like to get the regions width / height 
+
+		// Would like to get the regions width / height
 		$layoutid		= $this->layoutid;
 		$regionid		= $this->regionid;
-		
+
 		// Set the Session / Security information
 		$sessionId 		= session_id();
 		$securityToken 	= CreateFormToken();
-		
+
 		$session->setSecurityToken($securityToken);
-		
+
 		//Get the default value for the shared list
 		$default = Config::GetSetting($db,"defaultMedia");
 
 		$permissionid = 0;
 
-		if($default=="private") 
+		if($default=="private")
 		{
 			$permissionid = 1;
 		}
-		
+
 		//shared list
 		$shared_list = dropdownlist("SELECT permissionID, permission FROM permission", "permissionid", $permissionid);
-		
+
 		//Save button is different depending on if we are on a region or not
 		if ($regionid != "")
 		{
 			setSession('content','mediatype','powerpoint');
-			
+
 			$save_button = <<<END
 			<input id="btnSave" type="submit" value="Save" disabled />
 			<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" />
@@ -135,7 +135,7 @@
 			<input class="XiboFormButton" id="btnCancel" type="button" title="Close" href="index.php?p=content&q=displayForms&sp=add" value="Cancel" />
 END;
 		}
-		
+
 		$form = <<<FORM
 		<div style="display:none"><iframe name="fileupload" width="1px" height="1px"></iframe></div>
 		<div>
@@ -144,7 +144,7 @@
 				<input type="hidden" id="SecurityToken" value="$securityToken" />
 				<input type="hidden" name="MAX_FILE_SIZE" value="$this->maxFileSizeBytes" />
 				<table>
-					<tr> 
+					<tr>
 						<td><label for="file">Powerpoint File<span class="required">*</span></label></td>
 						<td colspan="3">
 							<input type="file" name="media_file" onchange="fileFormSubmit();this.form.submit();" />
@@ -172,7 +172,7 @@
 					<td><label for="permissionid">Sharing<span class="required">*</span></label></td>
 					<td>
 					$shared_list
-					</td>			
+					</td>
 				</tr>
 				<tr>
 					<td></td>
@@ -194,49 +194,49 @@
 
 		return $this->response;
 	}
-	
+
 	/**
 	 * Return the Edit Form as HTML
-	 * @return 
+	 * @return
 	 */
 	public function EditForm()
 	{
 		global $session;
 		$db 			=& $this->db;
 		$user			=& $this->user;
-				
-		// Would like to get the regions width / height 
+
+		// Would like to get the regions width / height
 		$layoutid		= $this->layoutid;
 		$regionid		= $this->regionid;
 		$mediaid		= $this->mediaid;
 		$lkid			= $this->lkid;
 		$userid			= Kit::GetParam('userid', _SESSION, _INT);
-		
+
 		// Set the Session / Security information
 		$sessionId 		= session_id();
 		$securityToken 	= CreateFormToken();
-		
+
 		$session->setSecurityToken($securityToken);
-		
+
 		// Load what we know about this media into the object
 		$SQL = "SELECT name, originalFilename, userID, permissionID, retired, storedAs, isEdited, editedMediaID FROM media WHERE mediaID = $mediaid ";
-		
+
 		if (!$result = $db->query($SQL))
 		{
 			trigger_error($db->error()); //log the error
-			
+
 			$this->message = "Error querying for the Media information with media ID [$mediaid] ";
 			return false;
 		}
-		
+
 		if ($db->num_rows($result) != 1)
 		{
 			trigger_error("More than one row for mediaId [$mediaid] How can this be?");
-			
+
 			$this->message = "Error querying for the Media information with media ID [$mediaid] ";
 			return false;
 		}
-		
+
 		$row 				= $db->get_row($result);
 		$name 				= $row[0];
 		$originalFilename 	= $row[1];
@@ -246,23 +246,23 @@
 		$storedAs			= $row[5];
 		$isEdited			= $row[6];
 		$editedMediaID		= $row[7];
-		
+
 		// derive the ext
 		$ext				= strtolower(substr(strrchr($originalFilename, "."), 1));
-		
+
 		//Calc the permissions on it aswell
 		list($see_permissions , $edit_permissions) = $user->eval_permission($userid, $permissionid);
-		
+
 		//shared list
 		$shared_list = dropdownlist("SELECT permissionID, permission FROM permission", "permissionid", $permissionid);
-		
+
 		//Save button is different depending on if we are on a region or not
 		if ($regionid != "")
 		{
 			setSession('content','mediatype','powerpoint');
-			
+
 			$extraNotes = '<em>Note: Uploading a new media item here will replace it on this layout only.</em>';
-			
+
 			$save_button = <<<END
 			<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" />
@@ -272,13 +272,13 @@
 		else
 		{
 			$extraNotes = '<em>Note: Uploading a new media item here will replace it on this layout only.</em>';
-			
+
 			$save_button = <<<END
 			<input id="btnSave" type="submit" value="Save" />
 			<input id="btnCancel" type="button" title="Close" onclick="$('#div_dialog').dialog('close')" value="Cancel" />
 END;
 		}
-		
+
 		$form = <<<FORM
 		<div style="display:none"><iframe name="fileupload" width="1px" height="1px"></iframe></div>
 		<div>
@@ -287,7 +287,7 @@
 				<input type="hidden" id="SecurityToken" value="$securityToken" />
 				<input type="hidden" name="MAX_FILE_SIZE" value="$this->maxFileSizeBytes" />
 				<table>
-					<tr> 
+					<tr>
 						<td><label for="file">New Powerpoint File<span class="required">*</span></label></td>
 						<td colspan="3">
 							<input type="file" name="media_file" onchange="fileFormSubmit();this.form.submit();" />
@@ -319,7 +319,7 @@
 					<td><label for="permissionid">Sharing<span class="required">*</span></label></td>
 					<td>
 					$shared_list
-					</td>			
+					</td>
 				</tr>
 				<tr>
 					<td></td>
@@ -343,50 +343,50 @@
 		$this->response->dialogWidth 	= '450px';
 		$this->response->dialogHeight 	= '280px';
 
-		return $this->response;		
+		return $this->response;
 	}
-	
+
 	/**
 	 * Return the Delete Form as HTML
-	 * @return 
+	 * @return
 	 */
 	public function DeleteForm()
 	{
 		$db 			=& $this->db;
 		$user			=& $this->user;
-				
-		// Would like to get the regions width / height 
+
+		// Would like to get the regions width / height
 		$layoutid		= $this->layoutid;
 		$regionid		= $this->regionid;
 		$mediaid		= $this->mediaid;
 		$lkid			= $this->lkid;
 		$userid			= Kit::GetParam('userid', _SESSION, _INT);
-		
+
 		$options = "";
 		//Always have the abilty to unassign from the region
 		$options .= "unassign|Unassign from this region only";
-		
+
 		// Load what we know about this media into the object
 		$SQL = "SELECT name, type, duration, originalFilename, userID, permissionID, retired, storedAs, isEdited, editedMediaID FROM media WHERE mediaID = $mediaid ";
-		
+
 		if (!$result = $db->query($SQL))
 		{
 			trigger_error($db->error()); //log the error
-			
+
 			$this->response->SetError('Error querying for the Media information with media ID [$mediaid]');
 			$this->response->keepOpen = true;
 			return $this->response;
 		}
-		
+
 		if ($db->num_rows($result) != 1)
 		{
 			trigger_error("More than one row for mediaId [$mediaid] How can this be?");
-			
+
 			$this->response->SetError('Error querying for the Media information with media ID [$mediaid]');
 			$this->response->keepOpen = true;
 			return $this->response;
 		}
-		
+
 		$row 				= $db->get_row($result);
 		$name 				= $row[0];
 		$duration			= $row[2];
@@ -397,18 +397,18 @@
 		$storedAs			= $row[7];
 		$isEdited			= $row[8];
 		$editedMediaID		= $row[9];
-		
+
 		// derive the ext
 		$ext				= strtolower(substr(strrchr($originalFilename, "."), 1));
-		
+
 		//Calc the permissions on it aswell
 		list($see_permissions , $edit_permissions) = $user->eval_permission($userid, $permissionid);
-		
+
 		//Is this user allowed to edit this media?
 		if ($edit_permissions)
 		{
 			$options .= ",retire|Unassign from this region and retire";
-		
+
 			//Is this media retired?
 			if ($editedMediaID != "")
 			{
@@ -418,7 +418,7 @@
 			{
 				$revised = false;
 			}
-		
+
 			//Is this media being used anywhere else?
 			if ($layoutid == "")
 			{
@@ -429,8 +429,8 @@
 			{
 				$SQL = "SELECT layoutID FROM lklayoutmedia WHERE mediaID = $mediaid AND layoutid <> $layoutid AND regionID <> '$regionid' ";
 			}
-			
-			if (!$results = $db->query($SQL)) 
+
+			if (!$results = $db->query($SQL))
 			{
 				trigger_error($db->error());
 
@@ -457,9 +457,9 @@
 				return $this->response;
 			}
 		}
-		
+
 		$options = ltrim($options, ",");
-		
+
 		$deleteOptions = listcontent($options,"options");
 
 		//we can delete
@@ -474,19 +474,19 @@
 			<input id="btnCancel" type="button" title="No / Cancel" href="index.php?p=layout&layoutid=$layoutid&regionid=$regionid&q=RegionOptions" onclick="$('#div_dialog').dialog('close');return false; " value="No" />
 		</form>
 END;
-		
+
 		$this->response->html 			= $form;
 		$this->response->dialogTitle 	= 'Delete Powerpoint';
 		$this->response->dialogSize 	= true;
 		$this->response->dialogWidth 	= '450px';
 		$this->response->dialogHeight 	= '280px';
 
-		return $this->response;	
+		return $this->response;
 	}
-	
+
 	/**
 	 * Add Media to the Database
-	 * @return 
+	 * @return
 	 */
 	public function AddMedia()
 	{
@@ -495,29 +495,29 @@
 		$regionid 	= $this->regionid;
 		$mediaid	= $this->mediaid;
 		$userid		= Kit::GetParam('userid', _SESSION, _INT);
-		
+
 		// File data
 		$tmpName	= Kit::GetParam('hidFileID', _POST, _STRING);
-		
+
 		if ($tmpName == '')
 		{
 			$this->response->SetError('Cannot save Powerpoint details. <br/> You must have picked a file.');
 			$this->response->keepOpen = true;
 			return $this->response;
 		}
-		
+
 		// File name and extension (orignial name)
 		$fileName		= Kit::GetParam('txtFileName', _POST, _STRING);
 		$fileName 		= basename($fileName);
 		$ext 			= strtolower(substr(strrchr($fileName, "."), 1));
-			
+
 		// Other properties
 		$name	  		= Kit::GetParam('name', _POST, _STRING);
 		$duration	  	= Kit::GetParam('duration', _POST, _INT, 0);
 		$permissionid 	= Kit::GetParam('permissionid', _POST, _INT, 1);
-		
+
 		if ($name == '') $name = Kit::ValidateParam($fileName, _FILENAME);
-		
+
 		// Validation
 		if ($ext != "ppt")
 		{
@@ -525,32 +525,32 @@
 			$this->response->keepOpen = true;
 			return $this->response;
 		}
-		
+
 		// Make sure the name isnt too long
-		if (strlen($name) > 100) 
+		if (strlen($name) > 100)
 		{
 			$this->response->SetError('The name cannot be longer than 100 characters');
 			$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;
 		}
-		
+
 		// Ensure the name is not already in the database
 		$SQL = sprintf("SELECT name FROM media WHERE name = '%s' AND userid = %d", $db->escape_string($name), $userid);
 
-		if(!$result = $db->query($SQL)) 
+		if(!$result = $db->query($SQL))
 		{
 			trigger_error($db->error());
 			$this->response->SetError('Error checking whether the media name is ok. Try choosing a different name.');
 			$this->response->keepOpen = true;
 			return $this->response;
-		} 
+		}
 
 		if ($db->num_rows($result) != 0)
 		{
@@ -558,11 +558,11 @@
 			$this->response->keepOpen = true;
 			return $this->response;
 		}
-		
+
 		// All OK to insert this record
 		$SQL  = "INSERT INTO media (name, type, duration, originalFilename, permissionID, userID, retired ) ";
 		$SQL .= "VALUES ('%s', 'powerpoint', '%s', '%s', %d, %d, 0) ";
-		
+
 		$SQL = sprintf($SQL, $db->escape_string($name), $db->escape_string($duration), $db->escape_string($fileName), $permissionid, $userid);
 
 		if (!$mediaid = $db->insert_query($SQL))
@@ -572,19 +572,19 @@
 			$this->response->keepOpen = true;
 			return $this->response;
 		}
-				
+
 		// File upload directory.. get this from the settings object
 		$databaseDir = Config::GetSetting($db, "LIBRARY_LOCATION");
-		
+
 		// What are we going to store this media as...
 		$storedAs = $mediaid.".".$ext;
-		 
+
 		// Now we need to move the file
 		if (!$result = rename($databaseDir."temp/".$tmpName, $databaseDir.$storedAs))
 		{
 			// If we couldnt move it - we need to delete the media record we just added
 			$SQL = sprintf("DELETE FROM media WHERE mediaID = %d ", $mediaid);
-			
+
 			if (!$db->query($SQL))
 			{
 				trigger_error($db->error());
@@ -593,23 +593,27 @@
 				return $this->response;
 			}
 		}
-		
+
+		// Calculate the MD5 and the file size
+		$md5 		= md5_file($databaseDir.$storedAs);
+		$fileSize 	= filesize($databaseDir.$storedAs);
+
 		// Update the media record to include this information
-		$SQL = sprintf("UPDATE media SET storedAs = '%s' WHERE mediaid = %d", $storedAs, $mediaid);
-		
+		$SQL = sprintf("UPDATE media SET storedAs = '%s', `MD5` = '%s', FileSize = %d WHERE mediaid = %d", $storedAs, $md5, $fileSize, $mediaid);
+
 		if (!$db->query($SQL))
 		{
 			trigger_error($db->error());
 			return true;
 		}
-		
+
 		// Required Attributes
 		$this->mediaid	= $mediaid;
 		$this->duration = $duration;
-		
+
 		// Any Options
 		$this->SetOption('uri', $storedAs);
-		
+
 		// Should have built the media object entirely by this time
 		if ($regionid != '')
 		{
@@ -619,18 +623,18 @@
 		}
 		else
 		{
-			$this->response->loadFormUri = "index.php?p=content&q=displayForms&sp=add";			
+			$this->response->loadFormUri = "index.php?p=content&q=displayForms&sp=add";
 		}
-				
+
 		// We want to load a new form
 		$this->response->loadForm	= true;
-		
+
 		return $this->response;
 	}
-	
+
 	/**
 	 * Edit Media in the Database
-	 * @return 
+	 * @return
 	 */
 	public function EditMedia()
 	{
@@ -639,13 +643,13 @@
 		$regionid 	= $this->regionid;
 		$mediaid	= $this->mediaid;
 		$userid		= Kit::GetParam('userid', _SESSION, _INT);
-		
+
 		// Stored As from the XML
 		$storedAs	= $this->GetOption('uri');
-		
+
 		// File data
 		$tmpName	= Kit::GetParam('hidFileID', _POST, _STRING);
-		
+
 		if ($tmpName == '')
 		{
 			$fileRevision = false;
@@ -653,12 +657,12 @@
 		else
 		{
 			$fileRevision = true;
-			
+
 			// File name and extension (orignial name)
 			$fileName		= Kit::GetParam('txtFileName', _POST, _STRING);
 			$fileName 		= basename($fileName);
 			$ext 			= strtolower(substr(strrchr($fileName, "."), 1));
-			
+
 			if ($ext != "ppt")
 			{
 				$this->response->SetError('Only PPT files are accepted - Are you sure this is a powerpoint?');
@@ -666,17 +670,17 @@
 				return $this->response;
 			}
 		}
-			
+
 		// Other properties
 		$name	  		= Kit::GetParam('name', _POST, _STRING);
 		$duration	  	= Kit::GetParam('duration', _POST, _INT, 0);
 		$permissionid 	= Kit::GetParam('permissionid', _POST, _INT, 1);
-		
+
 		if ($name == '')
 		{
 			if ($fileRevision)
 			{
-				$name = Kit::ValidateParam($fileName, _FILENAME);			
+				$name = Kit::ValidateParam($fileName, _FILENAME);
 			}
 			else
 			{
@@ -684,33 +688,33 @@
 				$this->response->keepOpen = true;
 				return $this->response;
 			}
-		} 
-		
+		}
+
 		// Make sure the name isnt too long
-		if (strlen($name) > 100) 
+		if (strlen($name) > 100)
 		{
 			$this->response->SetError('The name cannot be longer than 100 characters');
 			$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;
 		}
-		
+
 		// Ensure the name is not already in the database
 		$SQL = sprintf("SELECT name FROM media WHERE name = '%s' AND userid = %d AND mediaid <> %d ", $db->escape_string($name), $userid, $mediaid);
 
-		if(!$result = $db->query($SQL)) 
+		if(!$result = $db->query($SQL))
 		{
 			trigger_error($db->error());
 			$this->response->SetError('Error checking whether the media name is ok. Try choosing a different name.');
 			$this->response->keepOpen = true;
 			return $this->response;
-		} 
+		}
 
 		if ($db->num_rows($result) != 0)
 		{
@@ -718,34 +722,34 @@
 			$this->response->keepOpen = true;
 			return $this->response;
 		}
-		
+
 		//Are we revising this media - or just plain editing
 		if ($fileRevision)
 		{
 			// All OK to insert this record
 			$SQL  = "INSERT INTO media (name, type, duration, originalFilename, permissionID, userID, retired ) ";
 			$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))
 			{
 				//If we couldnt move it - we need to delete the media record we just added
 				$SQL = "DELETE FROM media WHERE mediaID = $new_mediaid ";
-				
+
 				if (!$db->insert_query($SQL))
 				{
 					$this->response->SetError('Error rolling back transcation.');
@@ -753,9 +757,14 @@
 					return $this->response;
 				}
 			}
-			
-			//Update the media record to include this information
-			$SQL = "UPDATE media SET storedAs = '$storedAs' WHERE mediaid = $new_mediaid";
+
+			// Calculate the MD5 and the file size
+			$md5 		= md5_file($databaseDir.$storedAs);
+			$fileSize 	= filesize($databaseDir.$storedAs);
+
+			// Update the media record to include this information
+			$SQL = sprintf("UPDATE media SET storedAs = '%s', `MD5` = '%s', FileSize = %d WHERE mediaid = %d", $storedAs, $md5, $fileSize, $new_mediaid);
+
 			if (!$db->query($SQL))
 			{
 				trigger_error($db->error());
@@ -763,13 +772,13 @@
 				$this->response->keepOpen = true;
 				return $this->response;
 			}
-			
+
 			// 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))
 			{
 				trigger_error($db->error());
@@ -783,54 +792,54 @@
 		{
 			// Editing the existing record
 			$new_mediaid = $mediaid;
-			
+
 			$SQL =  "UPDATE media SET name = '%s', duration = %d, permissionID = %d";
 			$SQL .= " WHERE mediaID = %d ";
 			$SQL = sprintf($SQL, $db->escape_string($name), $duration, $permissionid, $mediaid);
-			
+
 			Debug::LogEntry($db, 'audit', $SQL);
-	
+
 			if (!$db->query($SQL))
 			{
 				trigger_error($db->error());
-				
+
 				$this->response->SetError('Database error editing this media record.');
 				$this->response->keepOpen = true;
 				return $this->response;
 			}
 		}
-		
+
 		// Required Attributes
 		$this->mediaid	= $new_mediaid;
 		$this->duration = $duration;
-		
+
 		// Any Options
 		$this->SetOption('uri', $storedAs);
-		
+
 		// Should have built the media object entirely by this time
 		if ($regionid != '')
 		{
 			// This saves the Media Object to the Region
 			$this->UpdateRegion();
-			
+
 			$this->response->loadForm	 = true;
 			$this->response->loadFormUri = "index.php?p=layout&layoutid=$layoutid&regionid=$regionid&q=RegionOptions";;
 		}
 		else
 		{
-			$this->response->loadFormUri = "index.php?p=content&q=displayForms&sp=add";			
+			$this->response->loadFormUri = "index.php?p=content&q=displayForms&sp=add";
 			$this->response->message = 'Edited the Powerpoint.';
-			
+
 		}
-		
+
 		return $this->response;
 	}
-	
+
 	/**
 	 * Delete Media from the Database
-	 * @return 
+	 * @return
 	 */
-	public function DeleteMedia() 
+	public function DeleteMedia()
 	{
 		$db 		=& $this->db;
 		$layoutid 	= $this->layoutid;
@@ -838,10 +847,10 @@
 		$mediaid	= $this->mediaid;
 		$userid		= Kit::GetParam('userid', _SESSION, _INT);
 		$options  	= Kit::GetParam('options', _POST, _WORD);
-		
+
 		// Stored As from the XML
 		$this->uri	= $this->GetOption('uri');
-		
+
 		// Do we need to remove this from a layout?
 		if ($layoutid != '')
 		{
@@ -853,72 +862,72 @@
 			// Set this message now in preparation
 			$this->response->message = 'Deleted the Media.';
 		}
-				
+
 		// If we are set to retire we retire
 		if ($options == "retire")
 		{
 			//Update the media record to say it is retired
 			$SQL = "UPDATE media SET retired = 1 WHERE mediaid = $mediaid ";
-			
+
 			if (!$db->query($SQL))
 			{
 				trigger_error($db->error());
-				
+
 				$this->response->SetError('Database error retiring this media record.');
 				$this->response->keepOpen = true;
 				return $this->response;
 			}
 		}
-		
+
 		//If we are set to delete, we delete
 		if ($options == "delete")
 		{
 			//Update the media record to say it is retired
 			$SQL = "DELETE FROM media WHERE mediaid = $mediaid ";
-			
+
 			if (!$db->query($SQL))
 			{
 				trigger_error($db->error());
-				
+
 				$this->response->SetError('Database error deleting this media record.');
 				$this->response->keepOpen = true;
 				return $this->response;
 			}
-			
+
 			$this->DeleteMediaFiles();
 		}
-			
+
 		return $this->response;
 	}
-	
+
 	/**
 	 * Deletes the media files associated with this record
-	 * @return 
+	 * @return
 	 */
 	private function DeleteMediaFiles()
 	{
 		$db =& $this->db;
-		
+
 		//Library location
 		$databaseDir = Config::GetSetting($db, "LIBRARY_LOCATION");
-		
+
 		//3 things to check for..
 		//the actual file, the thumbnail, the background
 		if (file_exists($databaseDir.$this->uri))
 		{
 			unlink($databaseDir.$this->uri);
 		}
-		
+
 		if (file_exists($databaseDir."tn_".$this->uri))
 		{
 			unlink($databaseDir."tn_".$this->uri);
 		}
-		
+
 		if (file_exists($databaseDir."bg_".$this->uri))
 		{
 			unlink($databaseDir."bg_".$this->uri);
 		}
-		
+
 		return true;
 	}
 }
 
=== modified file 'server/modules/video.module.php'
--- server/modules/video.module.php	2009-06-28 10:47:06 +0000
+++ server/modules/video.module.php	2009-09-29 22:15:22 +0000
@@ -8,7 +8,7 @@
  * 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. 
+ * any later version.
  *
  * Xibo is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,31 +17,31 @@
  *
  * 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 video extends Module
 {
 	// Custom Media information
 	private $uri;
 	private $maxFileSize;
 	private $maxFileSizeBytes;
-	
+
 	public function __construct(database $db, user $user, $mediaid = '', $layoutid = '', $regionid = '')
 	{
 		// Must set the type of the class
 		$this->type 			= 'video';
-		
+
 		// Get the max upload size from PHP
 		$this->maxFileSize 		= ini_get('upload_max_filesize');
 		$this->maxFileSizeBytes = convertBytes($this->maxFileSize);
-	
-		// Must call the parent class	
+
+		// Must call the parent class
 		parent::__construct($db, $user, $mediaid, $layoutid, $regionid);
 	}
-	
+
 	/**
 	 * Sets the Layout and Region Information
 	 *  it will then fill in any blanks it has about this media if it can
-	 * @return 
+	 * @return
 	 * @param $layoutid Object
 	 * @param $regionid Object
 	 * @param $mediaid Object
@@ -53,75 +53,75 @@
 		$this->regionid 		= $regionid;
 		$mediaid			 	= $this->mediaid;
 		$this->existingMedia 	= false;
-		
+
 		if ($this->regionSpecific == 1) return;
-		
+
 		// Load what we know about this media into the object
 		$SQL = "SELECT name, type, duration, originalFilename, userID, permissionID, retired, storedAs, isEdited, editedMediaID FROM media WHERE mediaID = $mediaid ";
-		
+
 		if (!$result = $db->query($SQL))
 		{
 			trigger_error($db->error()); //log the error
 			return false;
 		}
-		
+
 		if ($db->num_rows($result) != 1)
 		{
 			trigger_error("More than one row for mediaId [$mediaid] How can this be?");
 			return false;
 		}
-		
+
 		$row 				= $db->get_row($result);
 		$duration			= $row[2];
 		$storedAs			= $row[7];
-		
+
 		// Required Attributes
 		$this->duration = $duration;
-		
+
 		// Any Options
 		$this->SetOption('uri', $storedAs);
-		
+
 		return true;
 	}
-	
+
 	/**
 	 * Return the Add Form as HTML
-	 * @return 
+	 * @return
 	 */
 	public function AddForm()
 	{
 		global $session;
 		$db 			=& $this->db;
 		$user			=& $this->user;
-				
-		// Would like to get the regions width / height 
+
+		// Would like to get the regions width / height
 		$layoutid		= $this->layoutid;
 		$regionid		= $this->regionid;
-		
+
 		// Set the Session / Security information
 		$sessionId 		= session_id();
 		$securityToken 	= CreateFormToken();
-		
+
 		$session->setSecurityToken($securityToken);
-		
+
 		//Get the default value for the shared list
 		$default = Config::GetSetting($db,"defaultMedia");
 
 		$permissionid = 0;
 
-		if($default=="private") 
+		if($default=="private")
 		{
 			$permissionid = 1;
 		}
-		
+
 		//shared list
 		$shared_list = dropdownlist("SELECT permissionID, permission FROM permission", "permissionid", $permissionid);
-		
+
 		//Save button is different depending on if we are on a region or not
 		if ($regionid != "")
 		{
 			setSession('content','mediatype','video');
-			
+
 			$save_button = <<<END
 			<input id="btnSave" type="submit" value="Save" disabled />
 			<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" />
@@ -135,7 +135,7 @@
 			<input class="XiboFormButton" id="btnCancel" type="button" title="Close" href="index.php?p=content&q=displayForms&sp=add" value="Cancel" />
 END;
 		}
-		
+
 		$form = <<<FORM
 		<div style="display:none"><iframe name="fileupload" width="1px" height="1px"></iframe></div>
 		<div>
@@ -144,7 +144,7 @@
 				<input type="hidden" id="SecurityToken" value="$securityToken" />
 				<input type="hidden" name="MAX_FILE_SIZE" value="$this->maxFileSizeBytes" />
 				<table>
-					<tr> 
+					<tr>
 						<td><label for="file">Video File<span class="required">*</span></label></td>
 						<td colspan="3">
 							<input type="file" name="media_file" onchange="fileFormSubmit();this.form.submit();" />
@@ -172,7 +172,7 @@
 					<td><label for="permissionid">Sharing<span class="required">*</span></label></td>
 					<td>
 					$shared_list
-					</td>			
+					</td>
 				</tr>
 				<tr>
 					<td></td>
@@ -194,49 +194,49 @@
 
 		return $this->response;
 	}
-	
+
 	/**
 	 * Return the Edit Form as HTML
-	 * @return 
+	 * @return
 	 */
 	public function EditForm()
 	{
 		global $session;
 		$db 			=& $this->db;
 		$user			=& $this->user;
-				
-		// Would like to get the regions width / height 
+
+		// Would like to get the regions width / height
 		$layoutid		= $this->layoutid;
 		$regionid		= $this->regionid;
 		$mediaid		= $this->mediaid;
 		$lkid			= $this->lkid;
 		$userid			= Kit::GetParam('userid', _SESSION, _INT);
-		
+
 		// Set the Session / Security information
 		$sessionId 		= session_id();
 		$securityToken 	= CreateFormToken();
-		
+
 		$session->setSecurityToken($securityToken);
-		
+
 		// Load what we know about this media into the object
 		$SQL = "SELECT name, originalFilename, userID, permissionID, retired, storedAs, isEdited, editedMediaID FROM media WHERE mediaID = $mediaid ";
-		
+
 		if (!$result = $db->query($SQL))
 		{
 			trigger_error($db->error()); //log the error
-			
+
 			$this->message = "Error querying for the Media information with media ID [$mediaid] ";
 			return false;
 		}
-		
+
 		if ($db->num_rows($result) != 1)
 		{
 			trigger_error("More than one row for mediaId [$mediaid] How can this be?");
-			
+
 			$this->message = "Error querying for the Media information with media ID [$mediaid] ";
 			return false;
 		}
-		
+
 		$row 				= $db->get_row($result);
 		$name 				= $row[0];
 		$originalFilename 	= $row[1];
@@ -246,23 +246,23 @@
 		$storedAs			= $row[5];
 		$isEdited			= $row[6];
 		$editedMediaID		= $row[7];
-		
+
 		// derive the ext
 		$ext				= strtolower(substr(strrchr($originalFilename, "."), 1));
-		
+
 		//Calc the permissions on it aswell
 		list($see_permissions , $edit_permissions) = $user->eval_permission($userid, $permissionid);
-		
+
 		//shared list
 		$shared_list = dropdownlist("SELECT permissionID, permission FROM permission", "permissionid", $permissionid);
-		
+
 		//Save button is different depending on if we are on a region or not
 		if ($regionid != "")
 		{
 			setSession('content','mediatype','image');
-			
+
 			$extraNotes = '<em>Note: Uploading a new media item here will replace it on this layout only.</em>';
-			
+
 			$save_button = <<<END
 			<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" />
@@ -272,13 +272,13 @@
 		else
 		{
 			$extraNotes = '<em>Note: As you editing from the library uploading a new media item will not replace the old one from any layouts. To do this nagivate to the layout and edit the media from there.</em>';
-			
+
 			$save_button = <<<END
 			<input id="btnSave" type="submit" value="Save" />
 			<input id="btnCancel" type="button" title="Close" onclick="$('#div_dialog').dialog('close')" value="Cancel" />
 END;
 		}
-		
+
 		$form = <<<FORM
 		<div style="display:none"><iframe name="fileupload" width="1px" height="1px"></iframe></div>
 		<div>
@@ -287,7 +287,7 @@
 				<input type="hidden" id="SecurityToken" value="$securityToken" />
 				<input type="hidden" name="MAX_FILE_SIZE" value="$this->maxFileSizeBytes" />
 				<table>
-					<tr> 
+					<tr>
 						<td><label for="file">New Video File<span class="required">*</span></label></td>
 						<td colspan="3">
 							<input type="file" name="media_file" onchange="fileFormSubmit();this.form.submit();" />
@@ -319,7 +319,7 @@
 					<td><label for="permissionid">Sharing<span class="required">*</span></label></td>
 					<td>
 					$shared_list
-					</td>			
+					</td>
 				</tr>
 				<tr>
 					<td></td>
@@ -343,50 +343,50 @@
 		$this->response->dialogWidth 	= '450px';
 		$this->response->dialogHeight 	= '280px';
 
-		return $this->response;		
+		return $this->response;
 	}
-	
+
 	/**
 	 * Return the Delete Form as HTML
-	 * @return 
+	 * @return
 	 */
 	public function DeleteForm()
 	{
 		$db 			=& $this->db;
 		$user			=& $this->user;
-				
-		// Would like to get the regions width / height 
+
+		// Would like to get the regions width / height
 		$layoutid		= $this->layoutid;
 		$regionid		= $this->regionid;
 		$mediaid		= $this->mediaid;
 		$lkid			= $this->lkid;
 		$userid			= Kit::GetParam('userid', _SESSION, _INT);
-		
+
 		$options = "";
 		//Always have the abilty to unassign from the region
 		$options .= "unassign|Unassign from this region only";
-		
+
 		// Load what we know about this media into the object
 		$SQL = "SELECT name, type, duration, originalFilename, userID, permissionID, retired, storedAs, isEdited, editedMediaID FROM media WHERE mediaID = $mediaid ";
-		
+
 		if (!$result = $db->query($SQL))
 		{
 			trigger_error($db->error()); //log the error
-			
+
 			$this->response->SetError('Error querying for the Media information with media ID [$mediaid]');
 			$this->response->keepOpen = true;
 			return $this->response;
 		}
-		
+
 		if ($db->num_rows($result) != 1)
 		{
 			trigger_error("More than one row for mediaId [$mediaid] How can this be?");
-			
+
 			$this->response->SetError('Error querying for the Media information with media ID [$mediaid]');
 			$this->response->keepOpen = true;
 			return $this->response;
 		}
-		
+
 		$row 				= $db->get_row($result);
 		$name 				= $row[0];
 		$duration			= $row[2];
@@ -397,18 +397,18 @@
 		$storedAs			= $row[7];
 		$isEdited			= $row[8];
 		$editedMediaID		= $row[9];
-		
+
 		// derive the ext
 		$ext				= strtolower(substr(strrchr($originalFilename, "."), 1));
-		
+
 		//Calc the permissions on it aswell
 		list($see_permissions , $edit_permissions) = $user->eval_permission($userid, $permissionid);
-		
+
 		//Is this user allowed to edit this media?
 		if ($edit_permissions)
 		{
 			$options .= ",retire|Unassign from this region and retire";
-		
+
 			//Is this media retired?
 			if ($editedMediaID != "")
 			{
@@ -418,7 +418,7 @@
 			{
 				$revised = false;
 			}
-		
+
 			//Is this media being used anywhere else?
 			if ($layoutid == "")
 			{
@@ -429,8 +429,8 @@
 			{
 				$SQL = "SELECT layoutID FROM lklayoutmedia WHERE mediaID = $mediaid AND layoutid <> $layoutid AND regionID <> '$regionid' ";
 			}
-			
-			if (!$results = $db->query($SQL)) 
+
+			if (!$results = $db->query($SQL))
 			{
 				trigger_error($db->error());
 
@@ -457,9 +457,9 @@
 				return $this->response;
 			}
 		}
-		
+
 		$options = ltrim($options, ",");
-		
+
 		$deleteOptions = listcontent($options,"options");
 
 		//we can delete
@@ -474,19 +474,19 @@
 			<input id="btnCancel" type="button" title="No / Cancel" href="index.php?p=layout&layoutid=$layoutid&regionid=$regionid&q=RegionOptions" onclick="$('#div_dialog').dialog('close');return false; " value="No" />
 		</form>
 END;
-		
+
 		$this->response->html 			= $form;
 		$this->response->dialogTitle 	= 'Delete Video';
 		$this->response->dialogSize 	= true;
 		$this->response->dialogWidth 	= '450px';
 		$this->response->dialogHeight 	= '280px';
 
-		return $this->response;	
+		return $this->response;
 	}
-	
+
 	/**
 	 * Add Media to the Database
-	 * @return 
+	 * @return
 	 */
 	public function AddMedia()
 	{
@@ -495,29 +495,29 @@
 		$regionid 	= $this->regionid;
 		$mediaid	= $this->mediaid;
 		$userid		= Kit::GetParam('userid', _SESSION, _INT);
-		
+
 		// File data
 		$tmpName	= Kit::GetParam('hidFileID', _POST, _STRING);
-		
+
 		if ($tmpName == '')
 		{
 			$this->response->SetError('Cannot save Video details. <br/> You must have picked a file.');
 			$this->response->keepOpen = true;
 			return $this->response;
 		}
-		
+
 		// File name and extension (orignial name)
 		$fileName		= Kit::GetParam('txtFileName', _POST, _STRING);
 		$fileName 		= basename($fileName);
 		$ext 			= strtolower(substr(strrchr($fileName, "."), 1));
-			
+
 		// Other properties
 		$name	  		= Kit::GetParam('name', _POST, _STRING);
 		$duration	  	= Kit::GetParam('duration', _POST, _INT, 0);
 		$permissionid 	= Kit::GetParam('permissionid', _POST, _INT, 1);
-		
+
 		if ($name == '') $name = Kit::ValidateParam($fileName, _FILENAME);
-		
+
 		// Validation
 		if ($ext != "wmv" && $ext != "mpeg" && $ext != "mpg")
 		{
@@ -525,25 +525,25 @@
 			$this->response->keepOpen = true;
 			return $this->response;
 		}
-		
+
 		// Make sure the name isnt too long
-		if (strlen($name) > 100) 
+		if (strlen($name) > 100)
 		{
 			$this->response->SetError('The name cannot be longer than 100 characters');
 			$this->response->keepOpen = true;
 			return $this->response;
 		}
-		
+
 		// Ensure the name is not already in the database
 		$SQL = sprintf("SELECT name FROM media WHERE name = '%s' AND userid = %d", $db->escape_string($name), $userid);
 
-		if(!$result = $db->query($SQL)) 
+		if(!$result = $db->query($SQL))
 		{
 			trigger_error($db->error());
 			$this->response->SetError('Error checking whether the media name is ok. Try choosing a different name.');
 			$this->response->keepOpen = true;
 			return $this->response;
-		} 
+		}
 
 		if ($db->num_rows($result) != 0)
 		{
@@ -551,11 +551,11 @@
 			$this->response->keepOpen = true;
 			return $this->response;
 		}
-		
+
 		// All OK to insert this record
 		$SQL  = "INSERT INTO media (name, type, duration, originalFilename, permissionID, userID, retired ) ";
 		$SQL .= "VALUES ('%s', 'video', '%s', '%s', %d, %d, 0) ";
-		
+
 		$SQL = sprintf($SQL, $db->escape_string($name), $db->escape_string($duration), $db->escape_string($fileName), $permissionid, $userid);
 
 		if (!$mediaid = $db->insert_query($SQL))
@@ -565,19 +565,19 @@
 			$this->response->keepOpen = true;
 			return $this->response;
 		}
-				
+
 		// File upload directory.. get this from the settings object
 		$databaseDir = Config::GetSetting($db, "LIBRARY_LOCATION");
-		
+
 		// What are we going to store this media as...
 		$storedAs = $mediaid.".".$ext;
-		 
+
 		// Now we need to move the file
 		if (!$result = rename($databaseDir."temp/".$tmpName, $databaseDir.$storedAs))
 		{
 			// If we couldnt move it - we need to delete the media record we just added
 			$SQL = sprintf("DELETE FROM media WHERE mediaID = %d ", $mediaid);
-			
+
 			if (!$db->query($SQL))
 			{
 				trigger_error($db->error());
@@ -586,23 +586,27 @@
 				return $this->response;
 			}
 		}
-		
+
+		// Calculate the MD5 and the file size
+		$md5 		= md5_file($databaseDir.$storedAs);
+		$fileSize 	= filesize($databaseDir.$storedAs);
+
 		// Update the media record to include this information
-		$SQL = sprintf("UPDATE media SET storedAs = '%s' WHERE mediaid = %d", $storedAs, $mediaid);
-		
+		$SQL = sprintf("UPDATE media SET storedAs = '%s', `MD5` = '%s', FileSize = %d WHERE mediaid = %d", $storedAs, $md5, $fileSize, $mediaid);
+
 		if (!$db->query($SQL))
 		{
 			trigger_error($db->error());
 			return true;
 		}
-		
+
 		// Required Attributes
 		$this->mediaid	= $mediaid;
 		$this->duration = $duration;
-		
+
 		// Any Options
 		$this->SetOption('uri', $storedAs);
-		
+
 		// Should have built the media object entirely by this time
 		if ($regionid != '')
 		{
@@ -612,18 +616,18 @@
 		}
 		else
 		{
-			$this->response->loadFormUri = "index.php?p=content&q=displayForms&sp=add";			
+			$this->response->loadFormUri = "index.php?p=content&q=displayForms&sp=add";
 		}
-				
+
 		// We want to load a new form
 		$this->response->loadForm	= true;
-		
+
 		return $this->response;
 	}
-	
+
 	/**
 	 * Edit Media in the Database
-	 * @return 
+	 * @return
 	 */
 	public function EditMedia()
 	{
@@ -632,13 +636,13 @@
 		$regionid 	= $this->regionid;
 		$mediaid	= $this->mediaid;
 		$userid		= Kit::GetParam('userid', _SESSION, _INT);
-		
+
 		// Stored As from the XML
 		$storedAs	= $this->GetOption('uri');
-		
+
 		// File data
 		$tmpName	= Kit::GetParam('hidFileID', _POST, _STRING);
-		
+
 		if ($tmpName == '')
 		{
 			$fileRevision = false;
@@ -646,12 +650,12 @@
 		else
 		{
 			$fileRevision = true;
-			
+
 			// File name and extension (orignial name)
 			$fileName		= Kit::GetParam('txtFileName', _POST, _STRING);
 			$fileName 		= basename($fileName);
 			$ext 			= strtolower(substr(strrchr($fileName, "."), 1));
-			
+
 			// Validation
 			if ($ext != "wmv" && $ext != "mpeg" && $ext != "mpg")
 			{
@@ -660,17 +664,17 @@
 				return $this->response;
 			}
 		}
-			
+
 		// Other properties
 		$name	  		= Kit::GetParam('name', _POST, _STRING);
 		$duration	  	= Kit::GetParam('duration', _POST, _INT, 0);
 		$permissionid 	= Kit::GetParam('permissionid', _POST, _INT, 1);
-		
+
 		if ($name == '')
 		{
 			if ($fileRevision)
 			{
-				$name = Kit::ValidateParam($fileName, _FILENAME);			
+				$name = Kit::ValidateParam($fileName, _FILENAME);
 			}
 			else
 			{
@@ -678,26 +682,26 @@
 				$this->response->keepOpen = true;
 				return $this->response;
 			}
-		} 
-		
+		}
+
 		// Make sure the name isnt too long
-		if (strlen($name) > 100) 
+		if (strlen($name) > 100)
 		{
 			$this->response->SetError('The name cannot be longer than 100 characters');
 			$this->response->keepOpen = true;
 			return $this->response;
 		}
-		
+
 		// Ensure the name is not already in the database
 		$SQL = sprintf("SELECT name FROM media WHERE name = '%s' AND userid = %d AND mediaid <> %d ", $db->escape_string($name), $userid, $mediaid);
 
-		if(!$result = $db->query($SQL)) 
+		if(!$result = $db->query($SQL))
 		{
 			trigger_error($db->error());
 			$this->response->SetError('Error checking whether the media name is ok. Try choosing a different name.');
 			$this->response->keepOpen = true;
 			return $this->response;
-		} 
+		}
 
 		if ($db->num_rows($result) != 0)
 		{
@@ -705,34 +709,34 @@
 			$this->response->keepOpen = true;
 			return $this->response;
 		}
-		
+
 		//Are we revising this media - or just plain editing
 		if ($fileRevision)
 		{
 			// All OK to insert this record
 			$SQL  = "INSERT INTO media (name, type, duration, originalFilename, permissionID, userID, retired ) ";
 			$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))
 			{
 				//If we couldnt move it - we need to delete the media record we just added
 				$SQL = "DELETE FROM media WHERE mediaID = $new_mediaid ";
-				
+
 				if (!$db->insert_query($SQL))
 				{
 					$this->response->SetError('Error rolling back transcation.');
@@ -740,23 +744,28 @@
 					return $this->response;
 				}
 			}
-			
+
+			// Calculate the MD5 and the file size
+			$md5 		= md5_file($databaseDir.$storedAs);
+			$fileSize 	= filesize($databaseDir.$storedAs);
+
 			// Update the media record to include this information
-			$SQL = "UPDATE media SET storedAs = '$storedAs' WHERE mediaid = $new_mediaid";
+			$SQL = sprintf("UPDATE media SET storedAs = '%s', `MD5` = '%s', FileSize = %d WHERE mediaid = %d", $storedAs, $md5, $fileSize, $new_mediaid);
+
 			if (!$db->query($SQL))
 			{
 				trigger_error($db->error());
-				$this->response->SetError('Error updating media with Library location.');
+				$this->response->SetError('Database error editing this media record.');
 				$this->response->keepOpen = true;
 				return $this->response;
 			}
-			
+
 			// 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))
 			{
 				trigger_error($db->error());
@@ -770,54 +779,54 @@
 		{
 			// Editing the existing record
 			$new_mediaid = $mediaid;
-			
+
 			$SQL =  "UPDATE media SET name = '%s', duration = %d, permissionID = %d";
 			$SQL .= " WHERE mediaID = %d ";
 			$SQL = sprintf($SQL, $db->escape_string($name), $duration, $permissionid, $mediaid);
-			
+
 			Debug::LogEntry($db, 'audit', $SQL);
-	
+
 			if (!$db->query($SQL))
 			{
 				trigger_error($db->error());
-				
+
 				$this->response->SetError('Database error editing this media record.');
 				$this->response->keepOpen = true;
 				return $this->response;
 			}
 		}
-		
+
 		// Required Attributes
 		$this->mediaid	= $new_mediaid;
 		$this->duration = $duration;
-		
+
 		// Any Options
 		$this->SetOption('uri', $storedAs);
-		
+
 		// Should have built the media object entirely by this time
 		if ($regionid != '')
 		{
 			// This saves the Media Object to the Region
 			$this->UpdateRegion();
-			
+
 			$this->response->loadForm	 = true;
 			$this->response->loadFormUri = "index.php?p=layout&layoutid=$layoutid&regionid=$regionid&q=RegionOptions";;
 		}
 		else
 		{
-			$this->response->loadFormUri = "index.php?p=content&q=displayForms&sp=add";			
+			$this->response->loadFormUri = "index.php?p=content&q=displayForms&sp=add";
 			$this->response->message = 'Edited the Video.';
-			
+
 		}
-		
+
 		return $this->response;
 	}
-	
+
 	/**
 	 * Delete Media from the Database
-	 * @return 
+	 * @return
 	 */
-	public function DeleteMedia() 
+	public function DeleteMedia()
 	{
 		$db 		=& $this->db;
 		$layoutid 	= $this->layoutid;
@@ -825,10 +834,10 @@
 		$mediaid	= $this->mediaid;
 		$userid		= Kit::GetParam('userid', _SESSION, _INT);
 		$options  	= Kit::GetParam('options', _POST, _WORD);
-		
+
 		// Stored As from the XML
 		$this->uri	= $this->GetOption('uri');
-		
+
 		// Do we need to remove this from a layout?
 		if ($layoutid != '')
 		{
@@ -840,72 +849,72 @@
 			// Set this message now in preparation
 			$this->response->message = 'Deleted the Media.';
 		}
-				
+
 		// If we are set to retire we retire
 		if ($options == "retire")
 		{
 			//Update the media record to say it is retired
 			$SQL = "UPDATE media SET retired = 1 WHERE mediaid = $mediaid ";
-			
+
 			if (!$db->query($SQL))
 			{
 				trigger_error($db->error());
-				
+
 				$this->response->SetError('Database error retiring this media record.');
 				$this->response->keepOpen = true;
 				return $this->response;
 			}
 		}
-		
+
 		//If we are set to delete, we delete
 		if ($options == "delete")
 		{
 			//Update the media record to say it is retired
 			$SQL = "DELETE FROM media WHERE mediaid = $mediaid ";
-			
+
 			if (!$db->query($SQL))
 			{
 				trigger_error($db->error());
-				
+
 				$this->response->SetError('Database error deleting this media record.');
 				$this->response->keepOpen = true;
 				return $this->response;
 			}
-			
+
 			$this->DeleteMediaFiles();
 		}
-			
+
 		return $this->response;
 	}
-	
+
 	/**
 	 * Deletes the media files associated with this record
-	 * @return 
+	 * @return
 	 */
 	private function DeleteMediaFiles()
 	{
 		$db =& $this->db;
-		
+
 		//Library location
 		$databaseDir = Config::GetSetting($db, "LIBRARY_LOCATION");
-		
+
 		//3 things to check for..
 		//the actual file, the thumbnail, the background
 		if (file_exists($databaseDir.$this->uri))
 		{
 			unlink($databaseDir.$this->uri);
 		}
-		
+
 		if (file_exists($databaseDir."tn_".$this->uri))
 		{
 			unlink($databaseDir."tn_".$this->uri);
 		}
-		
+
 		if (file_exists($databaseDir."bg_".$this->uri))
 		{
 			unlink($databaseDir."bg_".$this->uri);
 		}
-		
+
 		return true;
 	}
 }
 
=== modified file 'server/xmds.php'
--- server/xmds.php	2009-09-27 11:25:04 +0000
+++ server/xmds.php	2009-09-29 22:15:22 +0000
@@ -8,7 +8,7 @@
  * 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. 
+ * any later version.
  *
  * Xibo is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -29,66 +29,78 @@
 function Auth($hardwareKey)
 {
 	global $db;
-	
+
 	//check in the database for this hardwareKey
 	$SQL = "SELECT licensed, inc_schedule, isAuditing, displayID FROM display WHERE license = '$hardwareKey'";
-	if (!$result = $db->query($SQL)) 
+	if (!$result = $db->query($SQL))
 	{
 		trigger_error("License key query failed:" .$db->error());
 		return false;
 	}
-	
+
 	//Is it there?
-	if ($db->num_rows($result) == 0) 
+	if ($db->num_rows($result) == 0)
 	{
 		return false;
 	}
-	else 
+	else
 	{
 		//we have seen this display before, so check the licensed value
 		$row = $db->get_row($result);
-		if ($row[0] == 0) 
+		if ($row[0] == 0)
 		{
 			return false;
 		}
-		else 
+		else
 		{
+<<<<<<< TREE
 			$displayObject = new Display($db);
 			
 			$displayObject->Touch($hardwareKey);
 			
+=======
+			$time = date("Y-m-d H:i:s", time());
+
+			//Set the last accessed flag on the display
+			$SQL = "UPDATE display SET lastaccessed = '$time', loggedin = 1 WHERE license = '$hardwareKey' ";
+			if (!$result = $db->query($SQL))
+			{
+				trigger_error("Display update access failure: " .$db->error());
+			}
+
+>>>>>>> MERGE-SOURCE
 			//It is licensed
 			return array("licensed" => true, "inc_schedule" => $row[1], "isAuditing" => $row[2], "displayid" => $row[3]);
 		}
 	}
-	
+
 	return false;
 }
 
 /**
  * Checks that the calling service is talking the correct version
- * @return 
+ * @return
  * @param $version Object
  */
 function CheckVersion($version)
 {
 	global $db;
-	
+
 	// Look up the Service XMDS version from the Version table
 	$serverVersion = Config::Version($db, 'XmdsVersion');
-	
+
 	if ($version != $serverVersion)
 	{
 		Debug::LogEntry($db, 'audit', sprintf('A Client with an incorrect version connected. Client Version: [%s] Server Version [%s]', $version, $serverVersion));
 		return false;
 	}
-	
+
 	return true;
 }
 
 /**
  * Registers the Display with the server - if there is an available slot
- * @return 
+ * @return
  * @param $serverKey Object
  * @param $hardwareKey Object
  * @param $displayName Object
@@ -96,70 +108,99 @@
 function RegisterDisplay($serverKey, $hardwareKey, $displayName, $version)
 {
 	global $db;
-	
+
 	// Sanitize
 	$serverKey 		= Kit::ValidateParam($serverKey, _STRING);
 	$hardwareKey 	= Kit::ValidateParam($hardwareKey, _STRING);
 	$displayName 	= Kit::ValidateParam($displayName, _STRING);
 	$version 		= Kit::ValidateParam($version, _STRING);
-	
+
 	// Make sure we are talking the same language
 	if (!CheckVersion($version))
 	{
 		return new soap_fault("SOAP-ENV:Client", "", "Your client is not of the correct version for communication with this server. You can get the latest from http://www.xibo.org.uk", $serverKey);
 	}
-	
+
 	define('SERVER_KEY', Config::GetSetting($db, 'SERVER_KEY'));
-	
+
 	Debug::LogEntry($db, "audit", "[IN]", "xmds", "RegisterDisplay");
 	Debug::LogEntry($db, "audit", "serverKey [$serverKey], hardwareKey [$hardwareKey], displayName [$displayName]", "xmds", "RegisterDisplay");
-	
+
 	//Check the serverKey matches the one we have stored in this servers lic.txt file
 	if ($serverKey != SERVER_KEY)
 	{
 		return new soap_fault("SOAP-ENV:Client", "", "The Server key you entered does not match with the server key at this address", $serverKey);
 	}
-	
+
 	// Check the Length of the hardwareKey
 	if (strlen($hardwareKey) > 40)
 	{
 		return new soap_fault("SOAP-ENV:Client", "", "The Hardware Key you sent was too long. Only 40 characters are allowed (SHA1).", $hardwareKey);
 	}
+<<<<<<< TREE
 	
 	// Check in the database for this hardwareKey
+=======
+
+	//check in the database for this hardwareKey
+>>>>>>> MERGE-SOURCE
 	$SQL = "SELECT licensed, display FROM display WHERE license = '$hardwareKey'";
+<<<<<<< TREE
 	
 	if (!$result = $db->query($SQL)) 
+=======
+	if (!$result = $db->query($SQL))
+>>>>>>> MERGE-SOURCE
 	{
 		trigger_error("License key query failed:" .$db->error());
 		return new soap_fault("SOAP-ENV:Server", "", "License Key Query Failed, see server errorlog", $db->error());
 	}
+<<<<<<< TREE
 	
 	// Use a display object to Add or Edit the display
 	$displayObject = new Display($db);		
 	
 	// Is it there?
 	if ($db->num_rows($result) == 0) 
+=======
+
+	//Is it there?
+	if ($db->num_rows($result) == 0)
+>>>>>>> MERGE-SOURCE
 	{
+<<<<<<< TREE
 		// Get the default layout id
 		$defaultLayoutId = 4;
 		
 		// Add this display record
 		if (!$displayid = $displayObject->Add($displayName, 0, $defaultLayoutId, $hardwareKey, 0, 0)) return new soap_fault("SOAP-ENV:Server", "", "Error adding display");
 		
+=======
+		//Add this display record
+		$SQL = sprintf("INSERT INTO display (display, defaultlayoutid, license, licensed) VALUES ('%s', 1, '%s', 0)", $displayName, $hardwareKey);
+		if (!$displayid = $db->insert_query($SQL))
+		{
+			trigger_error($db->error());
+			return new soap_fault("SOAP-ENV:Server", "", "Error adding display");
+		}
+>>>>>>> MERGE-SOURCE
 		$active = "Display added and is awaiting licensing approval from an Administrator";
 	}
-	else 
+	else
 	{
 		//we have seen this display before, so check the licensed value
 		$row = $db->get_row($result);
+<<<<<<< TREE
 		
 		if ($row[0] == 0) 
+=======
+		if ($row[0] == 0)
+>>>>>>> MERGE-SOURCE
 		{
 			//Its Not licensed
 			$active = "Display is awaiting licensing approval from an Administrator.";
 		}
-		else 
+		else
 		{
 			//It is licensed
 			//Now check the names
@@ -169,20 +210,27 @@
 			}
 			else
 			{
+<<<<<<< TREE
 				// Update the name
 				if (!$displayObject->EditDisplayName($hardwareKey, $displayName))
+=======
+				//Update the name
+				$SQL = sprintf("UPDATE display SET display = '%s' WHERE license = '%s' ", $displayName, $hardwareKey);
+
+				if (!$db->query($SQL))
+>>>>>>> MERGE-SOURCE
 				{
 					return new soap_fault("SOAP-ENV:Server", "", "Error editing the display name");
 				}
-				
+
 				$active = "Changed display name from '{$row[1]}' to '$displayName' Display is active and ready to start.";
 			}
 		}
 	}
-	
-	Debug::LogEntry($db, "audit", "$active", "xmds", "RegisterDisplay");	
-	Debug::LogEntry($db, "audit", "[OUT]", "xmds", "RegisterDisplay");	
-	
+
+	Debug::LogEntry($db, "audit", "$active", "xmds", "RegisterDisplay");
+	Debug::LogEntry($db, "audit", "[OUT]", "xmds", "RegisterDisplay");
+
 	return $active;
 }
 
@@ -194,12 +242,12 @@
 function RequiredFiles($serverKey, $hardwareKey, $version)
 {
 	global $db;
-	
+
 	// Sanitize
 	$serverKey 		= Kit::ValidateParam($serverKey, _STRING);
 	$hardwareKey 	= Kit::ValidateParam($hardwareKey, _STRING);
 	$version 		= Kit::ValidateParam($version, _STRING);
-	
+
 	// Make sure we are talking the same language
 	if (!CheckVersion($version))
 	{
@@ -207,30 +255,43 @@
 	}
 
 	$libraryLocation = Config::GetSetting($db, "LIBRARY_LOCATION");
-	
+
 	//auth this request...
 	if (!$displayInfo = Auth($hardwareKey))
 	{
 		trigger_error("This display is not licensed [$hardwareKey]");
 		return new soap_fault("SOAP-ENV:Client", "", "This display client is not licensed");
 	}
-	
-	if ($displayInfo['isAuditing'] == 1) 
+
+	if ($displayInfo['isAuditing'] == 1)
 	{
-		Debug::LogEntry($db, "audit", "[IN]", "xmds", "RequiredFiles");	
-		Debug::LogEntry($db, "audit", "$hardwareKey", "xmds", "RequiredFiles");	
+		Debug::LogEntry($db, "audit", "[IN]", "xmds", "RequiredFiles");
+		Debug::LogEntry($db, "audit", "$hardwareKey", "xmds", "RequiredFiles");
 	}
-	
+
 	$requiredFilesXml = new DOMDocument("1.0");
+<<<<<<< TREE
 	$fileElements 	= $requiredFilesXml->createElement("files");
 	
+=======
+	$fileElements = $requiredFilesXml->createElement("files");
+
+>>>>>>> MERGE-SOURCE
 	$requiredFilesXml->appendChild($fileElements);
+<<<<<<< TREE
 	
 	$currentdate 	= time();
 	$infinityFromDT = mktime(0,0,0,1,1,2000);
 	$infinityToDT	= mktime(0,0,0,12,31,2050);
 	$plus4hours 	= $currentdate + 86400;
 	
+=======
+
+	$currentdate = date("Y-m-d H:i:s");
+	$time = time();
+	$plus4hours = date("Y-m-d H:i:s",$time + 86400);
+
+>>>>>>> MERGE-SOURCE
 	//Add file nodes to the $fileElements
 	//Firstly get all the scheduled layouts
 	$SQL  = " SELECT DISTINCT layout.layoutID, layout.xml, layout.background ";
@@ -239,9 +300,9 @@
 	$SQL .= " INNER JOIN lkdisplaydg ON lkdisplaydg.DisplayGroupID = schedule_detail.DisplayGroupID ";
 	$SQL .= " INNER JOIN display ON lkdisplaydg.DisplayID = display.displayID ";
 	$SQL .= sprintf(" WHERE display.license = '%s'  ", $hardwareKey);
-	
+
 	$SQLBase = $SQL;
-	
+
 	//Do we include the default display
 	if ($displayInfo['inc_schedule'] == 1)
 	{
@@ -252,129 +313,167 @@
 	{
 		$SQL .= sprintf(" AND (schedule_detail.FromDT < %d AND schedule_detail.ToDT > %d )", $plus4hours, $currentdate);
 	}
-	
-	if ($displayInfo['isAuditing'] == 1) Debug::LogEntry($db, "audit", "$SQL", "xmds", "RequiredFiles");	
+
+	if ($displayInfo['isAuditing'] == 1) Debug::LogEntry($db, "audit", "$SQL", "xmds", "RequiredFiles");
 
 	if (!$results = $db->query($SQL))
 	{
 		trigger_error($db->error());
 		return new soap_fault("SOAP-ENV:Server", "", "Unable to get a list of files", $db->error());
 	}
-	
+
 	// Was there anything?
 	if ($db->num_rows($results) == 0)
 	{
 		// No rows, run the query for default layout
 		$SQL  = $SQLBase;
+<<<<<<< TREE
 		$SQL .= sprintf(" AND ((schedule_detail.FromDT < %d AND schedule_detail.ToDT > %d )", $plus4hours, $currentdate);
 		$SQL .= sprintf(" OR (schedule_detail.FromDT = %d AND schedule_detail.ToDT = %d ))", $infinityFromDT, $infinityToDT);
 		
+=======
+		$SQL .= sprintf(" AND ((schedule_detail.starttime < '%s' AND schedule_detail.endtime > '%s' )", $plus4hours, $currentdate);
+		$SQL .= " OR (schedule_detail.starttime = '2050-12-31 00:00:00' AND schedule_detail.endtime = '2050-12-31 00:00:00' ))";
+
+>>>>>>> MERGE-SOURCE
 		if (!$results = $db->query($SQL))
 		{
 			trigger_error($db->error());
 			return new soap_fault("SOAP-ENV:Server", "", "Unable to get A list of layouts for the schedule", $db->error());
 		}
 	}
-	
+
 	while ($row = $db->get_row($results))
 	{
 		$layoutid = $row[0];
+<<<<<<< TREE
 		$layoutXml = $row[1];
 		$background = $row[2];
 		
+=======
+		$layoutXml = $row[3];
+		$background = $row[4];
+
+>>>>>>> MERGE-SOURCE
 		// Add all the associated media first
-		$SQL = "SELECT storedAs, media.mediaID 
-				FROM media 
-				INNER JOIN lklayoutmedia ON lklayoutmedia.mediaID = media.mediaID 
-				WHERE storedAs IS NOT NULL 
+		$SQL = "SELECT storedAs, media.mediaID, media.`MD5`, media.FileSize
+				FROM media
+				INNER JOIN lklayoutmedia ON lklayoutmedia.mediaID = media.mediaID
+				WHERE storedAs IS NOT NULL
 					AND lklayoutmedia.layoutID = $layoutid
-					AND media.mediaID NOT IN (SELECT MediaID 
-											  FROM blacklist 
-											  WHERE DisplayID = " . $displayInfo['displayid'] . " 
+					AND media.mediaID NOT IN (SELECT MediaID
+											  FROM blacklist
+											  WHERE DisplayID = " . $displayInfo['displayid'] . "
 											  AND isIgnored = 0 )";
-											  
+
 		if (!$mediaResults = $db->query($SQL))
 		{
 			trigger_error($db->error());
 			return new soap_fault("SOAP-ENV:Server", "", "Unable to get a list of media for the layout [$layoutid]");
 		}
-		
+
 		while ($row = $db->get_row($mediaResults))
 		{
+			$storedAs	= Kit::ValidateParam($row[0], _STRING);
+			$mediaId	= Kit::ValidateParam($row[1], _INT);
+			$md5		= Kit::ValidateParam($row[2], _STRING);
+			$fileSize	= Kit::ValidateParam($row[3], _INT);
+
+			// If they are empty calculate them and save them back to the media.
+			if ($md5 == '' || $fileSize == 0)
+			{
+
+				$md5 		= md5_file($libraryLocation.$row[0]);
+				$fileSize	= filesize($libraryLocation.$row[0]);
+
+				// Update the media record with this information
+				$SQL = sprintf("UPDATE media SET `MD5` = '%s', FileSize = %d WHERE MediaID = %d", $md5, $fileSize, $mediaId);
+
+				if (!$db->query($SQL))
+					trigger_error($db->error());
+			}
+
 			//Add the file node
 			$file = $requiredFilesXml->createElement("file");
-			
+
 			$file->setAttribute("type", "media");
-			$file->setAttribute("path", $row[0]);
-			$file->setAttribute("id",	$row[1]);
-			$file->setAttribute("size", filesize($libraryLocation.$row[0]));
-			$file->setAttribute("md5", md5_file($libraryLocation.$row[0]));
-			
+			$file->setAttribute("path", $storedAs);
+			$file->setAttribute("id",	$mediaId);
+			$file->setAttribute("size", $fileSize);
+			$file->setAttribute("md5", $md5);
+
 			$fileElements->appendChild($file);
 		}
-		
+
 		//Also append another file node for the background image (if there is one)
 		if ($background != "")
 		{
 			//firstly add this as a node
 			$file = $requiredFilesXml->createElement("file");
-			
+
 			$file->setAttribute("type", "media");
 			$file->setAttribute("path", $background);
 			$file->setAttribute("md5", md5_file($libraryLocation.$background));
 			$file->setAttribute("size", filesize($libraryLocation.$background));
-			
+
 			$fileElements->appendChild($file);
 		}
-		
+
 		// Add this layout as node
 		$file = $requiredFilesXml->createElement("file");
-		
+
 		$file->setAttribute("type", "layout");
 		$file->setAttribute("path", $layoutid);
 		$file->setAttribute("md5", md5($layoutXml . "\n"));
-		
+
 		$fileElements->appendChild($file);
 	}
-	
+
 	//
 	// Add a blacklist node
 	//
 	$blackList = $requiredFilesXml->createElement("file");
 	$blackList->setAttribute("type", "blacklist");
-	
+
 	$fileElements->appendChild($blackList);
-	
+
 	// Populate
-	$SQL = "SELECT MediaID 
-			FROM blacklist 
-			WHERE DisplayID = " . $displayInfo['displayid'] . " 
+	$SQL = "SELECT MediaID
+			FROM blacklist
+			WHERE DisplayID = " . $displayInfo['displayid'] . "
 			AND isIgnored = 0";
-			
+
 	if (!$results = $db->query($SQL))
 	{
 		trigger_error($db->error());
 		return new soap_fault("SOAP-ENV:Server", "", "Unable to get a list of blacklisted files", $db->error());
 	}
-	
+
 	// Add a black list element for each file
 	while ($row = $db->get_row($results))
 	{
 		$file = $requiredFilesXml->createElement("file");
 		$file->setAttribute("id", $row[0]);
-		
+
 		$blackList->appendChild($file);
 	}
 
 	// PHONE_HOME if required.
+<<<<<<< TREE
 	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') == 'On') {
+		// Find out when we last PHONED_HOME :D
+		// If it's been > 28 days since last PHONE_HOME then
+>>>>>>> MERGE-SOURCE
 		if (Config::GetSetting($db,'PHONE_HOME_DATE') < (time() - (60 * 60 * 24 * 28))) {
 
-			if ($displayInfo['isAuditing'] == 1) 
+			if ($displayInfo['isAuditing'] == 1)
 			{
+<<<<<<< TREE
 				Debug::LogEntry($db, "audit", "PHONE_HOME [IN]", "xmds", "RequiredFiles");	
 			}
 
@@ -383,6 +482,15 @@
 					FROM `display`
 					WHERE `licensed` = '1'";
 
+=======
+				Debug::LogEntry($db, "audit", "PHONE_HOME [IN]", "xmds", "RequiredFiles");
+			}
+
+			// Retrieve number of displays
+			$SQL = "SELECT COUNT(*)
+					FROM `display`
+					WHERE `licensed` = '1'";
+>>>>>>> MERGE-SOURCE
 			if (!$results = $db->query($SQL))
 			{
 				trigger_error($db->error());
@@ -390,6 +498,7 @@
 			while ($row = $db->get_row($results))
 			{
 				$PHONE_HOME_CLIENTS = Kit::ValidateParam($row[0],_INT);
+<<<<<<< TREE
 			}
 			
 			// Retrieve version number
@@ -398,9 +507,20 @@
 			$PHONE_HOME_URL = Config::GetSetting($db,'PHONE_HOME_URL') . "?id=" . urlencode(Config::GetSetting($db,'PHONE_HOME_KEY')) . "&version=" . urlencode($PHONE_HOME_VERSION) . "&numClients=" . urlencode($PHONE_HOME_CLIENTS);
 
 			if ($displayInfo['isAuditing'] == 1) 
+=======
+			}
+
+			// Retrieve version number
+			$PHONE_HOME_VERSION = Config::Version($db, 'app_ver');
+
+			$PHONE_HOME_URL = Config::GetSetting($db,'PHONE_HOME_URL') . "?id=" . urlencode(Config::GetSetting($db,'PHONE_HOME_KEY')) . "&version=" . urlencode($PHONE_HOME_VERSION) . "&numClients=" . urlencode($PHONE_HOME_CLIENTS);
+
+			if ($displayInfo['isAuditing'] == 1)
+>>>>>>> MERGE-SOURCE
 			{
-				Debug::LogEntry($db, "audit", "PHONE_HOME_URL " . $PHONE_HOME_URL , "xmds", "RequiredFiles");	
+				Debug::LogEntry($db, "audit", "PHONE_HOME_URL " . $PHONE_HOME_URL , "xmds", "RequiredFiles");
 			}
+<<<<<<< TREE
 
 			
 			// Set PHONE_HOME_TIME to NOW.
@@ -408,28 +528,42 @@
 					SET `value` = '" . time() . "'
 					WHERE `setting`.`setting` = 'PHONE_HOME_DATE' LIMIT 1";
 
+=======
+
+			// Set PHONE_HOME_TIME to NOW.
+			$SQL = "UPDATE `setting`
+					SET `value` = '" . time() . "'
+					WHERE `setting`.`setting` = 'PHONE_HOME_DATE' LIMIT 1";
+
+>>>>>>> MERGE-SOURCE
 			if (!$results = $db->query($SQL))
 			{
 				trigger_error($db->error());
 			}
-			
+
 			@file_get_contents($PHONE_HOME_URL);
 
-			if ($displayInfo['isAuditing'] == 1) 
+			if ($displayInfo['isAuditing'] == 1)
 			{
-				Debug::LogEntry($db, "audit", "PHONE_HOME [OUT]", "xmds", "RequiredFiles");	
+				Debug::LogEntry($db, "audit", "PHONE_HOME [OUT]", "xmds", "RequiredFiles");
 			}
 		//endif
 		}
 	}
+<<<<<<< TREE
 	// END OF PHONE_HOME CODE
 
 	if ($displayInfo['isAuditing'] == 1) 
+=======
+	// END OF PHONE_HOME CODE
+
+	if ($displayInfo['isAuditing'] == 1)
+>>>>>>> MERGE-SOURCE
 	{
-		Debug::LogEntry($db, "audit", $requiredFilesXml->saveXML(), "xmds", "RequiredFiles");	
-		Debug::LogEntry($db, "audit", "[OUT]", "xmds", "RequiredFiles");	
+		Debug::LogEntry($db, "audit", $requiredFilesXml->saveXML(), "xmds", "RequiredFiles");
+		Debug::LogEntry($db, "audit", "[OUT]", "xmds", "RequiredFiles");
 	}
-	
+
 	// Return the results of requiredFiles()
 	$requiredFilesXml->formatOutput = true;
 	
@@ -438,7 +572,7 @@
 
 /**
  * Gets the specified file
- * @return 
+ * @return
  * @param $hardwareKey Object
  * @param $filePath Object
  * @param $fileType Object
@@ -446,7 +580,7 @@
 function GetFile($serverKey, $hardwareKey, $filePath, $fileType, $chunkOffset, $chunkSize, $version)
 {
 	global $db;
-	
+
 	// Sanitize
 	$serverKey 		= Kit::ValidateParam($serverKey, _STRING);
 	$hardwareKey 	= Kit::ValidateParam($hardwareKey, _STRING);
@@ -454,83 +588,83 @@
 	$chunkOffset 	= Kit::ValidateParam($chunkOffset, _INT);
 	$chunkSize 		= Kit::ValidateParam($chunkSize, _INT);
 	$version 		= Kit::ValidateParam($version, _STRING);
-	
+
 	$libraryLocation = Config::GetSetting($db, "LIBRARY_LOCATION");
-	
+
 	// Make sure we are talking the same language
 	if (!CheckVersion($version))
 	{
 		return new soap_fault("SOAP-ENV:Client", "", "Your client is not of the correct version for communication with this server. You can get the latest from http://www.xibo.org.uk", $serverKey);
 	}
-	
+
 	//auth this request...
 	if (!$displayInfo = Auth($hardwareKey))
 	{
 		return new soap_fault("SOAP-ENV:Client", "", "This display client is not licensed");
 	}
-	
-	if ($displayInfo['isAuditing'] == 1) 
+
+	if ($displayInfo['isAuditing'] == 1)
 	{
-		Debug::LogEntry($db, "audit", "[IN]", "xmds", "GetFile");	
-		Debug::LogEntry($db, "audit", "Params: [$hardwareKey] [$filePath] [$fileType] [$chunkOffset] [$chunkSize]", "xmds", "GetFile");	
+		Debug::LogEntry($db, "audit", "[IN]", "xmds", "GetFile");
+		Debug::LogEntry($db, "audit", "Params: [$hardwareKey] [$filePath] [$fileType] [$chunkOffset] [$chunkSize]", "xmds", "GetFile");
 	}
 
 	if ($fileType == "layout")
 	{
 		$filePath = Kit::ValidateParam($filePath, _INT);
-		
+
 		$SQL = sprintf("SELECT xml FROM layout WHERE layoutid = %d", $filePath);
 		if (!$results = $db->query($SQL))
 		{
 			trigger_error($db->error());
 			return new soap_fault("SOAP-ENV:Server", "", "Unable to get a list of files", $db->error());
 		}
-		
+
 		$row = $db->get_row($results);
-		
+
 		$file = $row[0];
 	}
 	elseif ($fileType == "media")
 	{
 		$filePath = Kit::ValidateParam($filePath, _STRING);
-		
+
 		//Return the Chunk size specified
 		$f = fopen($libraryLocation.$filePath,"r");
-		
+
 		fseek($f, $chunkOffset);
-		
+
 		$file = fread($f, $chunkSize);
 	}
-	else 
+	else
 	{
 		return new soap_fault("SOAP-ENV:Client", "", "Unknown FileType Requested.");
 	}
-	
-	if ($displayInfo['isAuditing'] == 1) Debug::LogEntry($db, "audit", "[OUT]", "xmds", "GetFile");	
-	
+
+	if ($displayInfo['isAuditing'] == 1) Debug::LogEntry($db, "audit", "[OUT]", "xmds", "GetFile");
+
 	return base64_encode($file);
 }
 
 /**
  * Returns the schedule for the hardware key specified
- * @return 
+ * @return
  * @param $hardwareKey Object
  */
 function Schedule($serverKey, $hardwareKey, $version)
 {
 	global $db;
-	
+
 	// Sanitize
 	$serverKey 		= Kit::ValidateParam($serverKey, _STRING);
 	$hardwareKey 	= Kit::ValidateParam($hardwareKey, _STRING);
 	$version 		= Kit::ValidateParam($version, _STRING);
-	
+
 	// Make sure we are talking the same language
 	if (!CheckVersion($version))
 	{
 		return new soap_fault("SOAP-ENV:Client", "", "Your client is not of the correct version for communication with this server. You can get the latest from http://www.xibo.org.uk", $serverKey);
 	}
-	
+
 	//auth this request...
 	if (!$displayInfo = Auth($hardwareKey))
 	{
@@ -538,34 +672,49 @@
 	}
 
 	if ($displayInfo['isAuditing'] == 1) Debug::LogEntry($db, "audit", "[IN] $hardwareKey", "xmds", "Schedule");
-	
+
 	$scheduleXml = new DOMDocument("1.0");
 	$layoutElements = $scheduleXml->createElement("schedule");
-	
+
 	$scheduleXml->appendChild($layoutElements);
+<<<<<<< TREE
 	
 	$currentdate 	= time();
 	$infinityFromDT = mktime(0,0,0,1,1,2000);
 	$infinityToDT	= mktime(0,0,0,12,31,2050);
 	$plus4hours 	= $currentdate + 86400;
 	
+=======
+
+	$currentdate = date("Y-m-d H:i:s");
+	$time = time();
+	$plus4hours = date("Y-m-d H:i:s",$time + 86400);
+
+>>>>>>> MERGE-SOURCE
 	//Add file nodes to the $fileElements
 	//Firstly get all the scheduled layouts
 	$SQL  = " SELECT layout.layoutID, schedule_detail.FromDT, schedule_detail.ToDT, schedule_detail.eventID ";
 	$SQL .= " FROM layout ";
 	$SQL .= " INNER JOIN schedule_detail ON schedule_detail.layoutID = layout.layoutID ";
+<<<<<<< TREE
 	$SQL .= " INNER JOIN lkdisplaydg ON lkdisplaydg.DisplayGroupID = schedule_detail.DisplayGroupID ";
 	$SQL .= " INNER JOIN display ON lkdisplaydg.DisplayID = display.displayID ";
 	$SQL .= sprintf(" WHERE display.license = '%s'  ", $hardwareKey);
 	
+=======
+	$SQL .= " INNER JOIN display ON schedule_detail.displayID = display.displayID ";
+	$SQL .= " WHERE display.license = '$hardwareKey'  ";
+	$SQL .= "   AND layout.retired = 0  ";
+
+>>>>>>> MERGE-SOURCE
 	// Store the Base SQL for this display
 	$SQLBase = $SQL;
-	
+
 	// Run the query
 	if ($displayInfo['isAuditing'] == 1) Debug::LogEntry($db, "audit", "$SQL", "xmds", "Schedule");
-	
-
-	
+
+
+
 	// Do we include the default display
 	if ($displayInfo['inc_schedule'] == 1)
 	{
@@ -576,20 +725,20 @@
 	{
 		$SQL .= sprintf(" AND (schedule_detail.FromDT < %d AND schedule_detail.ToDT > %d )", $currentdate, $currentdate);
 	}
-	
+
 	if ($displayInfo['isAuditing'] == 1) Debug::LogEntry($db, "audit", "$SQL", "xmds", "Schedule");
-	
-	
+
+
 	// Before we run the main query we should check to see if there are any priority layouts to deal with
 	$SQLp = " AND schedule_detail.is_priority = 1 ";
-	
+
 	// Run the query
 	if (!$results = $db->query($SQL . $SQLp))
 	{
 		trigger_error($db->error());
 		return new soap_fault("SOAP-ENV:Server", "", "Unable to get A list of layouts for the schedule", $db->error());
 	}
-	
+
 	// If there were no results then continue to get the full schedule
 	if ($db->num_rows($results) == 0)
 	{
@@ -599,15 +748,21 @@
 			trigger_error($db->error());
 			return new soap_fault("SOAP-ENV:Server", "", "Unable to get A list of layouts for the schedule", $db->error());
 		}
-		
+
 		// Was there anything?
 		if ($db->num_rows($results) == 0)
 		{
 			// No rows, run the query for default layout
 			$SQL  = $SQLBase;
+<<<<<<< TREE
 			$SQL .= " AND ((schedule_detail.FromDT < $currentdate AND schedule_detail.ToDT > $currentdate )";
 			$SQL .= " OR (schedule_detail.FromDT = $infinityFromDT AND schedule_detail.ToDT = $infinityToDT ))";
 			
+=======
+			$SQL .= " AND ((schedule_detail.starttime < '$currentdate' AND schedule_detail.endtime > '$currentdate' )";
+			$SQL .= " OR (schedule_detail.starttime = '2050-12-31 00:00:00' AND schedule_detail.endtime = '2050-12-31 00:00:00' ))";
+
+>>>>>>> MERGE-SOURCE
 			if (!$results = $db->query($SQL))
 			{
 				trigger_error($db->error());
@@ -615,7 +770,7 @@
 			}
 		}
 	}
-	
+
 	// We must have some results in here by this point
 	while ($row = $db->get_row($results))
 	{
@@ -623,44 +778,48 @@
 		$fromdt 	= date('Y-m-d h:i:s', $row[1]);
 		$todt		= date('Y-m-d h:i:s', $row[2]);
 		$scheduleid = $row[3];
-			
+
 		//firstly add this as a node
 		$layout = $scheduleXml->createElement("layout");
-		
+
 		$layout->setAttribute("file", $layoutid);
 		$layout->setAttribute("fromdt", $fromdt);
 		$layout->setAttribute("todt", $todt);
 		$layout->setAttribute("scheduleid", $scheduleid);
-		
+
 		$layoutElements->appendChild($layout);
 	}
-	
+
 	if ($displayInfo['isAuditing'] == 1) Debug::LogEntry($db, "audit", $scheduleXml->saveXML(), "xmds", "Schedule");
 	if ($displayInfo['isAuditing'] == 1) Debug::LogEntry($db, "audit", "[OUT]", "xmds", "Schedule");
+<<<<<<< TREE
 	
 	$scheduleXml->formatOutput = true;
 	
+=======
+
+>>>>>>> MERGE-SOURCE
 	return $scheduleXml->saveXML();
 }
 
 /**
  * Recieves the XmlLog from the display
- * @return 
+ * @return
  * @param $hardwareKey String
  * @param $xml String
  */
 function RecieveXmlLog($serverKey, $hardwareKey, $xml, $version)
 {
 	global $db;
-	
+
 	return new soap_fault("SOAP-ENV:Client", "", "This is a depricated service call. You should instead call either SubmitLog or SubmitStats", $serverKey);
 }
 
 define('BLACKLIST_ALL', "All");
 define('BLACKLIST_SINGLE', "Single");
 /**
- * 
- * @return 
+ *
+ * @return
  * @param $hardwareKey Object
  * @param $mediaId Object
  * @param $type Object
@@ -668,7 +827,7 @@
 function BlackList($serverKey, $hardwareKey, $mediaId, $type, $reason, $version)
 {
 	global $db;
-	
+
 	// Sanitize
 	$serverKey 		= Kit::ValidateParam($serverKey, _STRING);
 	$hardwareKey 	= Kit::ValidateParam($hardwareKey, _STRING);
@@ -676,7 +835,7 @@
 	$type		 	= Kit::ValidateParam($type, _STRING);
 	$reason		 	= Kit::ValidateParam($reason, _STRING);
 	$version 		= Kit::ValidateParam($version, _STRING);
-	
+
 	// Make sure we are talking the same language
 	if (!CheckVersion($version))
 	{
@@ -688,19 +847,19 @@
 	{
 		return new soap_fault("SOAP-ENV:Client", "", "This display client is not licensed", $hardwareKey);
 	}
-		
+
 	if ($displayInfo['isAuditing'] == 1) Debug::LogEntry ($db, "audit", "[IN]", "xmds", "BlackList", "", $displayInfo['displayid']);
 	if ($displayInfo['isAuditing'] == 1) Debug::LogEntry ($db, "audit", "$xml", "xmds", "BlackList", "", $displayInfo['displayid']);
-		
+
 	// Check to see if this media/display is already blacklisted (and not ignored)
 	$SQL = "SELECT BlackListID FROM blacklist WHERE MediaID = $mediaId AND isIgnored = 0 AND DisplayID = " . $displayInfo['displayid'];
-	
+
 	if (!$results = $db->query($SQL))
 	{
 		trigger_error($db->error());
 		return new soap_fault("SOAP-ENV:Server", "", "Unable to query for BlackList records.", $db->error());
 	}
-	
+
 	if ($db->num_rows($results) == 0)
 	{
 		// Insert the black list record
@@ -711,20 +870,20 @@
 			// Only the current display
 			$SQL .= " WHERE displayID = " . $displayInfo['displayid'];
 		}
-		
+
 		if (!$displays = $db->query($SQL))
 		{
 			trigger_error($db->error());
 			return new soap_fault("SOAP-ENV:Server", "", "Unable to query for BlackList Displays.", $db->error());
 		}
-		
+
 		while ($row = $db->get_row($displays))
 		{
 			$displayId = $row[0];
-			
+
 			$SQL = "INSERT INTO blacklist (MediaID, DisplayID, ReportingDisplayID, Reason)
 						VALUES ($mediaId, $displayId, " . $displayInfo['displayid'] . ", '$reason') ";
-						
+
 			if (!$db->query($SQL))
 			{
 				trigger_error($db->error());
@@ -736,15 +895,15 @@
 	{
 		if ($displayInfo['isAuditing'] == 1) Debug::LogEntry ($db, "audit", "Media Already BlackListed [$mediaId]", "xmds", "BlackList", "", $displayInfo['displayid']);
 	}
-	
+
 	if ($displayInfo['isAuditing'] == 1) Debug::LogEntry ($db, "audit", "[OUT]", "xmds", "BlackList", "", $displayInfo['displayid']);
-	
+
 	return true;
 }
 
 /**
  * Submit client logging
- * @return 
+ * @return
  * @param $version Object
  * @param $serverKey Object
  * @param $hardwareKey Object
@@ -753,13 +912,13 @@
 function SubmitLog($version, $serverKey, $hardwareKey, $logXml)
 {
 	global $db;
-	
+
 	// Sanitize
 	$serverKey 		= Kit::ValidateParam($serverKey, _STRING);
 	$hardwareKey 	= Kit::ValidateParam($hardwareKey, _STRING);
 	$version 		= Kit::ValidateParam($version, _STRING);
 	$logXml 		= Kit::ValidateParam($logXml, _HTMLSTRING);
-	
+
 	// Make sure we are talking the same language
 	if (!CheckVersion($version))
 	{
@@ -771,20 +930,20 @@
 	{
 		return new soap_fault("SOAP-ENV:Client", "", "This display client is not licensed", $hardwareKey);
 	}
-		
+
 	if ($displayInfo['isAuditing'] == 1) Debug::LogEntry ($db, "audit", "IN", "xmds", "SubmitLog", "", $displayInfo['displayid']);
 	if ($displayInfo['isAuditing'] == 1) Debug::LogEntry ($db, "audit", 'XML [' . $logXml . ']', "xmds", "SubmitLog", "", $displayInfo['displayid']);
-	
+
 	// Load the XML into a DOMDocument
 	$document = new DOMDocument("1.0");
-	
+
 	if (!$document->loadXML($logXml))
 	{
 		return new soap_fault("SOAP-ENV:Client", "", "XML Cannot be loaded into DOM Document.", $hardwareKey);
 	}
-	
+
 	foreach ($document->documentElement->childNodes as $node)
-	{	
+	{
 		//Zero out the common vars
 		$date 		= "";
 		$message 	= "";
@@ -793,23 +952,23 @@
 		$mediaID 	= "";
 		$cat		= '';
 		$method		= '';
-		
+
 		// This will be a bunch of trace nodes
 		$message = $node->textContent;
-		
-		// Each element should have a category and a date 
+
+		// Each element should have a category and a date
 		$date	= $node->getAttribute('date');
 		$cat	= $node->getAttribute('category');
-		
-		if ($date == '' || $cat == '') 
+
+		if ($date == '' || $cat == '')
 		{
 			trigger_error('Log submitted without a date or category attribute');
 			continue;
 		}
-			
+
 		// Get the date and the message (all log types have these)
 		foreach ($node->childNodes as $nodeElements)
-		{			
+		{
 			if ($nodeElements->nodeName == "scheduleID")
 			{
 				$scheduleID = $nodeElements->textContent;
@@ -831,26 +990,26 @@
 				$method	= $nodeElements->textContent;
 			}
 		}
-		
+
 		// We should have enough information to log this now.
 		if ($cat == 'error' || $cat == 'Error')
 		{
-			Debug::LogEntry($db, $cat, $message, 'Client', $method, $date, $displayInfo['displayid'], $scheduleID, $layoutID, $mediaID);						
+			Debug::LogEntry($db, $cat, $message, 'Client', $method, $date, $displayInfo['displayid'], $scheduleID, $layoutID, $mediaID);
 		}
 		else
 		{
-			Debug::LogEntry($db, 'audit', $message, 'Client', $method, $date, $displayInfo['displayid'], $scheduleID, $layoutID, $mediaID);			
+			Debug::LogEntry($db, 'audit', $message, 'Client', $method, $date, $displayInfo['displayid'], $scheduleID, $layoutID, $mediaID);
 		}
 	}
 
 	if ($displayInfo['isAuditing'] == 1) Debug::LogEntry ($db, "audit", "OUT", "xmds", "SubmitLog", "", $displayInfo['displayid']);
-	
+
 	return true;
 }
 
 /**
  * Submit display statistics to the server
- * @return 
+ * @return
  * @param $version Object
  * @param $serverKey Object
  * @param $hardwareKey Object
@@ -859,13 +1018,13 @@
 function SubmitStats($version, $serverKey, $hardwareKey, $statXml)
 {
 	global $db;
-	
+
 	// Sanitize
 	$serverKey 		= Kit::ValidateParam($serverKey, _STRING);
 	$hardwareKey 	= Kit::ValidateParam($hardwareKey, _STRING);
 	$version 		= Kit::ValidateParam($version, _STRING);
 	$statXml 		= Kit::ValidateParam($statXml, _HTMLSTRING);
-	
+
 	// Make sure we are talking the same language
 	if (!CheckVersion($version))
 	{
@@ -877,55 +1036,55 @@
 	{
 		return new soap_fault("SOAP-ENV:Client", "", "This display client is not licensed", $hardwareKey);
 	}
-		
+
 	if ($displayInfo['isAuditing'] == 1) Debug::LogEntry ($db, "audit", "IN", "xmds", "SubmitStats", "", $displayInfo['displayid']);
 	if ($displayInfo['isAuditing'] == 1) Debug::LogEntry ($db, "audit", "StatXml: [" . $statXml . "]", "xmds", "SubmitStats", "", $displayInfo['displayid']);
-	
+
 	if ($statXml == "")
 	{
 		return new soap_fault("SOAP-ENV:Client", "", "Stat XML is empty.", $hardwareKey);
 	}
-	
+
 	// Log
 	if ($displayInfo['isAuditing'] == 1) Debug::LogEntry ($db, "audit", "About to create Stat Object.", "xmds", "SubmitStats", "", $displayInfo['displayid']);
-	
+
 	$statObject = new Stat($db);
-	
+
 	// Log
 	if ($displayInfo['isAuditing'] == 1) Debug::LogEntry ($db, "audit", "About to Create DOMDocument.", "xmds", "SubmitStats", "", $displayInfo['displayid']);
-	
+
 	// Load the XML into a DOMDocument
 	$document = new DOMDocument("1.0");
 	$document->loadXML($statXml);
-	
+
 	foreach ($document->documentElement->childNodes as $node)
-	{	
+	{
 		//Zero out the common vars
 		$fromdt		= '';
 		$todt		= '';
 		$type		= '';
-		
+
 		$scheduleID = 0;
 		$layoutID 	= 0;
 		$mediaID 	= '';
 		$tag		= '';
-		
+
 		// Each element should have these attributes
 		$fromdt	= $node->getAttribute('fromdt');
 		$todt	= $node->getAttribute('todt');
 		$type	= $node->getAttribute('type');
-		
-		if ($fromdt == '' || $todt == '' || $type == '') 
+
+		if ($fromdt == '' || $todt == '' || $type == '')
 		{