mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-01 20:30:39 +02:00
Code Issues Releases Wiki Activity

get_users_in_class wrong results (missing parent classes)

Browse Source
This commit is contained in:
secretr
2011-06-27 09:46:16 +00:00
parent 6a74e894e2
commit 19e558ad36
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
e107_handlers/userclass_class.php
View File

@@ -201,9 +201,13 @@ class user_class
$start_array = explode(',', $startList); $start_array = explode(',', $startList);
foreach ($start_array as $sa) foreach ($start_array as $sa)
{ // Merge in latest values - should eliminate duplicates as it goes { // Merge in latest values - should eliminate duplicates as it goes
$is[] = $sa; // add parent to the flat list first
if (isset($this->class_tree[$sa])) if (isset($this->class_tree[$sa]))
{ {
$is = array_merge($is,explode(',',$this->class_tree[$sa]['userclass_accum'])); if($this->class_tree[$sa]['userclass_accum'])
{
$is = array_merge($is,explode(',',$this->class_tree[$sa]['userclass_accum']));
}
} }
} }
if ($asArray) if ($asArray)
@@ -849,9 +853,10 @@ class user_class
public function get_users_in_class($classList, $fieldList = 'user_name, user_loginname', $includeAncestors = FALSE, $orderBy = 'user_id') public function get_users_in_class($classList, $fieldList = 'user_name, user_loginname', $includeAncestors = FALSE, $orderBy = 'user_id')
{ {
$ret = array(); $ret = array();
$classList = str_replace(' ','', $classList); // clean up white spaces
if ($includeAncestors) $classList = $this->get_all_user_classes($classList); if ($includeAncestors) $classList = $this->get_all_user_classes($classList);
$class_regex = "(^|,)(".str_replace(' ','',str_replace(",", "|", $classList)).")(,|$)"; $class_regex = "(^|,)(".str_replace(",", "|", $classList).")(,|$)";
$qry = "SELECT 'user_id,{$fieldList}' FROM `#user` WHERE user_class REGEXP '{$class_regex}' ORDER BY '{$orderBy}'"; $qry = "SELECT user_id,{$fieldList} FROM `#user` WHERE user_class REGEXP '{$class_regex}' ORDER BY '{$orderBy}'";
if ($this->sql_r->db_Select_gen($qry)) if ($this->sql_r->db_Select_gen($qry))
{ {
while ($row = $this->sql_r->db_Fetch(MYSQL_ASSOC)) while ($row = $this->sql_r->db_Fetch(MYSQL_ASSOC))