Merge branch '1.0.x' into testing

diff --git a/classes/Profile.php b/classes/Profile.php
index 73a98d4ff51541e1b4b4e05c9d99e3c37af97098..f7a94413b253d76b8127b68eb0068c8eb64c14f1 100644 (file)
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -245,30 +245,37 @@ class Profile extends Memcached_DataObject
         return !empty($request);
     }
 
-    function getGroups($offset=0, $limit=null)
+    function getGroups($offset=0, $limit=PROFILES_PER_PAGE)
     {
-        $qry =
-          'SELECT user_group.* ' .
-          'FROM user_group JOIN group_member '.
-          'ON user_group.id = group_member.group_id ' .
-          'WHERE group_member.profile_id = %d ' .
-          'ORDER BY group_member.created DESC ';
-
-        if ($offset>0 && !is_null($limit)) {
-            if ($offset) {
-                if (common_config('db','type') == 'pgsql') {
-                    $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset;
-                } else {
-                    $qry .= ' LIMIT ' . $offset . ', ' . $limit;
+        $ids = array();
+        
+        $keypart = sprintf('profile:groups:%d', $this->id);
+
+        $idstring = self::cacheGet($keypart);
+
+        if ($idstring !== false) {
+            $ids = explode(',', $idstring);
+        } else {
+            $gm = new Group_member();
+
+            $gm->profile_id = $this->id;
+
+            if ($gm->find()) {
+                while ($gm->fetch()) {
+                    $ids[] = $gm->group_id;
                 }
             }
+
+            self::cacheSet($keypart, implode(',', $ids));
         }
 
-        $groups = new User_group();
+        $groups = array();
 
-        $cnt = $groups->query(sprintf($qry, $this->id));
+        foreach ($ids as $id) {
+            $groups[] = User_group::staticGet('id', $id);
+        }
 
-        return $groups;
+        return new ArrayWrapper($groups);
     }
 
     /**
@@ -286,6 +293,7 @@ class Profile extends Memcached_DataObject
         } else {
             if (Event::handle('StartJoinGroup', array($group, $this))) {
                 $join = Group_member::join($group->id, $this->id);
+                self::blow('profile:groups:%d', $this->id);
                 Event::handle('EndJoinGroup', array($group, $this));
             }
         }
@@ -305,6 +313,7 @@ class Profile extends Memcached_DataObject
     {
         if (Event::handle('StartLeaveGroup', array($group, $this))) {
             Group_member::leave($group->id, $this->id);
+            self::blow('profile:groups:%d', $this->id);
             Event::handle('EndLeaveGroup', array($group, $this));
         }
     }

diff --git a/lib/defaultlocalnav.php b/lib/defaultlocalnav.php
index b9b45c8e010950ce9bb8ddfd96d9e0b4cf73a5cf..f150407621e83b8c75451b98e0cb4a395e013239 100644 (file)
--- a/lib/defaultlocalnav.php
+++ b/lib/defaultlocalnav.php
@@ -62,6 +62,11 @@ class DefaultLocalNav extends Menu
         // TRANS: Menu item in default local navigation panel.
         $this->submenu(_m('MENU','Public'), $bn);
 
+        if (!empty($user)) {
+            $sn = new StreamsNav($this->action);
+            $this->submenu(_m('MENU', 'Streams'), $sn);
+        }
+
         $this->action->elementEnd('ul');
     }
 }

diff --git a/lib/streamsnav.php b/lib/streamsnav.php
new file mode 100644 (file)
index 0000000..2051cc3
--- /dev/null
+++ b/lib/streamsnav.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Menu for streams
+ * 
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Cache
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * Menu for streams you follow
+ *
+ * @category  General
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class StreamsNav extends Menu
+{
+    /**
+     * Show the menu
+     *
+     * @return void
+     */
+    function show()
+    {
+        $user         = common_current_user();
+
+        if (empty($user)) {
+            throw new ServerException('Cannot show personal group navigation without a current user.');
+        }
+
+        $action = $this->actionName;
+
+        $this->out->elementStart('ul', array('class' => 'nav'));
+
+        if (Event::handle('StartStreamsNav', array($this))) {
+            $group = $user->getGroups();
+            
+            while ($group->fetch()) {
+                $this->out->menuItem(($group->mainpage) ? $group->mainpage : common_local_url('showgroup',
+                                                                                              array('nickname' => $group->nickname)),
+                                     $group->getBestName(),
+                                     '',
+                                     $action == 'showgroup' && $this->action->arg('nickname') == $group->nickname,
+                                     'nav_timeline_group_'.$group->nickname);
+            }
+            Event::handle('EndStreamsNav', array($this));
+        }
+
+        $this->out->elementEnd('ul');
+    }
+}