merge recent changes into HEAD

1 files changed, 15 insertions, 8 deletions

diff --git a/BitPermUser.php b/BitPermUser.php
index 2019890..dc77be1 100644
--- a/BitPermUser.php
+++ b/BitPermUser.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * $Header: /cvsroot/bitweaver/_bit_users/BitPermUser.php,v 1.11 2005/12/26 12:27:13 squareing Exp $
+ * $Header: /cvsroot/bitweaver/_bit_users/BitPermUser.php,v 1.12 2006/01/10 21:17:04 squareing Exp $
  *
  * Lib for user administration, groups and permissions
  * This lib uses pear so the constructor requieres
@@ -12,7 +12,7 @@
  * All Rights Reserved. See copyright.txt for details and a complete list of authors.
  * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details
  *
- * $Id: BitPermUser.php,v 1.11 2005/12/26 12:27:13 squareing Exp $
+ * $Id: BitPermUser.php,v 1.12 2006/01/10 21:17:04 squareing Exp $
  * @package users
  */
 
@@ -25,7 +25,7 @@ require_once( USERS_PKG_PATH.'BitUser.php' );
  * Class that holds all information for a given user
  *
  * @author   spider <spider@steelsun.com>
- * @version  $Revision: 1.11 $
+ * @version  $Revision: 1.12 $
  * @package  users
  * @subpackage  BitPermUser
  */
@@ -544,6 +544,15 @@ class BitPermUser extends BitUser {
 	}
 
 
+	function getUnassignedPerms() {
+		$query = "SELECT up.`perm_name` AS `hash_key`, up.*
+			FROM `".BIT_DB_PREFIX."users_permissions` up
+			LEFT JOIN `".BIT_DB_PREFIX."users_grouppermissions` ugp ON( up.`perm_name` = ugp.`perm_name` )
+			WHERE ugp.`group_id` IS NULL
+			ORDER BY `package`, `perm_name` ASC";
+		return( $this->mDb->getAssoc( $query ) );
+	}
+
 	// If the request has a ticket, some form action is being processed, and we need to validate we have a matched ticket to avoid XSS
 	function isAdmin( $pCheckTicket=FALSE ) {
 		$ret = FALSE;
@@ -757,13 +766,11 @@ class BitPermUser extends BitUser {
 	function assignPermissionToGroup( $perm, $pGroupId ) {
 		$gBitCache = new BitCache();
 		$gBitCache->removeCached("allperms");
-		$query = "delete from `".BIT_DB_PREFIX."users_grouppermissions` where `group_id` = ?
-			and `perm_name` = ?";
+		$query = "DELETE FROM `".BIT_DB_PREFIX."users_grouppermissions` WHERE `group_id` = ? AND `perm_name` = ?";
 		$result = $this->mDb->query($query, array($pGroupId, $perm));
-		$query = "insert into `".BIT_DB_PREFIX."users_grouppermissions`(`group_id`, `perm_name`)
-			values(?, ?)";
+		$query = "INSERT INTO `".BIT_DB_PREFIX."users_grouppermissions`(`group_id`, `perm_name`) VALUES(?, ?)";
 		$result = $this->mDb->query($query, array($pGroupId, $perm));
-		return true;
+		return TRUE;
 	}