Merge lp:~dangarner/xibo/bug-438779 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-10-01 21:40:24 +0000
@@ -0,0 +1,13 @@
+ALTER TABLE `module` ADD `ValidExtensions` VARCHAR( 254 ) NULL ;
+
+UPDATE `module` SET `ValidExtensions` = 'jpg,jpeg,png,bmp,gif' WHERE `module`.`ModuleID` =1 LIMIT 1 ;
+
+UPDATE `module` SET `ValidExtensions` = 'wmv,avi,mpg,mpeg' WHERE `module`.`ModuleID` =2 LIMIT 1 ;
+
+UPDATE `module` SET `ValidExtensions` = 'swf' WHERE `module`.`ModuleID` =3 LIMIT 1 ;
+
+UPDATE `module` SET `ValidExtensions` = 'ppt,pps' WHERE `module`.`ModuleID` =4 LIMIT 1 ;
+
+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/lib/modules/module.class.php'
--- server/lib/modules/module.class.php	2009-09-22 18:39:19 +0000
+++ server/lib/modules/module.class.php	2009-10-01 21:40:24 +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
@@ -27,26 +27,28 @@
 	protected $user;
 	protected $region;
 	protected $response;
-	
+
 	protected $layoutid;
 	protected $regionid;
-	
-	protected $mediaid;
+
+	protected $mediaid;
 	protected $name;
 	protected $type;
 	private   $schemaVersion;
 	protected $regionSpecific;
 	protected $duration;
 	protected $lkid;
+	protected $validExtensions;
+	protected $validExtensionsText;
 
 	protected $xml;
-	
+
 	protected $existingMedia;
 	protected $deleteFromRegion;
-	
+
 	/**
 	 * Constructor - sets up this media object with all the available information
-	 * @return 
+	 * @return
 	 * @param $db database
 	 * @param $user user
 	 * @param $mediaid String[optional]
@@ -56,74 +58,77 @@
 	public function __construct(database $db, user $user, $mediaid = '', $layoutid = '', $regionid = '')
 	{
 		include_once("lib/pages/region.class.php");
-		
+
 		$this->db 		=& $db;
 		$this->user 	=& $user;
-		
-		$this->mediaid 	= $mediaid;
+
+		$this->mediaid 	= $mediaid;
 		$this->name 	= '';
 		$this->layoutid = $layoutid;
 		$this->regionid = $regionid;
-		
+
 		$this->region 	= new region($db, $user);
 		$this->response = new ResponseManager();
-		
+
 		$this->existingMedia 	= false;
 		$this->deleteFromRegion = false;
 		$this->lkid				= '';
 		$this->duration 		= '';
-		
+
 		// Determine which type this module is
 		$this->SetModuleInformation();
-		
+
 		Debug::LogEntry($db, 'audit', 'New module created with MediaID: ' . $mediaid . ' LayoutID: ' . $layoutid . ' and RegionID: ' . $regionid);
-		
+
 		// Either the information from the region - or some blanks
 		$this->SetMediaInformation($this->layoutid, $this->regionid, $mediaid);
-		
+
 		return true;
 	}
-	
+
 	/**
 	 * Sets the module information
-	 * @return 
+	 * @return
 	 */
 	final private function SetModuleInformation()
 	{
 		$db 		=& $this->db;
 		$type		= $this->type;
-		
+
 		if ($type == '')
 		{
 			$this->response->SetError(__('Unable to create Module [No type given] - please refer to the Module Documentation.'));
 			$this->response->Respond();
 		}
-		
+
 		$SQL = sprintf("SELECT * FROM module WHERE Module = '%s'", $db->escape_string($type));
-		
-		if (!$result = $db->query($SQL)) 
+
+		if (!$result = $db->query($SQL))
 		{
 			$this->response->SetError(__('Unable to create Module [Cannot find type in the database] - please refer to the Module Documentation.'));
 			$this->response->Respond();
 		}
-		
+
 		if ($db->num_rows($result) != 1)
 		{
 			$this->response->SetError(__('Unable to create Module [No registered modules of this type] - please refer to the Module Documentation.'));
 			$this->response->Respond();
 		}
-		
+
 		$row = $db->get_assoc_row($result);
-		
-		$this->schemaVersion 	= Kit::ValidateParam($row['SchemaVersion'], _INT);
-		$this->regionSpecific 	= Kit::ValidateParam($row['RegionSpecific'], _INT);
-		
+
+		$this->schemaVersion 		= Kit::ValidateParam($row['SchemaVersion'], _INT);
+		$this->regionSpecific 		= Kit::ValidateParam($row['RegionSpecific'], _INT);
+		$this->validExtensionsText 	= Kit::ValidateParam($row['ValidExtensions'], _STRING);
+		$this->validExtensions 		= explode(',', $this->validExtensionsText);
+		$this->validExtensionsText	= str_replace(',', ', ', $this->validExtensionsText);
+
 		return true;
 	}
-	
+
 	/**
 	 * Gets the information about this Media on this region on this layout
-	 * @return 
+	 * @return
 	 * @param $layoutid Object
 	 * @param $regionid Object
 	 * @param $mediaid Object
@@ -133,28 +138,28 @@
 		$db 		=& $this->db;
 		$region 	=& $this->region;
 		$xmlDoc 	= new DOMDocument();
-		
+
 		if ($this->mediaid != '' && $this->regionid != '' && $this->layoutid != '')
 		{
 			$this->existingMedia = true;
-			
+
 			// Set the layout Xml
 			$layoutXml = $region->GetLayoutXml($layoutid);
-			
+
 			Debug::LogEntry($db, 'audit', 'Layout XML retrieved: ' . $layoutXml);
-			
+
 			$layoutDoc = new DOMDocument();
 			$layoutDoc->loadXML($layoutXml);
-			
+
 			$layoutXpath = new DOMXPath($layoutDoc);
-			
+
 			// Get the media node and extract the info
 			$mediaNodeXpath = $layoutXpath->query("//region[@id='$regionid']/media[@id='$mediaid']");
-			
+
 			if ($mediaNodeXpath->length > 0)
 			{
 				Debug::LogEntry($db, 'audit', 'Media Node Found.');
-				
+
 				// Create a Media node in the DOMDocument for us to replace
 				$xmlDoc->loadXML('<root/>');
 			}
@@ -163,13 +168,13 @@
 				$this->response->SetError(__('Cannot find this media item. Please refresh the region options.'));
 				$this->response->Respond();
 			}
-			
+
 			$mediaNode = $mediaNodeXpath->item(0);
 			$mediaNode->setAttribute('schemaVersion', $this->schemaVersion);
-			
+
 			$this->duration = $mediaNode->getAttribute('duration');
 			$this->lkid	 	= $mediaNode->getAttribute('lkid');
-			
+
 			$mediaNode = $xmlDoc->importNode($mediaNode, true);
 			$xmlDoc->documentElement->appendChild($mediaNode);
 		}
@@ -181,25 +186,25 @@
 				// But this is some existing media
 				// Therefore make sure we get the bare minimum!
 				$this->existingMedia = true;
-				
+
 				// Load what we know about this media into the object
 				$SQL = "SELECT duration, name FROM media WHERE mediaID = '$mediaid'";
-				
+
 				Debug::LogEntry($db, 'audit', $SQL, 'Module', 'SetMediaInformation');
-				
+
 				if (!$result = $db->query($SQL))
 				{
 					trigger_error($db->error()); //log the error
 				}
-				
+
 				if ($db->num_rows($result) != 0)
 				{
 					$row 				= $db->get_row($result);
-					$this->duration		= $row[0];
+					$this->duration		= $row[0];
 					$this->name			= $row[1];
 				}
 			}
-			
+
 			$xml = <<<XML
 			<root>
 				<media id="" type="$this->type" duration="" lkid="" schemaVersion="$this->schemaVersion">
@@ -210,32 +215,32 @@
 XML;
 			$xmlDoc->loadXML($xml);
 		}
-		
+
 		$this->xml = $xmlDoc;
-		
+
 		Debug::LogEntry($db, 'audit', 'XML is: ' . $this->xml->saveXML());
-		
+
 		return true;
 	}
-	
+
 	/**
 	 * Sets the Layout and Region Information
-	 * @return 
+	 * @return
 	 * @param $layoutid Object
 	 * @param $regionid Object
 	 * @param $mediaid Object
 	 */
 	public function SetRegionInformation($layoutid, $regionid)
-	{	
+	{
 		$this->layoutid = $layoutid;
 		$this->regionid = $regionid;
-		
+
 		return true;
 	}
-	
+
 	/**
 	 * This Media item represented as XML
-	 * @return 
+	 * @return
 	 */
 	final public function AsXml()
 	{
@@ -248,17 +253,17 @@
 		// LkID is done by the region code (where applicable - otherwise it will be left blank)
 		$mediaNodes = $this->xml->getElementsByTagName('media');
 		$mediaNode	= $mediaNodes->item(0);
-		
+
 		$mediaNode->setAttribute('id', $this->mediaid);
 		$mediaNode->setAttribute('duration', $this->duration);
 		$mediaNode->setAttribute('type', $this->type);
-		
+
 		return $this->xml->saveXML($mediaNode);
 	}
-	
+
 	/**
-	 * Adds the name/value element to the XML Options sequence 
-	 * @return 
+	 * Adds the name/value element to the XML Options sequence
+	 * @return
 	 * @param $name String
 	 * @param $value String
 	 */
@@ -266,25 +271,25 @@
 	{
 		$db =& $this->db;
 		if ($name == '') return;
-		
-		Debug::LogEntry($db, 'audit', sprintf('IN with Name=%s and value=%s', $name, $value), 'module', 'Set Option');		
-		
+
+		Debug::LogEntry($db, 'audit', sprintf('IN with Name=%s and value=%s', $name, $value), 'module', 'Set Option');
+
 		// Get the options node from this document
 		$optionNodes = $this->xml->getElementsByTagName('options');
 		// There is only 1
 		$optionNode = $optionNodes->item(0);
-		
+
 		// Create a new option node
 		$newNode = $this->xml->createElement($name, $value);
-		
+
 		Debug::LogEntry($db, 'audit', sprintf('Created a new Option Node with Name=%s and value=%s', $name, $value), 'module', 'Set Option');
-		
+
 		// Check to see if we already have this option or not
 		$xpath = new DOMXPath($this->xml);
-		
+
 		// Xpath for it
 		$userOptions = $xpath->query('//options/' . $name);
-		
+
 		if ($userOptions->length == 0)
 		{
 			// Append the new node to the list
@@ -293,28 +298,28 @@
 		else
 		{
 			// Replace the old node we found with XPath with the new node we just created
-			$optionNode->replaceChild($newNode, $userOptions->item(0));	
+			$optionNode->replaceChild($newNode, $userOptions->item(0));
 		}
 	}
-	
+
 	/**
 	 * Gets the value for the option in Parameter 1
-	 * @return 
+	 * @return
 	 * @param $name String The Option Name
 	 * @param $default Object[optional] The Default Value
 	 */
 	final protected function GetOption($name, $default = false)
 	{
 		$db =& $this->db;
-		
+
 		if ($name == '') return false;
-		
+
 		// Check to see if we already have this option or not
 		$xpath = new DOMXPath($this->xml);
-		
+
 		// Xpath for it
 		$userOptions = $xpath->query('//options/' . $name);
-		
+
 		if ($userOptions->length == 0)
 		{
 			// We do not have an option - return the default
@@ -328,37 +333,37 @@
 			return $userOptions->item(0)->nodeValue;
 		}
 	}
-	
+
 	/**
 	 * Sets the RAW XML string that is given as the content for Raw
-	 * @return 
+	 * @return
 	 * @param $xml String
 	 * @param $replace Boolean[optional]
 	 */
 	final protected function SetRaw($xml, $replace = false)
 	{
 		if ($xml == '') return;
-		
+
 		// Load the XML we are given into its own document
 		$rawNode = new DOMDocument();
 		$rawNode->loadXML('<raw>' . $xml . '</raw>');
-		
+
 		// Import the Raw node into this document (with all sub nodes)
 		$importedNode = $this->xml->importNode($rawNode->documentElement, true);
-		
+
 		// Get the Raw Xml node from our document
 		$rawNodes = $this->xml->getElementsByTagName('raw');
 
 		// There is only 1
 		$rawNode = $rawNodes->item(0);
-		
+
 		// Append the imported node (at the end of whats already there)
 		$rawNode->parentNode->replaceChild($importedNode, $rawNode);
 	}
-	
+
 	/**
 	 * Gets the XML string from RAW
-	 * @return 
+	 * @return
 	 */
 	final protected function GetRaw()
 	{
@@ -367,21 +372,21 @@
 
 		// There is only 1
 		$rawNode = $rawNodes->item(0);
-		
+
 		// Return it as a XML string
 		return $this->xml->saveXML($rawNode);
 	}
-	
+
 	/**
 	 * Updates the region information with this media record
-	 * @return 
+	 * @return
 	 */
 	final public function UpdateRegion()
 	{
 		// By this point we expect to have a MediaID, duration
 		$layoutid = $this->layoutid;
 		$regionid = $this->regionid;
-		
+
 		if ($this->deleteFromRegion)
 		{
 			// We call region delete
@@ -412,18 +417,27 @@
 				}
 			}
 		}
-		
+
 		return true;
 	}
-	
+
+	/**
+	* Determines whether or not the provided file extension is valid for this module
+	*
+	*/
+	final protected function IsValidExtension($extension)
+	{
+		return in_array($extension, $this->validExtensions);
+	}
+
 	/**
 	 * Return the Delete Form as HTML
-	 * @return 
+	 * @return
 	 */
 	public function DeleteForm()
 	{
 		$db =& $this->db;
-		
+
 		//Parameters
 		$layoutid 	= $this->layoutid;
 		$regionid 	= $this->regionid;
@@ -445,96 +459,115 @@
 			<input class="XiboFormButton" id="btnCancel" type="button" title="$msgTitle" href="index.php?p=layout&layoutid=$layoutid&regionid=$regionid&q=RegionOptions" value="No" />
 		</form>
 END;
-		
+
 		$this->response->html 		 	= $form;
 		$this->response->dialogTitle 	= __('Delete Item');
 		$this->response->dialogSize 	= true;
 		$this->response->dialogWidth 	= '450px';
 		$this->response->dialogHeight 	= '150px';
 
-		return $this->response;	
+		return $this->response;
 	}
-	
+
 	/**
 	 * Delete Media from the Database
-	 * @return 
+	 * @return
 	 */
-	public function DeleteMedia() 
+	public function DeleteMedia()
 	{
 		$db 		=& $this->db;
-		
+
 		$layoutid 	= $this->layoutid;
 		$regionid 	= $this->regionid;
-		
+
 		$url 		= "index.php?p=layout&layoutid=$layoutid&regionid=$regionid&q=RegionOptions";
-		
+
 		$this->deleteFromRegion = true;
 		$this->UpdateRegion();
-		
+
 		// We want to load a new form
 		$this->response->loadForm	= true;
 		$this->response->loadFormUri= $url;
-		
-		return $this->response;	
+
+		return $this->response;
 	}
-	
+
 	/**
 	 * Default AddForm
-	 * @return 
+	 * @return
 	 */
 	public function AddForm()
 	{
 		$form = '<p>' . __('Not yet implemented by this module.') . '</p>';
 END;
-		
+
 		$this->response->html 		 	= $form;
 		$this->response->dialogTitle 	= __('Add Item');
 		$this->response->dialogSize 	= true;
 		$this->response->dialogWidth 	= '450px';
 		$this->response->dialogHeight 	= '150px';
 
-		return $this->response;	
+		return $this->response;
 	}
-	
+
 	/**
 	 * Default Edit Form
-	 * @return 
+	 * @return
 	 */
 	public function EditForm()
 	{
+<<<<<<< TREE
 		$form = '<p>' . __('Not yet implemented by this module.') . '</p>';
 		
+=======
+		$form = <<<END
+		<p>Not yet implemented by this module.</p>
+END;
+
+>>>>>>> MERGE-SOURCE
 		$this->response->html 		 	= $form;
 		$this->response->dialogTitle 	= __('Add Item');
 		$this->response->dialogSize 	= true;
 		$this->response->dialogWidth 	= '450px';
 		$this->response->dialogHeight 	= '150px';
 
-		return $this->response;	
+		return $this->response;
 	}
-	
+
 	/**
 	 * Default Add Media
-	 * @return 
+	 * @return
 	 */
 	public function AddMedia()
 	{
 		// We want to load a new form
+<<<<<<< TREE
 		$this->response->message = __('Add Media has not been implemented for this module.');
 		
 		return $this->response;	
+=======
+		$this->response->message	= 'Add Media has not been implemented for this module.';
+
+		return $this->response;
+>>>>>>> MERGE-SOURCE
 	}
-	
+
 	/**
 	 * Default EditMedia
-	 * @return 
+	 * @return
 	 */
 	public function EditMedia()
 	{
 		// We want to load a new form
+<<<<<<< TREE
 		$this->response->message = __('Edit Media has not been implemented for this module.');
 		
 		return $this->response;	
+=======
+		$this->response->message	= 'Edit Media has not been implemented for this module.';
+
+		return $this->response;
+>>>>>>> MERGE-SOURCE
 	}
 
 	/**
@@ -544,10 +577,10 @@
 	public function GetName()
 	{
 		$db =& $this->db;
-		
+
 		Debug::LogEntry($db, 'audit', sprintf('Module name returned for MediaID: %s is %s', $this->mediaid, $this->name), 'Module', 'GetName');
-		
+
 		return $this->name;
 	}
 }
-?>
+?>
 \ No newline at end of file
 
=== 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-10-01 21:40:25 +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,11 +172,11 @@
 					<td><label for="permissionid">Sharing<span class="required">*</span></label></td>
 					<td>
 					$shared_list
-					</td>			
+					</td>
 				</tr>
 				<tr>
 					<td></td>
-					<td>This form accepts: <span class="required">swf</span> files up to a maximum size of <span class="required">$this->maxFileSize</span>.</td>
+					<td>This form accepts: <span class="required">$this->validExtensionsText</span> files up to a maximum size of <span class="required">$this->maxFileSize</span>.</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,11 +319,11 @@
 					<td><label for="permissionid">Sharing<span class="required">*</span></label></td>
 					<td>
 					$shared_list
-					</td>			
+					</td>
 				</tr>
 				<tr>
 					<td></td>
-					<td>This form accepts: <span class="required">swf</span> files up to a maximum size of <span class="required">$this->maxFileSize</span>.</td>
+					<td>This form accepts: <span class="required">$this->validExtensionsText</span> files up to a maximum size of <span class="required">$this->maxFileSize</span>.</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,62 +495,62 @@
 		$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")
+		if (!$this->IsValidExtension($ext))
 		{
-			$this->response->SetError('Only SWF files are accepted - Are you sure this is an flash?');
+			$this->response->SetError('Your file has an extension not supported by this Media Type.');
 			$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,23 @@
 				return $this->response;
 			}
 		}
-		
+
 		// Update the media record to include this information
 		$SQL = sprintf("UPDATE media SET storedAs = '%s' WHERE mediaid = %d", $storedAs, $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 +619,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 +639,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,30 +653,30 @@
 		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")
+
+			if (!$this->IsValidExtension($ext))
 			{
-				$this->response->SetError('Only SWF files are accepted - Are you sure this is an flash?');
+				$this->response->SetError('Your file has an extension not supported by this Media Type.');
 				$this->response->keepOpen = true;
 				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 +684,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 +718,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,7 +753,7 @@
 					return $this->response;
 				}
 			}
-			
+
 			//Update the media record to include this information
 			$SQL = "UPDATE media SET storedAs = '$storedAs' WHERE mediaid = $new_mediaid";
 			if (!$db->query($SQL))
@@ -763,13 +763,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 +783,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 +838,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 +853,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-10-01 21:40:25 +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,11 +172,11 @@
 					<td><label for="permissionid">Sharing<span class="required">*</span></label></td>
 					<td>
 					$shared_list
-					</td>			
+					</td>
 				</tr>
 				<tr>
 					<td></td>
-					<td>This form accepts: <span class="required">jpg, jpeg, png and gif</span> files up to a maximum size of <span class="required">$this->maxFileSize</span>.</td>
+					<td>This form accepts: <span class="required">$this->validExtensionsText</span> files up to a maximum size of <span class="required">$this->maxFileSize</span>.</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,11 +319,11 @@
 					<td><label for="permissionid">Sharing<span class="required">*</span></label></td>
 					<td>
 					$shared_list
-					</td>			
+					</td>
 				</tr>
 				<tr>
 					<td></td>
-					<td>This form accepts: <span class="required">jpg, jpeg, png and gif</span> files up to a maximum size of <span class="required">$this->maxFileSize</span>.</td>
+					<td>This form accepts: <span class="required">$this->validExtensionsText</span> files up to a maximum size of <span class="required">$this->maxFileSize</span>.</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,62 +495,62 @@
 		$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")
+		if (!$this->IsValidExtension($ext))
 		{
-			$this->response->SetError('Only images are accepted - Are you sure this is an image?');
+			$this->response->SetError('Your file has an extension not supported by Media Type.');
 			$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,26 @@
 				return $this->response;
 			}
 		}
-		
+
 		// Update the media record to include this information
 		$SQL = sprintf("UPDATE media SET storedAs = '%s' WHERE mediaid = %d", $storedAs, $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 +622,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 +642,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,30 +656,30 @@
 		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")
+
+			if (!$this->IsValidExtension($ext))
 			{
-				$this->response->SetError('Only images are accepted - Are you sure this is an image?');
+				$this->response->SetError('Your file has an extension not supported by this Media Type.');
 				$this->response->keepOpen = true;
 				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 +687,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 +721,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,7 +756,7 @@
 					return $this->response;
 				}
 			}
-			
+
 			//Update the media record to include this information
 			$SQL = "UPDATE media SET storedAs = '$storedAs' WHERE mediaid = $new_mediaid";
 			if (!$db->query($SQL))
@@ -766,20 +766,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 +793,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 +848,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 +863,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-10-01 21:40:25 +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,11 +172,11 @@
 					<td><label for="permissionid">Sharing<span class="required">*</span></label></td>
 					<td>
 					$shared_list
-					</td>			
+					</td>
 				</tr>
 				<tr>
 					<td></td>
-					<td>This form accepts: <span class="required">ppt/pps</span> files up to a maximum size of <span class="required">$this->maxFileSize</span>.</td>
+					<td>This form accepts: <span class="required">$this->validExtensionsText</span> files up to a maximum size of <span class="required">$this->maxFileSize</span>.</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,11 +319,11 @@
 					<td><label for="permissionid">Sharing<span class="required">*</span></label></td>
 					<td>
 					$shared_list
-					</td>			
+					</td>
 				</tr>
 				<tr>
 					<td></td>
-					<td>This form accepts: <span class="required">ppt/pps</span> files up to a maximum size of <span class="required">$this->maxFileSize</span>.</td>
+					<td>This form accepts: <span class="required">$this->validExtensionsText</span> files up to a maximum size of <span class="required">$this->maxFileSize</span>.</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,62 +495,62 @@
 		$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")
+		if (!$this->IsValidExtension($ext))
 		{
-			$this->response->SetError('Only PPT files are accepted - Are you sure this is an powerpoint?');
+			$this->response->SetError('Your file has an extension not supported by this Media Type.');
 			$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,23 @@
 				return $this->response;
 			}
 		}
-		
+
 		// Update the media record to include this information
 		$SQL = sprintf("UPDATE media SET storedAs = '%s' WHERE mediaid = %d", $storedAs, $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 +619,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 +639,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,30 +653,30 @@
 		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")
+
+			if (!$this->IsValidExtension($ext))
 			{
-				$this->response->SetError('Only PPT files are accepted - Are you sure this is a powerpoint?');
+				$this->response->SetError('Your file has an extension not supported by this Media Type.');
 				$this->response->keepOpen = true;
 				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 +684,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 +718,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,7 +753,7 @@
 					return $this->response;
 				}
 			}
-			
+
 			//Update the media record to include this information
 			$SQL = "UPDATE media SET storedAs = '$storedAs' WHERE mediaid = $new_mediaid";
 			if (!$db->query($SQL))
@@ -763,13 +763,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 +783,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 +838,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 +853,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-10-01 21:40:25 +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,11 +172,11 @@
 					<td><label for="permissionid">Sharing<span class="required">*</span></label></td>
 					<td>
 					$shared_list
-					</td>			
+					</td>
 				</tr>
 				<tr>
 					<td></td>
-					<td>This form accepts: <span class="required">wmv, mpeg and mpg</span> files up to a maximum size of <span class="required">$this->maxFileSize</span>.</td>
+					<td>This form accepts: <span class="required">$this->validExtensionsText</span> files up to a maximum size of <span class="required">$this->maxFileSize</span>.</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,11 +319,11 @@
 					<td><label for="permissionid">Sharing<span class="required">*</span></label></td>
 					<td>
 					$shared_list
-					</td>			
+					</td>
 				</tr>
 				<tr>
 					<td></td>
-					<td>This form accepts: <span class="required">wmv, mpeg and mpg</span> files up to a maximum size of <span class="required">$this->maxFileSize</span>.</td>
+					<td>This form accepts: <span class="required">$this->validExtensionsText</span> files up to a maximum size of <span class="required">$this->maxFileSize</span>.</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,55 +495,55 @@
 		$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")
+		if (!$this->IsValidExtension($ext))
 		{
-			$this->response->SetError('Only Vidoes are accepted - wmv, mpeg, mpg [this is ' . $ext . ']');
+			$this->response->SetError('Your file has an extension not supported by this Media Type.');
 			$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,23 @@
 				return $this->response;
 			}
 		}
-		
+
 		// Update the media record to include this information
 		$SQL = sprintf("UPDATE media SET storedAs = '%s' WHERE mediaid = %d", $storedAs, $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 +612,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 +632,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,31 +646,31 @@
 		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")
+			if (!$this->IsValidExtension($ext))
 			{
-				$this->response->SetError('Only Vidoes are accepted - wmv, mpeg, mpg [this is ' . $ext . ']');
+				$this->response->SetError('Your file has an extension not supported by this Media Type.');
 				$this->response->keepOpen = true;
 				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 +678,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 +705,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,7 +740,7 @@
 					return $this->response;
 				}
 			}
-			
+
 			// Update the media record to include this information
 			$SQL = "UPDATE media SET storedAs = '$storedAs' WHERE mediaid = $new_mediaid";
 			if (!$db->query($SQL))
@@ -750,13 +750,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());
@@ -770,54 +770,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 +825,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 +840,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;
 	}
 }