[Tikiwiki-cvs] tiki/lib userslib.php,1.247.2.3,1.247.2.4

[<sy...@us...>]

Update of /cvsroot/tikiwiki/tiki/lib
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv2580/lib

Modified Files:
      Tag: BRANCH-1-10
	userslib.php 
Log Message:
[MOD]group: new perm tiki_p_assign_my_groups that allows a user to assign himself in group from a list choosen by the admin

Index: userslib.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/lib/userslib.php,v
retrieving revision 1.247.2.3
retrieving revision 1.247.2.4
diff -u -d -r1.247.2.3 -r1.247.2.4
--- userslib.php	12 Nov 2007 18:44:50 -0000	1.247.2.3
+++ userslib.php	13 Nov 2007 17:37:16 -0000	1.247.2.4
@@ -1041,7 +1041,7 @@
 	$result = $this->query($query, array($userid));
     }
 
-    function get_groups($offset = 0, $maxRecords = -1, $sort_mode = 'groupName_asc', $find = '', $initial = '', $details="y", $inGroups='') {
+    function get_groups($offset = 0, $maxRecords = -1, $sort_mode = 'groupName_asc', $find = '', $initial = '', $details="y", $inGroups='', $userChoice='') {
 
 	$mid = "";
 	$bindvars = array();
@@ -1066,8 +1066,13 @@
 		}
 		$mid .= ')';
 	}
+	if ($userChoice) {
+		$mid .= $mid? ' and ': ' where ';
+		$mid .= '`userChoice` = ?';
+		$bindvars[] = 'y';
+	}
 
-	$query = "select `groupName` , `groupDesc`, `registrationChoice` from `users_groups` $mid order by ".$this->convert_sortmode($sort_mode);
+	$query = "select `groupName` , `groupDesc`, `registrationChoice`, `userChoice` from `users_groups` $mid order by ".$this->convert_sortmode($sort_mode);
 	$query_cant = "select count(*) from `users_groups` $mid";
 	$result = $this->query($query, $bindvars, $maxRecords, $offset);
 	$cant = $this->getOne($query_cant, $bindvars);
@@ -2162,28 +2167,27 @@
 	return true;
 	}
 
-	function add_group($group, $desc, $home, $utracker=0, $gtracker=0, $rufields='') {
+	function add_group($group, $desc, $home, $utracker=0, $gtracker=0, $rufields='', $userChoice='') {
 		global $cachelib;  
 		if ($this->group_exists($group))
 			return false;
-		$query = "insert into `users_groups`(`groupName`, `groupDesc`, `groupHome`,`usersTrackerId`,`groupTrackerId`, `registrationUsersFieldIds`) values(?,?,?,?,?,?)";
-		$result = $this->query($query, array($group, $desc, $home, (int)$utracker, (int)$gtracker, $rufields) );
+		$query = "insert into `users_groups`(`groupName`, `groupDesc`, `groupHome`,`usersTrackerId`,`groupTrackerId`, `registrationUsersFieldIds`, `userChoice`) values(?,?,?,?,?,?,?)";
+		$result = $this->query($query, array($group, $desc, $home, (int)$utracker, (int)$gtracker, $rufields, $userChoice) );
 		$cachelib->invalidate('grouplist');
 		return true;
 	}
 
-	function change_group($olgroup,$group,$desc,$home,$utracker=0,$gtracker=0,$ufield=0,$gfield=0,$rufields='') {
+	function change_group($olgroup,$group,$desc,$home,$utracker=0,$gtracker=0,$ufield=0,$gfield=0,$rufields='',$userChoice='') {
 		global $cachelib;
 		if ( $olgroup == 'Anonymous' || $olgroup == 'Registered' ) {
 			// Changing group name of 'Anonymous' and 'Registered' is not allowed.
 			if ( $group != $olgroup ) return false;
 		}
-
 		if (!$this->group_exists($olgroup))
-			return $this->add_group($group, $desc, $home,$utracker,$gtracker);
+			return $this->add_group($group, $desc, $home,$utracker,$gtracker, $userChoice);
 		$query = "update `users_groups` set `groupName`=?, `groupDesc`=?, `groupHome`=?, ";
-		$query.= " `usersTrackerId`=?, `groupTrackerId`=?, `usersFieldId`=?, `groupFieldId`=? , `registrationUsersFieldIds`=? where `groupName`=?";
-		$result = $this->query($query, array($group, $desc, $home, (int)$utracker, (int)$gtracker, (int)$ufield, (int)$gfield, $rufields, $olgroup));
+		$query.= " `usersTrackerId`=?, `groupTrackerId`=?, `usersFieldId`=?, `groupFieldId`=? , `registrationUsersFieldIds`=?, `userChoice`=? where `groupName`=?";
+		$result = $this->query($query, array($group, $desc, $home, (int)$utracker, (int)$gtracker, (int)$ufield, (int)$gfield, $rufields, $userChoice, $olgroup));
 		$query = "update `users_usergroups` set `groupName`=? where `groupName`=?";
 		$result = $this->query($query, array($group, $olgroup));
 		$query = "update `users_grouppermissions` set `groupName`=? where `groupName`=?";