Merge lp:~dangarner/xibo/110-server into lp:~xibo-maintainers/xibo/encke

[Dan Garner]

=== modified file 'server/install/database/20.php'
--- server/install/database/20.php	2009-10-14 18:15:10 +0000
+++ server/install/database/20.php	2009-12-28 14:14:15 +0000
@@ -36,6 +36,9 @@
                 // Each schedule record needs to be altered so that the displayID_list now reflects the displayGroupIDs
                 $this->UpdateSchedules();
 
+                // Create groups for all current users
+                $this->UpdateUserGroups();
+
 		return true;
 	}
 
@@ -129,5 +132,43 @@
                 }
             }
         }
+
+        /**
+         * We need to update the user groups
+         */
+        private function UpdateUserGroups()
+        {
+            $db =& $this->db;
+
+            // Get all the current users in the system
+            $SQL = "SELECT UserID, groupID, UserName FROM `user`";
+
+            if (!$result = $db->query($SQL))
+            {
+                trigger_error("Error creating user groups", E_USER_ERROR);
+            }
+
+            while ($row = $db->get_assoc_row($result))
+            {
+                // For each display create a display group and link it to the display
+                $ugid           = 0;
+                $userID		= Kit::ValidateParam($row['UserID'], _INT);
+                $groupID	= Kit::ValidateParam($row['groupID'], _INT);
+                $username  	= Kit::ValidateParam($row['UserName'], _STRING);
+
+                $ug = new UserGroup($db);
+
+                // For each one create a user specific group
+                if (!$ugId = $ug->Add($username, 1))
+                {
+                    trigger_error("Error creating user groups", E_USER_ERROR);
+                }
+
+                // Link to the users own userspecific group and also to the one they were already on
+                $ug->Link($ugId, $userID);
+
+                $ug->Link($groupID, $userID);
+            }
+        }
 }
 ?>
\ No newline at end of file

=== modified file 'server/install/database/20.sql'
--- server/install/database/20.sql	2009-10-09 20:28:23 +0000
+++ server/install/database/20.sql	2009-12-28 14:14:15 +0000
@@ -147,6 +147,31 @@
 ALTER TABLE `schedule_detail` DROP INDEX `schedule_detail_ibfk_3`;
 ALTER TABLE `schedule_detail` DROP INDEX `IM_SDT_DisplayID`;
 
+
+/* Users and Groups */
+CREATE TABLE IF NOT EXISTS `lkusergroup` (
+  `LkUserGroupID` int(11) NOT NULL auto_increment,
+  `GroupID` int(11) NOT NULL,
+  `UserID` int(11) NOT NULL,
+  PRIMARY KEY  (`LkUserGroupID`),
+  KEY `GroupID` (`GroupID`),
+  KEY `UserID` (`UserID`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=10 ;
+
+/* Add the user specific flag to groups */
+ALTER TABLE `group` ADD `IsUserSpecific` TINYINT NOT NULL DEFAULT '0';
+
+
+/* Add contraints to the new table */
+ALTER TABLE `lkusergroup` ADD FOREIGN KEY ( `GroupID` ) REFERENCES `group` (
+`groupID`
+);
+
+ALTER TABLE `lkusergroup` ADD FOREIGN KEY ( `UserID` ) REFERENCES `user` (
+`UserID`
+);
+
+
 /* VERSION UPDATE */
 /* Set the version table, etc */
 UPDATE `version` SET `app_ver` = '1.1.0';

=== modified file 'server/install/database/21.sql'
--- server/install/database/21.sql	2009-10-28 21:28:04 +0000
+++ server/install/database/21.sql	2009-12-28 14:14:15 +0000
@@ -8,6 +8,11 @@
 /* Request URI is too short of passing a lot of parameters in GET. Maybe we should use POST more? */
 ALTER TABLE `log` CHANGE `RequestUri` `RequestUri` VARCHAR( 2000 ) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL;
 
+/* Remove the groupID from the user record. */
+ALTER TABLE `user` DROP FOREIGN KEY `user_ibfk_3` ;
+
+ALTER TABLE `user` DROP `groupID` ;
+
 /* VERSION UPDATE */
 /* Set the version table, etc */
 UPDATE `setting` SET `value` = 0 WHERE `setting` = 'PHONE_HOME_DATE';

=== added file 'server/lib/data/usergroup.data.class.php'
--- server/lib/data/usergroup.data.class.php	1970-01-01 00:00:00 +0000
+++ server/lib/data/usergroup.data.class.php	2009-12-28 14:14:15 +0000
@@ -0,0 +1,259 @@
+<?php
+/*
+ * Xibo - Digitial Signage - http://www.xibo.org.uk
+ * Copyright (C) 2009 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 UserGroup extends Data
+{
+    public function __construct(database $db)
+    {
+        parent::__construct($db);
+    }
+
+    /**
+     * Adds a User Group to Xibo
+     * @return
+     * @param $UserGroup Object
+     * @param $isDisplaySpecific Object
+     * @param $description Object[optional]
+     */
+    public function Add($group, $isUserSpecific)
+    {
+        $db	=& $this->db;
+
+        Debug::LogEntry($db, 'audit', 'IN', 'UserGroup', 'Add');
+
+        // Create the SQL
+        $SQL  = "";
+        $SQL .= "INSERT ";
+        $SQL .= "INTO   `group` ";
+        $SQL .= "       ( ";
+        $SQL .= "              `group`     , ";
+        $SQL .= "              IsUserSpecific ";
+        $SQL .= "       ) ";
+        $SQL .= "       VALUES ";
+        $SQL .= "       ( ";
+        $SQL .= sprintf("              '%s', ", $db->escape_string($group));
+        $SQL .= sprintf("              %d   ", $isUserSpecific);
+        $SQL .= "       )";
+
+        if (!$groupID = $db->insert_query($SQL))
+        {
+                trigger_error($db->error());
+                $this->SetError(25000, __('Could not add User Group'));
+
+                return false;
+        }
+
+        Debug::LogEntry($db, 'audit', 'OUT', 'UserGroup', 'Add');
+
+        return $groupID;
+    }
+
+    /**
+     * Edits an existing Xibo Display Group
+     * @return
+     * @param $userGroupID Object
+     * @param $UserGroup Object
+     */
+    public function Edit($userGroupID, $userGroup)
+    {
+        $db	=& $this->db;
+
+        Debug::LogEntry($db, 'audit', 'IN', 'UserGroup', 'Edit');
+
+        // Create the SQL
+        $SQL  = "";
+        $SQL .= "UPDATE `group` ";
+        $SQL .= sprintf("SET    `group`   = '%s' ", $db->escape_string($userGroup));
+        $SQL .= sprintf("WHERE  GroupID = %d", $userGroupID);
+
+        if (!$db->query($SQL))
+        {
+                trigger_error($db->error());
+                $this->SetError(25005, __('Could not edit User Group'));
+
+                return false;
+        }
+
+        Debug::LogEntry($db, 'audit', 'OUT', 'UserGroup', 'Edit');
+
+        return true;
+    }
+
+    /**
+     * Deletes an Xibo User Group
+     * @return
+     * @param $userGroupID Object
+     */
+    public function Delete($userGroupID)
+    {
+        $db	=& $this->db;
+
+        Debug::LogEntry($db, 'audit', 'IN', 'UserGroup', 'Delete');
+
+        $SQL = sprintf("DELETE FROM `group` WHERE GroupID = %d", $userGroupID);
+
+        Debug::LogEntry($db, 'audit', $SQL);
+
+        if (!$db->query($SQL))
+        {
+            trigger_error($db->error());
+            $this->SetError(25015,__('Unable to delete User Group.'));
+            return false;
+        }
+
+        Debug::LogEntry($db, 'audit', 'OUT', 'UserGroup', 'Delete');
+
+        return true;
+    }
+
+    /**
+     * Links a User to a User Group
+     * @return
+     * @param $userGroupID Object
+     * @param $userID Object
+     */
+    public function Link($userGroupID, $userID)
+    {
+        $db	=& $this->db;
+
+        Debug::LogEntry($db, 'audit', 'IN', 'UserGroup', 'Link');
+
+        $SQL  = "";
+        $SQL .= "INSERT ";
+        $SQL .= "INTO   lkusergroup ";
+        $SQL .= "       ( ";
+        $SQL .= "              GroupID, ";
+        $SQL .= "              UserID ";
+        $SQL .= "       ) ";
+        $SQL .= "       VALUES ";
+        $SQL .= "       ( ";
+        $SQL .= sprintf("              %d, %d ", $userGroupID, $userID);
+        $SQL .= "       )";
+
+        if (!$db->query($SQL))
+        {
+                trigger_error($db->error());
+                $this->SetError(25005, __('Could not Link User Group to User'));
+
+                return false;
+        }
+
+        Debug::LogEntry($db, 'audit', 'OUT', 'UserGroup', 'Link');
+
+        return true;
+    }
+
+    /**
+     * Unlinks a Display from a Display Group
+     * @return
+     * @param $userGroupID Object
+     * @param $userID Object
+     */
+    public function Unlink($userGroupID, $userID)
+    {
+        $db	=& $this->db;
+
+        Debug::LogEntry($db, 'audit', 'IN', 'UserGroup', 'Unlink');
+
+        $SQL  = "";
+        $SQL .= "DELETE FROM ";
+        $SQL .= "   lkusergroup ";
+        $SQL .= sprintf("  WHERE GroupID = %d AND UserID = %d ", $userGroupID, $userID);
+
+        if (!$db->query($SQL))
+        {
+            trigger_error($db->error());
+            $this->SetError(25007, __('Could not Unlink User from User Group'));
+
+            return false;
+        }
+
+        Debug::LogEntry($db, 'audit', 'OUT', 'UserGroup', 'Unlink');
+
+        return true;
+    }
+
+    /**
+     * Edits the User Group associated with a User
+     * @return
+     * @param $userID Object
+     * @param $userName Object
+     */
+    public function EditUserGroup($userID, $userName)
+    {
+        $db	=& $this->db;
+
+        Debug::LogEntry($db, 'audit', 'IN', 'UserGroup', 'EditUserGroup');
+
+        // Get the UserGroupID for this UserID
+        $SQL  = "";
+        $SQL .= "SELECT `group`.GroupID ";
+        $SQL .= "FROM   `group` ";
+        $SQL .= "       INNER JOIN lkusergroup ";
+        $SQL .= "       ON     lkusergroup.GroupID = `group`.groupID ";
+        $SQL .= "WHERE  `group`.IsUserSpecific     = 1 ";
+        $SQL .= sprintf("   AND lkusergroup.UserID = %d", $userID);
+
+        if (!$result = $db->query($SQL))
+        {
+            trigger_error($db->error());
+            $this->SetError(25005, __('Unable to get the UserGroup for this User.'));
+
+            return false;
+        }
+
+        $row 		= $db->get_assoc_row($result);
+        $userGroupID	= $row['GroupID'];
+
+        if ($userGroupID == '')
+        {
+            // We should always have 1 display specific UserGroup for a display.
+            // Do we a) Error here and give up?
+            //		 b) Create one and link it up?
+            // $this->SetError(25006, __('Unable to get the UserGroup for this Display'));
+
+            if (!$userGroupID = $this->Add($userName, 1))
+            {
+                $this->SetError(25001, __('Could not add a user group for this user.'));
+
+                return false;
+            }
+
+            // Link the Two together
+            if (!$this->Link($userGroupID, $userID))
+            {
+                $this->SetError(25001, __('Could not link the new user with its group.'));
+
+                return false;
+            }
+        }
+        else
+        {
+            if (!$this->Edit($userGroupID, $userName)) return false;
+        }
+        
+        Debug::LogEntry($db, 'audit', 'OUT', 'UserGroup', 'EditUserGroup');
+
+        return true;
+    }
+}
+?>
\ No newline at end of file

=== modified file 'server/lib/include.php'
--- server/lib/include.php	2009-05-16 18:40:19 +0000
+++ server/lib/include.php	2009-12-28 14:14:15 +0000
@@ -88,8 +88,15 @@
 // create a database class instance
 $db = new database();
 
-if (!$db->connect_db($dbhost, $dbuser, $dbpass)) trigger_error($db->error(), E_USER_WARNING);
-if (!$db->select_db($dbname)) trigger_error($db->error(), E_USER_WARNING);
+if (!$db->connect_db($dbhost, $dbuser, $dbpass))
+{
+    die('Xibo has a database connection problem.');
+}
+
+if (!$db->select_db($dbname))
+{
+    die('Xibo has a database connection problem.');
+}
 
 date_default_timezone_set(Config::GetSetting($db, "defaultTimezone"));
 

=== modified file 'server/lib/js/group.js'
--- server/lib/js/group.js	2009-01-04 12:59:11 +0000
+++ server/lib/js/group.js	2009-12-28 14:14:15 +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) 2009 Daniel Garner
  *
  * This file is part of Xibo.
  *
@@ -17,3 +17,29 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
  */ 
+function ManageMembersCallBack()
+{
+    $("#usersIn, #usersOut").sortable({
+            connectWith: '.connectedSortable',
+            dropOnEmpty: true
+    }).disableSelection();
+}
+
+function MembersSubmit() {
+    // Serialise the form and then submit it via Ajax.
+    var href = $("#usersIn").attr('href') + "&ajax=true";
+
+    // Get the two lists
+    serializedData = $("#usersIn").sortable('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/pages/displaygroup.class.php'
--- server/lib/pages/displaygroup.class.php	2009-09-17 22:42:36 +0000
+++ server/lib/pages/displaygroup.class.php	2009-12-28 14:14:15 +0000
@@ -321,7 +321,7 @@
 		if(!$resultIn = $db->query($SQL))
 		{
 			trigger_error($db->error());
-			trigger_error(__('Error getting Displays'));
+			trigger_error(__('Error getting Displays'), E_USER_ERROR);
 		}
 		
 		// Displays not in group
@@ -340,7 +340,7 @@
 		if(!$resultOut = $db->query($SQL))
 		{
 			trigger_error($db->error());
-			trigger_error(__('Error getting Displays'));
+			trigger_error(__('Error getting Displays'), E_USER_ERROR);
 		}
 		
 		// Now we have an IN and an OUT results object which we can use to build our lists
@@ -598,7 +598,7 @@
 		if(!$resultIn = $db->query($SQL))
 		{
 			trigger_error($db->error());
-			trigger_error(__('Error getting Displays'));
+			trigger_error(__('Error getting Displays'), E_USER_ERROR);
 		}
 		
 		while($row = $db->get_assoc_row($resultIn))

=== modified file 'server/lib/pages/group.class.php'
--- server/lib/pages/group.class.php	2009-07-10 19:45:55 +0000
+++ server/lib/pages/group.class.php	2009-12-28 14:14:15 +0000
@@ -1,7 +1,7 @@
 <?php
 /*
  * Xibo - Digitial Signage - http://www.xibo.org.uk
- * Copyright (C) 2006,2007,2008 Daniel Garner and James Packer
+ * Copyright (C) 2006,2007,2008,2009 Daniel Garner and James Packer
  *
  * This file is part of Xibo.
  *
@@ -25,7 +25,6 @@
 	private $db;
 	private $user;
 	private $isadmin = false;
-	private $has_permissions = true;
 	
 	private $sub_page = "";
 	
@@ -33,9 +32,6 @@
 	private $groupid;
 	private $group = "";
 	
-	//lkpage group
-	private $lkpagegroupid;
-	private $pageid;
 	
 	//init
 	function __construct(database $db, user $user) 
@@ -72,6 +68,9 @@
 			
 			$this->group = $aRow['Group'];
 		}
+                
+            // Include the group data classes
+            include_once('lib/data/usergroup.data.class.php');
 	}
 	
 	function on_page_load() 
@@ -146,7 +145,7 @@
 		SELECT 	group.group,
 				group.groupID
 		FROM `group`
-		WHERE 1 = 1
+		WHERE IsUserSpecific = 0
 END;
 		if ($filter_name != '') 
 		{
@@ -166,6 +165,7 @@
 		$msgName	= __('Name');
 		$msgAction	= __('Action');
 		$msgEdit	= __('Edit');
+		$msgMembers	= __('Group Members');
 		$msgPageSec	= __('Page Security');
 		$msgMenuSec	= __('Menu Security');
 		$msgDispSec	= __('Display Security');
@@ -200,9 +200,9 @@
 			{
 				$buttons = <<<END
 				<button class="XiboFormButton" href="index.php?p=group&q=GroupForm&groupid=$groupid"><span>$msgEdit</span></button>
+				<button class="XiboFormButton" href="index.php?p=group&q=MembersForm&groupid=$groupid"><span>$msgMembers</span></button>
 				<button class="XiboFormButton" href="index.php?p=group&q=PageSecurityForm&groupid=$groupid"><span>$msgPageSec</span></button>
 				<button class="XiboFormButton" href="index.php?p=group&q=MenuItemSecurityForm&groupid=$groupid"><span>$msgMenuSec</span></button>
-				<button class="XiboFormButton" href="index.php?p=group&q=DisplayGroupSecurityForm&groupid=$groupid"><span>$msgDispSec</span></button>
 				<button class="XiboFormButton" href="index.php?p=group&q=delete_form&groupid=$groupid"><span>$msgDel</span></button>
 END;
 			}
@@ -471,32 +471,27 @@
 	 */
 	function add() 
 	{
-		$db 		=& $this->db;
-		$group 		= Kit::GetParam('group', _POST, _STRING);
-		$userid 	= $_SESSION['userid'];
-		
-		//check on required fields
-		if ($group == "") 
-		{
-			Kit::Redirect(array('success'=>false, 'message' => __('Group Name cannot be empty.')));
-		}
-		
-		//add the group record
-		$SQL  = "INSERT INTO `group` (`group`) ";
-		$SQL .= sprintf(" VALUES ('%s') ", $db->escape_string($group));
-		
-		if (!$db->query($SQL)) 
-		{
-			trigger_error($db->error());
-			Kit::Redirect(array('success'=>false, 'message' => __('Error adding a new group.')));
-		}
-		
-		// Construct the Response
-		$response 					= array();
-		$response['success']		= true;
-		$response['message']		= __('Added the Group');
-		
-		Kit::Redirect($response);		
+            $db 	=& $this->db;
+            $response	= new ResponseManager();
+
+            $group 	= Kit::GetParam('group', _POST, _STRING);
+            $userid 	= $_SESSION['userid'];
+
+            //check on required fields
+            if ($group == '')
+            {
+                trigger_error(__('Group Name cannot be empty.'), E_USER_ERROR);
+            }
+
+            $userGroupObject = new UserGroup($db);
+
+            if (!$userGroupObject->Add($group, 0))
+            {
+                trigger_error($userGroupObject->GetErrorMessage(), E_USER_ERROR);
+            }
+
+            $response->SetFormSubmitResponse(__('Added the Group'), false);
+            $response->Respond();
 	}
 	
 	/**
@@ -828,5 +823,150 @@
 		
 		Kit::Redirect($response);
 	}
+
+        /**
+         * Shows the Members of a Group
+         */
+        public function MembersForm()
+	{
+            $db 	=& $this->db;
+            $response	= new ResponseManager();
+            $groupID	= Kit::GetParam('groupid', _REQUEST, _INT);
+
+            // There needs to be two lists here.
+
+            // Users in group
+            $SQL  = "";
+            $SQL .= "SELECT user.UserID, ";
+            $SQL .= "       user.UserName ";
+            $SQL .= "FROM   `user` ";
+            $SQL .= "       INNER JOIN lkusergroup ";
+            $SQL .= "       ON     lkusergroup.UserID = user.UserID ";
+            $SQL .= sprintf("WHERE  lkusergroup.GroupID   = %d", $groupID);
+
+            if(!$resultIn = $db->query($SQL))
+            {
+                trigger_error($db->error());
+                trigger_error(__('Error getting Groups'), E_USER_ERROR);
+            }
+
+            // Users not in group
+            $SQL  = "";
+            $SQL .= "SELECT user.UserID, ";
+            $SQL .= "       user.UserName ";
+            $SQL .= "FROM   `user` ";
+            $SQL .= " WHERE user.UserID NOT       IN ( ";
+            $SQL .= "   SELECT user.UserID ";
+            $SQL .= "  FROM   `user` ";
+            $SQL .= "  INNER JOIN lkusergroup ";
+            $SQL .= "  ON     lkusergroup.UserID = user.UserID ";
+            $SQL .= sprintf("WHERE  lkusergroup.GroupID   = %d", $groupID);
+            $SQL .= "       )";
+
+            if(!$resultOut = $db->query($SQL))
+            {
+                trigger_error($db->error());
+                trigger_error(__('Error getting Users'), E_USER_ERROR);
+            }
+
+            // Now we have an IN and an OUT results object which we can use to build our lists
+            $listIn 	= '<ul id="usersIn" href="index.php?p=group&q=SetMembers&GroupID=' . $groupID . '" class="connectedSortable">';
+
+            while($row = $db->get_assoc_row($resultIn))
+            {
+                // For each item output a LI
+                $userID     = Kit::ValidateParam($row['UserID'], _INT);
+                $userName   = Kit::ValidateParam($row['UserName'], _STRING);
+
+                $listIn		.= '<li id="UserID_' . $userID . '"class="li-sortable">' . $userName . '</li>';
+            }
+            $listIn		.= '</ul>';
+
+            $listOut 	= '<ul id="usersOut" class="connectedSortable">';
+
+            while($row = $db->get_assoc_row($resultOut))
+            {
+                // For each item output a LI
+                $userID     = Kit::ValidateParam($row['UserID'], _INT);
+                $userName   = Kit::ValidateParam($row['UserName'], _STRING);
+
+                $listOut    .= '<li id="UserID_' . $userID . '" class="li-sortable">' . $userName . '</li>';
+            }
+            $listOut 	.= '</ul>';
+
+            // Build the final form.
+            $form = '<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=Users&Category=Groups')");
+            $response->AddButton(__('Cancel'), 'XiboDialogClose()');
+            $response->AddButton(__('Save'), 'MembersSubmit()');
+            $response->Respond();
+	}
+
+        /**
+	 * Sets the Members of a group
+	 * @return
+	 */
+	public function SetMembers()
+	{
+            $db             =& $this->db;
+            $response       = new ResponseManager();
+            $groupObject    = new UserGroup($db);
+
+            $groupID	= Kit::GetParam('GroupID', _REQUEST, _INT);
+            $users	= Kit::GetParam('UserID', _POST, _ARRAY, array());
+            $members	= array();
+
+            // Users in group
+            $SQL  = "";
+            $SQL .= "SELECT user.UserID, ";
+            $SQL .= "       user.UserName ";
+            $SQL .= "FROM   `user` ";
+            $SQL .= "       INNER JOIN lkusergroup ";
+            $SQL .= "       ON     lkusergroup.UserID = user.UserID ";
+            $SQL .= sprintf("WHERE  lkusergroup.GroupID   = %d", $groupID);
+
+            if(!$resultIn = $db->query($SQL))
+            {
+                trigger_error($db->error());
+                trigger_error(__('Error getting Users'));
+            }
+
+            while($row = $db->get_assoc_row($resultIn))
+            {
+                // Test whether this ID is in the array or not
+                $userID	= Kit::ValidateParam($row['UserID'], _INT);
+
+                if(!in_array($userID, $users))
+                {
+                    // Its currently assigned but not in the $displays array
+                    //  so we unassign
+                    if (!$groupObject->Unlink($groupID, $userID))
+                    {
+                        trigger_error($groupObject->GetErrorMessage(), E_USER_ERROR);
+                    }
+                }
+                else
+                {
+                    $members[] = $userID;
+                }
+            }
+
+            foreach($users as $userID)
+            {
+                    // Add any that are missing
+                    if(!in_array($userID, $members))
+                    {
+                        if (!$groupObject->Link($groupID, $userID))
+                        {
+                            trigger_error($groupObject->GetErrorMessage(), E_USER_ERROR);
+                        }
+                    }
+            }
+
+            $response->SetFormSubmitResponse(__('Group membership set'), false);
+            $response->Respond();
+	}
 }
 ?>
\ No newline at end of file

=== modified file 'server/lib/pages/schedule.class.php'
--- server/lib/pages/schedule.class.php	2009-10-28 20:03:37 +0000
+++ server/lib/pages/schedule.class.php	2009-12-28 14:14:15 +0000
@@ -1073,6 +1073,7 @@
 		
 		$date			= Kit::GetParam('date', _GET, _INT, mktime(date('H'), 0, 0, date('m'), date('d'), date('Y')));
 		$dateText		= date("d/m/Y", $date);
+		$hiddenDateText		= date("m/d/Y", $date);
 		$displayGroupIDs	= Kit::GetParam('DisplayGroupIDs', _SESSION, _ARRAY);
 		
 		// need to do some user checking here
@@ -1087,7 +1088,7 @@
 		
 		$form 		= <<<END
 			<form id="AddEventForm" class="XiboForm" action="index.php?p=schedule&q=AddEvent" method="post">
-				<input type="hidden" id="fromdt" name="fromdt" value="" />
+				<input type="hidden" id="fromdt" name="fromdt" value="$hiddenDateText" />
 				<input type="hidden" id="todt" name="todt" value="" />
 				<input type="hidden" id="rectodt" name="rectodt" value="" />
 				<table style="width:100%;">

=== modified file 'server/lib/pages/user.class.php'
--- server/lib/pages/user.class.php	2009-10-28 21:28:04 +0000
+++ server/lib/pages/user.class.php	2009-12-28 14:14:15 +0000
@@ -26,15 +26,6 @@
 	private $user;
 	private $sub_page;
 	
-	//database fields
-	private $userid;
-	private $username;
-	private $password;
-	private $usertypeid;
-	private $email;
-	private $homepage;
-	private $groupid;
-
 	/**
 	 * Contructor
 	 *
@@ -43,33 +34,11 @@
 	 */
 	function __construct(database $db, user $user) 
 	{
-		$this->db 	=& $db;
-		$this->user =& $user;
-		
-		$this->sub_page = Kit::GetParam('sp', _REQUEST, _WORD, 'view');
-		$userid 		= Kit::GetParam('userID', _REQUEST, _INT, 0);
-
-		if($userid != 0) 
-		{
-			$this->sub_page = "edit";
-			
-			$this->userid = $userid;
-
-			$sql = " SELECT UserName, UserPassword, usertypeid, email, groupID, homepage FROM user";
-			$sql .= sprintf(" WHERE userID = %d", $userid);
-
-			if(!$results = $db->query($sql)) trigger_error("Error excuting query".$db->error(), E_USER_ERROR);
-
-			while($aRow = $db->get_row($results)) 
-			{
-				$this->username 	= Kit::ValidateParam($aRow[0], _USERNAME);
-				$this->password 	= Kit::ValidateParam($aRow[1], _PASSWORD);
-				$this->usertypeid 	= Kit::ValidateParam($aRow[2], _INT);
-				$this->email 		= Kit::ValidateParam($aRow[3], _STRING);
-				$this->groupid 		= Kit::ValidateParam($aRow[4], _INT);
-				$this->homepage 	= Kit::ValidateParam($aRow[5], _STRING);
-			}
-		}
+            $this->db   =& $db;
+            $this->user =& $user;
+
+            // Include the group data classes
+            include_once('lib/data/usergroup.data.class.php');
 	}
 
 	function on_page_load() 
@@ -90,61 +59,77 @@
 	 */
 	function AddUser () 
 	{
-		$db 		=& $this->db;
-		$response	= new ResponseManager();
-
-		$user		= Kit::GetParam('username', _POST, _USERNAME);
-		$password 	= md5(Kit::GetParam('password', _POST, _USERNAME));
-		$usertypeid = Kit::GetParam('usertypeid', _POST, _INT);
-		$email 		= Kit::GetParam('email', _POST, _STRING);
-		$groupid	= Kit::GetParam('groupid', _POST, _INT);
-		
-		// Construct the Homepage
-		$homepage	= "dashboard";
-
-		// Validation
-		if ($user=="")
-		{
-			trigger_error("Please enter a User Name.", E_USER_ERROR);
-		} 
-		if ($password=="") 
-		{
-			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
-		$sqlcheck = " ";
-		$sqlcheck .= sprintf("SELECT UserName FROM user WHERE UserName = '%s'", $db->escape_string($user));
-
-		if(!$sqlcheckresult = $db->query($sqlcheck)) 
-		{
-			trigger_error($db->error());
-			trigger_error("Cant get this user's name. Please try another.", E_USER_ERROR);			
-		}
-		
-		if($db->num_rows($sqlcheckresult) != 0) 
-		{
-			trigger_error("Could Not Complete, Duplicate User Name Exists", E_USER_ERROR);
-		}
-		
-		//Ready to enter the user into the database
-		$query = "INSERT INTO user (UserName, UserPassword, usertypeid, email, homepage, groupid)";
-		$query .= " VALUES ('$user', '$password', $usertypeid, '$email', '$homepage', $groupid)";
-		
-		if(!$id = $db->insert_query($query)) 
-		{
-			trigger_error($db->error());
-			trigger_error("Error adding that user", E_USER_ERROR);
-		}
-
-		$response->SetFormSubmitResponse('User Saved.');
-		$response->Respond();
+            $db 	=& $this->db;
+            $response	= new ResponseManager();
+
+            $username   = Kit::GetParam('username', _POST, _STRING);
+            $password   = Kit::GetParam('password', _POST, _STRING);
+            $password   = md5($password);
+            $email      = Kit::GetParam('email', _POST, _STRING);
+            $usertypeid	= Kit::GetParam('usertypeid', _POST, _INT, 0);
+            $homepage   = Kit::GetParam('homepage', _POST, _STRING);
+            $pass_change = isset($_POST['pass_change']);
+
+            // Construct the Homepage
+            $homepage	= "dashboard";
+
+            // Validation
+            if ($username=="")
+            {
+                trigger_error("Please enter a User Name.", E_USER_ERROR);
+            }
+            if ($password=="")
+            {
+                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
+            $sqlcheck = " ";
+            $sqlcheck .= sprintf("SELECT UserName FROM user WHERE UserName = '%s'", $db->escape_string($username));
+
+            if(!$sqlcheckresult = $db->query($sqlcheck))
+            {
+                trigger_error($db->error());
+                trigger_error("Cant get this user's name. Please try another.", E_USER_ERROR);
+            }
+
+            if($db->num_rows($sqlcheckresult) != 0)
+            {
+                trigger_error("Could Not Complete, Duplicate User Name Exists", E_USER_ERROR);
+            }
+
+            //Ready to enter the user into the database
+            $query = "INSERT INTO user (UserName, UserPassword, usertypeid, email, homepage)";
+            $query .= " VALUES ('$username', '$password', $usertypeid, '$email', '$homepage')";
+
+            if(!$id = $db->insert_query($query))
+            {
+                trigger_error($db->error());
+                trigger_error("Error adding that user", E_USER_ERROR);
+            }
+
+            // Add the user group
+            $userGroupObject = new UserGroup($db);
+
+            if (!$groupID = $userGroupObject->Add($username, 1))
+            {
+                // We really want to delete the new user...
+                //TODO: Delete the new user
+                
+                // And then error
+                trigger_error($userGroupObject->GetErrorMessage(), E_USER_ERROR);
+            }
+
+            $userGroupObject->Link($groupID, $id);
+
+            $response->SetFormSubmitResponse('User Saved.');
+            $response->Respond();
 	}
 
 	/**
@@ -154,79 +139,90 @@
 	 */
 	function EditUser() 
 	{
-		$db 		=& $this->db;
-		$response	= new ResponseManager();
-			
-		$error = "";
-
-		$userID		= Kit::GetParam('userid', _POST, _INT, 0);
-		$username 	= $_POST['username'];
-		$password 	= md5($_POST['password']);
-		$email 		= $_POST['email'];
-		$usertypeid = $_POST['usertypeid'];
-		$homepage 	= $_POST['homepage'];
-		$groupid	= $_POST['groupid'];
-		$pass_change = isset($_POST['pass_change']);
-
-		// Validation
-		if ($username == "")
-		{
-			trigger_error("Please enter a User Name.", E_USER_ERROR);
-		} 
-		if ($password == "") 
-		{
-			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
-		$sqlcheck = " ";
-		$sqlcheck .= "SELECT UserName FROM user WHERE UserName = '" . $username . "' AND userID <> $userID ";
-
-		if (!$sqlcheckresult = $db->query($sqlcheck)) 
-		{
-			trigger_error($db->error());
-			trigger_error("Cant get this user's name. Please try another.", E_USER_ERROR);			
-		}
-		
-		if ($db->num_rows($sqlcheckresult) != 0) 
-		{
-			trigger_error("Could Not Complete, Duplicate User Name Exists", E_USER_ERROR);
-		}
-
-		//Everything is ok - run the update
-		$sql = "UPDATE user SET UserName = '$username'";
-		if ($pass_change) 
-		{
-			$sql .= ", UserPassword = '$password'";
-		}
-		
-		$sql .= ", email = '$email' ";
-		if ($homepage == 'dashboard')
-		{
-			//acts as a reset
-			$sql .= ", homepage='$homepage' ";
-		}
-		
-		if ($usertypeid != "")
-		{
-			$sql .= ", usertypeid =  " . $usertypeid . ", groupID = $groupid ";
-		}
-		$sql .= " WHERE UserID = ". $userID . "";
-
-		if (!$db->query($sql)) 
-		{
-			trigger_error($db->error());
-			trigger_error("Error updating that user", E_USER_ERROR);
-		}
-
-		$response->SetFormSubmitResponse('User Saved.');
-		$response->Respond();
+            $db 	=& $this->db;
+            $response	= new ResponseManager();
+
+            $userID	= Kit::GetParam('userid', _POST, _INT, 0);
+            $username   = Kit::GetParam('username', _POST, _STRING);
+            $password   = Kit::GetParam('password', _POST, _STRING);
+            $password   = md5($password);
+            $email      = Kit::GetParam('email', _POST, _STRING);
+            $usertypeid	= Kit::GetParam('usertypeid', _POST, _INT, 0);
+            $homepage   = Kit::GetParam('homepage', _POST, _STRING);
+            $pass_change = isset($_POST['pass_change']);
+
+            // Validation
+            if ($username == "")
+            {
+                trigger_error("Please enter a User Name.", E_USER_ERROR);
+            }
+            if ($password == "")
+            {
+                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
+            $sqlcheck = " ";
+            $sqlcheck .= "SELECT UserName FROM user WHERE UserName = '" . $username . "' AND userID <> $userID ";
+
+            if (!$sqlcheckresult = $db->query($sqlcheck))
+            {
+                trigger_error($db->error());
+                trigger_error(__("Cant get this user's name. Please try another."), E_USER_ERROR);
+            }
+
+            if ($db->num_rows($sqlcheckresult) != 0)
+            {
+                trigger_error(__("Could Not Complete, Duplicate User Name Exists"), E_USER_ERROR);
+            }
+
+            //Everything is ok - run the update
+            $sql = "UPDATE user SET UserName = '$username'";
+            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 . "";
+
+            if (!$db->query($sql))
+            {
+                trigger_error($db->error());
+                trigger_error("Error updating that user", E_USER_ERROR);
+            }
+
+            // Update the group to follow suit
+            $userGroupObject = new UserGroup($db);
+
+            if (!$userGroupObject->EditUserGroup($userID, $username))
+            {
+                // We really want to delete the new user...
+                //TODO: Delete the new user
+
+                // And then error
+                trigger_error($userGroupObject->GetErrorMessage(), E_USER_ERROR);
+            }
+
+            $response->SetFormSubmitResponse('User Saved.');
+            $response->Respond();
 	}
 
 	/**
@@ -237,30 +233,44 @@
 	 */
 	function DeleteUser() 
 	{
-		$db 			=& $this->db;
-		$response		= new ResponseManager();
-		$userid 		= Kit::GetParam('userid', _POST, _INT, 0);
-
-		$sqldel = "DELETE FROM user";
-		$sqldel .= " WHERE UserID = ". $userid . "";
-
-		if (!$db->query($sqldel)) 
-		{
-			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 ";
-		
-		if (!$db->query($sqldel)) 
-		{
-			trigger_error($db->error());
-			trigger_error("If logged in, this user will be deleted once they log out.", E_USER_ERROR);
-		}
-		
-		$response->SetFormSubmitResponse('User Deleted.');
-		$response->Respond();
+            $db 	=& $this->db;
+            $user       =& $this->user;
+
+            $response	= new ResponseManager();
+            $userid 	= Kit::GetParam('userid', _POST, _INT, 0);
+            $groupID    = $user->getGroupFromID($userid, true);
+
+            // Firstly delete the group for this user
+            $userGroupObject = new UserGroup($db);
+
+            $userGroupObject->Unlink($groupID, $userid);
+
+            if (!$userGroupObject->Delete($groupID))
+            {
+                trigger_error($userGroupObject->GetErrorMessage(), E_USER_ERROR);
+            }
+
+            // Delete the user
+            $sqldel = "DELETE FROM user";
+            $sqldel .= " WHERE UserID = ". $userid . "";
+
+            if (!$db->query($sqldel))
+            {
+                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 ";
+
+            if (!$db->query($sqldel))
+            {
+                trigger_error($db->error());
+                trigger_error(__("If logged in, this user will be deleted once they log out."), E_USER_ERROR);
+            }
+
+            $response->SetFormSubmitResponse(__('User Deleted.'));
+            $response->Respond();
 	}
 
 	/**
@@ -276,21 +286,20 @@
 		$itemName = $_REQUEST['usertypeid'];
 		$username = $_REQUEST['username'];
 
-		$sql = "SELECT user.UserID, user.UserName, user.usertypeid, user.loggedin, user.lastaccessed, user.email, user.homepage, group.group ";
+		$sql = "SELECT user.UserID, user.UserName, user.usertypeid, user.loggedin, user.lastaccessed, user.email, user.homepage ";
 		$sql .= " FROM user ";
-		$sql .= " INNER JOIN `group` ON user.groupid = group.groupID ";
 		$sql .= " WHERE 1=1 ";
 		if ($_SESSION['usertype']==3) 
 		{
-			$sql .= " AND usertypeid=3 AND userid = " . $_SESSION['userid'] . " ";
+                    $sql .= " AND usertypeid=3 AND userid = " . $_SESSION['userid'] . " ";
 		}
 		if($itemName!="all") 
 		{
-			$sql .= " AND usertypeid=\"" . $itemName . "\"";
+                    $sql .= " AND usertypeid=\"" . $itemName . "\"";
 		}
 		if ($username != "") 
 		{
-			$sql .= " AND UserName LIKE '%$username%' ";	
+                    $sql .= " AND UserName LIKE '%$username%' ";
 		}
 		$sql .= " ORDER by UserName";
 		
@@ -310,7 +319,6 @@
 						<th>Homepage</th>
 						<th>Layout</th>
 						<th>Email</th>
-						<th>Group</th>
 						<th>Action</th>
 					</tr>
 				</thead>
@@ -321,12 +329,12 @@
 		{
 			$userID 	= $aRow[0];
 			$userName 	= $aRow[1];
-			$usertypeid = $aRow[2];
+			$usertypeid     = $aRow[2];
 			$loggedin 	= $aRow[3];
-			$lastaccessed = $aRow[4];
+			$lastaccessed   = $aRow[4];
 			$email 		= $aRow[5];
 			$homepage	= $aRow[6];
-			$group		= $aRow[7];
+                        $groupid        = $user->getGroupFromID($userID, true);
 
 			if($loggedin==1) 
 			{
@@ -372,18 +380,19 @@
 			$table .= "<td>" . $homepageArray[0] . "</td>";
 			$table .= "<td>" . $layout . "</td>";
 			$table .= "<td>" . $email . "</td>";
-			$table .= "<td>" . $group . "</td>";
 			$table .= "<td>";
 			
 			if($_SESSION['usertype'] == 1 ||($userID == $_SESSION['userid'])) 
 			{
-				$table .= '<button class="XiboFormButton" href="index.php?p=user&q=DisplayForm&userID=' . $userID . '"><span>Edit</span></button>';
-				$table .= '<button class="XiboFormButton" href="index.php?p=user&q=DeleteForm&userID=' . $userID . '" ><span>Delete</span></button></div></td>';
-			}
-			else 
-			{
-				$table .= "</td>";
-			}
+                            $msgPageSec	= __('Page Security');
+                            $msgMenuSec	= __('Menu Security');
+
+                            $table .= '<button class="XiboFormButton" href="index.php?p=user&q=DisplayForm&userID=' . $userID . '"><span>Edit</span></button>';
+                            $table .= '<button class="XiboFormButton" href="index.php?p=user&q=DeleteForm&userID=' . $userID . '" ><span>Delete</span></button>';
+                            $table .= '<button class="XiboFormButton" href="index.php?p=group&q=PageSecurityForm&groupid=' . $groupid . '"><span>' . $msgPageSec . '</span></button>';
+                            $table .= '<button class="XiboFormButton" href="index.php?p=group&q=MenuItemSecurityForm&groupid=' . $groupid . '"><span>' . $msgMenuSec . '</span></button>';
+			}
+                        $table .= "</td>";
 			$table .= "</tr>";
 		}
 		$table .= "</tbody></table></div>";
@@ -398,18 +407,8 @@
 	 */
 	function displayPage() 
 	{
-		$db =& $this->db;
-
-		switch ($this->sub_page) 
-		{
-			
-			case 'view':
-				include('template/pages/user_view.php');
-				break;
-				
-			default:
-				break;
-		}
+            $db =& $this->db;
+            include('template/pages/user_view.php');
 	}
 	
 	/**
@@ -454,140 +453,148 @@
 	}
 
 	/**
-	 * Displays the Add user form (from Ajax)
+	 * Displays the User form (from Ajax)
 	 * @return 
 	 */
 	function DisplayForm() 
 	{
-		$db 			=& $this->db;
-		$user			=& $this->user;
-		$response 		= new ResponseManager();
-		
-		$helpManager            = new HelpManager($db, $user);
-		
-		//ajax request handler
-		
-		$userid		= $this->userid;
-		$username 	= $this->username;
-		$password 	= $this->password;
-		$usertypeid     = $this->usertypeid;
-		$email 		= $this->email;
-		$homepage	= $this->homepage;
-		$groupid	= $this->groupid;
-		
-		// Help UI
-		$nameHelp	= $helpManager->HelpIcon("The Login Name of the user.", true);
-		$passHelp	= $helpManager->HelpIcon("The Password for this user.", true);
-		$emailHelp	= $helpManager->HelpIcon("Users email address. E.g. [e-mail]", true);
-		$homepageHelp	= $helpManager->HelpIcon("The users Homepage. This should not be changed until you want to reset their homepage.", true);
-		$overpassHelp	= $helpManager->HelpIcon("Do you want to override this users password with the one entered here.", true);
-		$usertypeHelp	= $helpManager->HelpIcon("What is this users type? This would usually be set to 'User'", true);
-		$groupHelp	= $helpManager->HelpIcon("Which group does this user belong to? User groups control media sharing and access to functional areas of Xibo.", true);
-
-                $homepageOption = '';
-                $override_option = '';
-
-		//What form are we displaying
-		if ($userid == "")
-		{
-			//add form
-			$action = "index.php?p=user&q=AddUser";
-		}
-		else
-		{
-			//edit form
-			$action = "index.php?p=user&q=EditUser";
-			
-			//split the homepage into its component parts (if it needs to be)
-			if (strpos($homepage,'&') !== false) 
-			{
-				$homepage = substr($homepage, 0, strpos($homepage,'&'));
-			}
-		
-			//make the homepage dropdown
-			$homepage_list = listcontent("dashboard|dashboard,mediamanager|mediamanager", "homepage", $homepage);
-			
-			$homepageOption = <<<END
-			<tr>
-				<td><label for="homepage">Homepage<span class="required">*</span></label></td>
-				<td>$homepageHelp $homepage_list</td>
-			</tr>
+            $db             =& $this->db;
+            $user           =& $this->user;
+            $response       = new ResponseManager();
+            $helpManager    = new HelpManager($db, $user);
+
+            $userid         = Kit::GetParam('userID', _GET, _INT);
+
+            $SQL  = "";
+            $SQL .= "SELECT UserName    , ";
+            $SQL .= "       UserPassword, ";
+            $SQL .= "       usertypeid  , ";
+            $SQL .= "       email       , ";
+            $SQL .= "       homepage ";
+            $SQL .= "FROM   `user`";
+            $SQL .= sprintf(" WHERE userID = %d", $userid);
+
+            if(!$results = $db->query($SQL))
+            {
+                trigger_error($db->error());
+                trigger_error(__('Error getting user information.'), E_USER_ERROR);
+            }
+
+            while($aRow = $db->get_row($results))
+            {
+                $username 	= Kit::ValidateParam($aRow[0], _USERNAME);
+                $password 	= Kit::ValidateParam($aRow[1], _PASSWORD);
+                $usertypeid 	= Kit::ValidateParam($aRow[2], _INT);
+                $email 		= Kit::ValidateParam($aRow[3], _STRING);
+                $homepage 	= Kit::ValidateParam($aRow[4], _STRING);
+            }
+
+            // Help UI
+            $nameHelp       = $helpManager->HelpIcon("The Login Name of the user.", true);
+            $passHelp       = $helpManager->HelpIcon("The Password for this user.", true);
+            $emailHelp      = $helpManager->HelpIcon("Users email address. E.g. [e-mail]", true);
+            $homepageHelp   = $helpManager->HelpIcon("The users Homepage. This should not be changed until you want to reset their homepage.", true);
+            $overpassHelp   = $helpManager->HelpIcon("Do you want to override this users password with the one entered here.", true);
+            $usertypeHelp   = $helpManager->HelpIcon("What is this users type? This would usually be set to 'User'", true);
+
+            $homepageOption = '';
+            $override_option = '';
+
+            //What form are we displaying
+            if ($userid == "")
+            {
+                    //add form
+                    $action = "index.php?p=user&q=AddUser";
+            }
+            else
+            {
+                    //edit form
+                    $action = "index.php?p=user&q=EditUser";
+
+                    //split the homepage into its component parts (if it needs to be)
+                    if (strpos($homepage,'&') !== false)
+                    {
+                            $homepage = substr($homepage, 0, strpos($homepage,'&'));
+                    }
+
+                    //make the homepage dropdown
+                    $homepage_list = listcontent("dashboard|dashboard,mediamanager|mediamanager", "homepage", $homepage);
+
+                    $homepageOption = <<<END
+                    <tr>
+                            <td><label for="homepage">Homepage<span class="required">*</span></label></td>
+                            <td>$homepageHelp $homepage_list</td>
+                    </tr>
 END;
-			
-			$override_option = <<<FORM
-			<td>Override Password?</td>
-			<td>$overpassHelp <input type="checkbox" name="pass_change" value="0"></td>
+
+                    $override_option = <<<FORM
+                    <td>Override Password?</td>
+                    <td>$overpassHelp <input type="checkbox" name="pass_change" value="0"></td>
 FORM;
-		}
-
-		//get us the user type if we dont have it (for the default value)
-		if($usertypeid=="") 
-		{
-			$usertype = Config::GetSetting($db,"defaultUsertype");
-
-			$SQL = "SELECT usertypeid FROM usertype WHERE usertype = '$usertype'";
-			if(!$results = $db->query($SQL)) 
-			{
-				trigger_error($db->error());
-				trigger_error("Can not get Usertype information", E_USER_ERROR);
-			}
-			$row = $db->get_row($results);
-			$usertypeid = $row['0'];
-		}
-		
-		//group list
-		$group_list = dropdownlist("SELECT groupID, `group` FROM `group` ORDER BY `group`", "groupid", $groupid);
-		
-		if ($_SESSION['usertype']==1)
-		{
-			//usertype list
-			$usertype_list = dropdownlist("SELECT usertypeid, usertype FROM usertype", "usertypeid", $usertypeid);
-			
-			$usertypeOption = <<<END
-			<tr>
-				<td><label for="usertypeid">User Type <span class="required">*</span></label></td>
-				<td>$usertypeHelp $usertype_list</td>
-			</tr>
-			<tr>
-				<td><label for="groupid">Group <span class="required">*</span></label></td>
-				<td>$groupHelp $group_list</td>
-			</tr>	
-END;
-		}
-		else
-		{
-			$usertypeOption = "";
-		}
-		
-				
-		$form = <<<END
-		<form id="UserForm" class="XiboForm" method='post' action='$action'>
-			<input type='hidden' name='userid' value='$userid'>
-			<table>
-				<tr>
-					<td><label for="username">User Name<span class="required">*</span></label></td>
-					<td>$nameHelp <input type="text" id="" name="username" value="$username" class="required" /></td>
-				</tr>
-				<tr>
-					<td><label for="password">Password<span class="required">*</span></label></td>
-					<td>$passHelp <input type="password" id="password" name="password" value="$password" /></td>
-					$override_option
-				</tr>
-				<tr>
-					<td><label for="email">Email Address<span class="required">*</span></label></td>
-					<td>$emailHelp <input type="text" id="email" name="email" value="$email" class="required" /></td>
-				</tr>
-				$homepageOption
-				$usertypeOption
-			</table>
-		</form>
-END;
-
-		$response->SetFormRequestResponse($form, 'Add/Edit a User.', '550px', '320px');
-                $response->AddButton(__('Help'), 'XiboHelpRender("' . $helpManager->Link('User', 'Add') . '")');
-		$response->AddButton(__('Cancel'), 'XiboDialogClose()');
-		$response->AddButton(__('Save'), '$("#UserForm").submit()');
-		$response->Respond();
+            }
+
+            //get us the user type if we dont have it (for the default value)
+            if($usertypeid=="")
+            {
+                    $usertype = Config::GetSetting($db,"defaultUsertype");
+
+                    $SQL = "SELECT usertypeid FROM usertype WHERE usertype = '$usertype'";
+                    if(!$results = $db->query($SQL))
+                    {
+                            trigger_error($db->error());
+                            trigger_error("Can not get Usertype information", E_USER_ERROR);
+                    }
+                    $row = $db->get_row($results);
+                    $usertypeid = $row['0'];
+            }
+
+
+            if ($_SESSION['usertype']==1)
+            {
+                    //usertype list
+                    $usertype_list = dropdownlist("SELECT usertypeid, usertype FROM usertype", "usertypeid", $usertypeid);
+
+                    $usertypeOption = <<<END
+                    <tr>
+                            <td><label for="usertypeid">User Type <span class="required">*</span></label></td>
+                            <td>$usertypeHelp $usertype_list</td>
+                    </tr>
+END;
+            }
+            else
+            {
+                    $usertypeOption = "";
+            }
+
+
+            $form = <<<END
+            <form id="UserForm" class="XiboForm" method='post' action='$action'>
+                    <input type='hidden' name='userid' value='$userid'>
+                    <table>
+                            <tr>
+                                    <td><label for="username">User Name<span class="required">*</span></label></td>
+                                    <td>$nameHelp <input type="text" id="" name="username" value="$username" class="required" /></td>
+                            </tr>
+                            <tr>
+                                    <td><label for="password">Password<span class="required">*</span></label></td>
+                                    <td>$passHelp <input type="password" id="password" name="password" value="$password" /></td>
+                                    $override_option
+                            </tr>
+                            <tr>
+                                    <td><label for="email">Email Address<span class="required email">*</span></label></td>
+                                    <td>$emailHelp <input type="text" id="email" name="email" value="$email" class="required" /></td>
+                            </tr>
+                            $homepageOption
+                            $usertypeOption
+                    </table>
+            </form>
+END;
+
+            $response->SetFormRequestResponse($form, 'Add/Edit a User.', '550px', '320px');
+            $response->AddButton(__('Help'), 'XiboHelpRender("' . $helpManager->Link('User', 'Add') . '")');
+            $response->AddButton(__('Cancel'), 'XiboDialogClose()');
+            $response->AddButton(__('Save'), '$("#UserForm").submit()');
+            $response->Respond();
 	}
 	
 	/**

=== modified file 'server/modules/module_user_general.php'
--- server/modules/module_user_general.php	2009-10-28 21:28:04 +0000
+++ server/modules/module_user_general.php	2009-12-28 14:14:15 +0000
@@ -93,7 +93,7 @@
 		$db 		=& $this->db;
 		global $session;
 		
-		$sql = sprintf("SELECT UserID, UserName, UserPassword, usertypeid, groupID FROM user WHERE UserName = '%s' AND UserPassword = '%s'", $db->escape_string($username), $db->escape_string($password));
+		$sql = sprintf("SELECT UserID, UserName, UserPassword, usertypeid FROM user WHERE UserName = '%s' AND UserPassword = '%s'", $db->escape_string($username), $db->escape_string($password));
 		
 		if(!$result = $db->query($sql)) trigger_error('A database error occurred while checking your login details.', E_USER_ERROR);
 
@@ -114,7 +114,6 @@
 		$_SESSION['userid']		= Kit::ValidateParam($results[0], _INT);
 		$_SESSION['username']	= Kit::ValidateParam($results[1], _USERNAME);
 		$_SESSION['usertype']	= Kit::ValidateParam($results[3], _INT);
-		$_SESSION['groupid']	= Kit::ValidateParam($results[4], _INT);
 		
 		$this->usertypeid		= $_SESSION['usertype'];
 		$this->userid			= $_SESSION['userid'];
@@ -230,32 +229,52 @@
 
 	function getGroupFromID($id, $returnID = false) 
 	{
-		$db 		=& $this->db;
-		
-		$SQL = sprintf("SELECT group.group, group.groupID FROM user INNER JOIN `group` ON group.groupID = user.groupID WHERE userid = %d", $id);
-		
-		if(!$results = $db->query($SQL)) 
-		{
-			trigger_error("Error looking up user information (group)");
-			trigger_error($db->error());
-		}
-		
-		if ($db->num_rows($results)==0) 
-		{
-			if ($returnID) 
-			{
-				return "1";
-			}
-			return "Users";
-		}
-		
-		$row = $db->get_row($results);
-
-		if ($returnID) 
-		{
-			return $row[1];
-		}
-		return $row[0];
+            $db =& $this->db;
+		
+            $SQL  = "";
+            $SQL .= "SELECT group.group, ";
+            $SQL .= "       group.groupID ";
+            $SQL .= "FROM   `user` ";
+            $SQL .= "       INNER JOIN lkusergroup ";
+            $SQL .= "       ON     lkusergroup.UserID = user.UserID ";
+            $SQL .= "       INNER JOIN `group` ";
+            $SQL .= "       ON     group.groupID       = lkusergroup.GroupID ";
+            $SQL .= sprintf("WHERE  `user`.userid                     = %d ", $id);
+            $SQL .= "AND    `group`.IsUserSpecific = 1";
+		
+            if(!$results = $db->query($SQL))
+            {
+                trigger_error($db->error());
+                trigger_error("Error looking up user information (group)", E_USER_ERROR);
+            }
+		
+            if ($db->num_rows($results) == 0)
+            {
+                // Every user should have a group?
+                // Add one in!
+                include_once('lib/data/usergroup.data.class.php');
+
+                $userGroupObject = new UserGroup($db);
+                if (!$groupID = $userGroupObject->Add('Unknown user id: ' . $id, 1))
+                {
+                    // Error
+                    trigger_error(__('User does not have a group and Xibo is unable to add one.'), E_USER_ERROR);
+                }
+
+                // Link the two
+                $userGroupObject->Link($groupID, $id);
+
+                if ($returnID) return $groupID;
+                return 'Unknown';
+            }
+
+            $row = $db->get_row($results);
+
+            if ($returnID)
+            {
+                return $row[1];
+            }
+            return $row[0];
 	}
 	
 	function getUserTypeFromID($id, $returnID = false) 
@@ -426,7 +445,6 @@
 		$userid		=& $this->userid;
 		
 		$usertype 	= Kit::GetParam('usertype', _SESSION, _INT, 0);
-		$groupid	= $this->getGroupFromID($userid, true);
 		
 		// Check the security
 		if ($usertype == 1) 
@@ -447,14 +465,16 @@
 		
 		// we have access to only the pages assigned to this group
 		$SQL = "SELECT pages.pageID FROM pages INNER JOIN lkpagegroup ON lkpagegroup.pageid = pages.pageid ";
-		$SQL .= sprintf(" WHERE lkpagegroup.groupid = %d AND pages.name = '%s' ", $groupid, $db->escape_string($page));
+                $SQL .= "       INNER JOIN lkusergroup ";
+                $SQL .= "       ON     lkpagegroup.groupID       = lkusergroup.GroupID ";
+		$SQL .= sprintf(" WHERE lkusergroup.UserID = %d AND pages.name = '%s' ", $userid, $db->escape_string($page));
 	
 		Debug::LogEntry($db, 'audit', $SQL);
 	
 		if (!$results = $db->query($SQL)) 
 		{
 			trigger_error($db->error());
-			trigger_error('Can not get the page security for this group [' . $groupid . '] and page [' . $page . ']');
+			trigger_error('Can not get the page security for this user [' . $userid . '] and page [' . $page . ']');
 		}
 		
 		if ($db->num_rows($results) < 1)
@@ -477,8 +497,7 @@
 	{
 		$db 		=& $this->db;
 		$userid		=& $this->userid;
-		$usertypeid = Kit::GetParam('usertype', _SESSION, _INT);
-		$groupid	= $this->getGroupFromID($userid, true);
+		$usertypeid     = Kit::GetParam('usertype', _SESSION, _INT);
 		
 		Debug::LogEntry($db, 'audit', sprintf('Authing the menu for usertypeid [%d]', $usertypeid));
 		
@@ -497,15 +516,17 @@
 		$SQL .= "         ON       pages.pageID = menuitem.PageID ";
 		if ($usertypeid != 1) 
 		{
-			$SQL .= "         INNER JOIN lkmenuitemgroup ";
-			$SQL .= "         ON       lkmenuitemgroup.MenuItemID = menuitem.MenuItemID ";
-			$SQL .= "         INNER JOIN `group` ";
-			$SQL .= "         ON       lkmenuitemgroup.GroupID = group.GroupID ";
+			$SQL .= "       INNER JOIN lkmenuitemgroup ";
+			$SQL .= "       ON       lkmenuitemgroup.MenuItemID = menuitem.MenuItemID ";
+			$SQL .= "       INNER JOIN `group` ";
+			$SQL .= "       ON       lkmenuitemgroup.GroupID = group.GroupID ";
+                        $SQL .= "       INNER JOIN lkusergroup ";
+                        $SQL .= "       ON     group.groupID       = lkusergroup.GroupID ";
 		}
 		$SQL .= sprintf("WHERE    menu.Menu              = '%s' ", $db->escape_string($menu));
 		if ($usertypeid != 1) 
 		{
-			$SQL .= sprintf(" AND group.groupid = %d", $groupid);
+			$SQL .= sprintf(" AND lkusergroup.UserID = %d", $userid);
 		}
 		$SQL .= " ORDER BY menuitem.Sequence";
 		
@@ -596,7 +617,6 @@
 		
 		// Populate the array of display group ids we are authed against
 		$usertype 	= Kit::GetParam('usertype', _SESSION, _INT, 0);
-		$groupid	= $this->getGroupFromID($userid, true);
 		
 		$SQL  = "SELECT DISTINCT displaygroup.DisplayGroupID, displaygroup.DisplayGroup, IsDisplaySpecific ";
 		$SQL .= "  FROM displaygroup ";
@@ -607,10 +627,15 @@
 		if ($usertype != 1)
 		{
 			$SQL .= " INNER JOIN lkgroupdg ON lkgroupdg.DisplayGroupID = displaygroup.DisplayGroupID ";
-			$SQL .= sprintf(" WHERE lkgroupdg.GroupID = %d ", $groupid);
+			$SQL .= " INNER JOIN lkusergroup ON lkgroupdg.GroupID = lkusergroup.GroupID ";
                 }
-
+                
                 $SQL .= " WHERE display.licensed = 1 ";
+
+                if ($usertype != 1)
+                {
+                    $SQL .= sprintf(" AND lkusergroup.UserID = %d ", $userid);
+                }
 		
 		Debug::LogEntry($db, 'audit', $SQL, 'User', 'DisplayGroupAuth');