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

[Dan Garner]

[lp:~dangarner/xibo/server-132]

254. By Dan Garner on 2012-01-22

[server] Version bump in pre-display checks

=== added file 'server/install/database/43.sql'
--- server/install/database/43.sql	1970-01-01 00:00:00 +0000
+++ server/install/database/43.sql	2012-01-22 15:55:27 +0000
@@ -0,0 +1,5 @@
+INSERT INTO `setting` (`settingid`, `setting`, `value`, `type`, `helptext`, `options`, `cat`, `userChange`) VALUES (NULL, 'LAYOUT_COPY_MEDIA_CHECKB', 'Unchecked', 'dropdown', 'Default the checkbox for making duplicates of media when copying layouts', 'Checked|Unchecked', 'default', '1');
+
+UPDATE `version` SET `app_ver` = '1.3.2', `XmdsVersion` = 3;
+UPDATE `setting` SET `value` = 0 WHERE `setting` = 'PHONE_HOME_DATE';
+UPDATE `version` SET `DBVersion` = '43';
\ No newline at end of file

=== added file 'server/install/database/44.sql'
--- server/install/database/44.sql	1970-01-01 00:00:00 +0000
+++ server/install/database/44.sql	2012-01-22 15:55:27 +0000
@@ -0,0 +1,48 @@
+TRUNCATE TABLE help;
+
+INSERT INTO `help` (`HelpID`, `Topic`, `Category`, `Link`) VALUES
+(1, 'Layout', 'General', 'http://wiki.xibo.org.uk/wiki/Manual:Layouts'),
+(2, 'Content', 'General', 'http://wiki.xibo.org.uk/wiki/Manual:Media#The_Library'),
+(4, 'Schedule', 'General', 'http://wiki.xibo.org.uk/wiki/Manual:Scheduling'),
+(5, 'Group', 'General', 'http://wiki.xibo.org.uk/wiki/Manual:Administration:Users#Groups'),
+(6, 'Admin', 'General', 'http://wiki.xibo.org.uk/wiki/Manual:Administration:Settings'),
+(7, 'Report', 'General', 'http://wiki.xibo.org.uk/wiki/Manual:Administration:Log'),
+(8, 'Dashboard', 'General', 'http://wiki.xibo.org.uk/wiki/Manual:Overview#Dashboard'),
+(9, 'User', 'General', 'http://wiki.xibo.org.uk/wiki/Manual:Administration:Users'),
+(10, 'Display', 'General', 'http://wiki.xibo.org.uk/wiki/Manual:Administration:Displays'),
+(11, 'Displaygroup', 'General', 'http://wiki.xibo.org.uk/wiki/Manual:Administration:Displays#Groups'),
+(12, 'Layout', 'Add', 'http://wiki.xibo.org.uk/wiki/Manual:Layouts:Design#Adding_Layouts'),
+(13, 'Layout', 'Background', 'http://wiki.xibo.org.uk/wiki/Manual:Layouts:Design#Layout_Designer'),
+(14, 'Content', 'Assign', 'http://wiki.xibo.org.uk/wiki/Manual:Layouts:Design#Library'),
+(15, 'Layout', 'RegionOptions', 'http://wiki.xibo.org.uk/wiki/Manual:Layouts:Design#Assigning_Media'),
+(16, 'Content', 'AddtoLibrary', 'http://wiki.xibo.org.uk/wiki/Manual:Media'),
+(17, 'Display', 'Edit', 'http://wiki.xibo.org.uk/wiki/Manual:Administration:Displays#Edit'),
+(18, 'Display', 'Delete', 'http://wiki.xibo.org.uk/wiki/Manual:Administration:Displays#Delete'),
+(19, 'Displays', 'Groups', 'http://wiki.xibo.org.uk/wiki/Manual:Administration:Displays#Groups'),
+(20, 'Groups', 'General', 'http://wiki.xibo.org.uk/wiki/Manual:Administration:Users'),
+(21, 'User', 'Add', 'http://wiki.xibo.org.uk/wiki/Manual:Administration:Users#Add'),
+(22, 'User', 'Delete', 'http://wiki.xibo.org.uk/wiki/Manual:Administration:Users#Delete'),
+(23, 'Content', 'Config', 'http://wiki.xibo.org.uk/wiki/Manual:Administration:Settings'),
+(24, 'LayoutMedia', 'Permissions', 'http://wiki.xibo.org.uk/wiki/Manual:Layouts:Management#Layout_Permissions'),
+(25, 'Region', 'Permissions', 'http://wiki.xibo.org.uk/wiki/Manual:Layouts:Management#Layout_Permissions'),
+(26, 'Library', 'Assign', 'http://wiki.xibo.org.uk/wiki/Manual:Layouts:Design#AssigningFromLibrary'),
+(27, 'Media', 'Delete', 'http://wiki.xibo.org.uk/wiki/Manual:Media#Delete'),
+(28, 'DisplayGroup', 'Add', 'http://wiki.xibo.org.uk/wiki/Manual:Administration:DisplayGroups#Add'),
+(29, 'DisplayGroup', 'Edit', 'http://wiki.xibo.org.uk/wiki/Manual:Administration:DisplayGroups#Edit'),
+(30, 'DisplayGroup', 'Delete', 'http://wiki.xibo.org.uk/wiki/Manual:Administration:DisplayGroups#Delete'),
+(31, 'DisplayGroup', 'Members', 'http://wiki.xibo.org.uk/wiki/Manual:Administration:DisplayGroups#Members'),
+(32, 'DisplayGroup', 'GroupSecurity', 'http://wiki.xibo.org.uk/wiki/Manual:Administration:DisplayGroups#GroupSecurity');
+
+INSERT INTO `setting` (`settingid`, `setting`, `value`, `type`, `helptext`, `options`, `cat`, `userChange`) VALUES (NULL, 'MAX_LICENSED_DISPLAYS', '0', 'text', 'The maximum number of licensed clients for this server installation. 0 = unlimited', NULL, 'general', '0');
+
+ALTER TABLE  `setting` CHANGE  `setting`  `setting` VARCHAR( 50 ) NOT NULL;
+INSERT INTO `setting` (`settingid`, `setting`, `value`, `type`, `helptext`, `options`, `cat`, `userChange`) VALUES (NULL, 'LIBRARY_MEDIA_UPDATEINALL_CHECKB', 'Unchecked', 'dropdown', 'Default the checkbox for updating media on all layouts when editing in the library', 'Checked|Unchecked', 'default', '1');
+
+ALTER TABLE  `display` ADD  `MacAddress` VARCHAR( 254 ) NULL COMMENT  'Mac Address of the Client',
+ADD  `LastChanged` INT NULL COMMENT  'Last time this Mac Address changed';
+
+ALTER TABLE  `display` ADD  `NumberOfMacAddressChanges` INT NOT NULL;
+
+UPDATE `version` SET `app_ver` = '1.3.2', `XmdsVersion` = 3;
+UPDATE `setting` SET `value` = 0 WHERE `setting` = 'PHONE_HOME_DATE';
+UPDATE `version` SET `DBVersion` = '44';
\ No newline at end of file

=== modified file 'server/lib/app/helpmanager.class.php'
--- server/lib/app/helpmanager.class.php	2009-12-31 11:38:50 +0000
+++ server/lib/app/helpmanager.class.php	2012-01-22 15:55:27 +0000
@@ -103,7 +103,7 @@
 		$user 		=& $this->user;		
 		
 		// if topic is empty use the page name
-		$topic	= Kit::GetParam('p', _REQUEST, _WORD, $topic);
+		$topic	= ($topic == '') ? Kit::GetParam('p', _REQUEST, _WORD) : $topic;
 		$topic	= ucfirst($topic);
 		
 		$link	= 'index.php?p=help&q=Display&Topic=' . $topic . '&Category=' . $category . '';

=== modified file 'server/lib/data/display.data.class.php'
--- server/lib/data/display.data.class.php	2011-03-01 16:42:16 +0000
+++ server/lib/data/display.data.class.php	2012-01-22 15:55:27 +0000
@@ -115,8 +115,26 @@
 	{
 		$db	=& $this->db;
 		
-		Debug::LogEntry($db, 'audit', 'IN', 'DisplayGroup', 'Edit');
-		
+		Debug::LogEntry($db, 'audit', 'IN', 'Display', 'Edit');
+
+                // Check the number of licensed displays
+                $maxDisplays = Config::GetSetting($db, 'MAX_LICENSED_DISPLAYS');
+
+                if ($maxDisplays > 0)
+                {
+                    // See if this is a license switch
+                    $currentLicense = $db->GetSingleValue(sprintf('SELECT licensed FROM display WHERE DisplayID = %d', $displayID), 'licensed', _INT);
+
+                    if ($currentLicense != $licensed && $licensed == 1)
+                    {
+                        // License change - test number of licensed displays.
+                        $licensedDisplays = $db->GetSingleValue('SELECT COUNT(DisplayID) AS CountLicensed FROM display WHERE licensed =1 ', 'CountLicensed', _INT);
+
+                        if ($licensedDisplays + 1 > $maxDisplays)
+                            return $this->SetError(25000, sprintf(__('You have exceeded your maximum number of licensed displays. %d'), $maxDisplays));
+                    }
+                }
+
 		// Update the display record
 		$SQL  = "UPDATE display SET display = '%s', ";
 		$SQL .= "		defaultlayoutid = %d, ";
@@ -251,7 +269,7 @@
 	 * @return 
 	 * @param $license Object
 	 */
-	public function Touch($license, $clientAddress = '', $mediaInventoryComplete = 0, $mediaInventoryXml = '')
+	public function Touch($license, $clientAddress = '', $mediaInventoryComplete = 0, $mediaInventoryXml = '', $macAddress = '')
 	{
 		$db		=& $this->db;
 		$time 	= time();
@@ -273,6 +291,18 @@
                 if ($mediaInventoryXml != '')
                     $SQL .= sprintf(" , MediaInventoryXml = '%s' ", $mediaInventoryXml);
 
+                // Mac address storage
+                if ($macAddress != '')
+                {
+                    // Address changed.
+                    $currentAddress = $db->GetSingleValue(sprintf("SELECT MacAddress FROM display WHERE license = '%s'", $license), 'MacAddress', _STRING);
+
+                    if ($macAddress != $currentAddress)
+                    {
+                        $SQL .= sprintf(" , MacAddress = '%s', LastChanged = %d, NumberOfMacAddressChanges = NumberOfMacAddressChanges + 1 ", $macAddress, time());
+                    }
+                }
+
                 // Restrict to the display license
                 $SQL .= " WHERE license = '%s'";
                 $SQL = sprintf($SQL, $time, $license);

=== modified file 'server/lib/data/layout.data.class.php'
--- server/lib/data/layout.data.class.php	2011-08-29 22:08:11 +0000
+++ server/lib/data/layout.data.class.php	2012-01-22 15:55:27 +0000
@@ -1,7 +1,7 @@
 <?php
 /*
  * Xibo - Digitial Signage - http://www.xibo.org.uk
- * Copyright (C) 2009 Daniel Garner
+ * Copyright (C) 2011 Daniel Garner
  *
  * This file is part of Xibo.
  *
@@ -347,13 +347,28 @@
      * @param <int> $oldLayoutId
      * @param <string> $newLayoutName
      * @param <int> $userId
+     * @param <bool> $copyMedia Make copies of this layouts media
      * @return <int> 
      */
-    public function Copy($oldLayoutId, $newLayoutName, $userId)
+    public function Copy($oldLayoutId, $newLayoutName, $userId, $copyMedia = false)
     {
         $db =& $this->db;
         $currentdate = date("Y-m-d H:i:s");
 
+        // Include to media data class?
+        if ($copyMedia)
+        {
+            Kit::ClassLoader('media');
+            Kit::ClassLoader('mediagroupsecurity');
+            $mediaObject = new Media($db);
+            $mediaSecurity = new MediaGroupSecurity($db);
+        }
+
+        // Permissions model
+        Kit::ClassLoader('layoutgroupsecurity');
+        Kit::ClassLoader('layoutregiongroupsecurity');
+        Kit::ClassLoader('layoutmediagroupsecurity');
+
         // The Layout ID is the old layout
         $SQL  = "";
         $SQL .= " INSERT INTO layout (layout, xml, userID, description, tags, templateID, retired, duration, background, createdDT, modifiedDT) ";
@@ -399,12 +414,34 @@
 
             // If this is a non region specific type, then move on
             if ($this->IsRegionSpecific($type))
+            {
+                // Copy media security
+                $security = new LayoutMediaGroupSecurity($db);
+                $security->CopyAllForMedia($oldLayoutId, $newLayoutId, $mediaId, $mediaId);
                 continue;
+            }
 
             // Get the regionId
             $regionNode = $mediaNode->parentNode;
             $regionId = $regionNode->getAttribute('id');
 
+            // Do we need to copy this media record?
+            if ($copyMedia)
+            {
+                // Store the old media id
+                $oldMediaId = $mediaId;
+
+                // Take this media item and make a hard copy of it.
+                if (!$mediaId = $mediaObject->Copy($mediaId, $newLayoutName))
+                {
+                    $this->Delete($newLayoutId);
+                    return false;
+                }
+
+                // Update the permissions for the new media record
+                $mediaSecurity->Copy($oldMediaId, $mediaId);
+            }
+
             // Add the database link for this media record
             if (!$lkId = $this->AddLk($newLayoutId, $regionId, $mediaId))
             {
@@ -412,14 +449,26 @@
                 return false;
             }
 
+            // Update the permissions for this media on this layout
+            $security = new LayoutMediaGroupSecurity($db);
+            $security->CopyAllForMedia($oldLayoutId, $newLayoutId, $oldMediaId, $mediaId);
+
             // Set this LKID on the media node
             $mediaNode->setAttribute('lkid', $lkId);
+            $mediaNode->setAttribute('id', $mediaId);
         }
 
         Debug::LogEntry($this->db, 'audit', 'Finished looping through media nodes', 'layout', 'Copy');
 
         // Set the XML
         $this->SetLayoutXml($newLayoutId, $this->DomXml->saveXML());
+
+        // Layout permissions
+        $security = new LayoutGroupSecurity($db);
+        $security->CopyAll($oldLayoutId, $newLayoutId);
+
+        $security = new LayoutRegionGroupSecurity($db);
+        $security->CopyAll($oldLayoutId, $newLayoutId);
         
         // Return the new layout id
         return $newLayoutId;

=== modified file 'server/lib/data/layoutgroupsecurity.data.class.php'
--- server/lib/data/layoutgroupsecurity.data.class.php	2011-07-29 16:23:42 +0000
+++ server/lib/data/layoutgroupsecurity.data.class.php	2012-01-22 15:55:27 +0000
@@ -145,5 +145,44 @@
 
         return true;
     }
+
+    /**
+     * Copys all security for a layout
+     * @param <type> $layoutId
+     * @param <type> $newLayoutId
+     * @return <type>
+     */
+    public function CopyAll($layoutId, $newLayoutId)
+    {
+        $db =& $this->db;
+
+        Debug::LogEntry($db, 'audit', 'IN', 'LayoutGroupSecurity', 'Copy');
+
+        $SQL  = "";
+        $SQL .= "INSERT ";
+        $SQL .= "INTO   lklayoutgroup ";
+        $SQL .= "       ( ";
+        $SQL .= "              LayoutID, ";
+        $SQL .= "              GroupID, ";
+        $SQL .= "              View, ";
+        $SQL .= "              Edit, ";
+        $SQL .= "              Del ";
+        $SQL .= "       ) ";
+        $SQL .= " SELECT '%s', GroupID, View, Edit, Del ";
+        $SQL .= "   FROM lklayoutgroup ";
+        $SQL .= "  WHERE LayoutID = %d ";
+
+        $SQL = sprintf($SQL, $newLayoutId, $layoutId);
+
+        if (!$db->query($SQL))
+        {
+            trigger_error($db->error());
+            $this->SetError(25028, __('Could not Copy All Layout Security'));
+
+            return false;
+        }
+
+        return true;
+    }
 }
 ?>
\ No newline at end of file

=== modified file 'server/lib/data/layoutmediagroupsecurity.data.class.php'
--- server/lib/data/layoutmediagroupsecurity.data.class.php	2011-08-11 18:07:32 +0000
+++ server/lib/data/layoutmediagroupsecurity.data.class.php	2012-01-22 15:55:27 +0000
@@ -190,5 +190,93 @@
 
         return true;
     }
+
+    /**
+     * Copys all media security for a layout
+     * @param <type> $layoutId
+     * @param <type> $newLayoutId
+     * @return <type>
+     */
+    public function CopyAll($layoutId, $newLayoutId)
+    {
+        $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 '%s', RegionID, MediaID, GroupID, View, Edit, Del ";
+        $SQL .= "   FROM lklayoutmediagroup ";
+        $SQL .= "  WHERE LayoutID = %d ";
+
+        $SQL = sprintf($SQL, $newLayoutId, $layoutId);
+
+        Debug::LogEntry($db, 'audit', $SQL);
+
+        if (!$db->query($SQL))
+        {
+            trigger_error($db->error());
+            $this->SetError(25028, __('Could not Copy All Layout Media Security'));
+
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Copys all security for specific media on a layout
+     * @param <type> $layoutId
+     * @param <type> $newLayoutId
+     * @param <type> $oldMediaId
+     * @param <type> $newMediaId
+     * @return <type>
+     */
+    public function CopyAllForMedia($layoutId, $newLayoutId, $oldMediaId, $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 '%s', RegionID, '%s', GroupID, View, Edit, Del ";
+        $SQL .= "   FROM lklayoutmediagroup ";
+        $SQL .= "  WHERE LayoutID = %d AND MediaID = '%s' ";
+
+        $SQL = sprintf($SQL, $newLayoutId, $newMediaId, $layoutId, $oldMediaId);
+
+        Debug::LogEntry($db, 'audit', $SQL);
+
+        if (!$db->query($SQL))
+        {
+            trigger_error($db->error());
+            $this->SetError(25028, __('Could not Copy All Layout Media Security'));
+
+            return false;
+        }
+
+        return true;
+    }
 }
 ?>
\ No newline at end of file

=== modified file 'server/lib/data/layoutregiongroupsecurity.data.class.php'
--- server/lib/data/layoutregiongroupsecurity.data.class.php	2011-07-29 16:23:42 +0000
+++ server/lib/data/layoutregiongroupsecurity.data.class.php	2012-01-22 15:55:27 +0000
@@ -146,5 +146,45 @@
 
         return true;
     }
+
+    /**
+     * Copys all region security for a layout
+     * @param <type> $layoutId
+     * @param <type> $newLayoutId
+     * @return <type>
+     */
+    public function CopyAll($layoutId, $newLayoutId)
+    {
+        $db =& $this->db;
+
+        Debug::LogEntry($db, 'audit', 'IN', 'LayoutRegionGroupSecurity', 'Copy');
+
+        $SQL  = "";
+        $SQL .= "INSERT ";
+        $SQL .= "INTO   lklayoutregiongroup ";
+        $SQL .= "       ( ";
+        $SQL .= "              LayoutID, ";
+        $SQL .= "              RegionID, ";
+        $SQL .= "              GroupID, ";
+        $SQL .= "              View, ";
+        $SQL .= "              Edit, ";
+        $SQL .= "              Del ";
+        $SQL .= "       ) ";
+        $SQL .= " SELECT '%s', RegionID, GroupID, View, Edit, Del ";
+        $SQL .= "   FROM lklayoutregiongroup ";
+        $SQL .= "  WHERE LayoutID = %d ";
+
+        $SQL = sprintf($SQL, $newLayoutId, $layoutId);
+
+        if (!$db->query($SQL))
+        {
+            trigger_error($db->error());
+            $this->SetError(25028, __('Could not Copy All Layout Region Security'));
+
+            return false;
+        }
+
+        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-07-28 23:54:40 +0000
+++ server/lib/data/media.data.class.php	2012-01-22 15:55:27 +0000
@@ -337,5 +337,72 @@
 
         return $modules;
     }
+
+    /**
+     * Make a copy of this media record
+     * @param <type> $oldMediaId
+     */
+    public function Copy($oldMediaId, $prefix = '')
+    {
+        $db =& $this->db;
+
+        // Get the extension from the old media record
+        if (!$fileName = $this->db->GetSingleValue(sprintf("SELECT StoredAs FROM media WHERE MediaID = %d", $oldMediaId), 'StoredAs', _STRING))
+        {
+            trigger_error($db->error());
+            return $this->SetError(26, __('Error getting media extension before copy.'));
+        }
+
+        $extension = strtolower(substr(strrchr($fileName, '.'), 1));
+
+        $newMediaName = "CONCAT(name, ' ', 2)";
+
+        if ($prefix != '')
+            $newMediaName = "CONCAT('$prefix', ' ', name)";
+
+        // All OK to insert this record
+        $SQL  = "INSERT INTO media (name, type, duration, originalFilename, userID, retired ) ";
+        $SQL .= " SELECT %s, type, duration, originalFilename, userID, retired ";
+        $SQL .= "  FROM media ";
+        $SQL .= " WHERE MediaID = %d ";
+
+        $SQL = sprintf($SQL, $newMediaName, $oldMediaId);
+
+        if (!$newMediaId = $db->insert_query($SQL))
+        {
+            trigger_error($db->error());
+            return $this->SetError(26, __('Error copying media.'));
+        }
+
+        // Make a copy of the file
+        $libraryFolder 	= Config::GetSetting($db, 'LIBRARY_LOCATION');
+
+        if (!copy($libraryFolder . $oldMediaId . '.' . $extension, $libraryFolder . $newMediaId . '.' . $extension))
+        {
+            // If we couldnt move it - we need to delete the media record we just added
+            $SQL = sprintf("DELETE FROM media WHERE mediaID = %d ", $newMediaId);
+
+            if (!$db->query($SQL))
+                return $this->SetError(14, 'Error cleaning up after failure.');
+
+            return $this->SetError(15, 'Error storing file.');
+        }
+
+        // Calculate the MD5 and the file size
+        $storedAs   = $libraryFolder . $newMediaId . '.' . $extension;
+        $md5        = md5_file($storedAs);
+        $fileSize   = filesize($storedAs);
+
+        // Update the media record to include this information
+        $SQL = sprintf("UPDATE media SET storedAs = '%s', `MD5` = '%s', FileSize = %d WHERE mediaid = %d", $newMediaId . '.' . $extension, $md5, $fileSize, $newMediaId);
+
+        if (!$db->query($SQL))
+        {
+            trigger_error($db->error());
+            return $this->SetError(16, 'Updating stored file location and MD5');
+        }
+
+        return $newMediaId;
+    }
 }
 ?>

=== modified file 'server/lib/data/usergroup.data.class.php'
--- server/lib/data/usergroup.data.class.php	2009-12-11 15:43:31 +0000
+++ server/lib/data/usergroup.data.class.php	2012-01-22 15:55:27 +0000
@@ -1,7 +1,7 @@
 <?php
 /*
  * Xibo - Digitial Signage - http://www.xibo.org.uk
- * Copyright (C) 2009 Daniel Garner
+ * Copyright (C) 2009-11 Daniel Garner
  *
  * This file is part of Xibo.
  *
@@ -193,6 +193,62 @@
     }
 
     /**
+     * Unlinks all users from the speficied group
+     * @param <type> $userGroupId
+     */
+    public function UnlinkAllUsers($userGroupId)
+    {
+        $db =& $this->db;
+
+        Debug::LogEntry($db, 'audit', 'IN', 'UserGroup', 'UnlinkAllUsers');
+
+        $SQL  = "";
+        $SQL .= "DELETE FROM ";
+        $SQL .= "   lkusergroup ";
+        $SQL .= sprintf("  WHERE GroupID = %d ", $userGroupId);
+
+        if (!$db->query($SQL))
+        {
+            trigger_error($db->error());
+            $this->SetError(25007, __('Could not Unlink all Users from User Group'));
+
+            return false;
+        }
+
+        Debug::LogEntry($db, 'audit', 'OUT', 'UserGroup', 'UnlinkAllUsers');
+
+        return true;
+    }
+
+    /**
+     * Unliks all groups from the specified user
+     * @param <type> $userId
+     */
+    public function UnlinkAllGroups($userId)
+    {
+        $db =& $this->db;
+
+        Debug::LogEntry($db, 'audit', 'IN', 'UserGroup', 'UnlinkAllGroups');
+
+        $SQL  = "";
+        $SQL .= "DELETE FROM ";
+        $SQL .= "   lkusergroup ";
+        $SQL .= sprintf("  WHERE UserID = %d ", $userId);
+
+        if (!$db->query($SQL))
+        {
+            trigger_error($db->error());
+            $this->SetError(25007, __('Could not Unlink Groups from User'));
+
+            return false;
+        }
+
+        Debug::LogEntry($db, 'audit', 'OUT', 'UserGroup', 'UnlinkAllGroups');
+
+        return true;
+    }
+
+    /**
      * Edits the User Group associated with a User
      * @return
      * @param $userID Object

=== modified file 'server/lib/include.php'
--- server/lib/include.php	2011-09-01 22:35:43 +0000
+++ server/lib/include.php	2012-01-22 15:55:27 +0000
@@ -108,11 +108,11 @@
 Config::Version($db);
 
 // Does the version in the DB match the version of the code?
-if (DBVERSION != '42')
-    die(sprintf('Incompatible database version detected. Please ensure your database and website versions match. You have %d and the website for %d', DBVERSION, 42));
+if (DBVERSION != '44')
+    die(sprintf('Incompatible database version detected. Please ensure your database and website versions match. You have %d and the website for %d', DBVERSION, 44));
 
 // What is the production mode of the server?
-if(Config::GetSetting($db, "SERVER_MODE")=="Test") ini_set('display_errors', 1);
+if(Config::GetSetting($db, 'SERVER_MODE') == 'Test') ini_set('display_errors', 1);
 
 // Debugging?
 if(Config::GetSetting($db, "debug")=="On") error_reporting(E_ALL);

=== modified file 'server/lib/js/index.js'
--- server/lib/js/index.js	2008-12-10 23:48:15 +0000
+++ server/lib/js/index.js	2012-01-22 15:55: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.
  *
@@ -36,4 +36,74 @@
 function reset_time() {
 	document.getElementById("3").value = 0;
 	document.getElementById("4").value = 0;
+}
+
+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");
+    })
+
+    $('#div_dialog').dialog('option', 'width', 800);
+    $('#div_dialog').dialog('option', 'height', 500);
+    $('#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");
+    })
+
+    $('#div_dialog').dialog('option', 'width', 800);
+    $('#div_dialog').dialog('option', 'height', 500);
+    $('#div_dialog').dialog('option', 'position', 'center');
+
+
+    return false; //prevent submit
+}
+
+
+var datasetview_callback = function()
+{
+    $("#columnsIn, #columnsOut").sortable({
+		connectWith: '.connectedSortable',
+		dropOnEmpty: true
+	}).disableSelection();
+
+    return false; //prevent submit
+}
+
+var DataSetViewSubmit = function() {
+    // Serialise the form and then submit it via Ajax.
+    var href = $("#ModuleForm").attr('action') + "&ajax=true";
+
+    // Get the two lists
+    serializedData = $("#columnsIn").sortable('serialize') + "&" + $("#ModuleForm").serialize();
+
+    $.ajax({
+        type: "post",
+        url: href,
+        cache: false,
+        dataType: "json",
+        data: serializedData,
+        success: XiboSubmitResponse
+    });
+
+    return;
 }
\ No newline at end of file

=== modified file 'server/lib/js/mediamanager.js'
--- server/lib/js/mediamanager.js	2011-09-06 19:07:49 +0000
+++ server/lib/js/mediamanager.js	2012-01-22 15:55:27 +0000
@@ -26,24 +26,13 @@
     $("#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', 'width', 800);
+    $('#div_dialog').dialog('option', 'height', 500);
     $('#div_dialog').dialog('option', 'position', 'center');
 
+
     return false; //prevent submit
 }
 
@@ -61,25 +50,11 @@
         $("#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', 'width', 800);
+    $('#div_dialog').dialog('option', 'height', 500);
     $('#div_dialog').dialog('option', 'position', 'center');
 
+
     return false; //prevent submit
 }
 

=== modified file 'server/lib/js/stats.js'
--- server/lib/js/stats.js	2009-12-03 21:11:23 +0000
+++ server/lib/js/stats.js	2012-01-22 15:55:27 +0000
@@ -1,6 +1,6 @@
 /*
  * Xibo - Digitial Signage - http://www.xibo.org.uk
- * Copyright (C) 2009 Daniel Garner
+ * Copyright (C) 2009-2012 Daniel Garner
  *
  * This file is part of Xibo.
  *
@@ -16,4 +16,9 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
- */
\ No newline at end of file
+ */
+$(document).ready(function(){
+    $(".date-pick").datepicker({
+        dateFormat: "yy-mm-dd"
+    })
+});
\ No newline at end of file

=== modified file 'server/lib/modules/module.class.php'
--- server/lib/modules/module.class.php	2011-09-01 20:42:49 +0000
+++ server/lib/modules/module.class.php	2012-01-22 15:55:27 +0000
@@ -463,7 +463,7 @@
 	{
             $db =& $this->db;
             $helpManager = new HelpManager($db, $this->user);
-            $this->response->AddButton(__('Help'), 'XiboHelpRender("' . $helpManager->Link($this->type, 'Delete') . '")');
+            $this->response->AddButton(__('Help'), 'XiboHelpRender("' . $helpManager->Link('Media', 'Delete') . '")');
 
             //Parameters
             $layoutid = $this->layoutid;
@@ -579,7 +579,7 @@
 
                 $msgWarn = __('Are you sure you want to delete this media?');
                 $msgSelect = __('Please select from the following options');
-                $msgCaution = __('Warning! You cannot undo this operation');
+                $msgCaution = __('Deleting media cannot be undone');
 
                 //we can delete
                 $form = <<<END
@@ -922,7 +922,8 @@
         }
         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>';
+            $updateMediaChecked = (Config::GetSetting($db, 'LIBRARY_MEDIA_UPDATEINALL_CHECKB') == 'Checked') ? 'checked' : '';
+            $extraNotes = '<input type="checkbox" id="replaceInLayouts" name="replaceInLayouts" ' . $updateMediaChecked . '><label for="replaceInLayouts">' . __('Update this media in all layouts it is assigned to. Note: It will only be replaced in layouts you have permission to edit.') . '</label>';
 
             $save_button = <<<END
             <input id="btnSave" type="submit" value="Save" />
@@ -1408,12 +1409,81 @@
             $db->query(sprintf("UPDATE media SET duration = %d WHERE mediaID = %d", $this->duration, $this->mediaid));
 
             $this->response->message = 'Edited the ' . $this->displayType;
+
+            // Edit from the library - check to see if we are replacing this media in *all* layouts.
+            if (Kit::GetParam('replaceInLayouts', _POST, _CHECKBOX) == 1)
+                $this->ReplaceMediaInAllLayouts($mediaid, $this->mediaid, $this->duration);
         }
 
         return $this->response;
     }
 
     /**
+     * Replace media in all layouts.
+     * @param <type> $oldMediaId
+     * @param <type> $newMediaId
+     */
+    private function ReplaceMediaInAllLayouts($oldMediaId, $newMediaId)
+    {
+        Kit::ClassLoader('region');
+        $db =& $this->db;
+        $count = 0;
+        
+        Debug::LogEntry($db, 'audit', sprintf('Replacing mediaid %s with mediaid %s in all layouts', $oldMediaId, $newMediaId), 'module', 'ReplaceMediaInAllLayouts');
+
+        // Create a region object for later use
+        $region = new region($db, $this->user);
+
+        // Loop through a list of layouts this user has access to
+        foreach($this->user->LayoutList() as $layout)
+        {
+            $layoutId = $layout['layoutid'];
+
+            // Does this layout use the old media id?
+            $SQL = sprintf("SELECT lklayoutmediaid, regionid FROM lklayoutmedia WHERE mediaid = %d and layoutid = %d", $oldMediaId, $layoutId);
+            
+            if (!$results = $db->query($SQL))
+                return false;
+            
+            // Loop through each media link for this layout
+            while ($row = $db->get_assoc_row($results))
+            {
+                // Get the LKID of the link between this layout and this media.. could be more than one?
+                $lkId = $row['lklayoutmediaid'];
+                $regionId = $row['regionid'];
+
+                // Get the Type of this media
+                if (!$type = $region->GetMediaNodeType($layoutId, '', '', $lkId))
+                    continue;
+
+                // Create a new media node use it to swap the nodes over
+                Debug::LogEntry($db, 'audit', 'Creating new module with MediaID: ' . $newMediaId . ' LayoutID: ' . $layoutId . ' and RegionID: ' . $regionId, 'region', 'ReplaceMediaInAllLayouts');
+                require_once('modules/' . $type . '.module.php');
+
+                // Create a new module as if we were assigning it for the first time
+                $module = new $type($db, $this->user, $newMediaId);
+
+                // Sets the URI field
+                $module->SetRegionInformation($layoutId, $regionId);
+
+                // Get the media xml string to use in the swap.
+                $mediaXmlString = $module->AsXml();
+
+                // Swap the nodes
+                if (!$region->SwapMedia($layoutId, $regionId, $lkId, $oldMediaId, $newMediaId, $mediaXmlString))
+                    return false;
+
+                // Update the LKID with the new media id
+                $db->query("UPDATE lklayoutmedia SET mediaid = %d WHERE lklayoutmediaid = %d", $newMediaId, $row['lklayoutmediaid']);
+
+                $count++;
+            }
+        }
+
+        Debug::LogEntry($db, 'audit', sprintf('Replaced media in %d layouts', $count), 'module', 'ReplaceMediaInAllLayouts');
+    }
+
+    /**
      * Default GetName
      * @return
      */
@@ -1529,7 +1599,7 @@
         $form .= '</form>';
 
         $response->SetFormRequestResponse($form, __('Permissions'), '350px', '500px');
-        $response->AddButton(__('Help'), 'XiboHelpRender("' . $helpManager->Link('Layout', 'Permissions') . '")');
+        $response->AddButton(__('Help'), 'XiboHelpRender("' . $helpManager->Link('LayoutMedia', 'Permissions') . '")');
         $response->AddButton(__('Cancel'), 'XiboSwapDialog("index.php?p=layout&layoutid=' . $this->layoutid . '&regionid=' . $this->regionid . '&q=RegionOptions")');
         $response->AddButton(__('Save'), '$("#LayoutPermissionsForm").submit()');
 

=== modified file 'server/lib/pages/admin.class.php'
--- server/lib/pages/admin.class.php	2010-06-08 17:26:47 +0000
+++ server/lib/pages/admin.class.php	2012-01-22 15:55:27 +0000
@@ -251,6 +251,18 @@
 			</select>
 END;
 		}
+
+                if ($cat == 'content')
+                {
+                    // Display the file size
+                    $fileSize = $this->db->GetSingleValue('SELECT SUM(FileSize) AS SumSize FROM media', 'SumSize', _INT);
+
+                    $sz = 'BKMGTP';
+                    $factor = floor((strlen($fileSize) - 1) / 3);
+                    $fileSize = sprintf('%.2f', $fileSize / pow(1024, $factor)) . @$sz[$factor];
+
+                    $output .= sprintf('<p>You have %s of media in the library.</p>', $fileSize);
+                }
 		
 		// Need to now get all the Misc settings 
 		$SQL = "";

=== modified file 'server/lib/pages/content.class.php'
--- server/lib/pages/content.class.php	2011-08-22 22:10:57 +0000
+++ server/lib/pages/content.class.php	2012-01-22 15:55:27 +0000
@@ -167,7 +167,8 @@
 		$SQL .= "        media.name, ";
 		$SQL .= "        media.type, ";
 		$SQL .= "        media.duration, ";
-		$SQL .= "        media.userID ";
+		$SQL .= "        media.userID, ";
+		$SQL .= "        media.FileSize ";
 		$SQL .= "FROM    media ";
 		$SQL .= "WHERE   isEdited = 0 ";
 		if ($mediatype != "all") 
@@ -206,6 +207,7 @@
 		$msgType	= __('Type');
 		$msgRetired	= __('Retired');
 		$msgOwner	= __('Owner');
+		$msgFileSize	= __('Size');
 		$msgShared	= __('Permissions');
 		$msgAction	= __('Action');
 
@@ -217,6 +219,7 @@
 			        <th>$msgName</th>
 			        <th>$msgType</th>
 			        <th>h:mi:ss</th>            
+			        <th>$msgFileSize</th>
                                 <th>$msgOwner</th>
 			        <th>$msgShared</th>       
 			        <th>$msgAction</th>     
@@ -232,9 +235,15 @@
             $mediatype 		= Kit::ValidateParam($aRow[2], _WORD);
             $length 		= sec2hms(Kit::ValidateParam($aRow[3], _DOUBLE));
             $ownerid 		= Kit::ValidateParam($aRow[4], _INT);
+            $fileSize = Kit::ValidateParam($aRow[5], _INT);
+
+            // Size in MB
+            $sz = 'BKMGTP';
+            $factor = floor((strlen($fileSize) - 1) / 3);
+            $fileSize = sprintf('%.2f', $fileSize / pow(1024, $factor)) . @$sz[$factor];
 
             //get the username from the userID using the user module
-            $username 		= $user->getNameFromID($ownerid);
+            $username = $user->getNameFromID($ownerid);
 
             $group = $this->GroupsForMedia($mediaid);
 
@@ -258,6 +267,7 @@
                 $output .= "<td>$media</td>\n";
                 $output .= "<td>$mediatype</td>\n";
                 $output .= "<td>$length</td>\n";
+                $output .= "<td>$fileSize</td>\n";
                 $output .= "<td>$username</td>";
                 $output .= "<td>$group</td>";
 

=== modified file 'server/lib/pages/display.class.php'
--- server/lib/pages/display.class.php	2011-07-29 12:46:13 +0000
+++ server/lib/pages/display.class.php	2012-01-22 15:55:27 +0000
@@ -157,7 +157,7 @@
 
 		if (!$displayObject->Edit($displayid, $display, $auditing, $layoutid, $licensed, $inc_schedule, $email_alert, $alert_timeout))
 		{
-			trigger_error(__('Cannot Edit this Display'), E_USER_ERROR);
+			trigger_error($displayObject->GetErrorMessage(), E_USER_ERROR);
 		}
 
 		$response->SetFormSubmitResponse(__('Display Saved.'));

=== modified file 'server/lib/pages/displaygroup.class.php'
--- server/lib/pages/displaygroup.class.php	2011-07-24 22:19:52 +0000
+++ server/lib/pages/displaygroup.class.php	2012-01-22 15:55:27 +0000
@@ -174,7 +174,6 @@
 		$helpManager	= new HelpManager($db, $user);
 		
 		// Help UI
-		$helpButton 	= $helpManager->HelpButton("displays/groups", true);
 		$nameHelp		= $helpManager->HelpIcon(__("The Name of this Group."), true);
 		$descHelp		= $helpManager->HelpIcon(__("A short description of this Group."), true);
 		
@@ -199,7 +198,7 @@
 END;
 
 		$response->SetFormRequestResponse($form, __('Add Display Group'), '350px', '275px');
-		$response->AddButton(__('Help'), "XiboHelpRender('index.php?p=help&q=Display&Topic=Displays&Category=Groups')");
+		$response->AddButton(__('Help'), "XiboHelpRender('index.php?p=help&q=Display&Topic=DisplayGroup&Category=Add')");
 		$response->AddButton($msgCancel, 'XiboDialogClose()');
 		$response->AddButton($msgSave, '$("#DisplayGroupAddForm").submit()');
 		$response->Respond();
@@ -240,7 +239,6 @@
 		$description	= Kit::ValidateParam($row['Description'], _STRING);
 		
 		// Help UI
-		$helpButton 	= $helpManager->HelpButton("displays/groups", true);
 		$nameHelp		= $helpManager->HelpIcon(__("The Name of this Group."), true);
 		$descHelp		= $helpManager->HelpIcon(__("A short description of this Group."), true);
 		
@@ -266,7 +264,7 @@
 END;
 
 		$response->SetFormRequestResponse($form, __('Edit Display Group'), '350px', '275px');
-		$response->AddButton(__('Help'), "XiboHelpRender('index.php?p=help&q=Display&Topic=Displays&Category=Groups')");
+		$response->AddButton(__('Help'), "XiboHelpRender('index.php?p=help&q=Display&Topic=DisplayGroup&Category=Edit')");
 		$response->AddButton($msgCancel, 'XiboDialogClose()');
 		$response->AddButton($msgSave, '$("#DisplayGroupEditForm").submit()');
 		$response->Respond();
@@ -293,7 +291,7 @@
 END;
 		
 		$response->SetFormRequestResponse($form, __('Delete Display Group'), '350px', '175px');
-		$response->AddButton(__('Help'), "XiboHelpRender('index.php?p=help&q=Display&Topic=Displays&Category=Groups')");
+		$response->AddButton(__('Help'), "XiboHelpRender('index.php?p=help&q=Display&Topic=DisplayGroup&Category=Delete')");
 		$response->AddButton(__('No'), 'XiboDialogClose()');
 		$response->AddButton(__('Yes'), '$("#DisplayGroupDeleteForm").submit()');
 		$response->Respond();
@@ -375,7 +373,7 @@
 		$form       = $helpText . '<div class="connectedlist"><h3>Members</h3>' . $listIn . '</div><div class="connectedlist"><h3>Non-members</h3>' . $listOut . '</div>';
 		
 		$response->SetFormRequestResponse($form, __('Manage Membership'), '400', '375', 'ManageMembersCallBack');
-		$response->AddButton(__('Help'), "XiboHelpRender('index.php?p=help&q=Display&Topic=Displays&Category=Groups')");
+		$response->AddButton(__('Help'), "XiboHelpRender('index.php?p=help&q=Display&Topic=DisplayGroup&Category=Members')");
 		$response->AddButton(__('Cancel'), 'XiboDialogClose()');
 		$response->AddButton(__('Save'), 'MembersSubmit()');
 		$response->Respond();
@@ -458,7 +456,7 @@
 		$form		= $helpText . '<div class="connectedlist firstList"><h3>Members</h3>' . $listIn . '</div><div class="connectedlist"><h3>Non-members</h3>' . $listOut . '</div>';
 		
 		$response->SetFormRequestResponse($form, __('Manage Group Security for' . ' ' . $displayGroup), '400', '375', 'GroupSecurityCallBack');
-		$response->AddButton(__('Help'), "XiboHelpRender('index.php?p=help&q=Display&Topic=Displays&Category=Groups')");
+		$response->AddButton(__('Help'), "XiboHelpRender('index.php?p=help&q=Display&Topic=DisplayGroup&Category=GroupSecurity')");
 		$response->AddButton(__('Cancel'), 'XiboDialogClose()');
 		$response->AddButton(__('Save'), 'GroupSecuritySubmit()');
 		$response->Respond();

=== modified file 'server/lib/pages/index.class.php'
--- server/lib/pages/index.class.php	2011-08-06 15:36:50 +0000
+++ server/lib/pages/index.class.php	2012-01-22 15:55:27 +0000
@@ -106,7 +106,7 @@
 		
 		if ($referingpage == '') 
 		{
-                    header('Location:index.php?p=dashboard');
+                    header('Location:index.php?p=index');
 		}
 		else 
 		{
@@ -116,27 +116,27 @@
 		exit;
 	}
 
-	function logout($referingpage = "") 
-	{
-		global $user;
-		$db =& $this->db;
-		
-		$username 	= Kit::GetParam('username', _SESSION, _USERNAME);
-
-		setMessage($username . __("Please Login to access this page."));
-
-		//logs the user out -- true if ok
-		$user->logout();
-
-		if($referingpage=="") 
-		{
-			$referingpage="index";
-		}
-
-		//then go back to the index page
-		header("Location:index.php?p=".$referingpage);
-		exit;
-	}
+    function logout($referingpage = '')
+    {
+        global $user;
+        $db =& $this->db;
+
+        $username = Kit::GetParam('username', _SESSION, _USERNAME);
+
+        setMessage(__('Please Login to access this page.'));
+
+        //logs the user out -- true if ok
+        $user->logout();
+
+        if($referingpage == '')
+        {
+            $referingpage = 'index';
+        }
+
+        //then go back to the index page
+        header('Location:index.php?p=' . $referingpage);
+        exit;
+    }
 	
 	function forgotten() 
 	{
@@ -226,19 +226,26 @@
 	    return substr($password, 0, $length);
 	}  
 	
-	function displayPage() 
-	{
-		$db 	=& $this->db;
-		$user 	=& $this->user;
-		
-		include("lib/pages/dashboard.class.php");
-		
-		$schedule = new dashboardDAO($db, $user);
-		
-		$schedule->displayPage();
-		
-		exit;
-	}
+    function displayPage()
+    {
+        $db 	=& $this->db;
+        $user 	=& $this->user;
+
+        $homepage = $this->user->homePage;
+
+        if ($homepage == 'mediamanager')
+        {
+            include('lib/pages/mediamanager.class.php');
+            $userHomepage = new mediamanagerDAO($db, $user);
+        }
+        else
+        {
+            include("lib/pages/dashboard.class.php");
+            $userHomepage = new dashboardDAO($db, $user);
+        }
+
+        $userHomepage->displayPage();
+    }
 	
 	/**
 	 * Ping Pong

=== modified file 'server/lib/pages/layout.class.php'
--- server/lib/pages/layout.class.php	2011-09-03 11:10:49 +0000
+++ server/lib/pages/layout.class.php	2012-01-22 15:55:27 +0000
@@ -1823,6 +1823,9 @@
 
         $msgName        = __('New Name');
         $msgName2       = __('The name for the new layout');
+        $msgCopyMedia = __('Make new copies of all media on this layout?');
+
+        $copyMediaChecked = (Config::GetSetting($db, 'LAYOUT_COPY_MEDIA_CHECKB') == 'Checked') ? 'checked' : '';
 
         $form = <<<END
         <form id="LayoutCopyForm" class="XiboForm" method="post" action="index.php?p=layout&q=Copy">
@@ -1832,6 +1835,12 @@
                     <td><label for="layout" accesskey="n" title="$msgName2">$msgName<span class="required">*</span></label></td>
                     <td><input name="layout" class="required" type="text" id="layout" value="$oldLayout 2" tabindex="1" /></td>
                 </tr>
+                <tr>
+                    <td colspan="2">
+                        <input type="checkbox" id="copyMediaFiles" name="copyMediaFiles" $copyMediaChecked />
+                        <label for="copyMediaFiles" accesskey="c" title="$msgCopyMedia">$msgCopyMedia</label>
+                    </td>
+                </tr>
             </table>
         </form>
 END;
@@ -1854,12 +1863,13 @@
 
         $layoutid       = Kit::GetParam('layoutid', _POST, _INT);
         $layout         = Kit::GetParam('layout', _POST, _STRING);
+        $copyMedia = Kit::GetParam('copyMediaFiles', _POST, _CHECKBOX);
 
         Kit::ClassLoader('Layout');
 
         $layoutObject = new Layout($db);
 
-        if (!$layoutObject->Copy($layoutid, $layout, $user->userid))
+        if (!$layoutObject->Copy($layoutid, $layout, $user->userid, (bool)$copyMedia))
             trigger_error($layoutObject->GetErrorMessage(), E_USER_ERROR);
 
         $response->SetFormSubmitResponse(__('Layout Copied'));

=== modified file 'server/lib/pages/mediamanager.class.php'
--- server/lib/pages/mediamanager.class.php	2011-08-09 20:48:36 +0000
+++ server/lib/pages/mediamanager.class.php	2012-01-22 15:55:27 +0000
@@ -57,6 +57,16 @@
 
     public function MediaManagerFilter()
     {
+        $msgLayout = __('Layout');
+        $msgRegion = __('Region');
+        $msgMedia = __('Media');
+        $msgMediaType = __('Type');
+
+        $modules = $this->db->GetArray("SELECT Module, Name FROM module WHERE Enabled = 1 ORDER BY 2", true);
+        $modules[] = array('Module' => 'all', 'Name' => 'All');
+
+        $mediaTypeList = Kit::SelectList('filterMediaType', $modules, 'Module', 'Name', 'all');
+
         $id = uniqid();
 
         $xiboGrid = <<<HTML
@@ -65,6 +75,20 @@
                         <form onsubmit="return false">
 				<input type="hidden" name="p" value="mediamanager">
 				<input type="hidden" name="q" value="MediaManagerGrid">
+                            <table class="mediamanager_filterform">
+                                <tr>
+                                    <td>$msgLayout</td>
+                                    <td><input type="text" name="filterLayout"></td>
+                                    <td>$msgMedia</td>
+                                    <td><input type="text" name="filterMediaName"></td>
+				</tr>
+                                <tr>
+                                    <td>$msgRegion</td>
+                                    <td><input type="text" name="filterRegion"></td>
+                                    <td>$msgMediaType</td>
+                                    <td>$mediaTypeList</td>
+				</tr>
+                            </table>
                         </form>
                 </div>
                 <div class="XiboData">
@@ -80,10 +104,15 @@
         $db =& $this->db;
         $user =& $this->user;
         $response = new ResponseManager();
+
+        $filterLayout = Kit::GetParam('filterLayout', _POST, _STRING);
+        $filterRegion = Kit::GetParam('filterRegion', _POST, _STRING);
+        $filterMediaName = Kit::GetParam('filterMediaName', _POST, _STRING);
+        $filterMediaType = Kit::GetParam('filterMediaType', _POST, _STRING);
         
         // We would like a list of all layouts, media and media assignments that this user
         // has access to.
-        $layouts = $user->LayoutList();
+        $layouts = $user->LayoutList($filterLayout);
 
         $msgLayout = __('Layout');
         $msgRegion = __('Region');
@@ -142,6 +171,9 @@
                 $regionNodeSequence++;
                 $regionName = ($region->getAttribute('name') == '') ? 'Region ' . $regionNodeSequence : $region->getAttribute('name');
 
+                if ($filterRegion != '' && !stristr($regionName, $filterRegion))
+                    continue;
+
                 Debug::LogEntry($db, 'audit', 'Permissions granted for ' . $regionId . ' owned by ' . $ownerId, 'mediamanager', 'MediaManagerGrid');
 
                 // Media
@@ -167,6 +199,14 @@
                     $tmpModule = new $mediaType($db, $user, $mediaId, $layout['layoutid'], $regionId, $lkId);
                     $mediaName = $tmpModule->GetName();
 
+                    if ($filterMediaName != '' && !stristr($mediaName, $filterMediaName))
+                        continue;
+
+                            Debug::LogEntry($db, 'audit', $filterMediaType . ' ' . $mediaType);
+
+                    if ($filterMediaType != 'all' && $mediaType != strtolower($filterMediaType))
+                        continue;
+                    
                     $editLink = '<button class="XiboFormButton" href="index.php?p=module&mod=' . $mediaType . '&q=Exec&method=EditForm&showRegionOptions=0&layoutid=' . $layout['layoutid'] . '&regionid=' . $regionId . '&mediaid=' . $mediaId . '&lkid=' . $lkId . '">' . $msgEdit . '</button>';
                     $mediaNodeSequence++;
 

=== modified file 'server/lib/pages/region.class.php'
--- server/lib/pages/region.class.php	2011-08-18 23:34:53 +0000
+++ server/lib/pages/region.class.php	2012-01-22 15:55:27 +0000
@@ -593,18 +593,34 @@
      * @param <string> $mediaId
      * @return <string>
      */
-    public function GetMediaNodeType($layoutId, $regionId, $mediaId)
+    public function GetMediaNodeType($layoutId, $regionId = '', $mediaId = '', $lkId = '')
     {
         $db =& $this->db;
 
+        // Validate
+        if ($regionId == '' && $mediaId == '' && $lkId == '')
+            return false;
+
         //Load the XML for this layout
         $xml = new DOMDocument("1.0");
         $xml->loadXML($this->GetLayoutXml($layoutId));
 
         //Find the region
         $xpath = new DOMXPath($xml);
-        $mediaNodeList = $xpath->query('//region[@id="' . $regionId . '"]/media[@id="' . $mediaId . '"]');
-        $mediaNode = $mediaNodeList->item(0);
+
+        if ($lkId == '')
+        {
+            Debug::LogEntry($db, 'audit', 'No link ID. Using mediaid and regionid', 'region', 'GetMediaNodeType');
+            $mediaNodeList = $xpath->query('//region[@id="' . $regionId . '"]/media[@id="' . $mediaId . '"]');
+        }
+        else
+        {
+            $mediaNodeList = $xpath->query('//media[@lkid=' . $lkId . ']');
+        }
+
+        // Only 1 node
+        if (!$mediaNode = $mediaNodeList->item(0))
+            return false;
 
         return $mediaNode->getAttribute('type');
     }

=== modified file 'server/lib/pages/stats.class.php'
--- server/lib/pages/stats.class.php	2011-06-05 16:19:20 +0000
+++ server/lib/pages/stats.class.php	2012-01-22 15:55:27 +0000
@@ -1,7 +1,7 @@
 <?php
 /*
  * Xibo - Digitial Signage - http://www.xibo.org.uk
- * Copyright (C) 2009 Daniel Garner
+ * Copyright (C) 2009-2012 Daniel Garner
  *
  * This file is part of Xibo.
  *
@@ -49,40 +49,251 @@
 		echo 'Display Statistics';
 		return true;
 	}
-	
-	public function StatsForm()
-	{
-		$db 	=& $this->db;
-		$user 	=& $this->user;
-		$output = '';
-		
-		$fromdt			= date("Y-m-d H:i:s", time() - 86400);
-		$todt			= date("Y-m-d H:i:s");
-		$display_list 	= dropdownlist("SELECT 'All', 'All' UNION SELECT displayID, display FROM display WHERE licensed = 1 ORDER BY 2", "displayid");
-		
-		// We want to build a form which will sit on the page and allow a button press to generate a CSV file.
-		$output	.= '<script type="text/javascript">$(document).onload(function(){$(".date-pick").datepicker({dateFormat: "dd/mm/yy"})});</script>';
-		$output	.= '<form action="index.php?p=stats&q=OutputCSV" method="post">';
-		$output	.= ' <table>';
-		$output	.= '  <tr>';
-		$output	.= '   <td>From Date</td>';
-		$output	.= '   <td><input type="text" class="date-pick" name="fromdt" value="' . $fromdt . '"/></td>';
-		$output	.= '   <td>To Date</td>';
-		$output	.= '   <td><input type="text" class="date-pick" name="todt" value="' . $todt . '" /></td>';
-		$output	.= '  </tr>';
-		$output	.= '  <tr>';
-		$output	.= '   <td>Display</td>';
-		$output	.= '   <td>' . $display_list . '</td>';
-		$output	.= '  </tr>';
-		
-		$output	.= '  <tr>';
-		$output	.= '   <td><input type="submit" value="Export" /></td>';
-		$output	.= '  </tr>';
-		$output	.= ' </table>';
-		$output	.= '</form>';
-		
-		echo $output;
-	}
+
+    /**
+     * Shows the stats form
+     */
+    public function StatsForm()
+    {
+        $db =& $this->db;
+        $user =& $this->user;
+
+        $fromdt = date("Y-m-d", time() - 86400);
+        $todt = date("Y-m-d");
+        $display_list = dropdownlist("SELECT 'All', 'All' UNION SELECT displayID, display FROM display WHERE licensed = 1 ORDER BY 2", "displayid");
+
+        // List of Media this user has permission for
+        $media = $this->user->MediaList();
+        $media[] = array('mediaid' => 0, 'media' => 'All');
+        $mediaList = Kit::SelectList('mediaid', $media, 'mediaid', 'media', 0);
+
+        // We want to build a form which will sit on the page and allow a button press to generate a CSV file.
+        $output = '';
+        $output .= '<div id="StatsFilter">';
+        $output .= ' <form onsubmit="return false">';
+        $output .= ' <input type="hidden" name="p" value="stats">';
+        $output .= ' <input type="hidden" name="q" value="StatsGrid">';
+        $output .= ' <table>';
+        $output .= '  <tr>';
+        $output .= '   <td>From Date</td>';
+        $output .= '   <td><input type="text" class="date-pick" name="fromdt" value="' . $fromdt . '"/></td>';
+        $output .= '   <td>To Date</td>';
+        $output .= '   <td><input type="text" class="date-pick" name="todt" value="' . $todt . '" /></td>';
+        $output .= '  </tr>';
+        $output .= '  <tr>';
+        $output .= '   <td>' . __('Display') . '</td>';
+        $output .= '   <td>' . $display_list . '</td>';
+        $output .= '   <td>' . __('Media') . '</td>';
+        $output .= '   <td>' . $mediaList . '</td>';
+        $output .= '  </tr>';
+        $output .= ' </table>';
+        $output .= '</form>';
+        $output .= '</div>';
+
+        $id = uniqid();
+
+        $xiboGrid = <<<HTML
+        <div class="XiboGrid" id="$id">
+            <div class="XiboFilter">
+                $output
+            </div>
+            <div class="XiboData"></div>
+        </div>
+HTML;
+        echo $xiboGrid;
+    }
+
+    /**
+     * Shows the stats grid
+     */
+    public function StatsGrid()
+    {
+        $db =& $this->db;
+        $user =& $this->user;
+        $response = new ResponseManager();
+
+        $fromDt = Kit::GetParam('fromdt', _POST, _STRING);
+        $toDt = Kit::GetParam('todt', _POST, _STRING);
+        $displayId = Kit::GetParam('displayid', _POST, _INT);
+        $mediaId = Kit::GetParam('mediaid', _POST, _INT);
+
+        $output = '';
+
+        // Output CSV button
+        $output .= '<p>' . __('Export raw data to CSV') . '</p>';
+        $output .= '<form action="index.php" method="post">';
+        $output .= ' <input type="hidden" name="p" value="stats" />';
+        $output .= ' <input type="hidden" name="q" value="OutputCSV" />';
+        $output .= ' <input type="hidden" name="displayid" value="' . $displayId . '" />';
+        $output .= ' <input type="hidden" name="fromdt" value="' . $fromDt . '" />';
+        $output .= ' <input type="hidden" name="todt" value="' . $toDt . '" />';
+        $output .= ' <input type="submit" value="Export" />';
+        $output .= '</form>';
+
+        // 3 grids showing different stats.
+
+        // Layouts Ran
+        $SQL =  'SELECT display.Display, layout.Layout, COUNT(StatID) AS NumberPlays, SUM(TIME_TO_SEC(TIMEDIFF(end, start))) AS Duration, MIN(start) AS MinStart, MAX(end) AS MaxEnd ';
+        $SQL .= '  FROM stat ';
+        $SQL .= '  INNER JOIN layout ON layout.LayoutID = stat.LayoutID ';
+        $SQL .= '  INNER JOIN display ON stat.DisplayID = display.DisplayID ';
+        $SQL .= ' WHERE 1 = 1 ';
+        $SQL .= sprintf("  AND stat.end > '%s' ", $fromDt);
+        $SQL .= sprintf("  AND stat.start <= '%s' ", $toDt);
+
+        if ($displayId != 0)
+            $SQL .= sprintf("  AND stat.displayID = %d ", $displayId);
+
+        $SQL .= 'GROUP BY display.Display, layout.Layout ';
+        $SQL .= 'ORDER BY display.Display, layout.Layout';
+
+        $output .= '<p>' . __('Layouts ran') . '</p>';
+        $output .= '<table>';
+        $output .= '<thead>';
+        $output .= '<th>' . __('Display') . '</th>';
+        $output .= '<th>' . __('Layout') . '</th>';
+        $output .= '<th>' . __('Number of Plays') . '</th>';
+        $output .= '<th>' . __('Total Duration (s)') . '</th>';
+        $output .= '<th>' . __('Total Duration') . '</th>';
+        $output .= '<th>' . __('First Shown') . '</th>';
+        $output .= '<th>' . __('Last Shown') . '</th>';
+        $output .= '</thead>';
+        $output .= '<tbody>';
+
+        if (!$results = $this->db->query($SQL))
+        {
+            trigger_error($db->error());
+            trigger_error(__('Unable to get Layouts Ran'), E_USER_ERROR);
+        }
+
+        while ($row = $db->get_assoc_row($results))
+        {
+            $output .= '<tr>';
+            $output .= '<td>' . Kit::ValidateParam($row['Display'], _STRING) . '</td>';
+            $output .= '<td>' . Kit::ValidateParam($row['Layout'], _STRING) . '</td>';
+            $output .= '<td>' . Kit::ValidateParam($row['NumberPlays'], _INT) . '</td>';
+            $output .= '<td>' . Kit::ValidateParam($row['Duration'], _INT) . '</td>';
+            $output .= '<td>' . sec2hms(Kit::ValidateParam($row['Duration'], _INT)) . '</td>';
+            $output .= '<td>' . Kit::ValidateParam($row['MinStart'], _STRING) . '</td>';
+            $output .= '<td>' . Kit::ValidateParam($row['MaxEnd'], _STRING) . '</td>';
+            $output .= '</tr>';
+        }
+
+        $output .= '</tbody>';
+        $output .= '</table>';
+
+        // Media Ran
+        $SQL =  'SELECT display.Display, media.Name, COUNT(StatID) AS NumberPlays, SUM(TIME_TO_SEC(TIMEDIFF(end, start))) AS Duration, MIN(start) AS MinStart, MAX(end) AS MaxEnd ';
+        $SQL .= '  FROM stat ';
+        $SQL .= '  INNER JOIN display ON stat.DisplayID = display.DisplayID ';
+        $SQL .= '  INNER JOIN  media ON media.MediaID = stat.MediaID ';
+        $SQL .= ' WHERE 1 = 1 ';
+        $SQL .= sprintf("  AND stat.end > '%s' ", $fromDt);
+        $SQL .= sprintf("  AND stat.start <= '%s' ", $toDt);
+
+        if ($mediaId != 0)
+            $SQL .= sprintf("  AND media.MediaID = %d ", $mediaId);
+
+        if ($displayId != 0)
+            $SQL .= sprintf("  AND stat.displayID = %d ", $displayId);
+
+        $SQL .= 'GROUP BY display.Display, media.Name ';
+        $SQL .= 'ORDER BY display.Display, media.Name';
+
+        $output .= '<p>' . __('Library Media ran') . '</p>';
+        $output .= '<table>';
+        $output .= '<thead>';
+        $output .= '<th>' . __('Display') . '</th>';
+        $output .= '<th>' . __('Media') . '</th>';
+        $output .= '<th>' . __('Number of Plays') . '</th>';
+        $output .= '<th>' . __('Total Duration (s)') . '</th>';
+        $output .= '<th>' . __('Total Duration') . '</th>';
+        $output .= '<th>' . __('First Shown') . '</th>';
+        $output .= '<th>' . __('Last Shown') . '</th>';
+        $output .= '</thead>';
+        $output .= '<tbody>';
+
+        if (!$results = $this->db->query($SQL))
+        {
+            trigger_error($db->error());
+            trigger_error(__('Unable to get Library Media Ran'), E_USER_ERROR);
+        }
+
+        while ($row = $db->get_assoc_row($results))
+        {
+            $output .= '<tr>';
+            $output .= '<td>' . Kit::ValidateParam($row['Display'], _STRING) . '</td>';
+            $output .= '<td>' . Kit::ValidateParam($row['Name'], _STRING) . '</td>';
+            $output .= '<td>' . Kit::ValidateParam($row['NumberPlays'], _INT) . '</td>';
+            $output .= '<td>' . Kit::ValidateParam($row['Duration'], _INT) . '</td>';
+            $output .= '<td>' . sec2hms(Kit::ValidateParam($row['Duration'], _INT)) . '</td>';
+            $output .= '<td>' . Kit::ValidateParam($row['MinStart'], _STRING) . '</td>';
+            $output .= '<td>' . Kit::ValidateParam($row['MaxEnd'], _STRING) . '</td>';
+            $output .= '</tr>';
+        }
+
+        $output .= '</tbody>';
+        $output .= '</table>';
+
+        // Media on Layouts Ran
+        $SQL =  "SELECT display.Display, layout.Layout, IFNULL(media.Name, 'Text/Rss/Webpage') AS Name, COUNT(StatID) AS NumberPlays, SUM(TIME_TO_SEC(TIMEDIFF(end, start))) AS Duration, MIN(start) AS MinStart, MAX(end) AS MaxEnd ";
+        $SQL .= '  FROM stat ';
+        $SQL .= '  INNER JOIN display ON stat.DisplayID = display.DisplayID ';
+        $SQL .= '  INNER JOIN layout ON layout.LayoutID = stat.LayoutID ';
+        $SQL .= '  LEFT OUTER JOIN media ON media.MediaID = stat.MediaID ';
+        $SQL .= ' WHERE 1 = 1 ';
+        $SQL .= sprintf("  AND stat.end > '%s' ", $fromDt);
+        $SQL .= sprintf("  AND stat.start <= '%s' ", $toDt);
+
+        if ($mediaId != 0)
+            $SQL .= sprintf("  AND media.MediaID = %d ", $mediaId);
+
+        if ($displayId != 0)
+            $SQL .= sprintf("  AND stat.displayID = %d ", $displayId);
+
+        $SQL .= "GROUP BY display.Display, layout.Layout, IFNULL(media.Name, 'Text/Rss/Webpage') ";
+        $SQL .= "ORDER BY display.Display, layout.Layout, IFNULL(media.Name, 'Text/Rss/Webpage')";
+
+        $output .= '<p>' . __('Media on Layouts ran') . '</p>';
+        $output .= '<table>';
+        $output .= '<thead>';
+        $output .= '<th>' . __('Display') . '</th>';
+        $output .= '<th>' . __('Layout') . '</th>';
+        $output .= '<th>' . __('Media') . '</th>';
+        $output .= '<th>' . __('Number of Plays') . '</th>';
+        $output .= '<th>' . __('Total Duration (s)') . '</th>';
+        $output .= '<th>' . __('Total Duration') . '</th>';
+        $output .= '<th>' . __('First Shown') . '</th>';
+        $output .= '<th>' . __('Last Shown') . '</th>';
+        $output .= '</thead>';
+        $output .= '<tbody>';
+
+        if (!$results = $this->db->query($SQL))
+        {
+            trigger_error($db->error());
+            trigger_error(__('Unable to get Library Media Ran'), E_USER_ERROR);
+        }
+
+        while ($row = $db->get_assoc_row($results))
+        {
+            $output .= '<tr>';
+            $output .= '<td>' . Kit::ValidateParam($row['Display'], _STRING) . '</td>';
+            $output .= '<td>' . Kit::ValidateParam($row['Layout'], _STRING) . '</td>';
+            $output .= '<td>' . Kit::ValidateParam($row['Name'], _STRING) . '</td>';
+            $output .= '<td>' . Kit::ValidateParam($row['NumberPlays'], _INT) . '</td>';
+            $output .= '<td>' . Kit::ValidateParam($row['Duration'], _INT) . '</td>';
+            $output .= '<td>' . sec2hms(Kit::ValidateParam($row['Duration'], _INT)) . '</td>';
+            $output .= '<td>' . Kit::ValidateParam($row['MinStart'], _STRING) . '</td>';
+            $output .= '<td>' . Kit::ValidateParam($row['MaxEnd'], _STRING) . '</td>';
+            $output .= '</tr>';
+        }
+
+        $output .= '</tbody>';
+        $output .= '</table>';
+
+        $response->SetGridResponse($output);
+        $response->Respond();
+    }
 	
 	/**
 	 * Outputs a CSV of stats

=== modified file 'server/lib/pages/user.class.php'
--- server/lib/pages/user.class.php	2011-08-19 18:06:06 +0000
+++ server/lib/pages/user.class.php	2012-01-22 15:55:27 +0000
@@ -151,7 +151,7 @@
             $password   = md5($password);
             $email      = Kit::GetParam('email', _POST, _STRING);
             $usertypeid	= Kit::GetParam('usertypeid', _POST, _INT, 0);
-            $homepage   = Kit::GetParam('homepage', _POST, _STRING);
+            $homepage   = Kit::GetParam('homepage', _POST, _STRING, 'dashboard');
             $pass_change = isset($_POST['pass_change']);
 
             // Validation
@@ -163,14 +163,8 @@
             {
                 trigger_error("Please enter a Password.", E_USER_ERROR);
             }
-            if ($email == "")
-            {
-                trigger_error("Please enter an Email Address.", E_USER_ERROR);
-            }
-
-            if ($homepage == "") $homepage = "dashboard";
-
-            //Check for duplicate user name
+            
+            // Check for duplicate user name
             $sqlcheck = " ";
             $sqlcheck .= "SELECT UserName FROM user WHERE UserName = '" . $username . "' AND userID <> $userID ";
 
@@ -185,31 +179,21 @@
                 trigger_error(__("Could Not Complete, Duplicate User Name Exists"), E_USER_ERROR);
             }
 
-            //Everything is ok - run the update
-            $sql = "UPDATE user SET UserName = '$username'";
+            // Everything is ok - run the update
+            $sql = sprintf("UPDATE user SET UserName = '%s', HomePage = '%s', Email = '%s' ", $username, $homepage, $email);
+
             if ($pass_change)
-            {
-                $sql .= ", UserPassword = '$password'";
-            }
-
-            $sql .= ", email = '$email' ";
-            if ($homepage == 'dashboard')
-            {
-                //acts as a reset
-                $sql .= ", homepage='$homepage' ";
-            }
-
-            if ($usertypeid != "")
-            {
-                $sql .= ", usertypeid =  " . $usertypeid;
-            }
-
-            $sql .= " WHERE UserID = ". $userID . "";
+                $sql .= sprintf(", UserPassword = '%s'", $password);
+
+            if ($usertypeid != 0)
+                $sql .= sprintf(", usertypeid = %d ", $usertypeid);
+
+            $sql .= sprintf(" WHERE UserID = %d ", $userID);
 
             if (!$db->query($sql))
             {
                 trigger_error($db->error());
-                trigger_error("Error updating that user", E_USER_ERROR);
+                trigger_error(__('Error updating user'), E_USER_ERROR);
             }
 
             // Update the group to follow suit
@@ -243,30 +227,76 @@
             $userid 	= Kit::GetParam('userid', _POST, _INT, 0);
             $groupID    = $user->getGroupFromID($userid, true);
 
+            // Can we delete this user? Dont even try if we cant. Check tables that have this userid or this groupid
+            if ($this->db->GetCountOfRows(sprintf('SELECT LayoutID FROM layout WHERE UserID = %d', $userid)) > 0)
+                trigger_error(__('Cannot delete this user, they have layouts'), E_USER_ERROR);
+
+            if ($this->db->GetCountOfRows(sprintf('SELECT MediaID FROM media WHERE UserID = %d', $userid)) > 0)
+                trigger_error(__('Cannot delete this user, they have media'), E_USER_ERROR);
+
+            if ($this->db->GetCountOfRows(sprintf('SELECT EventID FROM schedule WHERE UserID = %d', $userid)) > 0)
+                trigger_error(__('Cannot delete this user, they have scheduled layouts'), E_USER_ERROR);
+
+            if ($this->db->GetCountOfRows(sprintf('SELECT Schedule_DetailID FROM schedule_detail WHERE UserID = %d', $userid)) > 0)
+                trigger_error(__('Cannot delete this user, they have schedule detail records'), E_USER_ERROR);
+
+            if ($this->db->GetCountOfRows(sprintf('SELECT TemplateID FROM template WHERE UserID = %d', $userid)) > 0)
+                trigger_error(__('Cannot delete this user, they have templates'), E_USER_ERROR);
+
+            if ($this->db->GetCountOfRows(sprintf('SELECT osr_id FROM oauth_server_registry WHERE osr_usa_id_ref = %d', $userid)) > 0)
+                trigger_error(__('Cannot delete this user, they have applications'), E_USER_ERROR);
+
+            if ($this->db->GetCountOfRows(sprintf('SELECT GroupID FROM lkdatasetgroup WHERE GroupID = %d', $groupID)) > 0)
+                trigger_error(__('Cannot delete this user, they have permissions to data sets'), E_USER_ERROR);
+
+            if ($this->db->GetCountOfRows(sprintf('SELECT GroupID FROM lkgroupdg WHERE GroupID = %d', $groupID)) > 0)
+                trigger_error(__('Cannot delete this user, they have permissions to display groups'), E_USER_ERROR);
+
+            if ($this->db->GetCountOfRows(sprintf('SELECT GroupID FROM lklayoutgroup WHERE GroupID = %d', $groupID)) > 0)
+                trigger_error(__('Cannot delete this user, they have permissions to layouts'), E_USER_ERROR);
+
+            if ($this->db->GetCountOfRows(sprintf('SELECT GroupID FROM lklayoutmediagroup WHERE GroupID = %d', $groupID)) > 0)
+                trigger_error(__('Cannot delete this user, they have permissions to media on layouts'), E_USER_ERROR);
+
+            if ($this->db->GetCountOfRows(sprintf('SELECT GroupID FROM lklayoutregiongroup WHERE GroupID = %d', $groupID)) > 0)
+                trigger_error(__('Cannot delete this user, they have permissions to regions on layouts'), E_USER_ERROR);
+
+            if ($this->db->GetCountOfRows(sprintf('SELECT GroupID FROM lkmediagroup WHERE GroupID = %d', $groupID)) > 0)
+                trigger_error(__('Cannot delete this user, they have permissions to media'), E_USER_ERROR);
+
+            if ($this->db->GetCountOfRows(sprintf('SELECT GroupID FROM lkmenuitemgroup WHERE GroupID = %d', $groupID)) > 0)
+                trigger_error(__('Cannot delete this user, they have permissions to menu items'), E_USER_ERROR);
+
+            if ($this->db->GetCountOfRows(sprintf('SELECT GroupID FROM lkpagegroup WHERE GroupID = %d', $groupID)) > 0)
+                trigger_error(__('Cannot delete this user, they have permissions to pages'), E_USER_ERROR);
+
+            if ($this->db->GetCountOfRows(sprintf('SELECT GroupID FROM lktemplategroup WHERE GroupID = %d', $groupID)) > 0)
+                trigger_error(__('Cannot delete this user, they have permissions to templates'), E_USER_ERROR);
+
             // Firstly delete the group for this user
             $userGroupObject = new UserGroup($db);
-
-            $userGroupObject->Unlink($groupID, $userid);
-
+            
+            // Remove this user from all user groups (including their own)
+            $userGroupObject->UnlinkAllGroups($userid);
+
+            // Delete the user specific group
             if (!$userGroupObject->Delete($groupID))
-            {
                 trigger_error($userGroupObject->GetErrorMessage(), E_USER_ERROR);
-            }
 
             // Delete the user
             $sqldel = "DELETE FROM user";
-            $sqldel .= " WHERE UserID = ". $userid . "";
+            $sqldel .= " WHERE UserID = %d"; 
 
-            if (!$db->query($sqldel))
+            if (!$db->query(sprintf($sqldel, $userid)))
             {
                 trigger_error($db->error());
                 trigger_error(__("This user has been active, you may only retire them."), E_USER_ERROR);
             }
 
             // We should delete this users sessions record.
-            $SQL = "DELETE FROM session WHERE userID = $userid ";
+            $SQL = "DELETE FROM session WHERE userID = %d ";
 
-            if (!$db->query($sqldel))
+            if (!$db->query(sprintf($SQL, $userid)))
             {
                 trigger_error($db->error());
                 trigger_error(__("If logged in, this user will be deleted once they log out."), E_USER_ERROR);

=== modified file 'server/lib/service/xmdssoap.class.php'
--- server/lib/service/xmdssoap.class.php	2011-09-01 20:57:15 +0000
+++ server/lib/service/xmdssoap.class.php	2012-01-22 15:55:27 +0000
@@ -880,6 +880,8 @@
         $document = new DOMDocument("1.0");
         $document->loadXML($inventory);
 
+        $macAddress = $document->documentElement->getAttribute('macAddress');
+
         // Assume we are complete (but we are getting some)
         $mediaInventoryComplete = 1;
 
@@ -902,7 +904,7 @@
 
         // Touch the display record
         $displayObject = new Display($db);
-        $displayObject->Touch($hardwareKey, '', $mediaInventoryComplete, $inventory);
+        $displayObject->Touch($hardwareKey, '', $mediaInventoryComplete, $inventory, $macAddress);
 
         return true;
     }

=== modified file 'server/locale/dbtranslate.php'
--- server/locale/dbtranslate.php	2011-07-29 15:31:53 +0000
+++ server/locale/dbtranslate.php	2012-01-22 15:55:27 +0000
@@ -74,4 +74,6 @@
 echo __('SHOW_DISPLAY_AS_VNCLINK');
 echo __('SHOW_DISPLAY_AS_VNC_TGT');
 echo __('REGION_OPTIONS_COLOURING');
+echo __('LAYOUT_COPY_MEDIA_CHECKB');
+echo __('LIBRARY_MEDIA_UPDATEINALL_CHECKB');
 ?>

=== modified file 'server/modules/module_db_mysql.php'
--- server/modules/module_db_mysql.php	2011-08-30 22:31:57 +0000
+++ server/modules/module_db_mysql.php	2012-01-22 15:55:27 +0000
@@ -164,6 +164,18 @@
     }
 
     /**
+     * Gets a count of rows returned by the specified SQL
+     * @param <type> $SQL
+     */
+    public function GetCountOfRows($SQL)
+    {
+        if (!$result = $this->query($SQL))
+            return 0;
+            
+        return $this->num_rows($result);
+    }
+
+    /**
      * Get an Array of Results
      * @param <type> $SQL
      * @return <type>

=== modified file 'server/modules/module_user_general.php'
--- server/modules/module_user_general.php	2011-09-06 19:07:49 +0000
+++ server/modules/module_user_general.php	2012-01-22 15:55:27 +0000
@@ -1005,7 +1005,7 @@
     /**
      * Returns an array of layouts that this user has access to
      */
-    public function LayoutList()
+    public function LayoutList($filterLayout = '')
     {
         $SQL  = "";
         $SQL .= "SELECT layoutID, ";
@@ -1014,6 +1014,10 @@
         $SQL .= "        tags, ";
         $SQL .= "        userID, xml ";
         $SQL .= "   FROM layout ";
+        $SQL .= " WHERE 1 = 1 ";
+
+        if ($filterLayout != '')
+            $SQL .= "   AND layout LIKE '%" . $filterLayout . "%'";
 
         //Debug::LogEntry($this->db, 'audit', sprintf('Retreiving list of layouts for %s with SQL: %s', $this->userName, $SQL));
 

=== modified file 'server/template/header.php'
--- server/template/header.php	2011-08-13 14:56:21 +0000
+++ server/template/header.php	2012-01-22 15:55:27 +0000
@@ -67,7 +67,7 @@
 		{
                     echo '<script type="text/javascript" src="lib/js/' . $p . '.js"></script>';
 			
-			if ($p == 'layout' || $p == 'mediamanager')
+			if ($p == 'layout' || $p == 'mediamanager' || $p == 'index')
 			{
 				?>
 					<script type="text/javascript" src="lib/js/text-render.js"></script>