Merge branch 'master' of ../trunk

4 files changed, 184 insertions, 1 deletions

diff --git a/actions/public.php b/actions/public.php
index 8ce7fbee3..b51a95f24 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -204,5 +204,7 @@ class PublicAction extends Action
         $top->show();
         $pop = new PopularNoticeSection($this);
         $pop->show();
+        $gbp = new GroupsByPostsSection($this);
+        $gbp->show();
     }
 }
diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php
index 3ec761389..97e1ed736 100644
--- a/classes/Memcached_DataObject.php
+++ b/classes/Memcached_DataObject.php
@@ -228,6 +228,6 @@ class Memcached_DataObject extends DB_DataObject
         }
         $inst->free();
         $c->set($ckey, $cached, MEMCACHE_COMPRESSED, $expiry);
-        return ArrayWrapper($cached);
+        return new ArrayWrapper($cached);
     }
 }
diff --git a/lib/groupsbypostssection.php b/lib/groupsbypostssection.php
new file mode 100644
index 000000000..a5e33a93d
--- /dev/null
+++ b/lib/groupsbypostssection.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * Groups with the most posts section
+ *
+ * PHP version 5
+ *
+ * LICENCE: 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  Widget
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @copyright 2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+/**
+ * Groups with the most posts section
+ *
+ * @category Widget
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ */
+
+class GroupsByPostsSection extends GroupSection
+{
+    function getGroups()
+    {
+        $qry = 'SELECT user_group.*, count(*) as value ' .
+          'FROM user_group JOIN group_inbox '.
+          'ON user_group.id = group_inbox.group_id ' .
+          'GROUP BY user_group.id ' .
+          'ORDER BY value DESC ';
+
+        $limit = GROUPS_PER_SECTION;
+        $offset = 0;
+
+        if (common_config('db','type') == 'pgsql') {
+            $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset;
+        } else {
+            $qry .= ' LIMIT ' . $offset . ', ' . $limit;
+        }
+
+        $group = Memcached_DataObject::cachedQuery('User_group',
+                                                   $qry,
+                                                   3600);
+        return $group;
+    }
+
+    function title()
+    {
+        return _('Groups with most posts');
+    }
+
+    function divId()
+    {
+        return 'top_groups_by_post';
+    }
+}
diff --git a/lib/groupsection.php b/lib/groupsection.php
new file mode 100644
index 000000000..bf26ab48c
--- /dev/null
+++ b/lib/groupsection.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * Base class for sections showing lists of groups
+ *
+ * PHP version 5
+ *
+ * LICENCE: 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  Widget
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @copyright 2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+define('GROUPS_PER_SECTION', 6);
+
+/**
+ * Base class for sections
+ *
+ * These are the widgets that show interesting data about a person
+ * group, or site.
+ *
+ * @category Widget
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ */
+
+class GroupSection extends Section
+{
+    function showContent()
+    {
+        $profiles = $this->getGroups();
+
+        if (!$profiles) {
+            return false;
+        }
+
+        $cnt = 0;
+
+        $this->out->elementStart('ul', 'entities group xoxo');
+
+        while ($profiles->fetch() && ++$cnt <= GROUPS_PER_SECTION) {
+            $this->showGroup($profiles);
+        }
+
+        $this->out->elementEnd('ul');
+
+        return ($cnt > GROUPS_PER_SECTION);
+    }
+
+    function getGroups()
+    {
+        return null;
+    }
+
+    function showGroup($group)
+    {
+        $this->out->elementStart('li', 'vcard');
+        $this->out->elementStart('a', array('title' => ($group->fullname) ?
+                                            $group->fullname :
+                                            $group->nickname,
+                                            'href' => $group->homeUrl(),
+                                            'rel' => 'contact group',
+                                            'class' => 'url'));
+        $logo = ($group->stream_logo) ?
+          $group->stream_logo : User_group::defaultLogo(AVATAR_STREAM_SIZE);
+
+        $this->out->element('img', array('src' => $logo,
+                                         'width' => AVATAR_MINI_SIZE,
+                                         'height' => AVATAR_MINI_SIZE,
+                                         'class' => 'avatar photo',
+                                         'alt' =>  ($group->fullname) ?
+                                         $group->fullname :
+                                         $group->nickname));
+        $this->out->element('span', 'fn org nickname', $group->nickname);
+        $this->out->elementEnd('a');
+        if ($group->value) {
+            $this->out->element('span', 'value', $group->value);
+        }
+        $this->out->elementEnd('li');
+    }
+}