svn commit: r1291960 - /incubator/vcl/trunk/web/.ht-inc/utils.php

[jf...@apache.org]

Author: jfthomps
Date: Tue Feb 21 19:20:00 2012
New Revision: 1291960

URL: http://svn.apache.org/viewvc?rev=1291960&view=rev
Log:
VCL-321
user lookup tool doesn't show user group affiliation

modified getUsersGroups - added group affiliation to names of owned groups when $includeaffil is 1

Modified:
    incubator/vcl/trunk/web/.ht-inc/utils.php

Modified: incubator/vcl/trunk/web/.ht-inc/utils.php
URL: http://svn.apache.org/viewvc/incubator/vcl/trunk/web/.ht-inc/utils.php?rev=1291960&r1=1291959&r2=1291960&view=diff
==============================================================================
--- incubator/vcl/trunk/web/.ht-inc/utils.php (original)
+++ incubator/vcl/trunk/web/.ht-inc/utils.php Tue Feb 21 19:20:00 2012
@@ -3375,10 +3375,20 @@ function getUsersGroups($userid, $includ
 		$groups[$row["usergroupid"]] = $row["name"];
 	}
 	if($includeowned) {
-		$query = "SELECT id AS usergroupid, "
-		       .        "name "
-		       . "FROM usergroup "
-		       . "WHERE ownerid = $userid";
+		if($includeaffil) {
+			$query = "SELECT g.id AS usergroupid, "
+			       .        "CONCAT(g.name, '@', a.name) AS name "
+			       . "FROM usergroup g, "
+			       .      "affiliation a "
+			       . "WHERE g.ownerid = $userid AND "
+			       .       "g.affiliationid = a.id";
+		}
+		else {
+			$query = "SELECT id AS usergroupid, "
+			       .        "name "
+			       . "FROM usergroup "
+			       . "WHERE ownerid = $userid";
+		}
 		$qh = doQuery($query, "101");
 		while($row = mysql_fetch_assoc($qh)) {
 			$groups[$row["usergroupid"]] = $row["name"];