Fix searching for users in certain groups, and the userlist element, given the...

Fix searching for users in certain groups, and the userlist element, given the group owner -> admins change.

htdocs/json/usersearch.php

@@ -43,10 +43,10 @@ $limit = param_integer('limit', 20);
 $offset = param_integer('offset', 0);
 $allfields = param_boolean('allfields');
 $group = param_integer('group', 0);
-$owner = param_boolean('owner', true);
+$includeadmins = param_boolean('includeadmins', true);
 
 if ($group) {
-    $data = array('group' => $group, 'owner' => $owner);
+    $data = array('group' => $group, 'includeadmins' => $includeadmins);
     $data = search_user($query, $limit, $offset, $data);
 }
 else {

htdocs/lib/form/elements/userlist.php

@@ -71,7 +71,7 @@ function pieform_element_userlist(Pieform $form, $element) {
 
     if (!empty($element['group'])) {
         $smarty->assign('group', $element['group']);
-        $smarty->assign('owner', !isset($element['owner']) || $element['owner'] ? 1 : 0);
+        $smarty->assign('includeadmins', !isset($element['includeadmins']) || $element['includeadmins'] ? 1 : 0);
     }
     if (empty($element['searchscript'])) {
         $element['searchscript'] = 'json/usersearch.php';

htdocs/search/internal/lib.php

@@ -99,12 +99,11 @@ class PluginSearchInternal extends PluginSearch {
                 LEFT JOIN {artefact} a ON u.id=a.owner
                 ';
         if (isset($data['group'])) {
-            $sql .= 'INNER JOIN {group_member} gm ON (gm.member = u.id AND gm.group = ' . (int)$data['group'] . ')
-                ';
-            if (isset($data['owner']) && !$data['owner']) {
-                $sql .= 'INNER JOIN {group} g ON (g.id = gm.group AND g.owner != u.id)
-                    ';
+            $groupadminsql = '';
+            if (isset($data['includeadmins']) and !$data['includeadmins']) {
+                $groupadminsql = " AND gm.role != 'admin'";
             }
+            $sql .= 'INNER JOIN {group_member} gm ON (gm.member = u.id AND gm.group = ' . (int)$data['group'] . $groupadminsql . ")\n";
         }
         $querydata = split(' ', preg_replace('/\s\s+/', ' ', strtolower(trim($query_string))));
         $namesql = '(
@@ -142,12 +141,11 @@ class PluginSearchInternal extends PluginSearch {
                     INNER JOIN {usr} u ON u.id = a.owner
                 ';
             if (isset($data['group'])) {
-                $sql .= 'INNER JOIN {group_member} gm ON (gm.member = u.id AND gm.group = ' . (int)$data['group'] . ')
-                    ';
-                if (isset($data['owner']) && !$data['owner']) {
-                    $sql .= 'INNER JOIN {group} g ON (g.id = gm.group AND g.owner != u.id)
-                        ';
-                    }
+                $groupadminsql = '';
+                if (isset($data['includeadmins']) and !$data['includeadmins']) {
+                    $groupadminsql = " AND gm.role != 'admin'";
+                }
+                $sql .= 'INNER JOIN {group_member} gm ON (gm.member = u.id AND gm.group = ' . (int)$data['group'] . $groupadminsql . ")\n";
             }
             $sql .= 'WHERE
                     u.id <> 0 AND u.active = 1 AND u.deleted = 0