Merge request from chimo adding getvaliddaemons to stopdaemons.php

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

diff --git a/classes/User_group.php b/classes/User_group.php
index 22b8d0bc04c7ab3004c93f9450ad8eaa9d00e3b2..aad38b635885540a29bf2b63e3b4b330744172b1 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')),
@@ -73,23 +74,28 @@ class User_group extends Managed_DataObject
         );
     }
 
-    protected $_profile = null;
+    protected $_profile = array();
 
     /**
      * @return Profile
      *
-     * @throws UserNoProfileException if user has no profile
+     * @throws GroupNoProfileException if user has no profile
      */
     public function getProfile()
     {
-        if (!($this->_profile instanceof Profile)) {
-            $this->_profile = Profile::getKV('id', $this->profile_id);
-            if (!($this->_profile instanceof Profile)) {
+        if (!isset($this->_profile[$this->profile_id])) {
+            $profile = Profile::getKV('id', $this->profile_id);
+            if (!$profile instanceof Profile) {
                 throw new GroupNoProfileException($this);
             }
+            $this->_profile[$this->profile_id] = $profile;
         }
+        return $this->_profile[$this->profile_id];
+    }
 
-        return $this->_profile;
+    public function getNickname()
+    {
+        return $this->getProfile()->getNickname();
     }
 
     public static function defaultLogo($size)
@@ -229,7 +235,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 +284,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;
     }
 
@@ -770,6 +757,8 @@ class User_group extends Managed_DataObject
         // or we'll miss clearing some cache keys; that can make it hard
         // to create a new group with one of those names or aliases.
         $this->setAliases(array());
+
+        // $this->isLocal() but we're using the resulting object
         $local = Local_group::getKV('group_id', $this->id);
         if ($local instanceof Local_group) {
             $local->delete();
@@ -822,6 +811,12 @@ class User_group extends Managed_DataObject
                 $this->force_scope == 1);
     }
 
+    public function isLocal()
+    {
+        $local = Local_group::getKV('group_id', $this->id);
+        return ($local instanceof Local_group);
+    }
+
     static function groupsFromText($text, Profile $profile)
     {
         $groups = array();