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.

1 files changed, 13 insertions, 8 deletions

diff --git a/modules/notification/helpers/notification.php b/modules/notification/helpers/notification.php
index 88d92b16..150616ab 100644
--- a/modules/notification/helpers/notification.php
+++ b/modules/notification/helpers/notification.php
@@ -67,15 +67,20 @@ class notification {
   }
 
   static function get_subscribers($item) {
-    // @todo don't access the user table directly
     // @todo only return distinct email addresses
-    $users = ORM::factory("user")
-      ->join("subscriptions", "users.id", "subscriptions.user_id")
-      ->join("items", "subscriptions.item_id", "items.id")
-      ->where("email IS NOT", null)
-      ->where("items.left_ptr <=", $item->left_ptr)
-      ->where("items.right_ptr >", $item->right_ptr)
-      ->find_all();
+    $subscriber_ids = array();
+    foreach (ORM::factory("subscription")
+             ->select("user_id")
+             ->join("items", "subscriptions.item_id", "items.id")
+             ->where("items.left_ptr <=", $item->left_ptr)
+             ->where("items.right_ptr >", $item->right_ptr)
+             ->find_all()
+             ->as_array() as $subscriber) {
+      $subscriber_ids[] = $subscriber->user_id;
+    }
+
+    $users = user::get_user_list(array("in" => array("id", $subscriber_ids),
+                                       "where" => array("email IS NOT" => null)));
 
     $subscribers = array();
     foreach ($users as $user) {