better output for registration confirmation

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

diff --git a/classes/Profile.php b/classes/Profile.php
index a47744a124dc26104b472ef62ed6ddba6870a90e..16484fbe6ebfbbca38d6eaabb67cd72a4f4410aa 100644 (file)
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -68,9 +68,17 @@ class Profile extends Memcached_DataObject
         if (is_null($height)) {
             $height = $width;
         }
-        return Avatar::pkeyGet(array('profile_id' => $this->id,
-                                     'width' => $width,
-                                     'height' => $height));
+
+        $avatar = null;
+
+        if (Event::handle('StartProfileGetAvatar', array($this, $width, &$avatar))) {
+            $avatar = Avatar::pkeyGet(array('profile_id' => $this->id,
+                                            'width' => $width,
+                                            'height' => $height));
+            Event::handle('EndProfileGetAvatar', array($this, $width, &$avatar));
+        }
+
+        return $avatar;
     }
 
     function getOriginalAvatar()
@@ -313,36 +321,66 @@ class Profile extends Memcached_DataObject
         return false;
     }
 
-    function getOwnedTags($auth_user, $offset=0, $limit=null, $since_id=0, $max_id=0)
+    function getLists($auth_user, $offset=0, $limit=null, $since_id=0, $max_id=0)
     {
-        $tags = new Profile_list();
-        $tags->tagger = $this->id;
+        $ids = array();
+
+        $keypart = sprintf('profile:lists:%d', $this->id);
+
+        $idstr = self::cacheGet($keypart);
 
-        if (($auth_user instanceof User || $auth_user instanceof Profile) &&
-                $auth_user->id === $this->id) {
-            // no condition, get both private and public tags
+        if ($idstr !== false) {
+            $ids = explode(',', $idstr);
         } else {
-            $tags->private = false;
-        }
+            $list = new Profile_list();
+            $list->selectAdd();
+            $list->selectAdd('id');
+            $list->tagger = $this->id;
+            $list->selectAdd('id as "cursor"');
+
+            if ($since_id>0) {
+               $list->whereAdd('id > '.$since_id);
+            }
 
-        $tags->selectAdd('id as "cursor"');
+            if ($max_id>0) {
+                $list->whereAdd('id <= '.$max_id);
+            }
 
-        if ($since_id>0) {
-           $tags->whereAdd('id > '.$since_id);
-        }
+            if($offset>=0 && !is_null($limit)) {
+                $list->limit($offset, $limit);
+            }
 
-        if ($max_id>0) {
-            $tags->whereAdd('id <= '.$max_id);
-        }
+            $list->orderBy('id DESC');
 
-        if($offset>=0 && !is_null($limit)) {
-            $tags->limit($offset, $limit);
+            if ($list->find()) {
+                while ($list->fetch()) {
+                    $ids[] = $list->id;
+                }
+            }
+
+            self::cacheSet($keypart, implode(',', $ids));
         }
 
-        $tags->orderBy('id DESC');
-        $tags->find();
+        $showPrivate = (($auth_user instanceof User ||
+                            $auth_user instanceof Profile) &&
+                        $auth_user->id === $this->id);
 
-        return $tags;
+        $lists = array();
+
+        foreach ($ids as $id) {
+            $list = Profile_list::staticGet('id', $id);
+            if (!empty($list) &&
+                ($showPrivate || !$list->private)) {
+
+                if (!isset($list->cursor)) {
+                    $list->cursor = $list->id;
+                }
+
+                $lists[] = $list;
+            }
+        }
+
+        return new ArrayWrapper($lists);
     }
 
     function getOtherTags($auth_user=null, $offset=0, $limit=null, $since_id=0, $max_id=0)