Merge commit 'refs/merge-requests/199' of git://gitorious.org/statusnet/mainline...

[quix0rs-gnu-social.git] / classes / User_group.php

diff --git a/classes/User_group.php b/classes/User_group.php
index 22b8d0bc04c7ab3004c93f9450ad8eaa9d00e3b2..e085014c46dd03256e65bfdae013206f74cac15a 100644 (file)
--- a/classes/User_group.php
+++ b/classes/User_group.php
@@ -62,6 +62,7 @@ class User_group extends Managed_DataObject
             'primary key' => array('id'),
             'unique keys' => array(
                 'user_group_uri_key' => array('uri'),
+// when it's safe and everyone's run upgrade.php                'user_profile_id_key' => array('profile_id'),
             ),
             'foreign keys' => array(
                 'user_group_id_fkey' => array('profile', array('profile_id' => 'id')),
@@ -229,7 +230,11 @@ class User_group extends Managed_DataObject
 
     public function getAdminCount()
     {
-        return $this->getAdmins()->N;
+        $block = new Group_member();
+        $block->group_id = $this->id;
+        $block->is_admin = 1;
+
+        return $block->count();
     }
 
     public function getMemberCount()
@@ -274,50 +279,27 @@ class User_group extends Managed_DataObject
         return $queue->count();
     }
 
-    function getAdmins($offset=0, $limit=null)
+    function getAdmins($offset=null, $limit=null)   // offset is null because DataObject wants it, 0 would mean no results
     {
-        $qry =
-          'SELECT profile.* ' .
-          'FROM profile JOIN group_member '.
-          'ON profile.id = group_member.profile_id ' .
-          'WHERE group_member.group_id = %d ' .
-          'AND group_member.is_admin = 1 ' .
-          'ORDER BY group_member.modified ASC ';
-
-        if ($limit != null) {
-            if (common_config('db','type') == 'pgsql') {
-                $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset;
-            } else {
-                $qry .= ' LIMIT ' . $offset . ', ' . $limit;
-            }
-        }
-
         $admins = new Profile();
+        $admins->joinAdd(array('id', 'group_member:profile_id'));
+        $admins->whereAdd(sprintf('group_member.group_id = %u AND group_member.is_admin = 1', $this->id));
+        $admins->orderBy('group_member.modified ASC');
+        $admins->limit($offset, $limit);
+        $admins->find();
 
-        $admins->query(sprintf($qry, $this->id));
         return $admins;
     }
 
-    function getBlocked($offset=0, $limit=null)
+    function getBlocked($offset=null, $limit=null)   // offset is null because DataObject wants it, 0 would mean no results
     {
-        $qry =
-          'SELECT profile.* ' .
-          'FROM profile JOIN group_block '.
-          'ON profile.id = group_block.blocked ' .
-          'WHERE group_block.group_id = %d ' .
-          'ORDER BY group_block.modified DESC ';
-
-        if ($limit != null) {
-            if (common_config('db','type') == 'pgsql') {
-                $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset;
-            } else {
-                $qry .= ' LIMIT ' . $offset . ', ' . $limit;
-            }
-        }
-
         $blocked = new Profile();
+        $blocked->joinAdd(array('id', 'group_block:blocked'));
+        $blocked->whereAdd(sprintf('group_block.group_id = %u', $this->id));
+        $blocked->orderBy('group_block.modified DESC');
+        $blocked->limit($offset, $limit);
+        $blocked->find();
 
-        $blocked->query(sprintf($qry, $this->id));
         return $blocked;
     }