Merge lp:~dangarner/xibo/334359 into lp:xibo/1.0

[Dan Garner]

[Dan Garner (dangarner)]

Fixed the two bugs as indicated in the Bug reports.

[Dan Garner (dangarner)]

review: Approve

=== modified file 'server/modules/flash.module.php'
--- server/modules/flash.module.php	2009-01-11 18:20:19 +0000
+++ server/modules/flash.module.php	2009-02-27 19:30:45 +0000
@@ -504,7 +504,7 @@
 			
 		// Other properties
 		$name	  		= Kit::GetParam('name', _POST, _STRING);
-		$duration	  	= Kit::GetParam('duration', _POST, _INT, 1);
+		$duration	  	= Kit::GetParam('duration', _POST, _INT, 0);
 		$permissionid 	= Kit::GetParam('permissionid', _POST, _INT, 1);
 		
 		if ($name == '') $name = Kit::ValidateParam($fileName, _FILENAME);
@@ -525,6 +525,13 @@
 			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);
 
@@ -653,7 +660,7 @@
 			
 		// Other properties
 		$name	  		= Kit::GetParam('name', _POST, _STRING);
-		$duration	  	= Kit::GetParam('duration', _POST, _INT, 1);
+		$duration	  	= Kit::GetParam('duration', _POST, _INT, 0);
 		$permissionid 	= Kit::GetParam('permissionid', _POST, _INT, 1);
 		
 		if ($name == '')
@@ -678,6 +685,13 @@
 			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);
 
@@ -804,6 +818,18 @@
 		
 		// Stored As from the XML
 		$this->uri	= $this->GetOption('uri');
+		
+		// Do we need to remove this from a layout?
+		if ($layoutid != '')
+		{
+			// Call base method - which will set up the response
+			parent::DeleteMedia();
+		}
+		else
+		{
+			// Set this message now in preparation
+			$this->response->message = 'Deleted the Media.';
+		}
 				
 		// If we are set to retire we retire
 		if ($options == "retire")
@@ -838,20 +864,8 @@
 			
 			$this->DeleteMediaFiles();
 		}
-		
-		// Options
-		if ($layoutid != '')
-		{
-			// Call base method - which will handle the response too
-			return parent::DeleteMedia();
-		}
-		else
-		{
-			// We want to load a new form
-			$this->response->message	 = 'Deleted the Media.';
-			
-			return $this->response;
-		}
+
+		return $this->response;
 	}
 	
 	/**
 
=== modified file 'server/modules/image.module.php'
--- server/modules/image.module.php	2009-01-11 17:55:31 +0000
+++ server/modules/image.module.php	2009-02-27 19:30:45 +0000
@@ -504,7 +504,7 @@
 			
 		// Other properties
 		$name	  		= Kit::GetParam('name', _POST, _STRING);
-		$duration	  	= Kit::GetParam('duration', _POST, _INT, 1);
+		$duration	  	= Kit::GetParam('duration', _POST, _INT, 0);
 		$permissionid 	= Kit::GetParam('permissionid', _POST, _INT, 1);
 		
 		if ($name == '') $name = Kit::ValidateParam($fileName, _FILENAME);
@@ -525,6 +525,13 @@
 			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);
 
@@ -656,7 +663,7 @@
 			
 		// Other properties
 		$name	  		= Kit::GetParam('name', _POST, _STRING);
-		$duration	  	= Kit::GetParam('duration', _POST, _INT, 1);
+		$duration	  	= Kit::GetParam('duration', _POST, _INT, 0);
 		$permissionid 	= Kit::GetParam('permissionid', _POST, _INT, 1);
 		
 		if ($name == '')
@@ -681,6 +688,13 @@
 			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);
 
@@ -814,6 +828,18 @@
 		
 		// Stored As from the XML
 		$this->uri	= $this->GetOption('uri');
+		
+		// Do we need to remove this from a layout?
+		if ($layoutid != '')
+		{
+			// Call base method - which will set up the response
+			parent::DeleteMedia();
+		}
+		else
+		{
+			// Set this message now in preparation
+			$this->response->message = 'Deleted the Media.';
+		}
 				
 		// If we are set to retire we retire
 		if ($options == "retire")
@@ -849,19 +875,7 @@
 			$this->DeleteMediaFiles();
 		}
 		
-		// Options
-		if ($layoutid != '')
-		{
-			// Call base method - which will handle the response too
-			return parent::DeleteMedia();
-		}
-		else
-		{
-			// We want to load a new form
-			$this->response->message	 = 'Deleted the Media.';
-			
-			return $this->response;
-		}
+		return $this->response;
 	}
 	
 	/**
 
=== modified file 'server/modules/powerpoint.module.php'
--- server/modules/powerpoint.module.php	2009-01-11 18:20:19 +0000
+++ server/modules/powerpoint.module.php	2009-02-27 19:30:45 +0000
@@ -504,7 +504,7 @@
 			
 		// Other properties
 		$name	  		= Kit::GetParam('name', _POST, _STRING);
-		$duration	  	= Kit::GetParam('duration', _POST, _INT, 1);
+		$duration	  	= Kit::GetParam('duration', _POST, _INT, 0);
 		$permissionid 	= Kit::GetParam('permissionid', _POST, _INT, 1);
 		
 		if ($name == '') $name = Kit::ValidateParam($fileName, _FILENAME);
@@ -525,6 +525,13 @@
 			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);
 
@@ -653,7 +660,7 @@
 			
 		// Other properties
 		$name	  		= Kit::GetParam('name', _POST, _STRING);
-		$duration	  	= Kit::GetParam('duration', _POST, _INT, 1);
+		$duration	  	= Kit::GetParam('duration', _POST, _INT, 0);
 		$permissionid 	= Kit::GetParam('permissionid', _POST, _INT, 1);
 		
 		if ($name == '')
@@ -678,6 +685,13 @@
 			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);
 
@@ -804,6 +818,18 @@
 		
 		// Stored As from the XML
 		$this->uri	= $this->GetOption('uri');
+		
+		// Do we need to remove this from a layout?
+		if ($layoutid != '')
+		{
+			// Call base method - which will set up the response
+			parent::DeleteMedia();
+		}
+		else
+		{
+			// Set this message now in preparation
+			$this->response->message = 'Deleted the Media.';
+		}
 				
 		// If we are set to retire we retire
 		if ($options == "retire")
@@ -838,20 +864,8 @@
 			
 			$this->DeleteMediaFiles();
 		}
-		
-		// Options
-		if ($layoutid != '')
-		{
-			// Call base method - which will handle the response too
-			return parent::DeleteMedia();
-		}
-		else
-		{
-			// We want to load a new form
-			$this->response->message	 = 'Deleted the Media.';
 			
-			return $this->response;
-		}
+		return $this->response;
 	}
 	
 	/**
 
=== modified file 'server/modules/text.module.php'
--- server/modules/text.module.php	2009-01-10 14:57:08 +0000
+++ server/modules/text.module.php	2009-02-27 19:30:45 +0000
@@ -167,7 +167,7 @@
 		
 		//Other properties
 		$direction	  = Kit::GetParam('direction', _POST, _WORD, 'none');
-		$duration	  = Kit::GetParam('duration', _POST, _INT, 1);
+		$duration	  = Kit::GetParam('duration', _POST, _INT, 0);
 		$text		  = Kit::GetParam('ta_text', _POST, _HTMLSTRING);
 		
 		$url 		  = "index.php?p=layout&layoutid=$layoutid&regionid=$regionid&q=RegionOptions";
@@ -180,6 +180,13 @@
 			return $this->response;
 		}
 		
+		if ($duration == 0)
+		{
+			$this->response->SetError('You must enter a duration.');
+			$this->response->keepOpen = true;
+			return $this->response;
+		}
+		
 		// Required Attributes
 		$this->mediaid	= md5(uniqid());
 		$this->duration = $duration;
@@ -216,7 +223,7 @@
 		
 		//Other properties
 		$direction	  = Kit::GetParam('direction', _POST, _WORD, 'none');
-		$duration	  = Kit::GetParam('duration', _POST, _INT, 1);
+		$duration	  = Kit::GetParam('duration', _POST, _INT, 0);
 		$text		  = Kit::GetParam('ta_text', _POST, _HTMLSTRING);
 		
 		$url 		  = "index.php?p=layout&layoutid=$layoutid&regionid=$regionid&q=RegionOptions";
@@ -229,6 +236,13 @@
 			return $this->response;
 		}
 		
+		if ($duration == 0)
+		{
+			$this->response->SetError('You must enter a duration.');
+			$this->response->keepOpen = true;
+			return $this->response;
+		}
+		
 		// Required Attributes
 		$this->duration = $duration;
 		
 
=== modified file 'server/modules/ticker.module.php'
--- server/modules/ticker.module.php	2009-02-23 19:48:15 +0000
+++ server/modules/ticker.module.php	2009-02-27 19:30:45 +0000
@@ -178,7 +178,7 @@
 		//Other properties
 		$uri		  = Kit::GetParam('uri', _POST, _URI);
 		$direction	  = Kit::GetParam('direction', _POST, _WORD, 'none');
-		$duration	  = Kit::GetParam('duration', _POST, _INT, 1);
+		$duration	  = Kit::GetParam('duration', _POST, _INT, 0);
 		$text		  = Kit::GetParam('ta_text', _POST, _HTMLSTRING);
 		$copyright	  = Kit::GetParam('copyright', _POST, _STRING);
 		
@@ -200,6 +200,13 @@
 			return $this->response;
 		}
 		
+		if ($duration == 0)
+		{
+			$this->response->SetError('You must enter a duration.');
+			$this->response->keepOpen = true;
+			return $this->response;
+		}
+		
 		// Required Attributes
 		$this->mediaid	= md5(uniqid());
 		$this->duration = $duration;
@@ -240,7 +247,7 @@
 		//Other properties
 		$uri		  = Kit::GetParam('uri', _POST, _URI);
 		$direction	  = Kit::GetParam('direction', _POST, _WORD, 'none');
-		$duration	  = Kit::GetParam('duration', _POST, _INT, 1);
+		$duration	  = Kit::GetParam('duration', _POST, _INT, 0);
 		$text		  = Kit::GetParam('ta_text', _POST, _HTMLSTRING);
 		$copyright	  = Kit::GetParam('copyright', _POST, _STRING);
 		
@@ -262,6 +269,13 @@
 			return $this->response;
 		}
 		
+		if ($duration == 0)
+		{
+			$this->response->SetError('You must enter a duration.');
+			$this->response->keepOpen = true;
+			return $this->response;
+		}
+		
 		// Required Attributes
 		$this->duration = $duration;
 		
 
=== modified file 'server/modules/video.module.php'
--- server/modules/video.module.php	2009-01-11 18:20:19 +0000
+++ server/modules/video.module.php	2009-02-27 19:30:45 +0000
@@ -504,7 +504,7 @@
 			
 		// Other properties
 		$name	  		= Kit::GetParam('name', _POST, _STRING);
-		$duration	  	= Kit::GetParam('duration', _POST, _INT, 1);
+		$duration	  	= Kit::GetParam('duration', _POST, _INT, 0);
 		$permissionid 	= Kit::GetParam('permissionid', _POST, _INT, 1);
 		
 		if ($name == '') $name = Kit::ValidateParam($fileName, _FILENAME);
@@ -525,6 +525,13 @@
 			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);
 
@@ -654,7 +661,7 @@
 			
 		// Other properties
 		$name	  		= Kit::GetParam('name', _POST, _STRING);
-		$duration	  	= Kit::GetParam('duration', _POST, _INT, 1);
+		$duration	  	= Kit::GetParam('duration', _POST, _INT, 0);
 		$permissionid 	= Kit::GetParam('permissionid', _POST, _INT, 1);
 		
 		if ($name == '')
@@ -679,6 +686,13 @@
 			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);
 
@@ -805,6 +819,18 @@
 		
 		// Stored As from the XML
 		$this->uri	= $this->GetOption('uri');
+		
+		// Do we need to remove this from a layout?
+		if ($layoutid != '')
+		{
+			// Call base method - which will set up the response
+			parent::DeleteMedia();
+		}
+		else
+		{
+			// Set this message now in preparation
+			$this->response->message = 'Deleted the Media.';
+		}
 				
 		// If we are set to retire we retire
 		if ($options == "retire")
@@ -839,20 +865,8 @@
 			
 			$this->DeleteMediaFiles();
 		}
-		
-		// Options
-		if ($layoutid != '')
-		{
-			// Call base method - which will handle the response too
-			return parent::DeleteMedia();
-		}
-		else
-		{
-			// We want to load a new form
-			$this->response->message	 = 'Deleted the Media.';
 			
-			return $this->response;
-		}
+		return $this->response;
 	}
 	
 	/**
 
=== modified file 'server/modules/webpage.module.php'
--- server/modules/webpage.module.php	2009-01-10 15:24:06 +0000
+++ server/modules/webpage.module.php	2009-02-27 19:30:45 +0000
@@ -149,7 +149,7 @@
 		
 		//Other properties
 		$uri		  = Kit::GetParam('uri', _POST, _URI);
-		$duration	  = Kit::GetParam('duration', _POST, _INT, 1);
+		$duration	  = Kit::GetParam('duration', _POST, _INT, 0);
 		
 		$url 		  = "index.php?p=layout&layoutid=$layoutid&regionid=$regionid&q=RegionOptions";
 						
@@ -161,6 +161,13 @@
 			return $this->response;
 		}
 		
+		if ($duration == 0)
+		{
+			$this->response->SetError('You must enter a duration.');
+			$this->response->keepOpen = true;
+			return $this->response;
+		}
+		
 		// Required Attributes
 		$this->mediaid	= md5(uniqid());
 		$this->duration = $duration;
@@ -196,7 +203,7 @@
 		
 		//Other properties
 		$uri		  = Kit::GetParam('uri', _POST, _URI);
-		$duration	  = Kit::GetParam('duration', _POST, _INT, 1);
+		$duration	  = Kit::GetParam('duration', _POST, _INT, 0);
 		
 		$url 		  = "index.php?p=layout&layoutid=$layoutid&regionid=$regionid&q=RegionOptions";
 						
@@ -208,6 +215,13 @@
 			return $this->response;
 		}
 		
+		if ($duration == 0)
+		{
+			$this->response->SetError('You must enter a duration.');
+			$this->response->keepOpen = true;
+			return $this->response;
+		}
+		
 		// Required Attributes
 		$this->duration = $duration;