Add support for the in filter to get_user_list and get_group_list. Convert the notifications to use user::get_user_list instead of accessing the table directly.

2 files changed, 14 insertions, 2 deletions

diff --git a/modules/user/helpers/group.php b/modules/user/helpers/group.php
index 2590c7d1..fbc5157d 100644
--- a/modules/user/helpers/group.php
+++ b/modules/user/helpers/group.php
@@ -82,7 +82,13 @@ class group_Core {
     $group = ORM::factory("group");
 
     foreach($filter as $method => $args) {
-      $group->$method($args);
+      switch ($method) {
+      case "in":
+        $group->in($args[0], $args[1]);
+        break;
+      default:
+        $group->$method($args);
+      }
     }
     return $group->find_all();
   }
diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
index 6a155768..c6a7735b 100644
--- a/modules/user/helpers/user.php
+++ b/modules/user/helpers/user.php
@@ -334,7 +334,13 @@ class user_Core {
     $user = ORM::factory("user");
 
     foreach($filter as $method => $args) {
-      $user->$method($args);
+      switch ($method) {
+      case "in":
+        $user->in($args[0], $args[1]);
+        break;
+      default:
+        $user->$method($args);
+      }
     }
     return $user->find_all();
   }