Merge lp:~dangarner/xibo/server-layout-media-permissions into lp:xibo/1.3

[Dan Garner]

[Dan Garner (dangarner)]

review: Approve

=== modified file 'server/img/forms/background_timeline.png'
 Binary files server/img/forms/background_timeline.png	2008-12-10 23:48:58 +0000 and server/img/forms/background_timeline.png	2011-08-18 23:36:27 +0000 differ
=== modified file 'server/install/database/41.sql'
--- server/install/database/41.sql	2011-06-05 17:18:24 +0000
+++ server/install/database/41.sql	2011-08-18 23:36:27 +0000
@@ -1,3 +1,221 @@
+CREATE TABLE IF NOT EXISTS `lklayoutgroup` (
+  `LkLayoutGroupID` int(11) NOT NULL AUTO_INCREMENT,
+  `LayoutID` int(11) NOT NULL,
+  `GroupID` int(11) NOT NULL,
+  `View` tinyint(4) NOT NULL DEFAULT '0',
+  `Edit` tinyint(4) NOT NULL DEFAULT '0',
+  `Del` tinyint(4) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`LkLayoutGroupID`),
+  KEY `LayoutID` (`LayoutID`),
+  KEY `GroupID` (`GroupID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+
+ALTER TABLE `lklayoutgroup`
+  ADD CONSTRAINT `lklayoutgroup_ibfk_2` FOREIGN KEY (`GroupID`) REFERENCES `group` (`groupID`),
+  ADD CONSTRAINT `lklayoutgroup_ibfk_1` FOREIGN KEY (`LayoutID`) REFERENCES `layout` (`layoutID`);
+
+ALTER TABLE  `group` ADD  `IsEveryone` TINYINT NOT NULL DEFAULT  '0';
+
+INSERT INTO `group` (
+`groupID` ,
+`group` ,
+`IsUserSpecific` ,
+`IsEveryone`
+)
+VALUES (
+NULL ,  'Everyone',  '0',  '1'
+);
+
+CREATE TABLE IF NOT EXISTS `lkmediagroup` (
+  `LkMediaGroupID` int(11) NOT NULL AUTO_INCREMENT,
+  `MediaID` int(11) NOT NULL,
+  `GroupID` int(11) NOT NULL,
+  `View` tinyint(4) NOT NULL DEFAULT '0',
+  `Edit` tinyint(4) NOT NULL DEFAULT '0',
+  `Del` tinyint(4) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`LkMediaGroupID`),
+  KEY `MediaID` (`MediaID`),
+  KEY `GroupID` (`GroupID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+
+ALTER TABLE `lkmediagroup`
+  ADD CONSTRAINT `lkmediagroup_ibfk_2` FOREIGN KEY (`GroupID`) REFERENCES `group` (`groupID`),
+  ADD CONSTRAINT `lkmediagroup_ibfk_1` FOREIGN KEY (`MediaID`) REFERENCES `media` (`MediaID`);
+
+CREATE TABLE IF NOT EXISTS `lklayoutmediagroup` (
+  `LkLayoutMediaGroup` int(11) NOT NULL AUTO_INCREMENT,
+  `LayoutID` int(11) NOT NULL,
+  `RegionID` varchar(50) NOT NULL,
+  `MediaID` varchar(50) NOT NULL,
+  `GroupID` int(11) NOT NULL,
+  `View` tinyint(4) NOT NULL DEFAULT '0',
+  `Edit` tinyint(4) NOT NULL DEFAULT '0',
+  `Del` tinyint(4) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`LkLayoutMediaGroup`),
+  KEY `LayoutID` (`LayoutID`),
+  KEY `GroupID` (`GroupID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+
+ALTER TABLE `lklayoutmediagroup`
+  ADD CONSTRAINT `lklayoutmediagroup_ibfk_2` FOREIGN KEY (`GroupID`) REFERENCES `group` (`groupID`),
+  ADD CONSTRAINT `lklayoutmediagroup_ibfk_1` FOREIGN KEY (`LayoutID`) REFERENCES `layout` (`layoutID`);
+
+CREATE TABLE IF NOT EXISTS `lktemplategroup` (
+  `LkTemplateGroupID` int(11) NOT NULL AUTO_INCREMENT,
+  `TemplateID` int(11) NOT NULL,
+  `GroupID` int(11) NOT NULL,
+  `View` tinyint(4) NOT NULL DEFAULT '0',
+  `Edit` tinyint(4) NOT NULL DEFAULT '0',
+  `Del` tinyint(4) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`LkTemplateGroupID`),
+  KEY `TemplateID` (`TemplateID`),
+  KEY `GroupID` (`GroupID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+
+ALTER TABLE `lktemplategroup`
+  ADD CONSTRAINT `lktemplategroup_ibfk_2` FOREIGN KEY (`GroupID`) REFERENCES `group` (`groupID`),
+  ADD CONSTRAINT `lktemplategroup_ibfk_1` FOREIGN KEY (`TemplateID`) REFERENCES `template` (`TemplateID`);
+
+ALTER TABLE  `layout` DROP  `permissionID`;
+
+ALTER TABLE  `media` DROP FOREIGN KEY  `media_ibfk_1` ;
+ALTER TABLE  `media` DROP  `permissionID`;
+
+ALTER TABLE  `template` DROP FOREIGN KEY  `template_ibfk_2` ;
+ALTER TABLE  `template` DROP  `permissionID`;
+
+DROP TABLE  `permission`;
+
+CREATE TABLE IF NOT EXISTS `lklayoutregiongroup` (
+  `LkLayoutRegionGroup` int(11) NOT NULL AUTO_INCREMENT,
+  `LayoutID` int(11) NOT NULL,
+  `RegionID` varchar(50) NOT NULL,
+  `GroupID` int(11) NOT NULL,
+  `View` tinyint(4) NOT NULL DEFAULT '0',
+  `Edit` tinyint(4) NOT NULL DEFAULT '0',
+  `Del` tinyint(4) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`LkLayoutRegionGroup`),
+  KEY `LayoutID` (`LayoutID`),
+  KEY `GroupID` (`GroupID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+
+ALTER TABLE `lklayoutregiongroup`
+  ADD CONSTRAINT `lklayoutregiongroup_ibfk_2` FOREIGN KEY (`GroupID`) REFERENCES `group` (`groupID`),
+  ADD CONSTRAINT `lklayoutregiongroup_ibfk_1` FOREIGN KEY (`LayoutID`) REFERENCES `layout` (`layoutID`);
+
+INSERT INTO lktemplategroup (TemplateID, GroupID, View)
+SELECT TemplateID, GroupId, 1
+  FROM template
+    CROSS JOIN (SELECT GroupID, `Group` FROM `group` WHERE IsEveryone = 1) `group`
+ WHERE IsSystem = 1;
+
+INSERT INTO `setting` (
+`settingid` ,
+`setting` ,
+`value` ,
+`type` ,
+`helptext` ,
+`options` ,
+`cat` ,
+`userChange`
+)
+VALUES (
+NULL ,  'REGION_OPTIONS_COLOURING',  'media',  'dropdown', NULL ,  'Media Colouring|Permissions Colouring',  'permissions',  '1'
+);
+
+UPDATE  `setting` SET  `setting` =  'LAYOUT_DEFAULT',
+`helptext` =  'New layouts will be created with these settings. If public everyone will be able to view and use this layout.' WHERE  `setting`.`settingid` =2 LIMIT 1 ;
+
+UPDATE  `setting` SET  `setting` =  'MEDIA_DEFAULT',
+`helptext` =  'Media will be created with these settings. If public everyone will be able to view and use this media.' WHERE  `setting`.`settingid` =1 LIMIT 1 ;
+
+INSERT INTO `pages` (`name`, `pagegroupID`) VALUES
+('help', 2),
+('clock', 2);
+
+INSERT INTO `module` (
+`ModuleID` ,
+`Module` ,
+`Enabled` ,
+`RegionSpecific` ,
+`Description` ,
+`ImageUri` ,
+`SchemaVersion` ,
+`ValidExtensions`
+)
+VALUES (
+NULL ,  'Counter',  '1',  '1',  'Customer Counter connected to a Remote Control',  'img/forms/webpage.gif',  '1', NULL
+);
+
+INSERT INTO  `pagegroup` (
+`pagegroupID` ,
+`pagegroup`
+)
+VALUES (
+NULL ,  'DataSets'
+);
+
+INSERT INTO `pages` (`name`, `pagegroupID`)
+SELECT 'dataset', pagegroupID
+  FROM pagegroup
+ WHERE pagegroup = 'DataSets';
+
+INSERT INTO `menuitem` (`menuID`, `pageID`, `Text`, `sequence`)
+SELECT '4', pageID, 'DataSets', '6'
+  FROM pages
+ WHERE `name` = 'dataset';
+
+CREATE TABLE IF NOT EXISTS `dataset` (
+  `DataSetID` int(11) NOT NULL AUTO_INCREMENT,
+  `DataSet` varchar(50) NOT NULL,
+  `Description` varchar(254) DEFAULT NULL,
+  `UserID` int(11) NOT NULL,
+  PRIMARY KEY (`DataSetID`),
+  KEY `UserID` (`UserID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+
+CREATE TABLE IF NOT EXISTS `datasetcolumn` (
+  `DataSetColumnID` int(11) NOT NULL AUTO_INCREMENT,
+  `DataSetID` int(11) NOT NULL,
+  `Heading` varchar(50) NOT NULL,
+  `DataTypeID` smallint(6) NOT NULL,
+  `ListContent` varchar(255) DEFAULT NULL,
+  `ColumnOrder` smallint(6) NOT NULL,
+  PRIMARY KEY (`DataSetColumnID`),
+  KEY `DataSetID` (`DataSetID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+
+ALTER TABLE `datasetcolumn`
+  ADD CONSTRAINT `datasetcolumn_ibfk_1` FOREIGN KEY (`DataSetID`) REFERENCES `dataset` (`DataSetID`);
+
+CREATE TABLE IF NOT EXISTS `datasetdata` (
+  `DataSetDataID` int(11) NOT NULL AUTO_INCREMENT,
+  `DataSetColumnID` int(11) NOT NULL,
+  `RowNumber` int(11) NOT NULL,
+  `Value` varchar(255) NOT NULL,
+  PRIMARY KEY (`DataSetDataID`),
+  KEY `DataColumnID` (`DataSetColumnID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+
+ALTER TABLE `datasetdata`
+  ADD CONSTRAINT `datasetdata_ibfk_1` FOREIGN KEY (`DataSetColumnID`) REFERENCES `datasetcolumn` (`DataSetColumnID`);
+
+CREATE TABLE IF NOT EXISTS `lkdatasetgroup` (
+  `LkDataSetGroupID` int(11) NOT NULL AUTO_INCREMENT,
+  `DataSetID` int(11) NOT NULL,
+  `GroupID` int(11) NOT NULL,
+  `View` tinyint(4) NOT NULL DEFAULT '0',
+  `Edit` tinyint(4) NOT NULL DEFAULT '0',
+  `Del` tinyint(4) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`LkDataSetGroupID`),
+  KEY `DataSetID` (`DataSetID`),
+  KEY `GroupID` (`GroupID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+
+ALTER TABLE `lkdatasetgroup`
+  ADD CONSTRAINT `lkdatasetgroup_ibfk_2` FOREIGN KEY (`GroupID`) REFERENCES `group` (`groupID`),
+  ADD CONSTRAINT `lkdatasetgroup_ibfk_1` FOREIGN KEY (`DataSetID`) REFERENCES `dataset` (`DataSetID`);
+
 
 
 UPDATE `version` SET `app_ver` = '1.3.0', `XmdsVersion` = 2;
 
=== modified file 'server/lib/app/kit.class.php'
--- server/lib/app/kit.class.php	2011-02-28 16:05:59 +0000
+++ server/lib/app/kit.class.php	2011-08-18 23:36:27 +0000
@@ -490,5 +490,18 @@
         return mail($to, $subject, $message, $headers);
     }
 
+    public static function SelectList($listName, $listValues, $idColumn, $nameColumn, $selectedId = '', $callBack = '')
+    {
+        $list = '<select name="' . $listName . '" id="' . $listName . '"' . $callBack . '>';
+
+        foreach ($listValues as $listItem)
+        {
+            $list .= '<option value="' . $listItem[$idColumn] . '" ' . (($listItem[$idColumn] == $selectedId) ? 'selected' : '') . '>' . $listItem[$nameColumn] . '</option>';
+        }
+
+        $list .= '</select>';
+
+        return $list;
+    }
 }
 ?>
 
=== added file 'server/lib/app/permissionmanager.class.php'
--- server/lib/app/permissionmanager.class.php	1970-01-01 00:00:00 +0000
+++ server/lib/app/permissionmanager.class.php	2011-08-18 23:36:27 +0000
@@ -0,0 +1,83 @@
+<?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 PermissionManager
+{
+    private $db;
+    private $user;
+    
+    public $ownerId;
+
+    public $view;
+    public $edit;
+    public $del;
+    public $modifyPermissions;
+
+    /**
+     * Constructs the Module Manager.
+     * @return
+     * @param $db Object
+     * @param $user Object
+     */
+    public function __construct(database $db, User $user)
+    {
+        $this->db       =& $db;
+        $this->user 	=& $user;
+
+        $this->view = false;
+        $this->edit = false;
+        $this->del = false;
+        $this->modifyPermissions = false;
+    }
+
+    public function Evaluate($ownerId, $view, $edit, $del)
+    {
+        $user =& $this->user;
+
+        $this->ownerId = $ownerId;
+        $this->view = $view;
+        $this->edit = $edit;
+        $this->del = $del;
+
+        // Basic checks first
+        if ($this->user->usertypeid == 1 || $ownerId == $user->userid)
+        {
+            // Super admin or owner, therefore permission granted to everything
+            $this->FullAccess();
+        }
+        else if ($this->user->usertypeid == 2 && $this->view == 1)
+        {
+            // Group Admin and we have view permissions (i.e. this group is assigned to this item)
+            $this->view = true;
+            $this->edit = true;
+            $this->del = true;
+        }
+    }
+
+    public function FullAccess()
+    {
+        $this->view = true;
+        $this->edit = true;
+        $this->del = true;
+        $this->modifyPermissions = true;
+    }
+}
 \ No newline at end of file
 
=== modified file 'server/lib/app/responsemanager.class.php'
--- server/lib/app/responsemanager.class.php	2010-05-29 11:16:24 +0000
+++ server/lib/app/responsemanager.class.php	2011-08-18 23:36:27 +0000
@@ -45,20 +45,25 @@
 	public $refresh;
 	public $refreshLocation;
 	public $focusInFirstInput;
+        public $appendHiddenSubmit;
 	
 	public $login;
 	public $clockUpdate;
+
+        public $uniqueReference;
 	
 	public function __construct()
 	{		
 		// Determine if this is an AJAX call or not
-		$this->ajax	= Kit::GetParam('ajax', _REQUEST, _BOOL, false);
+		$this->ajax = Kit::GetParam('ajax', _REQUEST, _BOOL, false);
 		
 		// Assume success
-		$this->success 				= true;
-		$this->clockUpdate 			= false;
-		$this->focusInFirstInput	= true;
-		$this->buttons				= '';
+		$this->success = true;
+		$this->clockUpdate = false;
+		$this->focusInFirstInput = true;
+                $this->appendHiddenSubmit = true;
+                $this->uniqueReference = '';
+		$this->buttons = '';
 		
 		return true;
 	}
@@ -212,6 +217,7 @@
 			// General
 			$response['html'] 			= $this->html;
 			$response['buttons']		= $this->buttons;
+                        $response['uniqueReference'] = $this->uniqueReference;
 			
 			$response['success']		= $this->success;
 			$response['callBack']		= $this->callBack;
 
=== modified file 'server/lib/app/translationengine.class.php'
--- server/lib/app/translationengine.class.php	2010-09-18 15:40:51 +0000
+++ server/lib/app/translationengine.class.php	2011-08-18 23:36:27 +0000
@@ -75,7 +75,7 @@
                     {
                         // Remove any quality rating (as we aren't interested)
                         $rawLang = explode(';', $lang);
-                        $lang = $rawLang[0];
+                        $lang = str_replace("-", "_", $rawLang[0]);
 
                         if (in_array($lang . '.mo', $supportedLangs))
                         {
 
=== added file 'server/lib/data/dataset.data.class.php'
--- server/lib/data/dataset.data.class.php	1970-01-01 00:00:00 +0000
+++ server/lib/data/dataset.data.class.php	2011-08-18 23:36:27 +0000
@@ -0,0 +1,148 @@
+<?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 DataSet extends Data
+{
+    /**
+     * Add a data set
+     * @param <type> $dataSet
+     * @param <type> $description
+     * @param <type> $userId
+     * @return <type>
+     */
+    public function Add($dataSet, $description, $userId)
+    {
+        $db =& $this->db;
+
+        // Validation
+        if (strlen($dataSet) > 50 || strlen($dataSet) < 1)
+        {
+            $this->SetError(25001, __("Name must be between 1 and 50 characters"));
+            return false;
+        }
+
+        if (strlen($description) > 254)
+        {
+            $this->SetError(25002, __("Description can not be longer than 254 characters"));
+            return false;
+        }
+
+        // Ensure there are no layouts with the same name
+        $SQL = sprintf("SELECT DataSet FROM dataset WHERE DataSet = '%s' ", $dataSet);
+
+        if ($db->GetSingleRow($SQL))
+        {
+            trigger_error($db->error());
+            $this->SetError(25004, sprintf(__("There is already dataset called '%s'. Please choose another name."), $dataSet));
+            return false;
+        }
+        // End Validation
+
+        $SQL = "INSERT INTO dataset (DataSet, Description, UserID) ";
+        $SQL .= " VALUES ('%s', '%s', %d) ";
+
+        if (!$id = $db->insert_query(sprintf($SQL, $dataSet, $description, $userId)))
+        {
+            trigger_error($db->error());
+            $this->SetError(25005, __('Could not add DataSet'));
+
+            return false;
+        }
+
+        Debug::LogEntry($db, 'audit', 'Complete', 'DataSet', 'Add');
+
+        return $id;
+    }
+
+    /**
+     * Edit a DataSet
+     * @param <type> $dataSetId
+     * @param <type> $dataSet
+     * @param <type> $description
+     */
+    public function Edit($dataSetId, $dataSet, $description)
+    {
+        $db =& $this->db;
+
+        // Validation
+        if (strlen($dataSet) > 50 || strlen($dataSet) < 1)
+        {
+            $this->SetError(25001, __("Name must be between 1 and 50 characters"));
+            return false;
+        }
+
+        if (strlen($description) > 254)
+        {
+            $this->SetError(25002, __("Description can not be longer than 254 characters"));
+            return false;
+        }
+
+        // Ensure there are no layouts with the same name
+        $SQL = sprintf("SELECT DataSet FROM dataset WHERE DataSet = '%s' AND DataSetID <> %d ", $dataSet, $dataSetId);
+
+        if ($db->GetSingleRow($SQL))
+        {
+            trigger_error($db->error());
+            $this->SetError(25004, sprintf(__("There is already a dataset called '%s'. Please choose another name."), $dataSet));
+            return false;
+        }
+        // End Validation
+
+        $SQL = "UPDATE dataset SET DataSet = '%s', Description = '%s' WHERE DataSetID = %d ";
+        $SQL = sprintf($SQL, $dataSet, $description, $dataSetId);
+
+        if (!$db->query($SQL))
+        {
+            trigger_error($db->error());
+            $this->SetError(25005, sprintf(__('Cannot edit dataset %s'), $dataSet));
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Delete DataSet
+     * @param <type> $dataSetId
+     */
+    public function Delete($dataSetId)
+    {
+        $db =& $this->db;
+
+        Kit::ClassLoader('datasetgroupsecurity');
+        $security = new DataSetGroupSecurity($db);
+        $security->UnlinkAll($dataSetId);
+
+        $SQL = "DELETE FROM dataset WHERE DataSetID = %d";
+        $SQL = sprintf($SQL, $dataSetId);
+
+        if (!$db->query($SQL))
+        {
+            trigger_error($db->error());
+            $this->SetError(25005, __('Cannot delete dataset'));
+            return false;
+        }
+        
+        return true;
+    }
+}
+?>
 \ No newline at end of file
 
=== added file 'server/lib/data/datasetcolumn.data.class.php'
--- server/lib/data/datasetcolumn.data.class.php	1970-01-01 00:00:00 +0000
+++ server/lib/data/datasetcolumn.data.class.php	2011-08-18 23:36:27 +0000
@@ -0,0 +1,127 @@
+<?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 DataSetColumn extends Data
+{
+    public function Add($dataSetId, $heading, $dataTypeId, $listContent, $columnOrder = '')
+    {
+        $db =& $this->db;
+
+        // Is the column order provided?
+        if ($columnOrder == '')
+        {
+            $SQL  = "";
+            $SQL .= "SELECT IFNULL(MAX(ColumnOrder), 1) AS ColumnOrder ";
+            $SQL .= "  FROM datasetcolumn ";
+            $SQL .= sprintf("WHERE datasetID = %d ", $dataSetId);
+
+            if (!$columnOrder = $db->GetSingleValue($SQL, 'ColumnOrder', _INT))
+            {
+                trigger_error($db->error());
+                return $this->SetError(25005, __('Could not determine the Column Order'));
+            }
+        }
+
+        $SQL  = "INSERT INTO datasetcolumn (DataSetID, Heading, DataTypeID, ListContent, ColumnOrder) ";
+        $SQL .= "    VALUES (%d, '%s', %d, '%s', %d) ";
+        $SQL = sprintf($SQL, $dataSetId, $heading, $dataTypeId, $listContent, $columnOrder);
+
+        if (!$id = $db->insert_query($SQL))
+        {
+            trigger_error($db->error());
+            return $this->SetError(25005, __('Could not add DataSet Column'));
+        }
+
+        Debug::LogEntry($db, 'audit', 'Complete', 'DataSetColumn', 'Add');
+
+        return $id;
+    }
+
+    public function Edit($dataSetColumnId, $heading, $dataTypeId, $listContent, $columnOrder)
+    {
+        $db =& $this->db;
+
+        // Validation
+        if ($listContent != '')
+        {
+            $list = explode(',', $listContent);
+
+            // We can check this is valid by building up a NOT IN sql statement, if we get results.. we know its not good
+            $select = '';
+
+            for ($i=0; $i < count($list); $i++)
+            {
+                $list_val = $list[$i];
+                $select .= "'$list_val',";
+            }
+
+            $select = rtrim($select, ',');
+
+            $SQL = sprintf("SELECT DataSetDataID FROM datasetdata WHERE DataColumnID = %d AND Value NOT IN (%s)", $dataSetColumnId, $select);
+
+            if (!$results = $db->query($SQL))
+            {
+                trigger_error($db->error());
+                return $this->SetError(25005, __('Could not edit DataSet Column'));
+            }
+
+            if ($db->num_rows($results) > 0)
+                return $this->SetError(25005, __('New list content value is invalid as it doesnt include values for existing data'));
+        }
+
+        $SQL  = "UPDATE datasetcolumn SET Heading = '%s', ListContent = '%s', ColumnOrder = %d ";
+        $SQL .= " WHERE DataSetColumnID = %d";
+
+        $SQL = sprintf($SQL, $heading, $listContent, $columnOrder, $dataSetColumnId);
+
+        if (!$db->query($SQL))
+        {
+            trigger_error($db->error());
+            return $this->SetError(25005, __('Could not edit DataSet Column'));
+        }
+
+        Debug::LogEntry($db, 'audit', 'Complete', 'DataSetColumn', 'Edit');
+
+        return true;
+    }
+
+    public function Delete($dataSetColumnId)
+    {
+        $db =& $this->db;
+
+        $SQL  = "DELETE FROM datasetcolumn ";
+        $SQL .= " WHERE DataSetColumnID = %d";
+
+        $SQL = sprintf($SQL, $dataSetColumnId);
+
+        if (!$db->query($SQL))
+        {
+            trigger_error($db->error());
+            return $this->SetError(25005, __('Could not delete DataSet Column'));
+        }
+
+        Debug::LogEntry($db, 'audit', 'Complete', 'DataSetColumn', 'Delete');
+
+        return true;
+    }
+}
+?>
 \ No newline at end of file
 
=== added file 'server/lib/data/datasetdata.data.class.php'
--- server/lib/data/datasetdata.data.class.php	1970-01-01 00:00:00 +0000
+++ server/lib/data/datasetdata.data.class.php	2011-08-18 23:36:27 +0000
@@ -0,0 +1,84 @@
+<?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 DataSetData extends Data
+{
+    public function Add($dataSetColumnId, $rowNumber, $value)
+    {
+        $db =& $this->db;
+
+        $SQL  = "INSERT INTO datasetdata (DataSetColumnID, RowNumber, Value) ";
+        $SQL .= "    VALUES (%d, %d, '%s') ";
+        $SQL = sprintf($SQL, $dataSetColumnId, $rowNumber, $value);
+
+        if (!$id = $db->insert_query($SQL))
+        {
+            trigger_error($db->error());
+            return $this->SetError(25005, __('Could not add DataSet Data'));
+        }
+
+        Debug::LogEntry($db, 'audit', 'Complete', 'DataSetData', 'Add');
+
+        return $id;
+    }
+
+    public function Edit($dataSetColumnId, $rowNumber, $value)
+    {
+        $db =& $this->db;
+
+        $SQL  = "UPDATE datasetdata SET Value = '%s' ";
+        $SQL .= " WHERE DataSetColumnID = %d AND RowNumber = %d";
+
+        $SQL = sprintf($SQL, $value, $dataSetColumnId, $rowNumber);
+
+        if (!$db->query($SQL))
+        {
+            trigger_error($db->error());
+            return $this->SetError(25005, __('Could not edit DataSet Data'));
+        }
+
+        Debug::LogEntry($db, 'audit', 'Complete', 'DataSetData', 'Edit');
+
+        return true;
+    }
+
+    public function Delete($dataSetColumnId, $rowNumber)
+    {
+        $db =& $this->db;
+
+        $SQL  = "DELETE FROM datasetdata ";
+        $SQL .= " WHERE DataSetColumnID = %d AND RowNumber = %d";
+
+        $SQL = sprintf($SQL, $dataSetColumnId, $rowNumber);
+
+        if (!$db->query($SQL))
+        {
+            trigger_error($db->error());
+            return $this->SetError(25005, __('Could not delete Data for Column/Row'));
+        }
+
+        Debug::LogEntry($db, 'audit', 'Complete', 'DataSetData', 'Delete');
+
+        return true;
+    }
+}
+?>
 \ No newline at end of file
 
=== added file 'server/lib/data/datasetgroupsecurity.data.class.php'
--- server/lib/data/datasetgroupsecurity.data.class.php	1970-01-01 00:00:00 +0000
+++ server/lib/data/datasetgroupsecurity.data.class.php	2011-08-18 23:36:27 +0000
@@ -0,0 +1,149 @@
+<?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 DataSetGroupSecurity extends Data
+{
+    public function __construct(database $db)
+    {
+        parent::__construct($db);
+    }
+
+    /**
+     * Links a Display Group to a Group
+     * @return
+     * @param $displayGroupID Object
+     * @param $groupID Object
+     */
+    public function Link($dataSetId, $groupId, $view, $edit, $del)
+    {
+        $db =& $this->db;
+
+        Debug::LogEntry($db, 'audit', 'IN', 'DataSetGroupSecurity', 'Link');
+
+        $SQL  = "";
+        $SQL .= "INSERT ";
+        $SQL .= "INTO   lkdatasetgroup ";
+        $SQL .= "       ( ";
+        $SQL .= "              DataSetID, ";
+        $SQL .= "              GroupID, ";
+        $SQL .= "              View, ";
+        $SQL .= "              Edit, ";
+        $SQL .= "              Del ";
+        $SQL .= "       ) ";
+        $SQL .= "       VALUES ";
+        $SQL .= "       ( ";
+        $SQL .= sprintf("  %d, %d, %d, %d, %d ", $dataSetId, $groupId, $view, $edit, $del);
+        $SQL .= "       )";
+
+        if (!$db->query($SQL))
+        {
+            trigger_error($db->error());
+            $this->SetError(25024, __('Could not Link DataSet to Group'));
+
+            return false;
+        }
+
+        Debug::LogEntry($db, 'audit', 'OUT', 'DataSetGroupSecurity', 'Link');
+
+        return true;
+    }
+
+    /**
+     * Links everyone to the layout specified
+     * @param <type> $layoutId
+     * @param <type> $view
+     * @param <type> $edit
+     * @param <type> $del
+     * @return <type>
+     */
+    public function LinkEveryone($dataSetId, $view, $edit, $del)
+    {
+        $db =& $this->db;
+
+        Debug::LogEntry($db, 'audit', 'IN', 'DataSetGroupSecurity', 'LinkEveryone');
+
+        $groupId = $db->GetSingleValue("SELECT GroupID FROM `group` WHERE IsEveryone = 1", 'GroupID', _INT);
+
+        return $this->Link($dataSetId, $groupId, $view, $edit, $del);
+    }
+
+    /**
+     * Unlinks a display group from a group
+     * @return
+     * @param $displayGroupID Object
+     * @param $groupID Object
+     */
+    public function Unlink($dataSetId, $groupId)
+    {
+        $db =& $this->db;
+
+        Debug::LogEntry($db, 'audit', 'IN', 'DataSetGroupSecurity', 'Unlink');
+
+        $SQL  = "";
+        $SQL .= "DELETE FROM ";
+        $SQL .= "   lkdatasetgroup ";
+        $SQL .= sprintf("  WHERE DataSetID = %d AND GroupID = %d ", $dataSetId, $groupId);
+
+        if (!$db->query($SQL))
+        {
+            trigger_error($db->error());
+            $this->SetError(25025, __('Could not Unlink DataSet from Group'));
+
+            return false;
+        }
+
+        Debug::LogEntry($db, 'audit', 'OUT', 'DataSetGroupSecurity', 'Unlink');
+
+        return true;
+    }
+
+        /**
+     * Unlinks a display group from a group
+     * @return
+     * @param $displayGroupID Object
+     * @param $groupID Object
+     */
+    public function UnlinkAll($dataSetId)
+    {
+        $db =& $this->db;
+
+        Debug::LogEntry($db, 'audit', 'IN', 'DataSetGroupSecurity', 'Unlink');
+
+        $SQL  = "";
+        $SQL .= "DELETE FROM ";
+        $SQL .= "   lkdatasetgroup ";
+        $SQL .= sprintf("  WHERE DataSetID = %d ", $dataSetId);
+
+        if (!$db->query($SQL))
+        {
+            trigger_error($db->error());
+            $this->SetError(25025, __('Could not Unlink DataSet from Group'));
+
+            return false;
+        }
+
+        Debug::LogEntry($db, 'audit', 'OUT', 'DataSetGroupSecurity', 'Unlink');
+
+        return true;
+    }
+}
+?>
 \ No newline at end of file
 
=== modified file 'server/lib/data/layout.data.class.php'
--- server/lib/data/layout.data.class.php	2011-01-07 22:03:11 +0000
+++ server/lib/data/layout.data.class.php	2011-08-18 23:36:27 +0000
@@ -29,13 +29,12 @@
      * Add a layout
      * @param <type> $layout
      * @param <type> $description
-     * @param <type> $permissionid
      * @param <type> $tags
      * @param <type> $userid
      * @param <type> $templateId
      * @return <type>
      */
-    public function Add($layout, $description, $permissionid, $tags, $userid, $templateId)
+    public function Add($layout, $description, $tags, $userid, $templateId)
     {
         $db          =& $this->db;
         $currentdate = date("Y-m-d H:i:s");
@@ -75,17 +74,17 @@
         Debug::LogEntry($db, 'audit', 'Validation Compelte', 'Layout', 'Add');
 
         // Get the XML for this template.
-        $templateXml = $this->GetTemplateXml($templateId);
+        $templateXml = $this->GetTemplateXml($templateId, $userid);
 
         Debug::LogEntry($db, 'audit', 'Retrieved template xml', 'Layout', 'Add');
 
         $SQL = <<<END
-        INSERT INTO layout (layout, description, userID, permissionID, createdDT, modifiedDT, tags, xml)
-         VALUES ('%s', '%s', %d, %d, '%s', '%s', '%s', '%s')
+        INSERT INTO layout (layout, description, userID, createdDT, modifiedDT, tags, xml)
+         VALUES ('%s', '%s', %d, %d, '%s', '%s', '%s')
 END;
 
         $SQL = sprintf($SQL, $db->escape_string($layout),
-                            $db->escape_string($description), $userid, $permissionid,
+                            $db->escape_string($description), $userid,
                             $db->escape_string($currentdate),
                             $db->escape_string($currentdate),
                             $db->escape_string($tags),
@@ -124,7 +123,7 @@
      * Gets the XML for the specified template id
      * @param <type> $templateId
      */
-    private function GetTemplateXml($templateId)
+    private function GetTemplateXml($templateId, $userId)
     {
         $db =& $this->db;
 
@@ -149,7 +148,16 @@
             if (!$row = $db->GetSingleRow(sprintf("SELECT xml FROM template WHERE templateID = %d ", $templateId)))
                 trigger_error(__('Error getting this template.'), E_USER_ERROR);
 
-            $xml = $row['xml'];
+            $xmlDoc = new DOMDocument("1.0");
+            $xmlDoc->loadXML($row['xml']);
+
+            $regionNodeList = $xmlDoc->getElementsByTagName('region');
+
+            //get the regions
+            foreach ($regionNodeList as $region)
+                $region->setAttribute('userId', $userId);
+
+            $xml = $xmlDoc->saveXML();
         }
 
         return $xml;
@@ -348,8 +356,8 @@
 
         // The Layout ID is the old layout
         $SQL  = "";
-        $SQL .= " INSERT INTO layout (layout, permissionID, xml, userID, description, tags, templateID, retired, duration, background, createdDT, modifiedDT) ";
-        $SQL .= " SELECT '%s', permissionID, xml, %d, description, tags, templateID, retired, duration, background, '%s', '%s' ";
+        $SQL .= " INSERT INTO layout (layout, xml, userID, description, tags, templateID, retired, duration, background, createdDT, modifiedDT) ";
+        $SQL .= " SELECT '%s', xml, %d, description, tags, templateID, retired, duration, background, '%s', '%s' ";
         $SQL .= "  FROM layout ";
         $SQL .= " WHERE layoutid = %d";
         $SQL = sprintf($SQL, $db->escape_string($newLayoutName), $userId, $db->escape_string($currentdate), $db->escape_string($currentdate), $oldLayoutId);
@@ -427,6 +435,9 @@
         $db =& $this->db;
 
         // Remove all LK records for this layout
+        $db->query(sprintf('DELETE FROM lklayoutgroup WHERE layoutid = %d', $layoutId));
+        $db->query(sprintf('DELETE FROM lklayoutmediagroup WHERE layoutid = %d', $layoutId));
+        $db->query(sprintf('DELETE FROM lklayoutregiongroup WHERE layoutid = %d', $layoutId));
         $db->query(sprintf('DELETE FROM lklayoutmedia WHERE layoutid = %d', $layoutId));
 
         // Remove the Layout
 
=== added file 'server/lib/data/layoutgroupsecurity.data.class.php'
--- server/lib/data/layoutgroupsecurity.data.class.php	1970-01-01 00:00:00 +0000
+++ server/lib/data/layoutgroupsecurity.data.class.php	2011-08-18 23:36:27 +0000
@@ -0,0 +1,149 @@
+<?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 LayoutGroupSecurity extends Data
+{
+    public function __construct(database $db)
+    {
+        parent::__construct($db);
+    }
+
+    /**
+     * Links a Display Group to a Group
+     * @return
+     * @param $displayGroupID Object
+     * @param $groupID Object
+     */
+    public function Link($layoutId, $groupId, $view, $edit, $del)
+    {
+        $db =& $this->db;
+
+        Debug::LogEntry($db, 'audit', 'IN', 'LayoutGroupSecurity', 'Link');
+
+        $SQL  = "";
+        $SQL .= "INSERT ";
+        $SQL .= "INTO   lklayoutgroup ";
+        $SQL .= "       ( ";
+        $SQL .= "              LayoutID, ";
+        $SQL .= "              GroupID, ";
+        $SQL .= "              View, ";
+        $SQL .= "              Edit, ";
+        $SQL .= "              Del ";
+        $SQL .= "       ) ";
+        $SQL .= "       VALUES ";
+        $SQL .= "       ( ";
+        $SQL .= sprintf("  %d, %d, %d, %d, %d ", $layoutId, $groupId, $view, $edit, $del);
+        $SQL .= "       )";
+
+        if (!$db->query($SQL))
+        {
+            trigger_error($db->error());
+            $this->SetError(25024, __('Could not Link Layout to Group'));
+
+            return false;
+        }
+
+        Debug::LogEntry($db, 'audit', 'OUT', 'LayoutGroupSecurity', 'Link');
+
+        return true;
+    }
+
+    /**
+     * Links everyone to the layout specified
+     * @param <type> $layoutId
+     * @param <type> $view
+     * @param <type> $edit
+     * @param <type> $del
+     * @return <type>
+     */
+    public function LinkEveryone($layoutId, $view, $edit, $del)
+    {
+        $db =& $this->db;
+
+        Debug::LogEntry($db, 'audit', 'IN', 'LayoutGroupSecurity', 'LinkEveryone');
+
+        $groupId = $db->GetSingleValue("SELECT GroupID FROM `group` WHERE IsEveryone = 1", 'GroupID', _INT);
+
+        return $this->Link($layoutId, $groupId, $view, $edit, $del);
+    }
+
+    /**
+     * Unlinks a display group from a group
+     * @return
+     * @param $displayGroupID Object
+     * @param $groupID Object
+     */
+    public function Unlink($layoutId, $groupId)
+    {
+        $db =& $this->db;
+
+        Debug::LogEntry($db, 'audit', 'IN', 'LayoutGroupSecurity', 'Unlink');
+
+        $SQL  = "";
+        $SQL .= "DELETE FROM ";
+        $SQL .= "   lklayoutgroup ";
+        $SQL .= sprintf("  WHERE LayoutID = %d AND GroupID = %d ", $layoutId, $groupId);
+
+        if (!$db->query($SQL))
+        {
+            trigger_error($db->error());
+            $this->SetError(25025, __('Could not Unlink Layout from Group'));
+
+            return false;
+        }
+
+        Debug::LogEntry($db, 'audit', 'OUT', 'LayoutGroupSecurity', 'Unlink');
+
+        return true;
+    }
+
+        /**
+     * Unlinks a display group from a group
+     * @return
+     * @param $displayGroupID Object
+     * @param $groupID Object
+     */
+    public function UnlinkAll($layoutId)
+    {
+        $db =& $this->db;
+
+        Debug::LogEntry($db, 'audit', 'IN', 'LayoutGroupSecurity', 'Unlink');
+
+        $SQL  = "";
+        $SQL .= "DELETE FROM ";
+        $SQL .= "   lklayoutgroup ";
+        $SQL .= sprintf("  WHERE LayoutID = %d ", $layoutId);
+
+        if (!$db->query($SQL))
+        {
+            trigger_error($db->error());
+            $this->SetError(25025, __('Could not Unlink Layout from Group'));
+
+            return false;
+        }
+
+        Debug::LogEntry($db, 'audit', 'OUT', 'LayoutGroupSecurity', 'Unlink');
+
+        return true;
+    }
+}
+?>
 \ No newline at end of file
 
=== added file 'server/lib/data/layoutmediagroupsecurity.data.class.php'
--- server/lib/data/layoutmediagroupsecurity.data.class.php	1970-01-01 00:00:00 +0000
+++ server/lib/data/layoutmediagroupsecurity.data.class.php	2011-08-18 23:36:27 +0000
@@ -0,0 +1,194 @@
+<?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 LayoutMediaGroupSecurity extends Data
+{
+    public function __construct(database $db)
+    {
+        parent::__construct($db);
+    }
+
+    /**
+     * Links a Display Group to a Group
+     * @return
+     * @param $displayGroupID Object
+     * @param $groupID Object
+     */
+    public function Link($layoutId, $regionId, $mediaId, $groupId, $view, $edit, $del)
+    {
+        $db =& $this->db;
+
+        Debug::LogEntry($db, 'audit', 'IN', 'LayoutMediaGroupSecurity', 'Link');
+
+        $SQL  = "";
+        $SQL .= "INSERT ";
+        $SQL .= "INTO   lklayoutmediagroup ";
+        $SQL .= "       ( ";
+        $SQL .= "              LayoutID, ";
+        $SQL .= "              RegionID, ";
+        $SQL .= "              MediaID, ";
+        $SQL .= "              GroupID, ";
+        $SQL .= "              View, ";
+        $SQL .= "              Edit, ";
+        $SQL .= "              Del ";
+        $SQL .= "       ) ";
+        $SQL .= "       VALUES ";
+        $SQL .= "       ( ";
+        $SQL .= sprintf("  %d, '%s', '%s', %d, %d, %d, %d ", $layoutId, $regionId, $mediaId, $groupId, $view, $edit, $del);
+        $SQL .= "       )";
+
+        if (!$db->query($SQL))
+        {
+            trigger_error($db->error());
+            $this->SetError(25026, __('Could not Link Layout Media to Group'));
+
+            return false;
+        }
+
+        Debug::LogEntry($db, 'audit', 'OUT', 'LayoutMediaGroupSecurity', 'Link');
+
+        return true;
+    }
+
+    /**
+     * Links everyone to the layout specified
+     * @param <type> $layoutId
+     * @param <type> $view
+     * @param <type> $edit
+     * @param <type> $del
+     * @return <type>
+     */
+    public function LinkEveryone($layoutId, $regionId, $mediaId, $view, $edit, $del)
+    {
+        $db =& $this->db;
+
+        Debug::LogEntry($db, 'audit', 'IN', 'LayoutMediaGroupSecurity', 'LinkEveryone');
+
+        $groupId = $db->GetSingleValue("SELECT GroupID FROM `group` WHERE IsEveryone = 1", 'GroupID', _INT);
+
+        return $this->Link($layoutId, $regionId, $mediaId, $groupId, $view, $edit, $del);
+    }
+
+    /**
+     * Unlinks a display group from a group
+     * @return
+     * @param $displayGroupID Object
+     * @param $groupID Object
+     */
+    public function Unlink($layoutId, $regionId, $mediaId, $groupId)
+    {
+        $db =& $this->db;
+
+        Debug::LogEntry($db, 'audit', 'IN', 'LayoutMediaGroupSecurity', 'Unlink');
+
+        $SQL  = "";
+        $SQL .= "DELETE FROM ";
+        $SQL .= "   lklayoutmediagroup ";
+        $SQL .= sprintf("  WHERE LayoutID = %d AND RegionID = '%s' AND MediaID = '%s' AND GroupID = %d ", $layoutId, $regionId, $mediaId, $groupId);
+
+        if (!$db->query($SQL))
+        {
+            trigger_error($db->error());
+            $this->SetError(25027, __('Could not Unlink Layout Media from Group'));
+
+            return false;
+        }
+
+        Debug::LogEntry($db, 'audit', 'OUT', 'LayoutMediaGroupSecurity', 'Unlink');
+
+        return true;
+    }
+
+        /**
+     * Unlinks a display group from a group
+     * @return
+     * @param $displayGroupID Object
+     * @param $groupID Object
+     */
+    public function UnlinkAll($layoutId, $regionId, $mediaId)
+    {
+        $db =& $this->db;
+
+        Debug::LogEntry($db, 'audit', 'IN', 'LayoutMediaGroupSecurity', 'Unlink');
+
+        $SQL  = "";
+        $SQL .= "DELETE FROM ";
+        $SQL .= "   lklayoutmediagroup ";
+        $SQL .= sprintf("  WHERE LayoutID = %d AND RegionID = '%s' AND MediaID = '%s' ", $layoutId, $regionId, $mediaId);
+
+        if (!$db->query($SQL))
+        {
+            trigger_error($db->error());
+            $this->SetError(25028, __('Could not Unlink Layout Media from Group'));
+
+            return false;
+        }
+
+        Debug::LogEntry($db, 'audit', 'OUT', 'LayoutMediaGroupSecurity', 'Unlink');
+
+        return true;
+    }
+
+    /**
+     * Copies a media items permissions
+     * @param <type> $layoutId
+     * @param <type> $regionId
+     * @param <type> $mediaId
+     * @param <type> $newMediaId
+     * @return <type>
+     */
+    public function Copy($layoutId, $regionId, $mediaId, $newMediaId)
+    {
+        $db =& $this->db;
+
+        Debug::LogEntry($db, 'audit', 'IN', 'LayoutMediaGroupSecurity', 'Copy');
+
+        $SQL  = "";
+        $SQL .= "INSERT ";
+        $SQL .= "INTO   lklayoutmediagroup ";
+        $SQL .= "       ( ";
+        $SQL .= "              LayoutID, ";
+        $SQL .= "              RegionID, ";
+        $SQL .= "              MediaID, ";
+        $SQL .= "              GroupID, ";
+        $SQL .= "              View, ";
+        $SQL .= "              Edit, ";
+        $SQL .= "              Del ";
+        $SQL .= "       ) ";
+        $SQL .= " SELECT LayoutID, RegionID, '%s', GroupID, View, Edit, Del ";
+        $SQL .= "   FROM lklayoutmediagroup ";
+        $SQL .= "  WHERE LayoutID = %d AND RegionID = '%s' AND MediaID = '%s' ";
+
+        $SQL = sprintf($SQL, $newMediaId, $layoutId, $regionId, $mediaId);
+
+        if (!$db->query($SQL))
+        {
+            trigger_error($db->error());
+            $this->SetError(25028, __('Could not Copy Layout Media Security'));
+
+            return false;
+        }
+
+        return true;
+    }
+}
+?>
 \ No newline at end of file
 
=== added file 'server/lib/data/layoutregiongroupsecurity.data.class.php'
--- server/lib/data/layoutregiongroupsecurity.data.class.php	1970-01-01 00:00:00 +0000
+++ server/lib/data/layoutregiongroupsecurity.data.class.php	2011-08-18 23:36:27 +0000
@@ -0,0 +1,150 @@
+<?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 LayoutRegionGroupSecurity extends Data
+{
+    public function __construct(database $db)
+    {
+        parent::__construct($db);
+    }
+
+    /**
+     * Links a Display Group to a Group
+     * @return
+     * @param $displayGroupID Object
+     * @param $groupID Object
+     */
+    public function Link($layoutId, $regionId, $groupId, $view, $edit, $del)
+    {
+        $db =& $this->db;
+
+        Debug::LogEntry($db, 'audit', 'IN', 'LayoutRegionGroupSecurity', 'Link');
+
+        $SQL  = "";
+        $SQL .= "INSERT ";
+        $SQL .= "INTO   lklayoutregiongroup ";
+        $SQL .= "       ( ";
+        $SQL .= "              LayoutID, ";
+        $SQL .= "              RegionID, ";
+        $SQL .= "              GroupID, ";
+        $SQL .= "              View, ";
+        $SQL .= "              Edit, ";
+        $SQL .= "              Del ";
+        $SQL .= "       ) ";
+        $SQL .= "       VALUES ";
+        $SQL .= "       ( ";
+        $SQL .= sprintf("  %d, '%s', '%s', %d, %d, %d ", $layoutId, $regionId, $groupId, $view, $edit, $del);
+        $SQL .= "       )";
+
+        if (!$db->query($SQL))
+        {
+            trigger_error($db->error());
+            $this->SetError(25026, __('Could not Link Layout Region to Group'));
+
+            return false;
+        }
+
+        Debug::LogEntry($db, 'audit', 'OUT', 'LayoutRegionGroupSecurity', 'Link');
+
+        return true;
+    }
+
+    /**
+     * Links everyone to the layout specified
+     * @param <type> $layoutId
+     * @param <type> $view
+     * @param <type> $edit
+     * @param <type> $del
+     * @return <type>
+     */
+    public function LinkEveryone($layoutId, $regionId, $view, $edit, $del)
+    {
+        $db =& $this->db;
+
+        Debug::LogEntry($db, 'audit', 'IN', 'LayoutGroupSecurity', 'LinkEveryone');
+
+        $groupId = $db->GetSingleValue("SELECT GroupID FROM `group` WHERE IsEveryone = 1", 'GroupID', _INT);
+
+        return $this->Link($layoutId, $regionId, $groupId, $view, $edit, $del);
+    }
+
+    /**
+     * Unlinks a display group from a group
+     * @return
+     * @param $displayGroupID Object
+     * @param $groupID Object
+     */
+    public function Unlink($layoutId, $regionId, $groupId)
+    {
+        $db =& $this->db;
+
+        Debug::LogEntry($db, 'audit', 'IN', 'LayoutRegionGroupSecurity', 'Unlink');
+
+        $SQL  = "";
+        $SQL .= "DELETE FROM ";
+        $SQL .= "   lklayoutregiongroup ";
+        $SQL .= sprintf("  WHERE LayoutID = %d AND RegionID = '%s' AND GroupID = %d ", $layoutId, $regionId, $groupId);
+
+        if (!$db->query($SQL))
+        {
+            trigger_error($db->error());
+            $this->SetError(25027, __('Could not Unlink Layout Region from Group'));
+
+            return false;
+        }
+
+        Debug::LogEntry($db, 'audit', 'OUT', 'LayoutRegionGroupSecurity', 'Unlink');
+
+        return true;
+    }
+
+        /**
+     * Unlinks a display group from a group
+     * @return
+     * @param $displayGroupID Object
+     * @param $groupID Object
+     */
+    public function UnlinkAll($layoutId, $regionId)
+    {
+        $db =& $this->db;
+
+        Debug::LogEntry($db, 'audit', 'IN', 'LayoutRegionGroupSecurity', 'Unlink');
+
+        $SQL  = "";
+        $SQL .= "DELETE FROM ";
+        $SQL .= "   lklayoutregiongroup ";
+        $SQL .= sprintf("  WHERE LayoutID = %d AND RegionID = '%s' ", $layoutId, $regionId);
+
+        if (!$db->query($SQL))
+        {
+            trigger_error($db->error());
+            $this->SetError(25028, __('Could not Unlink Layout Region from Group'));
+
+            return false;
+        }
+
+        Debug::LogEntry($db, 'audit', 'OUT', 'LayoutRegionGroupSecurity', 'Unlink');
+
+        return true;
+    }
+}
+?>
 \ No newline at end of file
 
=== modified file 'server/lib/data/media.data.class.php'
--- server/lib/data/media.data.class.php	2011-05-14 10:14:52 +0000
+++ server/lib/data/media.data.class.php	2011-08-18 23:36:27 +0000
@@ -33,11 +33,10 @@
      * @param <type> $name
      * @param <type> $duration
      * @param <type> $fileName
-     * @param <type> $permissionId
      * @param <type> $userId
      * @return <type>
      */
-    public function Add($fileId, $type, $name, $duration, $fileName, $permissionId, $userId)
+    public function Add($fileId, $type, $name, $duration, $fileName, $userId)
     {
         $db =& $this->db;
 
@@ -62,11 +61,11 @@
             return $this->SetError(12, __('Media you own already has this name. Please choose another.'));
 
         // 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  = "INSERT INTO media (name, type, duration, originalFilename, userID, retired ) ";
+        $SQL .= "VALUES ('%s', '%s', '%s', '%s', %d, 0) ";
 
         $SQL = sprintf($SQL, $db->escape_string($name), $db->escape_string($type),
-            $db->escape_string($duration), $db->escape_string($fileName), $permissionId, $userId);
+            $db->escape_string($duration), $db->escape_string($fileName), $userId);
 
         if (!$mediaId = $db->insert_query($SQL))
         {
@@ -111,10 +110,9 @@
      * @param <type> $mediaId
      * @param <type> $name
      * @param <type> $duration
-     * @param <type> $permissionId
      * @return <bool>
      */
-    public function Edit($mediaId, $name, $duration, $permissionId, $userId)
+    public function Edit($mediaId, $name, $duration, $userId)
     {
         $db =& $this->db;
 
@@ -128,8 +126,8 @@
         if ($db->GetSingleRow(sprintf("SELECT name FROM media WHERE name = '%s' AND userid = %d", $db->escape_string($name), $userId)))
             return $this->SetError(12, __('Media you own already has this name. Please choose another.'));
        
-        $SQL = "UPDATE media SET name = '%s', duration = %d, permissionID = %d WHERE MediaID = %d";
-        $SQL = sprintf($SQL, $db->escape_string($name), $duration, $permissionId, $mediaId);
+        $SQL = "UPDATE media SET name = '%s', duration = %d WHERE MediaID = %d";
+        $SQL = sprintf($SQL, $db->escape_string($name), $duration, $mediaId);
 
         if (!$db->query($SQL))
         {
@@ -153,7 +151,7 @@
         // Call add with this file Id and then update the existing mediaId with the returned mediaId
         // from the add call.
         // Will need to get some information about the existing media record first.
-        $SQL = "SELECT name, duration, permissionId, UserID, type FROM media WHERE MediaID = %d";
+        $SQL = "SELECT name, duration, UserID, type FROM media WHERE MediaID = %d";
         $SQL = sprintf($SQL, $mediaId);
 
         if (!$row = $db->GetSingleRow($SQL))
@@ -162,7 +160,7 @@
             return $this->SetError(31, 'Unable to get information about existing media record.');
         }
 
-        if (!$newMediaId = $this->Add($fileId, $row['type'], $row['name'], $row['duration'], $fileName, $row['permissionId'], $row['UserID']))
+        if (!$newMediaId = $this->Add($fileId, $row['type'], $row['name'], $row['duration'], $fileName, $row['UserID']))
             return false;
 
         // Update the existing record with the new record's id
 
=== added file 'server/lib/data/mediagroupsecurity.data.class.php'
--- server/lib/data/mediagroupsecurity.data.class.php	1970-01-01 00:00:00 +0000
+++ server/lib/data/mediagroupsecurity.data.class.php	2011-08-18 23:36:27 +0000
@@ -0,0 +1,188 @@
+<?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 MediaGroupSecurity extends Data
+{
+    public function __construct(database $db)
+    {
+        parent::__construct($db);
+    }
+
+    /**
+     * Links a Display Group to a Group
+     * @return
+     * @param $displayGroupID Object
+     * @param $groupID Object
+     */
+    public function Link($mediaId, $groupId, $view, $edit, $del)
+    {
+        $db =& $this->db;
+
+        Debug::LogEntry($db, 'audit', 'IN', 'MediaGroupSecurity', 'Link');
+
+        $SQL  = "";
+        $SQL .= "INSERT ";
+        $SQL .= "INTO   lkmediagroup ";
+        $SQL .= "       ( ";
+        $SQL .= "              MediaID, ";
+        $SQL .= "              GroupID, ";
+        $SQL .= "              View, ";
+        $SQL .= "              Edit, ";
+        $SQL .= "              Del ";
+        $SQL .= "       ) ";
+        $SQL .= "       VALUES ";
+        $SQL .= "       ( ";
+        $SQL .= sprintf("  %d, %d, %d, %d, %d ", $mediaId, $groupId, $view, $edit, $del);
+        $SQL .= "       )";
+
+        if (!$db->query($SQL))
+        {
+            trigger_error($db->error());
+            $this->SetError(25026, __('Could not Link Media to Group'));
+
+            return false;
+        }
+
+        Debug::LogEntry($db, 'audit', 'OUT', 'MediaGroupSecurity', 'Link');
+
+        return true;
+    }
+
+    /**
+     * Links everyone to the layout specified
+     * @param <type> $layoutId
+     * @param <type> $view
+     * @param <type> $edit
+     * @param <type> $del
+     * @return <type>
+     */
+    public function LinkEveryone($mediaId, $view, $edit, $del)
+    {
+        $db =& $this->db;
+
+        Debug::LogEntry($db, 'audit', 'IN', 'MediaGroupSecurity', 'LinkEveryone');
+
+        $groupId = $db->GetSingleValue("SELECT GroupID FROM `group` WHERE IsEveryone = 1", 'GroupID', _INT);
+
+        return $this->Link($mediaId, $groupId, $view, $edit, $del);
+    }
+
+    /**
+     * Unlinks a display group from a group
+     * @return
+     * @param $displayGroupID Object
+     * @param $groupID Object
+     */
+    public function Unlink($mediaId, $groupId)
+    {
+        $db =& $this->db;
+
+        Debug::LogEntry($db, 'audit', 'IN', 'MediaGroupSecurity', 'Unlink');
+
+        $SQL  = "";
+        $SQL .= "DELETE FROM ";
+        $SQL .= "   lkmediagroup ";
+        $SQL .= sprintf("  WHERE MediaID = %d AND GroupID = %d ", $mediaId, $groupId);
+
+        if (!$db->query($SQL))
+        {
+            trigger_error($db->error());
+            $this->SetError(25027, __('Could not Unlink Layout from Group'));
+
+            return false;
+        }
+
+        Debug::LogEntry($db, 'audit', 'OUT', 'MediaGroupSecurity', 'Unlink');
+
+        return true;
+    }
+
+        /**
+     * Unlinks a display group from a group
+     * @return
+     * @param $displayGroupID Object
+     * @param $groupID Object
+     */
+    public function UnlinkAll($mediaId)
+    {
+        $db =& $this->db;
+
+        Debug::LogEntry($db, 'audit', 'IN', 'MediaGroupSecurity', 'Unlink');
+
+        $SQL  = "";
+        $SQL .= "DELETE FROM ";
+        $SQL .= "   lkmediagroup ";
+        $SQL .= sprintf("  WHERE MediaID = %d ", $mediaId);
+
+        if (!$db->query($SQL))
+        {
+            trigger_error($db->error());
+            $this->SetError(25028, __('Could not Unlink Media from Group'));
+
+            return false;
+        }
+
+        Debug::LogEntry($db, 'audit', 'OUT', 'MediaGroupSecurity', 'Unlink');
+
+        return true;
+    }
+
+    /**
+     * Copies a media items permissions
+     * @param <type> $mediaId
+     * @param <type> $newMediaId
+     * @return <type>
+     */
+    public function Copy($mediaId, $newMediaId)
+    {
+        $db =& $this->db;
+
+        Debug::LogEntry($db, 'audit', 'IN', 'MediaGroupSecurity', 'Copy');
+
+        $SQL  = "";
+        $SQL .= "INSERT ";
+        $SQL .= "INTO   lkmediagroup ";
+        $SQL .= "       ( ";
+        $SQL .= "              MediaID, ";
+        $SQL .= "              GroupID, ";
+        $SQL .= "              View, ";
+        $SQL .= "              Edit, ";
+        $SQL .= "              Del ";
+        $SQL .= "       ) ";
+        $SQL .= " SELECT '%s', GroupID, View, Edit, Del ";
+        $SQL .= "   FROM lkmediagroup ";
+        $SQL .= "  WHERE MediaID = '%s' ";
+
+        $SQL = sprintf($SQL, $newMediaId, $mediaId);
+
+        if (!$db->query($SQL))
+        {
+            trigger_error($db->error());
+            $this->SetError(25028, __('Could not Copy Layout Media Security'));
+
+            return false;
+        }
+
+        return true;
+    }
+}
+?>
 \ No newline at end of file
 
=== modified file 'server/lib/data/schedule.data.class.php'
--- server/lib/data/schedule.data.class.php	2011-02-13 17:08:55 +0000
+++ server/lib/data/schedule.data.class.php	2011-08-18 23:36:27 +0000
@@ -44,6 +44,8 @@
                 if (count($displayGroupIDs) == 0)
                     return $this->SetError(25001, __('No display groups selected'));
 
+                if ($userID == 0)
+                    return $this->SetError(25001, __('No User Id Present'));
 
                 // Cant have a 0 increment as it creates a loop
                 if ($recDetail == 0)
 
=== added file 'server/lib/data/templategroupsecurity.data.class.php'
--- server/lib/data/templategroupsecurity.data.class.php	1970-01-01 00:00:00 +0000
+++ server/lib/data/templategroupsecurity.data.class.php	2011-08-18 23:36:27 +0000
@@ -0,0 +1,130 @@
+<?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 TemplateGroupSecurity extends Data
+{
+    public function __construct(database $db)
+    {
+        parent::__construct($db);
+    }
+
+    /**
+     * Links a Display Group to a Group
+     * @return
+     * @param $displayGroupID Object
+     * @param $groupID Object
+     */
+    public function Link($templateId, $groupId, $view, $edit, $del)
+    {
+        $db =& $this->db;
+
+        Debug::LogEntry($db, 'audit', 'IN', 'TemplateGroupSecurity', 'Link');
+
+        $SQL  = "";
+        $SQL .= "INSERT ";
+        $SQL .= "INTO   lktemplategroup ";
+        $SQL .= "       ( ";
+        $SQL .= "              TemplateID, ";
+        $SQL .= "              GroupID, ";
+        $SQL .= "              View, ";
+        $SQL .= "              Edit, ";
+        $SQL .= "              Del ";
+        $SQL .= "       ) ";
+        $SQL .= "       VALUES ";
+        $SQL .= "       ( ";
+        $SQL .= sprintf("  %d, %d, %d, %d, %d ", $templateId, $groupId, $view, $edit, $del);
+        $SQL .= "       )";
+
+        if (!$db->query($SQL))
+        {
+            trigger_error($db->error());
+            $this->SetError(25024, __('Could not Link Template to Group'));
+
+            return false;
+        }
+
+        Debug::LogEntry($db, 'audit', 'OUT', 'TemplateGroupSecurity', 'Link');
+
+        return true;
+    }
+
+    /**
+     * Unlinks a display group from a group
+     * @return
+     * @param $displayGroupID Object
+     * @param $groupID Object
+     */
+    public function Unlink($templateId, $groupId)
+    {
+        $db =& $this->db;
+
+        Debug::LogEntry($db, 'audit', 'IN', 'TemplateGroupSecurity', 'Unlink');
+
+        $SQL  = "";
+        $SQL .= "DELETE FROM ";
+        $SQL .= "   lktemplategroup ";
+        $SQL .= sprintf("  WHERE TemplateID = %d AND GroupID = %d ", $templateId, $groupId);
+
+        if (!$db->query($SQL))
+        {
+            trigger_error($db->error());
+            $this->SetError(25025, __('Could not Unlink Template from Group'));
+
+            return false;
+        }
+
+        Debug::LogEntry($db, 'audit', 'OUT', 'TemplateGroupSecurity', 'Unlink');
+
+        return true;
+    }
+
+        /**
+     * Unlinks a display group from a group
+     * @return
+     * @param $displayGroupID Object
+     * @param $groupID Object
+     */
+    public function UnlinkAll($templateId)
+    {
+        $db =& $this->db;
+
+        Debug::LogEntry($db, 'audit', 'IN', 'TemplateGroupSecurity', 'Unlink');
+
+        $SQL  = "";
+        $SQL .= "DELETE FROM ";
+        $SQL .= "   lktemplategroup ";
+        $SQL .= sprintf("  WHERE TemplateID = %d ", $templateId);
+
+        if (!$db->query($SQL))
+        {
+            trigger_error($db->error());
+            $this->SetError(25025, __('Could not Unlink Template from Group'));
+
+            return false;
+        }
+
+        Debug::LogEntry($db, 'audit', 'OUT', 'TemplateGroupSecurity', 'Unlink');
+
+        return true;
+    }
+}
+?>
 \ No newline at end of file
 
=== modified file 'server/lib/include.php'
--- server/lib/include.php	2011-06-05 16:17:41 +0000
+++ server/lib/include.php	2011-08-18 23:36:27 +0000
@@ -32,6 +32,7 @@
 require_once("lib/app/pagemanager.class.php");
 require_once("lib/app/menumanager.class.php");
 require_once("lib/app/modulemanager.class.php");
+require_once("lib/app/permissionmanager.class.php");
 require_once("lib/app/formmanager.class.php");
 require_once("lib/app/helpmanager.class.php");
 require_once("lib/app/responsemanager.class.php");
 
=== modified file 'server/lib/js/core.js'
--- server/lib/js/core.js	2010-08-01 10:45:26 +0000
+++ server/lib/js/core.js	2011-08-18 23:36:27 +0000
@@ -24,7 +24,7 @@
     $('#system_message').dialog({
         title: "Application Message",
         width: "320",
-        height: "120",
+        height: "220",
         draggable: false,
         resizable: false,
         bgiframe: true,
@@ -299,6 +299,14 @@
                     $('input[type=text]', '#div_dialog').eq(0).focus();
                 }
 
+                if (response.appendHiddenSubmit) {
+                    var hiddenField = '<input type="submit" style="display:none" />';
+
+                    if ($("input[type=submit]", "#div_dialog").length == 0) {
+                        $("form", "#div_dialog").append('<input type="submit" style="display:none" />');
+                    }
+                }
+
                 // Call Xibo Init for this form
                 XiboInitialise("#div_dialog");
             }
@@ -410,8 +418,9 @@
         }
 
         // Should we display the message?
-        if (!response.hideMessage || response.message != '') {
-            SystemMessage(response.message);
+        if (!response.hideMessage) {
+            if (response.message != '')
+                SystemMessage(response.message);
         }
 
         // Do we need to fire a callback function?
 
=== added file 'server/lib/js/dataset.js'
--- server/lib/js/dataset.js	1970-01-01 00:00:00 +0000
+++ server/lib/js/dataset.js	2011-08-18 23:36:27 +0000
@@ -0,0 +1,69 @@
+/*
+ * 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/>.
+ */
+
+var dataSetData = function() {
+    $('.XiboDataSetDataForm').submit(function() {
+        return false;
+    });
+    
+    $('.XiboDataSetDataForm input').change(XiboDataSetDataFormChange);
+    $('.XiboDataSetDataForm select').change(XiboDataSetDataFormChange);
+}
+
+var XiboDataSetDataFormChange = function() {
+    // Submit this form using AJAX.
+    var url = $(this.form).attr("action") + "&ajax=true";
+
+    $.ajax({
+        type:"post",
+        url:url,
+        cache:false,
+        dataType:"json",
+        data:$(this.form).serialize(),
+        success: XiboDataSetDataFormSubmitResponse
+    });
+
+    return false;
+}
+
+var XiboDataSetDataFormSubmitResponse = function(response) {
+
+    if (response.success) {
+        $('#' + response.uniqueReference).attr("action", response.loadFormUri);
+    }
+    else {
+        // Login Form needed?
+        if (response.login) {
+            LoginBox(response.message);
+            return false;
+        }
+        else {
+            // Just an error we dont know about
+            if (response.message == undefined) {
+                SystemMessage(response);
+            }
+            else {
+                SystemMessage(response.message);
+            }
+        }
+    }
+
+    return false;
+}
 \ No newline at end of file
 
=== modified file 'server/lib/js/layout.js'
--- server/lib/js/layout.js	2010-08-05 19:09:05 +0000
+++ server/lib/js/layout.js	2011-08-18 23:36:27 +0000
@@ -89,7 +89,7 @@
     return false; //prevent submit
 }
 
-function microblog_callback()
+var microblog_callback = function()
 {
     // Conjure up a text editor
     $("#ta_template").ckeditor();
@@ -169,7 +169,7 @@
                     var layoutid = $(t).attr("layoutid");
                     var regionid = $(t).attr("regionid");
 
-	            XiboFormRender("index.php?p=user&q=SetUserHomepageForm&layoutid="+layoutid+"&regionid="+regionid);
+	            XiboFormRender("index.php?p=layout&q=RegionPermissionsForm&layoutid="+layoutid+"&regionid="+regionid);
 	        }
             }
 	});
@@ -195,7 +195,7 @@
 	
 	
 	// Preview
-	$('.region').each(function(){
+	$('.regionPreview').each(function(){
             new Preview(this);
 	});
 
 
=== modified file 'server/lib/js/mediamanager.js'
--- server/lib/js/mediamanager.js	2009-12-31 11:38:50 +0000
+++ server/lib/js/mediamanager.js	2011-08-18 23:36:27 +0000
@@ -1,6 +1,6 @@
 /*
  * Xibo - Digitial Signage - http://www.xibo.org.uk
- * Copyright (C) 2006,2007,2008 Daniel Garner and James Packer
+ * Copyright (C) 2011 Daniel Garner
  *
  * This file is part of Xibo.
  *
@@ -16,121 +16,69 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
- */ 
-$(document).ready(function() {
-	
-});
-
-var exec_filter_callback = function() {
-	
-}
-
-var submit_form_callback = function(outputDiv) {
-	
-	//Just refresh
-	//window.location = window.location.href;
-	
-	return false;
-}
-
-var region_options_callback = function(outputDiv)
-{
-	set_form_size(830,450);
-	
-	//Get all the tooltip_hidden
-	$(".tooltip_hidden").parent().hover(function()
-	{
-		//Change the hidden div's content
-		$('#tooltip_hover').html($(".tooltip_hidden",this).html()).css("left",$(this).css("left")).show();
-	}, function() 
-	{
-		$('#tooltip_hover').hide();
-	});
-	
-	//Make the elements draggable
-	$(".timebar_ctl").draggable({
-		containment: document.getElementById("timeline_ctl")
-	});
-	
-	$(".mediabreak").droppable({
-		accept: ".timebar_ctl",
-		drop: function(ev, ui) {
-			orderRegion(ui, this);
-		}
-	});
-}
-
-function orderRegion(timeBar, mediaBreak){
-	var layoutid = $(timeBar.element.offsetParent).attr("layoutid");
-	var regionid = $(timeBar.element.offsetParent).attr("regionid");
-	var mediaid = $(timeBar.element).attr("mediaid");
-	var sequence = $(mediaBreak).attr("breakid");
-	
-	$.ajax({
-		type: "post",
-		url: "index.php?p=layout&q=RegionOrder&layoutid=" + layoutid + "&callingpage=mediamanager&ajax=true",
-		cache: false,
-		datatype: "html",
-		data: {
-			"mediaid": mediaid,
-			"sequence": sequence,
-			"regionid": regionid
-		},
-		success: function(transport){
-		
-			var response = transport.split('|');
-			
-			if (response[0] == '0') {
-				//success
-				//Post notice somewhere?
-			}
-			else 
-				if (response[0] == '1') //failure
-				{
-				
-					alert(response[1]);
-				}
-				else 
-					if (response[0] == '2') //login
-					{
-						alert("You need to login");
-					}
-					else 
-						if (response[0] == '3') {
-							window.location = response[1]; //redirect
-						}
-						else 
-							if (response[0] == '6') //success, load form
-							{
-								//we need: uri, callback, onsubmit
-								var uri = response[1];
-								var callback = response[2];
-								var onsubmit = response[3];
-								
-								load_form(uri, $('#div_dialog'), callback, onsubmit);
-							}
-							else {
-								alert("An unknown error occured");
-							}
-			
-			return false;
-		}
-	});
-}
-
-function dialog_filter() {
-	exec_filter('stack_filter_form','dialog_grid');
-	
-	return false;
-}
-
-/**
- * Handles the tRegionOptions trigger
  */
-function tRegionOptions()
-{
-	var regionid = gup("regionid");
-	var layoutid = gup("layoutid");
-	
-	load_form('index.php?p=layout&layoutid='+layoutid+'&regionid='+regionid+'&q=RegionOptions', $('#div_dialog'),'',region_options_callback);
+var text_callback = function()
+{
+    // Conjure up a text editor
+    $("#ta_text").ckeditor();
+
+    // Make sure when we close the dialog we also destroy the editor
+    $("#div_dialog").bind("dialogclose.xibo", function(event, ui){
+        $("#ta_text").ckeditorGet().destroy();
+        $("#div_dialog").unbind("dialogclose.xibo");
+    })
+
+    var regionid = $("#iRegionId").val();
+    var width = $("#region_"+regionid).width();
+    var height = $("#region_"+regionid).height();
+
+    // Min width
+    if (width < 800) width = 800;
+
+    // Adjust the width and height
+    width = width + 80;
+    height = height + 295;
+
+    $('#div_dialog').height(height+"px");
+    $('#div_dialog').dialog('option', 'width', width);
+    $('#div_dialog').dialog('option', 'height', height);
+    $('#div_dialog').dialog('option', 'position', 'center');
+
+    return false; //prevent submit
+}
+
+var microblog_callback = function()
+{
+    // Conjure up a text editor
+    $("#ta_template").ckeditor();
+    $("#ta_nocontent").ckeditor();
+
+    // Make sure when we close the dialog we also destroy the editor
+    $("#div_dialog").bind("dialogclose.xibo", function(event, ui){
+        $("#ta_template").ckeditorGet().destroy();
+        $("#ta_nocontent").ckeditorGet().destroy();
+
+        $("#div_dialog").unbind("dialogclose.xibo");
+    })
+
+    var regionid = $("#iRegionId").val();
+    var width = $("#region_"+regionid).width();
+    var height = $("#region_"+regionid).height();
+
+    //Min width
+    if (width < 800) width = 800;
+    height = height - 170;
+
+    // Min height
+    if (height < 300) height = 300;
+
+    width = width + 80;
+    height = height + 480;
+
+    $('#div_dialog').height(height+"px");
+    $('#div_dialog').dialog('option', 'width', width);
+    $('#div_dialog').dialog('option', 'height', height);
+    $('#div_dialog').dialog('option', 'position', 'center');
+
+    return false; //prevent submit
 }
 \ No newline at end of file
 
=== modified file 'server/lib/modules/module.class.php'
--- server/lib/modules/module.class.php	2010-08-28 13:20:11 +0000
+++ server/lib/modules/module.class.php	2011-08-18 23:36:27 +0000
@@ -27,13 +27,15 @@
 	protected $user;
 	protected $region;
 	protected $response;
+        public $auth;
+	protected $type;
+      	protected $displayType;
 
 	protected $layoutid;
 	protected $regionid;
 
 	protected $mediaid;
 	protected $name;
-	protected $type;
 	private   $schemaVersion;
 	protected $regionSpecific;
 	protected $duration;
@@ -45,6 +47,9 @@
 
 	protected $existingMedia;
 	protected $deleteFromRegion;
+        protected $showRegionOptions;
+        protected $originalUserId;
+        protected $assignedMedia;
 
     /**
      * Constructor - sets up this media object with all the available information
@@ -73,12 +78,13 @@
 
         $this->existingMedia 	= false;
         $this->deleteFromRegion = false;
-        $this->duration 		= '';
+        $this->showRegionOptions = Kit::GetParam('showRegionOptions', _REQUEST, _INT, 1);
+        $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);
+        Debug::LogEntry($db, 'audit', '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, $this->mediaid, $this->lkid);
@@ -135,18 +141,20 @@
      */
     final private function SetMediaInformation($layoutid, $regionid, $mediaid, $lkid)
     {
-        $db 		=& $this->db;
-        $region 	=& $this->region;
-        $xmlDoc 	= new DOMDocument();
+        $db =& $this->db;
+        $region =& $this->region;
+        $xmlDoc = new DOMDocument();
 
         if ($this->mediaid != '' && $this->regionid != '' && $this->layoutid != '')
         {
+            // Existing media that is assigned to a layout
             $this->existingMedia = true;
+            $this->assignedMedia = true;
 
             // Set the layout Xml
             $layoutXml = $region->GetLayoutXml($layoutid);
 
-            Debug::LogEntry($db, 'audit', 'Layout XML retrieved: ' . $layoutXml);
+            //Debug::LogEntry($db, 'audit', 'Layout XML retrieved: ' . $layoutXml);
 
             $layoutDoc = new DOMDocument();
             $layoutDoc->loadXML($layoutXml);
@@ -173,10 +181,17 @@
             
             // Get the LK id if we do not have one provided
             if ($lkid == '')
-                $this->lkid     = $mediaNode->getAttribute('lkid');
+                $this->lkid = $mediaNode->getAttribute('lkid');
+
+            $this->originalUserId = $mediaNode->getAttribute('userId');
+
+            // Make sure we have permissions
+            $this->auth = $this->user->MediaAssignmentAuth($this->originalUserId, $this->layoutid, $this->regionid, $this->mediaid, true);
 
             $mediaNode = $xmlDoc->importNode($mediaNode, true);
             $xmlDoc->documentElement->appendChild($mediaNode);
+
+            Debug::LogEntry($db, 'audit', 'Existing Assigned Media XML is: \n ' . $xmlDoc->saveXML(), 'module', 'SetMediaInformation');
         }
         else
         {
@@ -186,9 +201,10 @@
                 // But this is some existing media
                 // Therefore make sure we get the bare minimum!
                 $this->existingMedia = true;
+                $this->assignedMedia = false;
 
                 // Load what we know about this media into the object
-                $SQL = "SELECT duration, name FROM media WHERE mediaID = '$mediaid'";
+                $SQL = "SELECT duration, name, UserId FROM media WHERE mediaID = '$mediaid'";
 
                 Debug::LogEntry($db, 'audit', $SQL, 'Module', 'SetMediaInformation');
 
@@ -199,15 +215,23 @@
 
                 if ($db->num_rows($result) != 0)
                 {
-                    $row 				= $db->get_row($result);
-                    $this->duration		= $row[0];
-                    $this->name			= $row[1];
+                    $row = $db->get_row($result);
+                    $this->duration = $row[0];
+                    $this->name = $row[1];
+                    $this->originalUserId = $row[2];
                 }
+
+                $this->auth = $this->user->MediaAuth($this->mediaid, true);
+            }
+            else
+            {
+                // New assignment, therefore user and permissions are defaulted
+                $this->originalUserId = $this->user->userid;
             }
 
             $xml = <<<XML
             <root>
-                    <media id="" type="$this->type" duration="" lkid="" schemaVersion="$this->schemaVersion">
+                    <media id="" type="$this->type" duration="" lkid="" userId="$this->originalUserId" schemaVersion="$this->schemaVersion">
                             <options />
                             <raw />
                     </media>
@@ -217,9 +241,6 @@
         }
 
         $this->xml = $xmlDoc;
-
-        Debug::LogEntry($db, 'audit', 'XML is: ' . $this->xml->saveXML());
-
         return true;
     }
 
@@ -257,6 +278,7 @@
 		$mediaNode->setAttribute('id', $this->mediaid);
 		$mediaNode->setAttribute('duration', $this->duration);
 		$mediaNode->setAttribute('type', $this->type);
+                $mediaNode->setAttribute('userId', $this->originalUserId);
 
 		return $this->xml->saveXML($mediaNode);
 	}
@@ -439,37 +461,150 @@
 	 */
 	public function DeleteForm()
 	{
-		$db =& $this->db;
-
-		//Parameters
-		$layoutid 	= $this->layoutid;
-		$regionid 	= $this->regionid;
-		$mediaid	= $this->mediaid;
-		
-		// Messages
-		$msgTitle 		= __('Return to the Region Options');
-		$msgWarn		= __('Are you sure you want to remove this item from Xibo?');
-		$msgWarnLost 	= __('It will be lost');
-
-		//we can delete
-		$form = <<<END
-		<form class="XiboForm" method="post" action="index.php?p=module&mod=text&q=Exec&method=DeleteMedia">
-			<input type="hidden" name="mediaid" value="$mediaid">
-			<input type="hidden" name="layoutid" value="$layoutid">
-			<input type="hidden" name="regionid" value="$regionid">
-			<p>$msgWarn <span class="required">$msgWarnLost</span>.</p>
-			<input id="btnSave" type="submit" value="Yes"  />
-			<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;
+            $db =& $this->db;
+            $helpManager = new HelpManager($db, $this->user);
+            $this->response->AddButton(__('Help'), 'XiboHelpRender("' . $helpManager->Link($this->type, 'Delete') . '")');
+
+            //Parameters
+            $layoutid = $this->layoutid;
+            $regionid = $this->regionid;
+            $mediaid = $this->mediaid;
+            $lkid = $this->lkid;
+            $userid = $this->user->userid;
+
+            // Can this user delete?
+            if (!$this->auth->del)
+            {
+                $this->response->SetError('You do not have permission to delete this media.');
+                $this->response->keepOpen = false;
+                return $this->response;
+            }
+
+            // Messages
+            $msgTitle = __('Return to the Region Options');
+            $msgWarn = __('Are you sure you want to remove this item from Xibo?');
+            $msgWarnLost = __('It will be lost');
+            $msgYes = __('Yes');
+            $msgNo = __('No');
+
+            if ($this->regionSpecific)
+            {
+                $form = <<<END
+                <form id="MediaDeleteForm" class="XiboForm" method="post" action="index.php?p=module&mod=text&q=Exec&method=DeleteMedia">
+                        <input type="hidden" name="mediaid" value="$mediaid">
+                        <input type="hidden" name="layoutid" value="$layoutid">
+                        <input type="hidden" name="regionid" value="$regionid">
+                        <p>$msgWarn <span class="required">$msgWarnLost</span>.</p>
+                </form>
+END;
+                $this->response->AddButton(__('No'), 'XiboFormRender("index.php?p=layout&layoutid=' . $layoutid . '&regionid=' . $regionid . '&q=RegionOptions")');
+                $this->response->AddButton(__('Yes'), '$("#MediaDeleteForm").submit()');
+            }
+            else
+            {
+                // This is for library based media
+                $options = '';
+
+                // Always have the abilty to unassign from the region
+                $options .= 'unassign|' . __('Unassign from this region only');
+
+                // Is this user allowed to edit this media?
+                if ($this->auth->edit)
+                {
+                    // Load what we know about this media into the object
+                    $SQL = "SELECT IFNULL(editedMediaID, 0) AS editedMediaID FROM media WHERE mediaID = $mediaid ";
+                    $editedMediaID = $db->GetSingleValue($SQL, 'editedMediaID', _INT);
+                    
+                    if ($editedMediaID === false)
+                    {
+                        trigger_error($editedMediaID . $db->error());
+                        $this->response->SetError(__('Error querying for the Media information'));
+                        $this->response->keepOpen = true;
+                        return $this->response;
+                    }
+
+                    $options .= ',retire|' . __('Unassign from this region and retire');
+
+                    // Is this media retired?
+                    $revised = false;
+                    if ($editedMediaID != 0)
+                            $revised = true;
+
+                    // Is this media being used anywhere else?
+                    if ($layoutid == '')
+                    {
+                        $SQL = sprintf('SELECT layoutID FROM lklayoutmedia WHERE mediaID = %d ', $mediaid);
+                        $options = '';
+                    }
+                    else
+                    {
+                        $SQL = sprintf("SELECT layoutID FROM lklayoutmedia WHERE mediaID = %d AND layoutid <> %d AND regionID <> '%s' ", $mediaid, $layoutid, $regionid);
+                    }
+
+                    if (!$results = $db->query($SQL))
+                    {
+                        trigger_error($db->error());
+
+                        $this->response->SetError(__('Cannot determine if this media has been used.'));
+                        $this->response->keepOpen = true;
+                        return $this->response;
+                    }
+
+                    if ($db->num_rows($results) == 0 && !$revised)
+                    {
+                        $options .= ',delete|' . __('Delete this media');
+                    }
+                    else
+                    {
+                        $options .= ',retire|' . __('Retire this media');
+                    }
+                }
+                else
+                {
+                    // If this is the normal content page then say they cant edit, otherwise display the form with only the unassign option
+                    if ($layoutid == '')
+                    {
+                        $this->response->SetError(__('You do not have permission to alter/delete this media.'));
+                        $this->response->keepOpen = true;
+                        return $this->response;
+                    }
+                }
+
+                $options = ltrim($options, ',');
+
+                $deleteOptions = listcontent($options, 'options');
+
+                $msgWarn = __('Are you sure you want to delete this media?');
+                $msgSelect = __('Please select from the following options');
+                $msgCaution = __('Warning! You cannot undo this operation');
+
+                //we can delete
+                $form = <<<END
+                <form id="MediaDeleteForm" class="XiboForm" method="post" action="index.php?p=module&mod=$this->type&q=Exec&method=DeleteMedia">
+                    <input type="hidden" name="mediaid" value="$mediaid">
+                    <input type="hidden" name="lkid" value="$lkid">
+                    <input type="hidden" name="layoutid" value="$layoutid">
+                    <input type="hidden" name="regionid" value="$regionid">
+                    <p>$msgWarn</p>
+                    <p>$msgSelect: $deleteOptions </p>
+                    <p>$msgCaution</p>
+                </form>
+END;
+                if ($layoutid == '')
+                    $this->response->AddButton(__('No'), 'XiboDialogClose()');
+                else
+                   $this->response->AddButton(__('No'), 'XiboFormRender("index.php?p=layout&layoutid=' . $layoutid . '&regionid=' . $regionid . '&q=RegionOptions")');
+
+                $this->response->AddButton(__('Yes'), '$("#MediaDeleteForm").submit()');
+            }
+
+            $this->response->html = $form;
+            $this->response->dialogTitle = __('Delete Media');
+            $this->response->dialogSize = true;
+            $this->response->dialogWidth = '450px';
+            $this->response->dialogHeight = '280px';
+
+            return $this->response;
 	}
 
 	/**
@@ -478,21 +613,93 @@
 	 */
 	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;
+            $db =& $this->db;
+
+            $layoutid = $this->layoutid;
+            $regionid = $this->regionid;
+            $mediaid = $this->mediaid;
+
+            $url = "index.php?p=layout&layoutid=$layoutid&regionid=$regionid&q=RegionOptions";
+
+            if (!$this->auth->del)
+            {
+                $this->response->SetError('You do not have permission to delete this assignment.');
+                $this->response->keepOpen = false;
+                return $this->response;
+            }
+
+            if ($layoutid != '')
+            {
+                Kit::ClassLoader('layoutmediagroupsecurity');
+                $security = new LayoutMediaGroupSecurity($db);
+
+                if (!$security->UnlinkAll($layoutid, $regionid, $this->mediaid))
+                    trigger_error($security->GetErrorMessage(), E_USER_ERROR);
+
+                $this->deleteFromRegion = true;
+                $this->UpdateRegion();
+            }
+
+            // Are we region specific media?
+            if (!$this->regionSpecific)
+            {
+                $options = Kit::GetParam('options', _POST, _WORD);
+
+                // If we are set to retire we retire
+		if ($options == 'retire')
+		{
+                    //Update the media record to say it is retired
+                    $SQL = sprintf("UPDATE media SET retired = 1 WHERE mediaid = %d ", $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')
+		{
+                    // Get the file location from the database
+                    $storedAs = $db->GetSingleValue(sprintf("SELECT storedAs FROM media WHERE mediaid = %d", $mediaid), 'storedAs', _FILENAME);
+
+                    // Remove permission assignments
+                    Kit::ClassLoader('mediagroupsecurity');
+
+                    $security = new MediaGroupSecurity($db);
+
+                    if (!$security->UnlinkAll($mediaid))
+                        trigger_error($security->GetErrorMessage(), E_USER_ERROR);
+
+                    //Update the media record to say it is retired
+                    $SQL = sprintf("DELETE FROM media WHERE mediaid = %d ", $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($storedAs);
+		}
+
+                $this->response->message = __('Media Deleted');
+            }
+            else
+            {
+                // We want to load a new form
+                $this->response->loadForm = true;
+                $this->response->loadFormUri= $url;
+            }
+
+            return $this->response;
 	}
 
 	/**
@@ -513,6 +720,118 @@
 		return $this->response;
 	}
 
+    protected function AddFormForLibraryMedia()
+    {
+        global $session;
+        $db =& $this->db;
+        $user =& $this->user;
+
+        // Would like to get the regions width / height
+        $layoutid = $this->layoutid;
+        $regionid = $this->regionid;
+
+        // Set the Session / Security information
+        $sessionId = session_id();
+        $securityToken = CreateFormToken();
+        $backgroundImage = Kit::GetParam('backgroundImage', _GET, _BOOL, false);
+
+        $session->setSecurityToken($securityToken);
+
+        //Get the default value for the shared list
+        $default = Config::GetSetting($db, 'defaultMedia');
+        $defaultDuration = Config::GetSetting($db, 'jpg_length');
+
+        // Save button is different depending on if we are on a region or not
+        if ($regionid != '' && $this->showRegionOptions)
+        {
+            setSession('content','mediatype', $this->type);
+
+            $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" />
+            <input class="XiboFormButton" type="button" href="index.php?p=content&q=LibraryAssignForm&layoutid=$layoutid&regionid=$regionid" title="Library" value="Library" />
+END;
+        }
+        elseif ($regionid != '' && !$this->showRegionOptions)
+        {
+            $save_button = <<<END
+            <input id="btnSave" type="submit" value="Save" disabled />
+            <input class="XiboFormButton" id="btnCancel" type="button" title="Close" onclick="$('#div_dialog').dialog('close')" value="Cancel" />
+END;
+        }
+        elseif ($backgroundImage)
+        {
+            // Show the save button, and make cancel go back to the background form
+            $save_button = <<<END
+            <input id="btnSave" type="submit" value="Save" disabled />
+            <input class="XiboFormButton" id="btnCancel" type="button" title="Close" href="index.php?p=layout&q=BackgroundForm&modify=true&layoutid=$layoutid" value="Cancel" />
+END;
+        }
+        else
+        {
+            $save_button = <<<END
+            <input id="btnSave" type="submit" value="Save" disabled />
+            <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>
+                <form id="file_upload" method="post" action="index.php?p=content&q=FileUpload" enctype="multipart/form-data" target="fileupload">
+                        <input type="hidden" id="PHPSESSID" value="$sessionId" />
+                        <input type="hidden" id="SecurityToken" value="$securityToken" />
+                        <input type="hidden" name="MAX_FILE_SIZE" value="$this->maxFileSizeBytes" />
+                        <table>
+                                <tr>
+                                        <td><label for="file">$this->displayType File<span class="required">*</span></label></td>
+                                        <td colspan="3">
+                                                <input type="file" name="media_file" onchange="fileFormSubmit();this.form.submit();" />
+                                        </td>
+                                </tr>
+                        </table>
+                </form>
+        </div>
+        <div id="uploadProgress" style="display:none">
+                <img src="img/loading.gif"><span style="padding-left:10px">You may fill in the form while your file is uploading.</span>
+        </div>
+        <form class="XiboForm" id="AddLibraryBasedMedia" method="post" action="index.php?p=module&mod=$this->type&q=Exec&method=AddMedia">
+                <input type="hidden" name="layoutid" value="$layoutid">
+                <input type="hidden" name="regionid" value="$regionid">
+                <input type="hidden" name="backgroundImage" value="$backgroundImage" />
+                <input type="hidden" name="showRegionOptions" value="$this->showRegionOptions" />
+                <input type="hidden" id="txtFileName" name="txtFileName" readonly="true" />
+                <input type="hidden" name="hidFileID" id="hidFileID" value="" />
+                <table width="100%">
+                        <tr>
+                        <td><label for="name" title="The name of the $this->type. Leave this blank to use the file name">Name</label></td>
+                        <td><input id="name" name="name" type="text"></td>
+                        </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="$defaultDuration"></td>
+                        </tr>
+                        <tr>
+                                <td></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>
+                                <td colspan="3">$save_button</td>
+                        </tr>
+                </table>
+        </form>
+FORM;
+
+        $this->response->html = $form;
+        $this->response->dialogTitle = 'Add New ' . $this->displayType;
+        $this->response->dialogSize = true;
+        $this->response->dialogWidth = '450px';
+        $this->response->dialogHeight = '280px';
+
+        return $this->response;
+    }
+
 	/**
 	 * Default Edit Form
 	 * @return
@@ -530,6 +849,148 @@
 		return $this->response;
 	}
 
+    protected function EditFormForLibraryMedia()
+    {
+        global $session;
+        $db =& $this->db;
+        $user =& $this->user;
+
+        // Would like to get the regions width / height
+        $layoutid = $this->layoutid;
+        $regionid = $this->regionid;
+        $mediaid = $this->mediaid;
+        $lkid = $this->lkid;
+        $userid	= $this->user->userid;
+
+        // Can this user delete?
+        if (!$this->auth->edit)
+        {
+            $this->response->SetError('You do not have permission to edit this media.');
+            $this->response->keepOpen = false;
+            return $this->response;
+        }
+
+        // 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, retired, storedAs, isEdited, editedMediaID FROM media WHERE mediaID = $mediaid ";
+
+        if (!$row = $db->GetSingleRow($SQL))
+        {
+            trigger_error($db->error()); //log the error
+
+            $this->message = __('Error querying for the Media information');
+            return false;
+        }
+
+        $name = $row['name'];
+        $originalFilename = $row['originalFilename'];
+        $userid = $row['userID'];
+        $retired = $row['retired'];
+        $storedAs = $row['storedAs'];
+        $isEdited = $row['isEdited'];
+        $editedMediaID = $row['editedMediaID'];
+        $ext = strtolower(substr(strrchr($originalFilename, '.'), 1));
+
+        // Save button is different depending on if we are on a region or not
+        if ($regionid != '' && $this->showRegionOptions)
+        {
+            setSession('content', 'mediatype', $this->type);
+
+            $extraNotes = '<em>Note: Uploading a new ' . $this->displayType . ' 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" />
+END;
+        }
+        elseif ($regionid != '' && !$this->showRegionOptions)
+        {
+            $extraNotes = '<em>Note: Uploading a new ' . $this->displayType . ' 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;
+        }
+        else
+        {
+            $extraNotes = '<em>Note: As you are editing from the library uploading a new media item will not replace the old one from any layouts. To do this navigate 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;
+        }
+
+        $durationFieldEnabled = ($this->auth->modifyPermissions) ? '' : ' readonly';
+
+        $form = <<<FORM
+        <div style="display:none"><iframe name="fileupload" width="1px" height="1px"></iframe></div>
+        <div>
+                <form id="file_upload" method="post" action="index.php?p=content&q=FileUpload" enctype="multipart/form-data" target="fileupload">
+                        <input type="hidden" id="PHPSESSID" value="$sessionId" />
+                        <input type="hidden" id="SecurityToken" value="$securityToken" />
+                        <input type="hidden" name="MAX_FILE_SIZE" value="$this->maxFileSizeBytes" />
+                        <table>
+                                <tr>
+                                        <td><label for="file">New $this->displayType File<span class="required">*</span></label></td>
+                                        <td colspan="3">
+                                                <input type="file" name="media_file" onchange="fileFormSubmit();this.form.submit();" />
+                                        </td>
+                                </tr>
+                        </table>
+                </form>
+        </div>
+        <div id="uploadProgress" style="display:none">
+                <img src="img/loading.gif"><span style="padding-left:10px">You may fill in the form while your file is uploading.</span>
+        </div>
+        <form class="XiboForm" method="post" action="index.php?p=module&mod=$this->type&q=Exec&method=EditMedia">
+                <input type="hidden" name="hidFileID" id="hidFileID" value="" />
+                <input type="hidden" id="txtFileName" name="txtFileName" readonly="true" />
+                <input type="hidden" name="layoutid" value="$layoutid">
+                <input type="hidden" name="regionid" value="$regionid">
+                <input type="hidden" name="mediaid" value="$mediaid">
+                <input type="hidden" name="lkid" value="$lkid">
+                <input type="hidden" id="PHPSESSID" value="$sessionId" />
+                <input type="hidden" id="SecurityToken" value="$securityToken" />
+                <input type="hidden" name="showRegionOptions" value="$this->showRegionOptions" />
+                <table>
+                        <tr>
+                        <td><label for="name" title="The name of the $this->displayType. Leave this blank to use the file name">Name</label></td>
+                        <td><input id="name" name="name" type="text" value="$name"></td>
+                        <td><label for="duration" title="The duration in seconds this media 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" $durationFieldEnabled></td>
+                        </tr>
+                        <tr>
+                                <td></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>
+                                <td colspan="2">$extraNotes</td>
+                        </tr>
+                        <tr>
+                                <td></td>
+                                <td colspan="3">$save_button</td>
+                        </tr>
+                </table>
+        </form>
+FORM;
+
+        $this->response->html 		= $form;
+        $this->response->dialogTitle 	= 'Edit ' . $this->displayType;
+        $this->response->dialogSize 	= true;
+        $this->response->dialogWidth 	= '450px';
+        $this->response->dialogHeight 	= '280px';
+
+        return $this->response;
+    }
+
 	/**
 	 * Default Add Media
 	 * @return
@@ -542,6 +1003,171 @@
 		return $this->response;	
 	}
 
+    protected function AddLibraryMedia()
+    {
+        $db =& $this->db;
+        $layoutid = $this->layoutid;
+        $regionid = $this->regionid;
+        $mediaid = $this->mediaid;
+        $userid	= $this->user->userid;
+        $backgroundImage = Kit::GetParam('backgroundImage', _POST, _BOOL, false);
+
+        // 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, -1);
+
+        if ($name == '')
+            $name = Kit::ValidateParam($fileName, _FILENAME);
+
+        // Validation
+        if (!$this->IsValidExtension($ext))
+        {
+            $this->response->SetError(sprintf(__('Your file has an extension not supported by Media Type %s'), $this->displayType));
+            $this->response->keepOpen = true;
+            return $this->response;
+        }
+
+        // Make sure the name isnt too long
+        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))
+        {
+            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)
+        {
+            $this->response->SetError('Some media you own already has this name. Please choose another.');
+            $this->response->keepOpen = true;
+            return $this->response;
+        }
+
+        // All OK to insert this record
+        $SQL  = "INSERT INTO media (name, type, duration, originalFilename, userID, retired ) ";
+        $SQL .= "VALUES ('%s', '$this->type', '%s', '%s', %d, 0) ";
+
+        $SQL = sprintf($SQL, $db->escape_string($name), $db->escape_string($duration), $db->escape_string($fileName), $userid);
+
+        if (!$mediaid = $db->insert_query($SQL))
+        {
+            trigger_error($db->error());
+            $this->response->SetError(__('Database error adding this media record.'));
+            $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());
+                $this->response->SetError(__('Error storing file'));
+                $this->response->keepOpen = true;
+                return $this->response;
+            }
+        }
+
+        // Calculate the MD5 and the file size
+        $md5 = md5_file($databaseDir.$storedAs);
+        $fileSize = filesize($databaseDir.$storedAs);
+
+        // Update the media record to include this information
+        $SQL = sprintf("UPDATE media SET storedAs = '%s', `MD5` = '%s', FileSize = %d WHERE mediaid = %d", $storedAs, $md5, $fileSize, $mediaid);
+
+        if (!$db->query($SQL))
+        {
+            trigger_error($db->error());
+            return true;
+        }
+
+        // Required Attributes
+        $this->mediaid	= $mediaid;
+        $this->duration = $duration;
+
+        // Any Options
+        $this->SetOption('uri', $storedAs);
+
+        // Should have built the media object entirely by this time
+        if ($regionid != '' && $this->showRegionOptions)
+        {
+            // This saves the Media Object to the Region
+            $this->UpdateRegion();
+            $this->response->loadFormUri = "index.php?p=layout&layoutid=$layoutid&regionid=$regionid&q=RegionOptions";;
+        }
+        elseif ($regionid != '' && !$this->showRegionOptions)
+        {
+            $this->UpdateRegion();
+            $this->response->loadForm = false;
+        }
+        else
+        {
+            $this->response->loadFormUri = "index.php?p=content&q=displayForms&sp=add";
+        }
+
+        // We want to load a new form
+        $this->response->loadForm = true;
+
+        // If we just added a background we should load the background form
+        if ($backgroundImage)
+        {
+            $this->response->loadFormUri = "index.php?p=layout&q=BackgroundForm&modify=true&layoutid=$layoutid&backgroundOveride=$storedAs";
+        }
+
+        // What permissions should we assign this with?
+        if (Config::GetSetting($db, 'MEDIA_DEFAULT') == 'public')
+        {
+            Kit::ClassLoader('mediagroupsecurity');
+
+            $security = new MediaGroupSecurity($db);
+            $security->LinkEveryone($mediaid, 1, 0, 0);
+        }
+
+        return $this->response;
+    }
+
 	/**
 	 * Default EditMedia
 	 * @return
@@ -554,18 +1180,256 @@
 		return $this->response;	
 	}
 
-	/**
-	 * Default GetName
-	 * @return
-	 */
-	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;
-	}
+    protected function EditLibraryMedia()
+    {
+        $db =& $this->db;
+        $user =& $this->user;
+        $layoutid = $this->layoutid;
+        $regionid = $this->regionid;
+        $mediaid = $this->mediaid;
+        $userid = $this->user->userid;
+
+        if (!$this->auth->edit)
+        {
+            $this->response->SetError('You do not have permission to edit this media.');
+            $this->response->keepOpen = false;
+            return $this->response;
+        }
+
+        // Stored As from the XML
+        $storedAs = $this->GetOption('uri');
+
+        // File data
+        $tmpName = Kit::GetParam('hidFileID', _POST, _STRING);
+
+        if ($tmpName == '')
+        {
+            $fileRevision = false;
+        }
+        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 (!$this->IsValidExtension($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);
+        
+        if ($this->auth->modifyPermissions)
+            $this->duration = Kit::GetParam('duration', _POST, _INT, 0);
+
+        if ($name == '')
+        {
+            if ($fileRevision)
+            {
+                $name = Kit::ValidateParam($fileName, _FILENAME);
+            }
+            else
+            {
+                $this->response->SetError(__('The Name cannot be blank.'));
+                $this->response->keepOpen = true;
+                return $this->response;
+            }
+        }
+
+        // Make sure the name isnt too long
+        if (strlen($name) > 100)
+        {
+            $this->response->SetError(__('The name cannot be longer than 100 characters'));
+            $this->response->keepOpen = true;
+            return $this->response;
+        }
+
+        if ($this->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  AND IsEdited = 0", $db->escape_string($name), $userid, $mediaid);
+
+        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)
+        {
+            $this->response->SetError(__('Some media you own already has this name. Please choose another.'));
+            $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, userID, retired ) ";
+            $SQL .= "VALUES ('%s', '$this->type', '%s', '%s', %d, 0) ";
+
+            $SQL = sprintf($SQL, $db->escape_string($name), $db->escape_string($this->duration), $db->escape_string($fileName), $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.');
+                    $this->response->keepOpen = true;
+                    return $this->response;
+                }
+            }
+
+            // Calculate the MD5 and the file size
+            $md5 = md5_file($databaseDir.$storedAs);
+            $fileSize = filesize($databaseDir.$storedAs);
+
+            // Update the media record to include this information
+            $SQL = sprintf("UPDATE media SET storedAs = '%s', `MD5` = '%s', FileSize = %d WHERE mediaid = %d", $storedAs, $md5, $fileSize, $new_mediaid);
+
+            if (!$db->query($SQL))
+            {
+                trigger_error($db->error());
+                $this->response->SetError('Error updating media with Library location.');
+                $this->response->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());
+
+                $this->response->SetError('Database error editing this media record.');
+                $this->response->keepOpen = true;
+                return $this->response;
+            }
+
+            // We need to assign all permissions for the old media id to the new media id
+            Kit::ClassLoader('mediagroupsecurity');
+
+            $security = new MediaGroupSecurity($db);
+            $security->Copy($mediaid, $new_mediaid);
+
+            // Are we on a region
+            if ($regionid != '')
+            {
+                Kit::ClassLoader('layoutmediagroupsecurity');
+
+                $security = new LayoutMediaGroupSecurity($db);
+                $security->Copy($layoutid, $regionid, $mediaid, $new_mediaid);
+            }
+        }
+        else
+        {
+            // Editing the existing record
+            $new_mediaid = $mediaid;
+
+            $SQL =  "UPDATE media SET name = '%s' ";
+            $SQL .= " WHERE mediaID = %d ";
+            $SQL = sprintf($SQL, $db->escape_string($name), $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;
+
+        // Any Options
+        $this->SetOption('uri', $storedAs);
+
+        // Should have built the media object entirely by this time
+        if ($regionid != '' && $this->showRegionOptions)
+        {
+            // 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";;
+        }
+        elseif ($regionid != '' && !$this->showRegionOptions)
+        {
+            $this->UpdateRegion();
+            $this->response->loadForm = false;
+        }
+        else
+        {
+            // We are in the library so we therefore have to update the duration with the new value.
+            // We could do this in the above code, but it is much simpler here until we rewrite
+            // these classes to use a data base class.
+            $db->query(sprintf("UPDATE media SET duration = %d WHERE mediaID = %d", $this->duration, $this->mediaid));
+
+            $this->response->message = 'Edited the ' . $this->displayType;
+        }
+
+        return $this->response;
+    }
+
+    /**
+     * Default GetName
+     * @return
+     */
+    public function GetName()
+    {
+        $db =& $this->db;
+
+        if ($this->name == '' && !$this->regionSpecific)
+        {
+            // Load what we know about this media into the object
+            $SQL = "SELECT name FROM media WHERE mediaID = %d ";
+
+            $this->name = $db->GetSingleValue(sprintf($SQL, $this->mediaid), 'name', _STRING);
+        }
+
+        Debug::LogEntry($db, 'audit', sprintf('Module name returned for MediaID: %s is %s', $this->mediaid, $this->name), 'Module', 'GetName');
+
+        return $this->name;
+    }
 
         /**
          * Preview code for a module
@@ -585,5 +1449,231 @@
     {
         return $this->regionSpecific;
     }
+
+    /**
+     * Permissions form
+     */
+    public function PermissionsForm()
+    {
+        $db =& $this->db;
+        $user =& $this->user;
+        $response = $this->response;
+        $helpManager = new HelpManager($db, $user);
+
+        if (!$this->auth->modifyPermissions)
+            trigger_error(__('You do not have permissions to edit this media'), E_USER_ERROR);
+
+        // Form content
+        $form = '<form id="LayoutPermissionsForm" class="XiboForm" method="post" action="index.php?p=module&mod=' . $this->type . '&q=Exec&method=Permissions">';
+	$form .= '<input type="hidden" name="layoutid" value="' . $this->layoutid . '" />';
+	$form .= '<input type="hidden" name="regionid" value="' . $this->regionid . '" />';
+	$form .= '<input type="hidden" name="mediaid" value="' . $this->mediaid . '" />';
+        $form .= '<div class="dialog_table">';
+	$form .= '  <table style="width:100%">';
+        $form .= '      <tr>';
+        $form .= '          <th>' . __('Group') . '</th>';
+        $form .= '          <th>' . __('View') . '</th>';
+        $form .= '          <th>' . __('Edit') . '</th>';
+        $form .= '          <th>' . __('Delete') . '</th>';
+        $form .= '      </tr>';
+
+        // List of all Groups with a view/edit/delete checkbox
+        $SQL = '';
+        $SQL .= 'SELECT `group`.GroupID, `group`.`Group`, View, Edit, Del, `group`.IsUserSpecific ';
+        $SQL .= '  FROM `group` ';
+
+        if ($this->assignedMedia)
+        {
+            $SQL .= '   LEFT OUTER JOIN lklayoutmediagroup ';
+            $SQL .= '   ON lklayoutmediagroup.GroupID = group.GroupID ';
+            $SQL .= sprintf(" AND lklayoutmediagroup.MediaID = '%s' AND lklayoutmediagroup.RegionID = '%s' AND lklayoutmediagroup.LayoutID = %d ", $this->mediaid, $this->regionid, $this->layoutid);
+        }
+        else
+        {
+            $SQL .= '   LEFT OUTER JOIN lkmediagroup ';
+            $SQL .= '   ON lkmediagroup.GroupID = group.GroupID ';
+            $SQL .= sprintf('       AND lkmediagroup.MediaID = %d ', $this->mediaid);
+        }
+
+        $SQL .= ' WHERE `group`.GroupID <> %d ';
+        $SQL .= 'ORDER BY `group`.IsEveryone DESC, `group`.IsUserSpecific, `group`.`Group` ';
+
+        $SQL = sprintf($SQL, $user->getGroupFromId($user->userid, true));
+
+        Debug::LogEntry($db, 'audit', $SQL, 'module', 'PermissionsForm');
+
+        if (!$results = $db->query($SQL))
+        {
+            trigger_error($db->error());
+            trigger_error(__('Unable to get permissions for this layout'), E_USER_ERROR);
+        }
+
+        while($row = $db->get_assoc_row($results))
+        {
+            $groupId = $row['GroupID'];
+            $group = ($row['IsUserSpecific'] == 0) ? '<strong>' . $row['Group'] . '</strong>' : $row['Group'];
+
+            $form .= '<tr>';
+            $form .= ' <td>' . $group . '</td>';
+            $form .= ' <td><input type="checkbox" name="groupids[]" value="' . $groupId . '_view" ' . (($row['View'] == 1) ? 'checked' : '') . '></td>';
+            $form .= ' <td><input type="checkbox" name="groupids[]" value="' . $groupId . '_edit" ' . (($row['Edit'] == 1) ? 'checked' : '') . '></td>';
+            $form .= ' <td><input type="checkbox" name="groupids[]" value="' . $groupId . '_del" ' . (($row['Del'] == 1) ? 'checked' : '') . '></td>';
+            $form .= '</tr>';
+        }
+
+        $form .= '</table>';
+        $form .= '</div>';
+        $form .= '</form>';
+
+        $response->SetFormRequestResponse($form, __('Permissions'), '350px', '500px');
+        $response->AddButton(__('Help'), 'XiboHelpRender("' . $helpManager->Link('Layout', 'Permissions') . '")');
+        $response->AddButton(__('Cancel'), 'XiboSwapDialog("index.php?p=layout&layoutid=' . $this->layoutid . '&regionid=' . $this->regionid . '&q=RegionOptions")');
+        $response->AddButton(__('Save'), '$("#LayoutPermissionsForm").submit()');
+
+        return $response;
+    }
+
+    /**
+     * Permissions Edit
+     */
+    public function Permissions()
+    {
+        $db =& $this->db;
+        $user =& $this->user;
+        $response = $this->response;
+
+        Kit::ClassLoader('mediagroupsecurity');
+        Kit::ClassLoader('layoutmediagroupsecurity');
+
+        $layoutId = Kit::GetParam('layoutid', _POST, _INT);
+        $regionId = Kit::GetParam('regionid', _POST, _STRING);
+        $mediaId = Kit::GetParam('mediaid', _POST, _STRING);
+        $groupIds = Kit::GetParam('groupids', _POST, _ARRAY);
+
+        if (!$this->auth->modifyPermissions)
+            trigger_error(__('You do not have permissions to edit this layout'), E_USER_ERROR);
+
+        // Unlink all
+        if ($this->assignedMedia)
+        {
+            $layoutMediaSecurity = new LayoutMediaGroupSecurity($db);
+            if (!$layoutMediaSecurity->UnlinkAll($layoutId, $regionId, $mediaId))
+                trigger_error(__('Unable to set permissions'));
+        }
+        else
+        {
+            $mediaSecurity = new MediaGroupSecurity($db);
+            if (!$mediaSecurity->UnlinkAll($mediaId))
+                trigger_error(__('Unable to set permissions'));
+        }
+
+        // Some assignments for the loop
+        $lastGroupId = 0;
+        $first = true;
+        $view = 0;
+        $edit = 0;
+        $del = 0;
+
+        // List of groupIds with view, edit and del assignments
+        foreach($groupIds as $groupPermission)
+        {
+            $groupPermission = explode('_', $groupPermission);
+            $groupId = $groupPermission[0];
+
+            if ($first)
+            {
+                // First time through
+                $first = false;
+                $lastGroupId = $groupId;
+            }
+
+            if ($groupId != $lastGroupId)
+            {
+                // The groupId has changed, so we need to write the current settings to the db.
+                // Link new permissions
+                if ($this->assignedMedia)
+                {
+                    if (!$layoutMediaSecurity->Link($layoutId, $regionId, $mediaId, $lastGroupId, $view, $edit, $del))
+                        trigger_error(__('Unable to set permissions'));
+                }
+                else
+                {
+                    if (!$mediaSecurity->Link($mediaId, $lastGroupId, $view, $edit, $del))
+                        trigger_error(__('Unable to set permissions'));
+                }
+
+                // Reset
+                $lastGroupId = $groupId;
+                $view = 0;
+                $edit = 0;
+                $del = 0;
+            }
+
+            switch ($groupPermission[1])
+            {
+                case 'view':
+                    $view = 1;
+                    break;
+
+                case 'edit':
+                    $edit = 1;
+                    break;
+
+                case 'del':
+                    $del = 1;
+                    break;
+            }
+        }
+
+        // Need to do the last one
+        if (!$first)
+        {
+            if ($this->assignedMedia)
+            {
+                if (!$layoutMediaSecurity->Link($layoutId, $regionId, $mediaId, $lastGroupId, $view, $edit, $del))
+                    trigger_error(__('Unable to set permissions'));
+            }
+            else
+            {
+                if (!$mediaSecurity->Link($mediaId, $lastGroupId, $view, $edit, $del))
+                    trigger_error(__('Unable to set permissions'));
+            }
+        }
+
+        $response->SetFormSubmitResponse(__('Permissions Changed'));
+
+        return $response;
+    }
+
+    /**
+     * Deletes the media files associated with this record
+     * @return
+     */
+    private function DeleteMediaFiles($fileName)
+    {
+        $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 . $fileName))
+        {
+            unlink($databaseDir . $fileName);
+        }
+
+        if (file_exists($databaseDir . 'tn_' . $fileName))
+        {
+            unlink($databaseDir . 'tn_' . $fileName);
+        }
+
+        if (file_exists($databaseDir . 'bg_' . $fileName))
+        {
+            unlink($databaseDir . 'bg_' . $fileName);
+        }
+
+        return true;
+    }
 }
 ?>
 \ No newline at end of file
 
=== modified file 'server/lib/pages/content.class.php'
--- server/lib/pages/content.class.php	2011-06-05 16:17:41 +0000
+++ server/lib/pages/content.class.php	2011-08-18 23:36:27 +0000
@@ -70,11 +70,6 @@
 		if (isset($_SESSION['content']['usertype'])) $usertype = $_SESSION['content']['usertype'];
 		if (isset($_SESSION['content']['playlistid'])) $playlistid = $_SESSION['content']['playlistid'];
 		
-		//shared list
-		$shared = "All";
-		if (isset($_SESSION['content']['shared'])) $shared = $_SESSION['content']['shared'];
-		$shared_list = dropdownlist("SELECT 'all','All' UNION SELECT permissionID, permission FROM permission", "shared", $shared);
-		
 		$filter_userid = "";
 		if (isset($_SESSION['content']['filter_userid'])) $filter_userid = $_SESSION['content']['filter_userid'];
 		
@@ -122,8 +117,6 @@
 							<td>$user_list</td>
 							<td></td>
 							<td></td>
-							<td>$msgShared</td>
-							<td>$shared_list</td>
 						</tr>
 					</table>
 			</form>
@@ -174,12 +167,9 @@
 		$SQL .= "        media.name, ";
 		$SQL .= "        media.type, ";
 		$SQL .= "        media.duration, ";
-		$SQL .= "        media.userID, ";
-		$SQL .= "        permission.permission, ";
-		$SQL .= "        media.permissionID ";
+		$SQL .= "        media.userID ";
 		$SQL .= "FROM    media ";
-		$SQL .= "INNER JOIN permission ON permission.permissionID = media.permissionID ";
-		$SQL .= "WHERE   1            = 1  AND isEdited = 0 ";
+		$SQL .= "WHERE   isEdited = 0 ";
 		if ($mediatype != "all") 
 		{
 			$SQL .= sprintf(" AND media.type = '%s'", $db->escape_string($mediatype));
@@ -192,10 +182,6 @@
 		{
 			$SQL .= sprintf(" AND media.userid = %d ", $filter_userid);
 		}
-		if ($shared != "all") 
-		{
-			$SQL .= sprintf(" AND media.permissionID = %d ", $shared);			
-		}
 		//retired options
 		if ($filter_retired == '1') 
 		{
@@ -220,7 +206,7 @@
 		$msgType	= __('Type');
 		$msgRetired	= __('Retired');
 		$msgOwner	= __('Owner');
-		$msgShared	= __('Shared');
+		$msgShared	= __('Permissions');
 		$msgAction	= __('Action');
 
     	$output = <<<END
@@ -231,83 +217,86 @@
 			        <th>$msgName</th>
 			        <th>$msgType</th>
 			        <th>h:mi:ss</th>            
+                                <th>$msgOwner</th>
 			        <th>$msgShared</th>       
-					<th>$msgOwner</th>
 			        <th>$msgAction</th>     
 			    </tr>
 			</thead>
 			<tbody>
 END;
 		
-	    while ($aRow = $db->get_row($results)) 
-		{
-	    	$mediaid 		= Kit::ValidateParam($aRow[0], _INT);
-			$media 			= Kit::ValidateParam($aRow[1], _STRING);
-			$mediatype 		= Kit::ValidateParam($aRow[2], _WORD);
-			$length 		= sec2hms(Kit::ValidateParam($aRow[3], _DOUBLE));
-			$ownerid 		= Kit::ValidateParam($aRow[4], _INT);
-			
-			$permission 	= Kit::ValidateParam($aRow[5], _STRING);
-			$permissionid 	= Kit::ValidateParam($aRow[6], _INT);
-			
-			//get the username from the userID using the user module
-			$username 		= $user->getNameFromID($ownerid);
-			$group			= $user->getGroupFromID($ownerid);
-			
-			//get the permissions
-			list($see_permissions , $edit_permissions) = $user->eval_permission($ownerid, $permissionid);
-			
-			if ($see_permissions) //is this user allowed to see this
-			{ 
-				if ($edit_permissions) 
-				{
-					//double click action - depends on what type of media we are
-					$output .= <<<END
-					<tr href='index.php?p=module&mod=$mediatype&q=Exec&method=EditForm&mediaid=$mediaid' ondblclick="XiboFormRender($(this).attr('href'))">
-END;
-				}
-				else 
-				{
-					$output .= '<tr ondblclick="alert(' . __('You do not have permission to edit this media') . ')">';
-				}
-				
-				$output .= "<td>$media</td>\n";
-		    	$output .= "<td>$mediatype</td>\n";
-		    	$output .= "<td>$length</td>\n";
-		    	$output .= "<td>$permission</td>\n";
-				$output .= "<td>$username</td>";
-				
-				// ACTION buttons
-		    	if ($edit_permissions) 
-				{
-					$msgEdit	= __('Edit');
-					$msgDelete	= __('Delete');
-					
-			   		$buttons 	= "<button class='XiboFormButton' title='$msgEdit' href='index.php?p=module&mod=$mediatype&q=Exec&method=EditForm&mediaid=$mediaid'><span>$msgEdit</span></button>";					
-	    			$buttons 	.= "<button class='XiboFormButton' title='$msgDelete' href='index.php?p=module&mod=$mediatype&q=Exec&method=DeleteForm&mediaid=$mediaid'><span>$msgDelete</span></button>";
-		    	}
-		    	else 
-				{
-		    		$buttons = __("No available actions.");
-		    	}
-				
-				$output .= <<<END
-				<td>
-					<div class='buttons'>
-						$buttons
-					</div>
-				</td>
-END;
-				
-		    	$output .= "</tr>\n";
-			}
-	    }
+        while ($aRow = $db->get_row($results))
+        {
+            $mediaid 		= Kit::ValidateParam($aRow[0], _INT);
+            $media 			= Kit::ValidateParam($aRow[1], _STRING);
+            $mediatype 		= Kit::ValidateParam($aRow[2], _WORD);
+            $length 		= sec2hms(Kit::ValidateParam($aRow[3], _DOUBLE));
+            $ownerid 		= Kit::ValidateParam($aRow[4], _INT);
+
+            //get the username from the userID using the user module
+            $username 		= $user->getNameFromID($ownerid);
+
+            $group = $this->GroupsForMedia($mediaid);
+
+            // Permissions
+            $auth = $this->user->MediaAuth($mediaid, true);
+
+            if ($auth->view) //is this user allowed to see this
+            {
+                if ($auth->edit)
+                {
+                    //double click action - depends on what type of media we are
+                    $output .= <<<END
+                    <tr href='index.php?p=module&mod=$mediatype&q=Exec&method=EditForm&mediaid=$mediaid' ondblclick="XiboFormRender($(this).attr('href'))">
+END;
+                }
+                else
+                {
+                    $output .= '<tr ondblclick="alert(' . __('You do not have permission to edit this media') . ')">';
+                }
+
+                $output .= "<td>$media</td>\n";
+                $output .= "<td>$mediatype</td>\n";
+                $output .= "<td>$length</td>\n";
+                $output .= "<td>$username</td>";
+                $output .= "<td>$group</td>";
+
+                // ACTION buttons
+                if ($auth->edit)
+                {
+                    $msgEdit	= __('Edit');
+                    $msgDelete	= __('Delete');
+
+                    $buttons 	= "<button class='XiboFormButton' title='$msgEdit' href='index.php?p=module&mod=$mediatype&q=Exec&method=EditForm&mediaid=$mediaid'><span>$msgEdit</span></button>";
+                    
+                    if ($auth->del)
+                        $buttons .= "<button class='XiboFormButton' title='$msgDelete' href='index.php?p=module&mod=$mediatype&q=Exec&method=DeleteForm&mediaid=$mediaid'><span>$msgDelete</span></button>";
+
+                    if ($auth->modifyPermissions)
+                        $buttons .= "<button class='XiboFormButton' title='$msgShared' href='index.php?p=module&mod=$mediatype&q=Exec&method=PermissionsForm&mediaid=$mediaid'><span>$msgShared</span></button>";
+                }
+                else
+                {
+                    $buttons = __("No available actions.");
+                }
+
+                $output .= <<<END
+                <td>
+                        <div class='buttons'>
+                                $buttons
+                        </div>
+                </td>
+END;
+
+                $output .= "</tr>\n";
+            }
+        }
 		
     	$output .= "</tbody></table>\n</div>\n";
 
     	$response->SetGridResponse($output);
-		$response->Respond();
-	}
+        $response->Respond();
+    }
 	
 	/**
 	 * Display the forms
@@ -501,11 +490,8 @@
 		$SQL .= "        media.name, ";
 		$SQL .= "        media.type, ";
 		$SQL .= "        media.duration, ";
-		$SQL .= "        media.userID, ";
-		$SQL .= "        permission.permission, ";
-		$SQL .= "        media.permissionID ";
+		$SQL .= "        media.userID ";
 		$SQL .= "FROM    media ";
-		$SQL .= "INNER JOIN permission ON permission.permissionID = media.permissionID ";
 		$SQL .= "WHERE   retired = 0 AND isEdited = 0 ";
 		if($mediatype != "all") 
 		{
@@ -528,7 +514,6 @@
 		$msgType	= __('Type');
 		$msgLen		= __('Duration');
 		$msgOwner	= __('Owner');
-		$msgShared	= __('Shared');
 		$msgSelect	= __('Select');
 		
 		//some table headings
@@ -543,7 +528,6 @@
 			        <th>$msgName</th>
 		            <th>$msgType</th>
 		            <th>$msgLen</th>
-		            <th>$msgShared</th>
 			        <th>$msgSelect</th>
 			    </tr>
 				</thead>
@@ -559,26 +543,21 @@
 			$length 		= sec2hms(Kit::ValidateParam($row[3], _DOUBLE));
 			$ownerid 		= Kit::ValidateParam($row[4], _INT);
 			
-			$permission 	= Kit::ValidateParam($row[5], _STRING);
-			$permissionid 	= Kit::ValidateParam($row[6], _INT);
-			
 			//get the username from the userID using the user module
 			$username 		= $user->getNameFromID($ownerid);
 			$group			= $user->getGroupFromID($ownerid);
 	
-			//get the permissions
-			list($see_permissions , $edit_permissions) = $user->eval_permission($ownerid, $permissionid);
-			
-			if ($see_permissions) 
-			{ //is this user allowed to see this
+			// Permissions
+                        $auth = $this->user->MediaAuth($mediaid, true);
 
-				$form .= "<tr>";
-				$form .= "<td>" . $media . "</td>\n";
-				$form .= "<td>" . $mediatype . "</td>\n";
-				$form .= "<td>" . $length . "</td>\n";
-				$form .= "<td>" . $permission . "</td>\n";
-				$form .= "<td><input type='checkbox' name='mediaids[]' value='$mediaid'></td>";
-				$form .= "</tr>";
+                        if ($auth->view) //is this user allowed to see this
+                        {
+                            $form .= "<tr>";
+                            $form .= "<td>" . $media . "</td>\n";
+                            $form .= "<td>" . $mediatype . "</td>\n";
+                            $form .= "<td>" . $length . "</td>\n";
+                            $form .= "<td><input type='checkbox' name='mediaids[]' value='$mediaid'></td>";
+                            $form .= "</tr>";
 			}
 		}
 
@@ -674,5 +653,42 @@
         Debug::LogEntry($db, "audit", "[OUT]", "FileUpload");
         exit;
     }
+
+    /**
+     * Get a list of group names for a layout
+     * @param <type> $layoutId
+     * @return <type>
+     */
+    private function GroupsForMedia($mediaId)
+    {
+        $db =& $this->db;
+
+        $SQL = '';
+        $SQL .= 'SELECT `group`.Group ';
+        $SQL .= '  FROM `group` ';
+        $SQL .= '   INNER JOIN lkmediagroup ';
+        $SQL .= '   ON `group`.GroupID = lkmediagroup.GroupID ';
+        $SQL .= ' WHERE lkmediagroup.MediaID = %d ';
+
+        $SQL = sprintf($SQL, $mediaId);
+
+        if (!$results = $db->query($SQL))
+        {
+            trigger_error($db->error());
+            trigger_error(__('Unable to get group information for media'), E_USER_ERROR);
+        }
+
+        $groups = '';
+
+        while ($row = $db->get_assoc_row($results))
+        {
+            $groups .= $row['Group'] . ', ';
+        }
+
+        $groups = trim($groups);
+        $groups = trim($groups, ',');
+
+        return $groups;
+    }
 }
 ?>
 \ No newline at end of file
 
=== added file 'server/lib/pages/dataset.class.php'
--- server/lib/pages/dataset.class.php	1970-01-01 00:00:00 +0000
+++ server/lib/pages/dataset.class.php	2011-08-18 23:36:27 +0000
@@ -0,0 +1,1022 @@
+<?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 datasetDAO
+{
+    private $db;
+    private $user;
+
+    function __construct(database $db, user $user)
+    {
+        $this->db =& $db;
+        $this->user =& $user;
+
+        Kit::ClassLoader('dataset');
+        Kit::ClassLoader('datasetcolumn');
+        Kit::ClassLoader('datasetdata');
+    }
+
+    function on_page_load()
+    {
+            return "";
+    }
+
+    function echo_page_heading()
+    {
+            echo __("Layouts");
+            return true;
+    }
+
+    function displayPage()
+    {
+        require('template/pages/dataset_view.php');
+    }
+
+    public function DataSetFilter()
+    {
+        $id = uniqid();
+
+        $xiboGrid = <<<HTML
+        <div class="XiboGrid" id="$id">
+                <div class="XiboFilter">
+                        <form onsubmit="return false">
+				<input type="hidden" name="p" value="dataset">
+				<input type="hidden" name="q" value="DataSetGrid">
+                        </form>
+                </div>
+                <div class="XiboData">
+
+                </div>
+        </div>
+HTML;
+        echo $xiboGrid;
+    }
+
+    public function DataSetGrid()
+    {
+        $db =& $this->db;
+        $user =& $this->user;
+        $response = new ResponseManager();
+
+        $msgEdit = __('Edit');
+        $msgDelete = __('Delete');
+        $msgPermissions = __('Permissions');
+
+        $output = <<<END
+        <div class="info_table">
+        <table style="width:100%">
+            <thead>
+                <tr>
+                <th>Name</th>
+                <th>Description</th>
+                <th>Owner</th>
+                <th>$msgPermissions</th>
+                <th>Action</th>
+                </tr>
+            </thead>
+            <tbody>
+END;
+
+        foreach($this->user->DataSetList() as $dataSet)
+        {
+            $auth = $user->DataSetAuth($dataSet['datasetid'], true);
+            $owner = $user->getNameFromID($dataSet['ownerid']);
+            $groups = $this->GroupsForDataSet($dataSet['datasetid']);
+
+            $output .= '<tr>';
+            $output .= '    <td>' . $dataSet['dataset'] . '</td>';
+            $output .= '    <td>' . $dataSet['description'] . '</td>';
+            $output .= '    <td>' . $owner . '</td>';
+            $output .= '    <td>' . $groups . '</td>';
+            $output .= '    <td>';
+
+            if ($auth->edit)
+            {
+                $output .= '<button class="XiboFormButton" href="index.php?p=dataset&q=DataSetDataForm&datasetid=' . $dataSet['datasetid'] . '&dataset=' . $dataSet['dataset'] . '"><span>' . __('View Data') . '</span></button>';
+                $output .= '<button class="XiboFormButton" href="index.php?p=dataset&q=DataSetColumnsForm&datasetid=' . $dataSet['datasetid'] . '&dataset=' . $dataSet['dataset'] . '"><span>' . __('View Columns') . '</span></button>';
+                $output .= '<button class="XiboFormButton" href="index.php?p=dataset&q=EditDataSetForm&datasetid=' . $dataSet['datasetid'] . '"><span>' . $msgEdit . '</span></button>';
+            }
+
+            if ($auth->del)
+                $output .= '<button class="XiboFormButton" href="index.php?p=dataset&q=DeleteDataSetForm&datasetid=' . $dataSet['datasetid'] . '"><span>' . $msgDelete . '</span></button>';
+
+            if ($auth->modifyPermissions)
+                $output .= '<button class="XiboFormButton" href="index.php?p=dataset&q=PermissionsForm&datasetid=' . $dataSet['datasetid'] . '"><span>' . $msgPermissions . '</span></button>';
+
+            $output .= '    </td>';
+            $output .= '</tr>';
+        }
+
+        $output .= '</tbody></table></div>';
+        $response->SetGridResponse($output);
+        $response->Respond();
+    }
+
+    public function AddDataSetForm()
+    {
+        $db =& $this->db;
+        $user =& $this->user;
+        $response = new ResponseManager();
+
+        $helpManager = new HelpManager($db, $user);
+
+        $msgName = __('Name');
+        $msgDesc = __('Description');
+
+        $form = <<<END
+        <form id="AddDataSetForm" class="XiboForm" method="post" action="index.php?p=dataset&q=AddDataSet">
+            <table>
+                <tr>
+                    <td><label for="dataset" accesskey="n">$msgName<span class="required">*</span></label></td>
+                    <td><input name="dataset" class="required" type="text" id="dataset" tabindex="1" /></td>
+                </tr>
+                <tr>
+                    <td><label for="description" accesskey="d">$msgDesc</label></td>
+                    <td><input name="description" type="text" id="description" tabindex="2" /></td>
+                </tr>
+            </table>
+        </form>
+END;
+
+
+        $response->SetFormRequestResponse($form, __('Add DataSet'), '350px', '275px');
+        $response->AddButton(__('Help'), 'XiboHelpRender("' . $helpManager->Link('DataSet', 'Add') . '")');
+        $response->AddButton(__('Cancel'), 'XiboDialogClose()');
+        $response->AddButton(__('Add'), '$("#AddDataSetForm").submit()');
+        $response->Respond();
+    }
+
+    /**
+     * Add a dataset
+     */
+    public function AddDataSet()
+    {
+        $db =& $this->db;
+        $user =& $this->user;
+        $response = new ResponseManager();
+
+        $dataSet = Kit::GetParam('dataset', _POST, _STRING);
+        $description = Kit::GetParam('description', _POST, _STRING);
+
+        $dataSetObject = new DataSet($db);
+        if (!$dataSetId = $dataSetObject->Add($dataSet, $description, $this->user->userid))
+            trigger_error($dataSetObject->GetErrorMessage(), E_USER_ERROR);
+
+        // Also add one column
+        $dataSetColumn = new DataSetColumn($db);
+        $dataSetColumn->Add($dataSetId, 'Col1', 1, null, 1);
+            
+        $response->SetFormSubmitResponse(__('DataSet Added'));
+        $response->Respond();
+    }
+
+    public function EditDataSetForm()
+    {
+        $db =& $this->db;
+        $user =& $this->user;
+        $response = new ResponseManager();
+
+        $helpManager = new HelpManager($db, $user);
+
+        $dataSetId = Kit::GetParam('datasetid', _GET, _INT);
+
+        $auth = $user->DataSetAuth($dataSetId, true);
+        if (!$auth->edit)
+            trigger_error(__('Access Denied'));
+
+        // Get the information we already know
+        $SQL = sprintf("SELECT DataSet, Description FROM dataset WHERE DataSetID = %d", $dataSetId);
+
+        if (!$row = $db->GetSingleRow($SQL))
+            trigger_error(__('Unable to get DataSet information'));
+
+        $dataSet = $row['DataSet'];
+        $description = $row['Description'];
+
+        $msgName = __('Name');
+        $msgDesc = __('Description');
+
+        $form = <<<END
+        <form id="EditDataSetForm" class="XiboForm" method="post" action="index.php?p=dataset&q=EditDataSet">
+            <input type="hidden" name="datasetid" value="$dataSetId" />
+            <table>
+                <tr>
+                    <td><label for="dataset" accesskey="n">$msgName<span class="required">*</span></label></td>
+                    <td><input name="dataset" class="required" type="text" id="dataset" tabindex="1" value="$dataSet" /></td>
+                </tr>
+                <tr>
+                    <td><label for="description" accesskey="d">$msgDesc</label></td>
+                    <td><input name="description" type="text" id="description" tabindex="2" value="$description" /></td>
+                </tr>
+            </table>
+        </form>
+END;
+
+
+        $response->SetFormRequestResponse($form, __('Edit DataSet'), '350px', '275px');
+        $response->AddButton(__('Help'), 'XiboHelpRender("' . $helpManager->Link('DataSet', 'Add') . '")');
+        $response->AddButton(__('Cancel'), 'XiboDialogClose()');
+        $response->AddButton(__('Edit'), '$("#EditDataSetForm").submit()');
+        $response->Respond();
+    }
+
+    public function EditDataSet()
+    {
+        $db =& $this->db;
+        $user =& $this->user;
+        $response = new ResponseManager();
+
+        $dataSetId = Kit::GetParam('datasetid', _POST, _INT);
+
+        $auth = $user->DataSetAuth($dataSetId, true);
+        if (!$auth->edit)
+            trigger_error(__('Access Denied'));
+
+        $dataSet = Kit::GetParam('dataset', _POST, _STRING);
+        $description = Kit::GetParam('description', _POST, _STRING);
+
+        $dataSetObject = new DataSet($db);
+        if (!$dataSetObject->Edit($dataSetId, $dataSet, $description))
+            trigger_error($dataSetObject->GetErrorMessage(), E_USER_ERROR);
+
+        $response->SetFormSubmitResponse(__('DataSet Edited'));
+        $response->Respond();
+    }
+
+    /**
+     * Return the Delete Form as HTML
+     * @return
+     */
+    public function DeleteDataSetForm()
+    {
+        $db =& $this->db;
+        $response = new ResponseManager();
+        $helpManager = new HelpManager($db, $this->user);
+
+        $dataSetId = Kit::GetParam('datasetid', _GET, _INT);
+
+        $auth = $this->user->DataSetAuth($dataSetId, true);
+        if (!$auth->del)
+            trigger_error(__('Access Denied'));
+
+        // Translate messages
+        $msgDelete		= __('Are you sure you want to delete this DataSet?');
+        $msgYes			= __('Yes');
+        $msgNo			= __('No');
+
+        //we can delete
+        $form = <<<END
+        <form id="DataSetDeleteForm" class="XiboForm" method="post" action="index.php?p=dataset&q=DeleteDataSet">
+            <input type="hidden" name="datasetid" value="$dataSetId">
+            <p>$msgDelete</p>
+        </form>
+END;
+
+        $response->SetFormRequestResponse($form, __('Delete this DataSet?'), '350px', '200px');
+        $response->AddButton(__('Help'), 'XiboHelpRender("' . $helpManager->Link('DataSet', 'Delete') . '")');
+        $response->AddButton(__('Cancel'), 'XiboDialogClose()');
+        $response->AddButton(__('Delete'), '$("#DataSetDeleteForm").submit()');
+        $response->Respond();
+    }
+
+    public function DeleteDataSet()
+    {
+        $db =& $this->db;
+        $user =& $this->user;
+        $response = new ResponseManager();
+
+        $dataSetId = Kit::GetParam('datasetid', _POST, _INT);
+
+        $auth = $user->DataSetAuth($dataSetId, true);
+        if (!$auth->del)
+            trigger_error(__('Access Denied'));
+
+        $dataSetObject = new DataSet($db);
+        if (!$dataSetObject->Delete($dataSetId))
+            trigger_error($dataSetObject->GetErrorMessage(), E_USER_ERROR);
+
+        $response->SetFormSubmitResponse(__('DataSet Deleted'));
+        $response->Respond();
+    }
+
+    public function DataSetColumnsForm()
+    {
+        $db =& $this->db;
+        $response = new ResponseManager();
+        $helpManager = new HelpManager($db, $this->user);
+
+        $dataSetId = Kit::GetParam('datasetid', _GET, _INT);
+        $dataSet = Kit::GetParam('dataset', _GET, _STRING);
+
+        $auth = $this->user->DataSetAuth($dataSetId, true);
+        if (!$auth->edit)
+            trigger_error(__('Access Denied'));
+
+        $msgEdit = __('Edit');
+        $msgDelete = __('Delete');
+
+        $form = <<<END
+        <div class="info_table">
+        <table style="width:100%">
+            <thead>
+                <tr>
+                <th>Heading</th>
+                <th>Data Type</th>
+                <th>List Content</th>
+                <th>Column Order</th>
+                <th>Action</th>
+                </tr>
+            </thead>
+            <tbody>
+END;
+
+        $SQL  = "";
+        $SQL .= "SELECT DataSetColumnID, Heading, DataTypeID, ListContent, ColumnOrder ";
+        $SQL .= "  FROM datasetcolumn ";
+        $SQL .= sprintf(" WHERE DataSetID = %d ", $dataSetId);
+        $SQL .= "ORDER BY ColumnOrder ";
+
+        if (!$results = $db->query($SQL))
+            trigger_error(__('Unable to get columns for DataSet'));
+
+        while ($row = $db->get_assoc_row($results))
+        {
+            $form .= '<tr>';
+            $form .= '  <td>' . $row['Heading'] . '</td>';
+            $form .= '  <td>String</td>';
+            $form .= '  <td>' . $row['ListContent'] . '</td>';
+            $form .= '  <td>' . $row['ColumnOrder'] . '</td>';
+            $form .= '  <td>';
+            $form .= '      <button class="XiboFormButton" href="index.php?p=dataset&q=EditDataSetColumnForm&datasetid=' . $dataSetId . '&datasetcolumnid=' . $row['DataSetColumnID'] . '&dataset=' . $dataSet . '"><span>' . $msgEdit . '</span></button>';
+
+            if ($auth->del)
+                $form .= '      <button class="XiboFormButton" href="index.php?p=dataset&q=DeleteDataSetColumnForm&datasetid=' . $dataSetId . '&datasetcolumnid=' . $row['DataSetColumnID'] . '&dataset=' . $dataSet . '"><span>' . $msgDelete . '</span></button>';
+
+            $form .= '  </td>';
+            $form .= '</tr>';
+        }
+
+        $form .= '</tbody></table></div>';
+        
+        $response->SetFormRequestResponse($form, sprintf(__('Columns for %s'), $dataSet), '550px', '400px');
+        $response->AddButton(__('Help'), 'XiboHelpRender("' . $helpManager->Link('DataSet', 'ViewColumns') . '")');
+        $response->AddButton(__('Close'), 'XiboDialogClose()');
+        $response->AddButton(__('Add Column'), 'XiboFormRender("index.php?p=dataset&q=AddDataSetColumnForm&datasetid=' . $dataSetId . '&dataset=' . $dataSet . '")');
+        $response->Respond();
+    }
+
+    public function AddDataSetColumnForm()
+    {
+        $db =& $this->db;
+        $response = new ResponseManager();
+        $helpManager = new HelpManager($db, $this->user);
+
+        $dataSetId = Kit::GetParam('datasetid', _GET, _INT);
+        $dataSet = Kit::GetParam('dataset', _GET, _STRING);
+
+        $auth = $this->user->DataSetAuth($dataSetId, true);
+        if (!$auth->edit)
+            trigger_error(__('Access Denied'));
+
+        $msgHeading = __('Heading');
+        $msgListContent = __('List Content');
+        $msgColumnOrder = __('Column Order');
+
+        $form = <<<END
+        <form id="DataSetColumnEditForm" class="XiboForm" method="post" action="index.php?p=dataset&q=AddDataSetColumn">
+            <input type="hidden" name="dataset" value="$dataSet" />
+            <input type="hidden" name="datasetid" value="$dataSetId" />
+            <table>
+                <tr>
+                    <td><label for="heading" accesskey="h">$msgHeading<span class="required">*</span></label></td>
+                    <td><input name="heading" class="required" type="text" id="heading" tabindex="1" /></td>
+                </tr>
+                <tr>
+                    <td><label for="listcontent" accesskey="l">$msgListContent</label></td>
+                    <td><input name="listcontent" type="text" id="listcontent" tabindex="2" /></td>
+                </tr>
+                <tr>
+                    <td><label for="columnorder" accesskey="c">$msgColumnOrder</label></td>
+                    <td><input name="columnorder" type="text" id="columnorder" tabindex="3" /></td>
+                </tr>
+            </table>
+        </form>
+END;
+
+        $response->SetFormRequestResponse($form, __('Add Column'), '450px', '400px');
+        $response->AddButton(__('Help'), 'XiboHelpRender("' . $helpManager->Link('DataSet', 'EditColumn') . '")');
+        $response->AddButton(__('Cancel'), 'XiboFormRender("index.php?p=dataset&q=DataSetColumnsForm&datasetid=' . $dataSetId . '&dataset=' . $dataSet . '")');
+        $response->AddButton(__('Save'), '$("#DataSetColumnEditForm").submit()');
+        $response->Respond();
+    }
+
+    public function AddDataSetColumn()
+    {
+        $db =& $this->db;
+        $user =& $this->user;
+        $response = new ResponseManager();
+
+        $dataSetId = Kit::GetParam('datasetid', _POST, _INT);
+        $dataSet = Kit::GetParam('dataset', _POST, _STRING);
+
+        $auth = $user->DataSetAuth($dataSetId, true);
+        if (!$auth->edit)
+            trigger_error(__('Access Denied'));
+
+        $heading = Kit::GetParam('heading', _POST, _WORD);
+        $listContent = Kit::GetParam('listcontent', _POST, _STRING);
+        $columnOrder = Kit::GetParam('columnorder', _POST, _INT);
+
+        $dataSetObject = new DataSetColumn($db);
+        if (!$dataSetObject->Add($dataSetId, $heading, 1, $listContent))
+            trigger_error($dataSetObject->GetErrorMessage(), E_USER_ERROR);
+
+        $response->SetFormSubmitResponse(__('Column Edited'));
+        $response->hideMessage = true;
+        $response->loadForm = true;
+        $response->loadFormUri = 'index.php?p=dataset&q=DataSetColumnsForm&datasetid=' . $dataSetId . '&dataset=' . $dataSet;
+        $response->Respond();
+    }
+
+    public function EditDataSetColumnForm()
+    {
+        $db =& $this->db;
+        $response = new ResponseManager();
+        $helpManager = new HelpManager($db, $this->user);
+
+        $dataSetId = Kit::GetParam('datasetid', _GET, _INT);
+        $dataSetColumnId = Kit::GetParam('datasetcolumnid', _GET, _INT);
+        $dataSet = Kit::GetParam('dataset', _GET, _STRING);
+
+        $auth = $this->user->DataSetAuth($dataSetId, true);
+        if (!$auth->edit)
+            trigger_error(__('Access Denied'));
+
+        // Get some information about this data set column
+        $SQL = sprintf("SELECT Heading, ListContent, ColumnOrder FROM datasetcolumn WHERE DataSetColumnID = %d", $dataSetColumnId);
+        
+        if (!$row = $db->GetSingleRow($SQL))
+            trigger_error(__('Unabled to get Data Column information'), E_USER_ERROR);
+
+        $heading = Kit::ValidateParam($row['Heading'], _WORD);
+        $listContent = Kit::ValidateParam($row['ListContent'], _STRING);
+        $columnOrder = Kit::ValidateParam($row['ColumnOrder'], _INT);
+
+        $msgHeading = __('Heading');
+        $msgListContent = __('List Content');
+        $msgColumnOrder = __('Column Order');
+
+        $form = <<<END
+        <form id="DataSetColumnEditForm" class="XiboForm" method="post" action="index.php?p=dataset&q=EditDataSetColumn">
+            <input type="hidden" name="dataset" value="$dataSet" />
+            <input type="hidden" name="datasetid" value="$dataSetId" />
+            <input type="hidden" name="datasetcolumnid" value="$dataSetColumnId" />
+            <table>
+                <tr>
+                    <td><label for="heading" accesskey="h">$msgHeading<span class="required">*</span></label></td>
+                    <td><input name="heading" class="required" type="text" id="heading" tabindex="1" value="$heading" /></td>
+                </tr>
+                <tr>
+                    <td><label for="listcontent" accesskey="l">$msgListContent</label></td>
+                    <td><input name="listcontent" type="text" id="listcontent" tabindex="2" value="$listContent" /></td>
+                </tr>
+                <tr>
+                    <td><label for="columnorder" accesskey="c">$msgColumnOrder</label></td>
+                    <td><input name="columnorder" type="text" id="columnorder" tabindex="3" value="$columnOrder" /></td>
+                </tr>
+            </table>
+        </form>
+END;
+
+        $response->SetFormRequestResponse($form, __('Edit Column'), '450px', '400px');
+        $response->AddButton(__('Help'), 'XiboHelpRender("' . $helpManager->Link('DataSet', 'EditColumn') . '")');
+        $response->AddButton(__('Cancel'), 'XiboFormRender("index.php?p=dataset&q=DataSetColumnsForm&datasetid=' . $dataSetId . '&dataset=' . $dataSet . '")');
+        $response->AddButton(__('Save'), '$("#DataSetColumnEditForm").submit()');
+        $response->Respond();
+    }
+
+    public function EditDataSetColumn()
+    {
+        $db =& $this->db;
+        $user =& $this->user;
+        $response = new ResponseManager();
+
+        $dataSetId = Kit::GetParam('datasetid', _POST, _INT);
+        $dataSet = Kit::GetParam('dataset', _POST, _STRING);
+
+        $auth = $user->DataSetAuth($dataSetId, true);
+        if (!$auth->edit)
+            trigger_error(__('Access Denied'));
+            
+        $dataSetColumnId = Kit::GetParam('datasetcolumnid', _POST, _INT);
+        $heading = Kit::GetParam('heading', _POST, _WORD);
+        $listContent = Kit::GetParam('listcontent', _POST, _STRING);
+        $columnOrder = Kit::GetParam('columnorder', _POST, _INT);
+
+        $dataSetObject = new DataSetColumn($db);
+        if (!$dataSetObject->Edit($dataSetColumnId, $heading, 1, $listContent, $columnOrder))
+            trigger_error($dataSetObject->GetErrorMessage(), E_USER_ERROR);
+
+        $response->SetFormSubmitResponse(__('Column Edited'));
+        $response->hideMessage = true;
+        $response->loadForm = true;
+        $response->loadFormUri = 'index.php?p=dataset&q=DataSetColumnsForm&datasetid=' . $dataSetId . '&dataset=' . $dataSet;
+        $response->Respond();
+    }
+
+    public function DeleteDataSetColumnForm()
+    {
+        $db =& $this->db;
+        $response = new ResponseManager();
+        $helpManager = new HelpManager($db, $this->user);
+
+        $dataSetId = Kit::GetParam('datasetid', _GET, _INT);
+        $dataSet = Kit::GetParam('dataset', _GET, _STRING);
+
+        $auth = $this->user->DataSetAuth($dataSetId, true);
+        if (!$auth->edit)
+            trigger_error(__('Access Denied'));
+
+        $dataSetColumnId = Kit::GetParam('datasetcolumnid', _GET, _INT);
+
+        $auth = $this->user->DataSetAuth($dataSetId, true);
+        if (!$auth->del)
+            trigger_error(__('Access Denied'));
+
+        // Translate messages
+        $msgDelete		= __('Are you sure you want to delete this Column?');
+        $msgYes			= __('Yes');
+        $msgNo			= __('No');
+
+        //we can delete
+        $form = <<<END
+        <form id="DataSetColumnDeleteForm" class="XiboForm" method="post" action="index.php?p=dataset&q=DeleteDataSetColumn">
+            <input type="hidden" name="datasetid" value="$dataSetId">
+            <input type="hidden" name="dataset" value="$dataSet">
+            <input type="hidden" name="datasetcolumnid" value="$dataSetColumnId">
+            <p>$msgDelete</p>
+        </form>
+END;
+
+        $response->SetFormRequestResponse($form, __('Delete this Column?'), '350px', '200px');
+        $response->AddButton(__('Help'), 'XiboHelpRender("' . $helpManager->Link('DataSet', 'DeleteColumn') . '")');
+        $response->AddButton(__('Cancel'), 'XiboFormRender("index.php?p=dataset&q=DataSetColumnsForm&datasetid=' . $dataSetId . '&dataset=' . $dataSet . '")');
+        $response->AddButton(__('Delete'), '$("#DataSetColumnDeleteForm").submit()');
+        $response->Respond();
+    }
+
+    public function DeleteDataSetColumn()
+    {
+        $db =& $this->db;
+        $user =& $this->user;
+        $response = new ResponseManager();
+
+        $dataSetId = Kit::GetParam('datasetid', _POST, _INT);
+        $dataSet = Kit::GetParam('dataset', _POST, _STRING);
+
+        $auth = $this->user->DataSetAuth($dataSetId, true);
+        if (!$auth->edit)
+            trigger_error(__('Access Denied'));
+
+        $dataSetColumnId = Kit::GetParam('datasetcolumnid', _POST, _INT);
+
+        $dataSetObject = new DataSetColumn($db);
+        if (!$dataSetObject->Delete($dataSetColumnId))
+            trigger_error($dataSetObject->GetErrorMessage(), E_USER_ERROR);
+
+        $response->SetFormSubmitResponse(__('Column Deleted'));
+        $response->hideMessage = true;
+        $response->loadForm = true;
+        $response->loadFormUri = 'index.php?p=dataset&q=DataSetColumnsForm&datasetid=' . $dataSetId . '&dataset=' . $dataSet;
+        $response->Respond();
+    }
+
+    public function DataSetDataForm()
+    {
+        $db =& $this->db;
+        $response = new ResponseManager();
+        $helpManager = new HelpManager($db, $this->user);
+
+        $dataSetId = Kit::GetParam('datasetid', _GET, _INT);
+        $dataSet = Kit::GetParam('dataset', _GET, _STRING);
+
+        $auth = $this->user->DataSetAuth($dataSetId, true);
+        if (!$auth->edit)
+            trigger_error(__('Access Denied'));
+
+        // Get the max number of rows
+        $SQL  = "";
+        $SQL .= "SELECT MAX(RowNumber) AS RowNumber, COUNT(DISTINCT datasetcolumn.DataSetColumnID) AS ColNumber ";
+        $SQL .= "  FROM datasetdata ";
+        $SQL .= "   RIGHT OUTER JOIN datasetcolumn ";
+        $SQL .= "   ON datasetcolumn.DataSetColumnID = datasetdata.DataSetColumnID ";
+        $SQL .= sprintf("WHERE datasetcolumn.DataSetID = %d ", $dataSetId);
+
+        Debug::LogEntry($db, 'audit', $SQL, 'dataset', 'DataSetDataForm');
+
+        if (!$maxResult = $db->GetSingleRow($SQL))
+        {
+            trigger_error($db->error());
+            trigger_error(__('Unable to find the number of data points'), E_USER_ERROR);
+        }
+
+        $maxRows = $maxResult['RowNumber'];
+        $maxCols = $maxResult['ColNumber'];
+
+        // Get some information about the columns in this dataset
+        $SQL  = "SELECT Heading, DataSetColumnID, ListContent, ColumnOrder FROM datasetcolumn WHERE DataSetID = %d ";
+        $SQL .= "ORDER BY ColumnOrder ";
+        
+        if (!$results = $db->query(sprintf($SQL, $dataSetId)))
+        {
+            trigger_error($db->error());
+            trigger_error(__('Unable to find the column headings'), E_USER_ERROR);
+        }
+
+        $columnDefinition = array();
+        
+        $form  = '<div class="info_table">';
+        $form .= '<table style="width:100%">';
+        $form .= '   <tr>';
+        $form .= '      <th>' . __('Row Number') . '</th>';
+
+	while ($row = $db->get_assoc_row($results))
+        {
+            $columnDefinition[] = $row;
+            $heading = $row['Heading'];
+
+            $form .= ' <th>' . $heading . '</th>';
+        }
+
+        $form .= '</tr>';
+
+        // Loop through the max rows
+        for ($row = 1; $row <= $maxRows + 2; $row++)
+        {
+            $form .= '<tr>';
+            $form .= '  <td>' . $row . '</td>';
+
+            // $row is the current row
+            for ($col = 0; $col < $maxCols; $col++)
+            {
+                $dataSetColumnId = $columnDefinition[$col]['DataSetColumnID'];
+                $listContent = $columnDefinition[$col]['ListContent'];
+                $columnOrder = $columnDefinition[$col]['ColumnOrder'];
+
+                // Value for this Col/Row
+                $value = '';
+
+                if ($row <= $maxRows)
+                {
+                    // This is intended to be a blank row
+                    $SQL  = "";
+                    $SQL .= "SELECT Value ";
+                    $SQL .= "  FROM datasetdata ";
+                    $SQL .= "WHERE datasetdata.RowNumber = %d ";
+                    $SQL .= "   AND datasetdata.DataSetColumnID = %d ";
+                    $SQL = sprintf($SQL, $row, $dataSetColumnId);
+
+                    Debug::LogEntry($db, 'audit', $SQL, 'dataset');
+
+                    if (!$results = $db->query($SQL))
+                    {
+                        trigger_error($db->error());
+                        trigger_error(__('Can not get the data row/column'), E_USER_ERROR);
+                    }
+
+                    if ($db->num_rows($results) == 0)
+                    {
+                        $value = '';
+                    }
+                    else
+                    {
+                        $valueRow = $db->get_assoc_row($results);
+                        $value = $valueRow['Value'];
+                    }
+                }
+                
+                // Do we need a select list?
+                if ($listContent != '')
+                {
+                    $listItems = explode(',', $listContent);
+                    $selected = ($value == '') ? ' selected' : '';
+                    $select = '<select name="value">';
+                    $select.= '     <option value="" ' . $selected . '></option>';
+
+                    for ($i=0; $i < count($listItems); $i++)
+                    {
+                        $selected = ($listItems[$i] == $value) ? ' selected' : '';
+
+                        $select .= '<option value="' . $listItems[$i] . '" ' . $selected . '>' . $listItems[$i] . '</option>';
+                    }
+
+                    $select .= '</select>';
+                }
+                else
+                {
+                    $select = '<input type="text" name="value" value="' . $value . '">';
+                }
+
+                $action = ($value == '') ? 'AddDataSetData' : 'EditDataSetData';
+                $fieldId = uniqid();
+                
+                $form .= <<<END
+                <td>
+                    <form id="$fieldId" class="XiboDataSetDataForm" action="index.php?p=dataset&q=$action">
+                        <input type="hidden" name="fieldid" value="$fieldId">
+                        <input type="hidden" name="datasetid" value="$dataSetId">
+                        <input type="hidden" name="datasetcolumnid" value="$dataSetColumnId">
+                        <input type="hidden" name="rownumber" value="$row">
+                        $select
+                    </form>
+                </td>
+END;
+
+                
+            } //cols loop
+
+            $form .= '</tr>';
+        } //rows loop
+
+        $form .= '</table></div>';
+        
+        $response->SetFormRequestResponse($form, $dataSet, '750px', '600px', 'dataSetData');
+        $response->AddButton(__('Help'), 'XiboHelpRender("' . $helpManager->Link('DataSet', 'Data') . '")');
+        $response->AddButton(__('Add Rows'), 'XiboFormRender("index.php?p=dataset&q=DataSetDataForm&datasetid=' . $dataSetId . '&dataset=' . $dataSet . '")');
+        $response->AddButton(__('Done'), 'XiboDialogClose()');
+        $response->Respond();
+    }
+
+    public function AddDataSetData()
+    {
+        $db =& $this->db;
+        $user =& $this->user;
+        $response = new ResponseManager();
+
+        $response->uniqueReference = Kit::GetParam('fieldid', _POST, _WORD);
+        $dataSetId = Kit::GetParam('datasetid', _POST, _INT);
+        $dataSetColumnId = Kit::GetParam('datasetcolumnid', _POST, _INT);
+        $rowNumber = Kit::GetParam('rownumber', _POST, _INT);
+        $value = Kit::GetParam('value', _POST, _STRING);
+
+        $auth = $user->DataSetAuth($dataSetId, true);
+        if (!$auth->edit)
+            trigger_error(__('Access Denied'));
+
+        $dataSetObject = new DataSetData($db);
+        if (!$dataSetObject->Add($dataSetColumnId, $rowNumber, $value))
+            trigger_error($dataSetObject->GetErrorMessage(), E_USER_ERROR);
+
+        $response->SetFormSubmitResponse(__('Data Added'));
+        $response->loadFormUri = 'index.php?p=dataset&q=EditDataSetData';
+        $response->hideMessage = true;
+        $response->keepOpen = true;
+        $response->Respond();
+    }
+
+    public function EditDataSetData()
+    {
+        $db =& $this->db;
+        $user =& $this->user;
+        $response = new ResponseManager();
+
+        $response->uniqueReference = Kit::GetParam('fieldid', _POST, _WORD);
+        $dataSetId = Kit::GetParam('datasetid', _POST, _INT);
+        $dataSetColumnId = Kit::GetParam('datasetcolumnid', _POST, _INT);
+        $rowNumber = Kit::GetParam('rownumber', _POST, _INT);
+        $value = Kit::GetParam('value', _POST, _STRING);
+
+        $auth = $user->DataSetAuth($dataSetId, true);
+        if (!$auth->edit)
+            trigger_error(__('Access Denied'));
+
+        if ($value == '')
+        {
+            $dataSetObject = new DataSetData($db);
+            if (!$dataSetObject->Delete($dataSetColumnId, $rowNumber))
+                trigger_error($dataSetObject->GetErrorMessage(), E_USER_ERROR);
+
+            $response->SetFormSubmitResponse(__('Data Deleted'));
+            $response->loadFormUri = 'index.php?p=dataset&q=AddDataSetData';
+        }
+        else
+        {
+            $dataSetObject = new DataSetData($db);
+            if (!$dataSetObject->Edit($dataSetColumnId, $rowNumber, $value))
+                trigger_error($dataSetObject->GetErrorMessage(), E_USER_ERROR);
+
+            $response->SetFormSubmitResponse(__('Data Edited'));
+            $response->loadFormUri = 'index.php?p=dataset&q=EditDataSetData';
+        }
+
+        $response->hideMessage = true;
+        $response->keepOpen = true;
+        $response->Respond();
+    }
+
+    /**
+     * Get a list of group names for a layout
+     * @param <type> $layoutId
+     * @return <type>
+     */
+    private function GroupsForDataSet($dataSetId)
+    {
+        $db =& $this->db;
+
+        $SQL = '';
+        $SQL .= 'SELECT `group`.Group ';
+        $SQL .= '  FROM `group` ';
+        $SQL .= '   INNER JOIN lkdatasetgroup ';
+        $SQL .= '   ON `group`.GroupID = lkdatasetgroup.GroupID ';
+        $SQL .= ' WHERE lkdatasetgroup.DataSetID = %d ';
+
+        $SQL = sprintf($SQL, $dataSetId);
+
+        if (!$results = $db->query($SQL))
+        {
+            trigger_error($db->error());
+            trigger_error(__('Unable to get group information for dataset'), E_USER_ERROR);
+        }
+
+        $groups = '';
+
+        while ($row = $db->get_assoc_row($results))
+        {
+            $groups .= $row['Group'] . ', ';
+        }
+
+        $groups = trim($groups);
+        $groups = trim($groups, ',');
+
+        return $groups;
+    }
+
+    public function PermissionsForm()
+    {
+        $db =& $this->db;
+        $user =& $this->user;
+        $response = new ResponseManager();
+        $helpManager = new HelpManager($db, $user);
+
+        $dataSetId = Kit::GetParam('datasetid', _GET, _INT);
+
+        $auth = $this->user->DataSetAuth($dataSetId, true);
+
+        if (!$auth->modifyPermissions)
+            trigger_error(__('You do not have permissions to edit this dataset'), E_USER_ERROR);
+
+        // Form content
+        $form = '<form id="DataSetPermissionsForm" class="XiboForm" method="post" action="index.php?p=dataset&q=Permissions">';
+	$form .= '<input type="hidden" name="datasetid" value="' . $dataSetId . '" />';
+        $form .= '<div class="dialog_table">';
+	$form .= '  <table style="width:100%">';
+        $form .= '      <tr>';
+        $form .= '          <th>' . __('Group') . '</th>';
+        $form .= '          <th>' . __('View') . '</th>';
+        $form .= '          <th>' . __('Edit') . '</th>';
+        $form .= '          <th>' . __('Delete') . '</th>';
+        $form .= '      </tr>';
+
+        // List of all Groups with a view/edit/delete checkbox
+        $SQL = '';
+        $SQL .= 'SELECT `group`.GroupID, `group`.`Group`, View, Edit, Del, `group`.IsUserSpecific ';
+        $SQL .= '  FROM `group` ';
+        $SQL .= '   LEFT OUTER JOIN lkdatasetgroup ';
+        $SQL .= '   ON lkdatasetgroup.GroupID = group.GroupID ';
+        $SQL .= '       AND lkdatasetgroup.DataSetID = %d ';
+        $SQL .= ' WHERE `group`.GroupID <> %d ';
+        $SQL .= 'ORDER BY `group`.IsEveryone DESC, `group`.IsUserSpecific, `group`.`Group` ';
+
+        $SQL = sprintf($SQL, $dataSetId, $user->getGroupFromId($user->userid, true));
+
+        if (!$results = $db->query($SQL))
+        {
+            trigger_error($db->error());
+            trigger_error(__('Unable to get permissions for this dataset'), E_USER_ERROR);
+        }
+
+        while($row = $db->get_assoc_row($results))
+        {
+            $groupId = $row['GroupID'];
+            $group = ($row['IsUserSpecific'] == 0) ? '<strong>' . $row['Group'] . '</strong>' : $row['Group'];
+
+            $form .= '<tr>';
+            $form .= ' <td>' . $group . '</td>';
+            $form .= ' <td><input type="checkbox" name="groupids[]" value="' . $groupId . '_view" ' . (($row['View'] == 1) ? 'checked' : '') . '></td>';
+            $form .= ' <td><input type="checkbox" name="groupids[]" value="' . $groupId . '_edit" ' . (($row['Edit'] == 1) ? 'checked' : '') . '></td>';
+            $form .= ' <td><input type="checkbox" name="groupids[]" value="' . $groupId . '_del" ' . (($row['Del'] == 1) ? 'checked' : '') . '></td>';
+            $form .= '</tr>';
+        }
+
+        $form .= '</table>';
+        $form .= '</div>';
+        $form .= '</form>';
+
+        $response->SetFormRequestResponse($form, __('Permissions'), '350px', '500px');
+        $response->AddButton(__('Help'), 'XiboHelpRender("' . $helpManager->Link('Layout', 'Permissions') . '")');
+        $response->AddButton(__('Cancel'), 'XiboDialogClose()');
+        $response->AddButton(__('Save'), '$("#DataSetPermissionsForm").submit()');
+        $response->Respond();
+    }
+
+    public function Permissions()
+    {
+        $db =& $this->db;
+        $user =& $this->user;
+        $response = new ResponseManager();
+        Kit::ClassLoader('datasetgroupsecurity');
+
+        $dataSetId = Kit::GetParam('datasetid', _POST, _INT);
+        $groupIds = Kit::GetParam('groupids', _POST, _ARRAY);
+
+        $auth = $this->user->DataSetAuth($dataSetId, true);
+
+        if (!$auth->modifyPermissions)
+            trigger_error(__('You do not have permissions to edit this dataset'), E_USER_ERROR);
+
+        // Unlink all
+        $security = new DataSetGroupSecurity($db);
+        if (!$security->UnlinkAll($dataSetId))
+            trigger_error(__('Unable to set permissions'));
+
+        // Some assignments for the loop
+        $lastGroupId = 0;
+        $first = true;
+        $view = 0;
+        $edit = 0;
+        $del = 0;
+
+        // List of groupIds with view, edit and del assignments
+        foreach($groupIds as $groupPermission)
+        {
+            $groupPermission = explode('_', $groupPermission);
+            $groupId = $groupPermission[0];
+
+            if ($first)
+            {
+                // First time through
+                $first = false;
+                $lastGroupId = $groupId;
+            }
+
+            if ($groupId != $lastGroupId)
+            {
+                // The groupId has changed, so we need to write the current settings to the db.
+                // Link new permissions
+                if (!$security->Link($dataSetId, $groupId, $view, $edit, $del))
+                    trigger_error(__('Unable to set permissions'));
+
+                // Reset
+                $lastGroupId = $groupId;
+                $view = 0;