[evolvis-commits] r15886: Remove some duplicated code
mirabilos at evolvis.org
mirabilos at evolvis.org
Tue Mar 1 00:34:55 CET 2011
Author: mirabilos
Date: 2011-03-01 00:34:55 +0100 (Tue, 01 Mar 2011)
New Revision: 15886
Modified:
trunk/gforge_base/evolvisforge-5.1/src/common/include/Group.class.php
Log:
Remove some duplicated code
Modified: trunk/gforge_base/evolvisforge-5.1/src/common/include/Group.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/include/Group.class.php 2011-02-28 23:34:53 UTC (rev 15885)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/include/Group.class.php 2011-02-28 23:34:55 UTC (rev 15886)
@@ -2131,14 +2131,7 @@
* @return array of User objects for this group.
*/
function &getMembers() {
- if (!isset($this->membersArr)) {
- $res = db_query_params ('SELECT users.* FROM users INNER JOIN user_group ON users.user_id=user_group.user_id WHERE user_group.group_id=$1',
- array ($this->getID())) ;
- while ($arr = db_fetch_array($res)) {
- $this->membersArr[] = new GFUser($arr['user_id'],$arr);
- }
- }
- return $this->membersArr;
+ return $this->getUsers (true) ;
}
/**
@@ -2696,43 +2689,44 @@
* @return array of user's objects.
*/
function getUsers($onlylocal = true) {
- $users = array () ;
-
- if (USE_PFO_RBAC) {
- $ids = array () ;
- foreach ($this->getRoles() as $role) {
- if ($onlylocal
- && ($role->getHomeProject() == NULL || $role->getHomeProject()->getID() != $this->getID())) {
- continue ;
+ if (!isset($this->membersArr)) {
+ $this->membersArr = array () ;
+
+ if (USE_PFO_RBAC) {
+ $ids = array () ;
+ foreach ($this->getRoles() as $role) {
+ if ($onlylocal
+ && ($role->getHomeProject() == NULL || $role->getHomeProject()->getID() != $this->getID())) {
+ continue ;
+ }
+ foreach ($role->getUsers() as $user) {
+ $ids[] = $user->getID() ;
+ }
}
- foreach ($role->getUsers() as $user) {
- $ids[] = $user->getID() ;
+ $ids = array_unique ($ids) ;
+ foreach ($ids as $id) {
+ $u = user_get_object ($id) ;
+ if ($u->isActive()) {
+ $this->membersArr[] = $u ;
+ }
}
- }
- $ids = array_unique ($ids) ;
- foreach ($ids as $id) {
- $u = user_get_object ($id) ;
- if ($u->isActive()) {
- $users[] = $u ;
+ } else {
+
+ $users_group_res = db_query_params ('SELECT u.user_id FROM users u, user_group ug WHERE ug.group_id=$1 AND ug.user_id=u.user_id AND u.status=$2',
+ array ($this->getID(),
+ 'A'));
+ if (!$users_group_res) {
+ $this->setError('Error: Enable to get users from group '. $this->getID() . ' ' .db_error());
+ return false;
}
+
+ for ($i=0; $i<db_numrows($users_group_res); $i++) {
+ $this->membersArr[$i] = new GFUser(db_result($users_group_res,$i,'user_id'),false);
+ }
+
}
- } else {
-
- $users_group_res = db_query_params ('SELECT u.user_id FROM users u, user_group ug WHERE ug.group_id=$1 AND ug.user_id=u.user_id AND u.status=$2',
- array ($this->getID(),
- 'A'));
- if (!$users_group_res) {
- $this->setError('Error: Enable to get users from group '. $this->getID() . ' ' .db_error());
- return false;
- }
-
- for ($i=0; $i<db_numrows($users_group_res); $i++) {
- $users[$i] = new GFUser(db_result($users_group_res,$i,'user_id'),false);
- }
-
}
-
- return $users;
+ return $this->membersArr;
}
function setDocmanSearchStatus($status) {
More information about the evolvis-commits
mailing list