Merge lp:~dangarner/xibo/server-130 into lp:xibo/1.3

[Dan Garner]

=== added file 'server/install/database/41.sql'
--- server/install/database/41.sql	1970-01-01 00:00:00 +0000
+++ server/install/database/41.sql	2011-07-16 11:26:18 +0000
@@ -0,0 +1,5 @@
+
+
+UPDATE `version` SET `app_ver` = '1.3.0', `XmdsVersion` = 2;
+UPDATE `setting` SET `value` = 0 WHERE `setting` = 'PHONE_HOME_DATE';
+UPDATE `version` SET `DBVersion` = '41';
\ No newline at end of file

=== added file 'server/lib/data/template.data.class.php'
--- server/lib/data/template.data.class.php	1970-01-01 00:00:00 +0000
+++ server/lib/data/template.data.class.php	2011-07-16 11:26:18 +0000
@@ -0,0 +1,41 @@
+<?php
+/*
+ * Xibo - Digitial Signage - http://www.xibo.org.uk
+ * Copyright (C) 2011 Daniel Garner
+ *
+ * This file is part of Xibo.
+ *
+ * Xibo is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version.
+ *
+ * Xibo is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
+ */
+defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
+
+class Template extends Data
+{
+    /**
+     * Deletes a layout
+     * @param <type> $layoutId
+     * @return <type>
+     */
+    public function Delete($templateId)
+    {
+        $db =& $this->db;
+
+        // Remove the Layout
+        if (!$db->query(sprintf('DELETE FROM template WHERE TemplateId = %d', $templateId)))
+            return $this->SetError(25105, __('Unable to delete template'));
+
+        return true;
+    }
+}
+?>
\ No newline at end of file

=== modified file 'server/lib/include.php'
--- server/lib/include.php	2011-06-05 15:27:06 +0000
+++ server/lib/include.php	2011-07-16 11:26:18 +0000
@@ -107,8 +107,8 @@
 Config::Version($db);
 
 // Does the version in the DB match the version of the code?
-if (DBVERSION != '28')
-    die(sprintf('Incompatible database version detected. Please ensure your database and website versions match. You have %d and the website for %d', DBVERSION, 27));
+if (DBVERSION != '41')
+    die(sprintf('Incompatible database version detected. Please ensure your database and website versions match. You have %d and the website for %d', DBVERSION, 41));
 
 // What is the production mode of the server?
 if(Config::GetSetting($db, "SERVER_MODE")=="Test") ini_set('display_errors', 1);

=== modified file 'server/lib/pages/content.class.php'
--- server/lib/pages/content.class.php	2010-10-03 19:12:25 +0000
+++ server/lib/pages/content.class.php	2011-07-16 11:26:18 +0000
@@ -205,7 +205,8 @@
 		{
 			$SQL .= " AND media.retired = 0 ";			
 		}
-		
+		$SQL .= " ORDER BY media.name ";
+
 		Debug::LogEntry($db, 'audit', $SQL);
 
 		if (!$results = $db->query($SQL)) 
@@ -514,6 +515,7 @@
 		{
 			$SQL.= " AND media.name LIKE '%" . sprintf('%s', $name) . "%'";
 		}
+                $SQL .= " ORDER BY media.name ";
 		
 		if(!$results = $db->query($SQL)) 
 		{

=== modified file 'server/lib/pages/stats.class.php'
--- server/lib/pages/stats.class.php	2009-12-31 11:38:50 +0000
+++ server/lib/pages/stats.class.php	2011-07-16 11:26:18 +0000
@@ -117,6 +117,8 @@
 		{
 			$SQL .= sprintf("  AND stat.displayID = %d ", $displayID);
 		}
+
+                $SQL .= " ORDER BY stat.start ";
 		
 		Debug::LogEntry($db, 'audit', $SQL, 'Stats', 'OutputCSV');
 		

=== modified file 'server/lib/pages/template.class.php'
--- server/lib/pages/template.class.php	2009-02-22 20:38:02 +0000
+++ server/lib/pages/template.class.php	2011-07-16 11:26:18 +0000
@@ -112,8 +112,9 @@
 		
 		$tags = "";
 		if (isset($_SESSION['template']['tags'])) $tags = $_SESSION['template']['tags'];
-		
-		$is_system = $_SESSION['template']['is_system'];
+
+                $is_system = 'all';
+		if (isset($_SESSION['template']['is_system'])) $is_system = $_SESSION['template']['is_system'];
 		
 		$system_list = dropdownlist("SELECT 'all','All' UNION SELECT '1','Yes' UNION SELECT '0','No'","is_system",$is_system);
 		
@@ -219,7 +220,7 @@
 		
 		while ($row = $db->get_row($results)) 
 		{
-			$templateid = $row[0];
+			$templateId = Kit::ValidateParam($row[0], _INT);
 			$template 	= $row[1];
 			$issystem 	= $row[2];
 			$tags		= $row[3];
@@ -232,9 +233,14 @@
 			$group			= $user->getGroupFromID($userid);
 			
 			//get the permissions
-			list($see_permissions , $edit_permissions) = $user->eval_permission($userid, $permissionid);
+			list($see_permissions, $edit_permissions) = $user->eval_permission($userid, $permissionid);
 			
 			$buttons = "No available Actions";
+
+                        if ($edit_permissions && $issystem == 'No')
+                        {
+                            $buttons = '<button class="XiboFormButton" href="index.php?p=template&q=DeleteTemplateForm&templateId=' . $templateId . '"><span>' . __('Delete') . '</span></button>';
+                        }
 			
 			if ($see_permissions)
 			{
@@ -442,20 +448,69 @@
 		return false;	
 	}
 	
-	/**
-	 * Deletes a template
-	 * @return 
-	 */
-	function DeleteTemplate() 
-	{
-		$db =& $this->db;
-		
-		$templateid = $_REQUEST['templateid'];
-		
-		//ajax request handler
-		trigger_error('Deleting of templates currently unavailable.', E_USER_ERROR);
-		return false;	
-	}
+    /**
+     * Deletes a template
+     * @return
+     */
+    function DeleteTemplate()
+    {
+        $db =& $this->db;
+        $user =& $this->user;
+        $response = new ResponseManager();
+        $helpManager = new HelpManager($db, $user);
+
+        $templateId = Kit::GetParam('templateId', _POST, _INT);
+
+        if ($templateId == 0)
+            trigger_error(__('No template found'), E_USER_ERROR);
+
+        // Is this user allowed to delete this template?
+        if (!$this->user->TemplateAuth($templateId))
+            trigger_error(__('Access denied'), E_USER_ERROR);
+
+        // Use the data class
+        Kit::ClassLoader('template');
+        $template = new Template($db);
+
+        // Delete the template
+        if (!$template->Delete($templateId))
+            trigger_error($layout->GetErrorMessage(), E_USER_ERROR);
+
+        $response->SetFormSubmitResponse(__('The Template has been Deleted'));
+        $response->Respond();
+    }
+
+    /**
+     * Shows the form to delete a template
+     */
+    public function DeleteTemplateForm()
+    {
+        $db =& $this->db;
+        $user =& $this->user;
+        $response = new ResponseManager();
+        $helpManager = new HelpManager($db, $user);
+        
+        $templateId = Kit::GetParam('templateId', _GET, _INT);
+
+        if ($templateId == 0)
+            trigger_error(__('No template found'), E_USER_ERROR);
+        
+        // Construct some messages to display
+        $msgWarn = __('Are you sure you want to delete this template?');
+
+        $form = <<<END
+        <form id="DeleteTemplateForm" class="XiboForm" method="post" action="index.php?p=template&q=DeleteTemplate">
+            <input type="hidden" name="templateId" value="$templateId">
+            <p>$msgWarn</p>
+        </form>
+END;
+
+        $response->SetFormRequestResponse($form, __('Delete a Template'), '350px', '275px');
+        $response->AddButton(__('Help'), 'XiboHelpRender("' . $helpManager->Link('Template', 'Delete') . '")');
+        $response->AddButton(__('No'), 'XiboDialogClose()');
+        $response->AddButton(__('Yes'), '$("#DeleteTemplateForm").submit()');
+        $response->Respond();
+    }
 	
 	/**
 	 * Gets the Xml for the specified layout

=== modified file 'server/lib/service/rest.class.php'
--- server/lib/service/rest.class.php	2011-01-30 10:29:25 +0000
+++ server/lib/service/rest.class.php	2011-07-16 11:26:18 +0000
@@ -806,6 +806,29 @@
     }
 
     /**
+     * Delete Template
+     * @return <XiboAPIResponse>
+     */
+    public function TemplateDelete()
+    {
+        if (!$this->user->PageAuth('template'))
+            return $this->Error(1, 'Access Denied');
+
+        Kit::ClassLoader('Template');
+
+        $template     = new Template($this->db);
+        $templateId   = $this->GetParam('templateId', _INT);
+
+        if (!$this->user->TemplateAuth($templateId))
+            return $this->Error(1, 'Access Denied');
+
+        if (!$template->Delete($templateId))
+            return $this->Error($layout->GetErrorNumber(), $layout->GetErrorMessage());
+
+        return $this->Respond($this->ReturnId('success', true));
+    }
+
+    /**
      * Lists enabled modules
      * @return <XiboAPIResponse>
      */

=== modified file 'server/modules/flash.module.php'
--- server/modules/flash.module.php	2010-08-01 12:35:20 +0000
+++ server/modules/flash.module.php	2011-07-16 11:26:18 +0000
@@ -102,7 +102,8 @@
 		$session->setSecurityToken($securityToken);
 
 		//Get the default value for the shared list
-		$default = Config::GetSetting($db,"defaultMedia");
+		$default = Config::GetSetting($db, 'defaultMedia');
+                $defaultDuration = Config::GetSetting($db, 'jpg_length');
 
 		$permissionid = 0;
 
@@ -165,7 +166,7 @@
 				</tr>
 				<tr>
 		    		<td><label for="duration" title="The duration in seconds this flash should be displayed (may be overridden on each layout)">Duration<span class="required">*</span></label></td>
-		    		<td><input id="duration" name="duration" type="text" value="$this->duration"></td>
+		    		<td><input id="duration" name="duration" type="text" value="$defaultDuration"></td>
 					<td><label for="permissionid">Sharing<span class="required">*</span></label></td>
 					<td>
 					$shared_list

=== modified file 'server/modules/image.module.php'
--- server/modules/image.module.php	2010-08-01 12:35:20 +0000
+++ server/modules/image.module.php	2011-07-16 11:26:18 +0000
@@ -102,7 +102,8 @@
 		$session->setSecurityToken($securityToken);
 
 		//Get the default value for the shared list
-		$default = Config::GetSetting($db,"defaultMedia");
+		$default = Config::GetSetting($db, 'defaultMedia');
+                $defaultDuration = Config::GetSetting($db, 'jpg_length');
 
 		$permissionid = 0;
 
@@ -174,7 +175,7 @@
 				</tr>
 				<tr>
 		    		<td><label for="duration" title="The duration in seconds this image should be displayed (may be overridden on each layout)">Duration<span class="required">*</span></label></td>
-		    		<td><input id="duration" name="duration" type="text" value="$this->duration"></td>
+		    		<td><input id="duration" name="duration" type="text" value="$defaultDuration"></td>
 					<td><label for="permissionid">Sharing<span class="required">*</span></label></td>
 					<td>
 					$shared_list

=== modified file 'server/modules/module_user_general.php'
--- server/modules/module_user_general.php	2010-10-19 20:41:35 +0000
+++ server/modules/module_user_general.php	2011-07-16 11:26:18 +0000
@@ -900,6 +900,25 @@
     }
 
     /**
+     *Authorises a user against a template Id
+     * @param <type> $templateId
+     * @return <type>
+     */
+    public function TemplateAuth($templateId)
+    {
+        // TODO: Extend to cover group access and all that
+        if (!$userId = $this->db->GetSingleValue(sprintf("SELECT UserID FROM template WHERE TemplateID = %d", $templateId), 'UserID', _INT))
+        {
+            trigger_error($this->db->error_text);
+            trigger_error($this->db->error());
+
+            return false;
+        }
+
+        return ($userId == $this->userid);
+    }
+
+    /**
      * Returns an array of layouts that this user has access to
      */
     public function LayoutList()

=== modified file 'server/modules/powerpoint.module.php'
--- server/modules/powerpoint.module.php	2010-08-01 12:35:20 +0000
+++ server/modules/powerpoint.module.php	2011-07-16 11:26:18 +0000
@@ -103,6 +103,7 @@
 
 		//Get the default value for the shared list
 		$default = Config::GetSetting($db,"defaultMedia");
+                $defaultDuration = Config::GetSetting($db, 'ppt_length');
 
 		$permissionid = 0;
 
@@ -165,7 +166,7 @@
 				</tr>
 				<tr>
 		    		<td><label for="duration" title="The duration in seconds this powerpoint should be displayed (may be overridden on each layout)">Duration<span class="required">*</span></label></td>
-		    		<td><input id="duration" name="duration" type="text" value="$this->duration"></td>
+		    		<td><input id="duration" name="duration" type="text" value="$defaultDuration"></td>
 					<td><label for="permissionid">Sharing<span class="required">*</span></label></td>
 					<td>
 					$shared_list