Merge branch 'master' of ../trunk

diff --git a/actions/showstream.php b/actions/showstream.php
index 1ea84cf218bfc04c87188a271cd69218e8e92208..9e209cd4a06e352bc212e0e35638b67a28ab2752 100644 (file)
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -388,6 +388,8 @@ class ShowstreamAction extends Action
         $this->showSubscribers();
         $this->showGroups();
         $this->showStatistics();
+        $cloud = new PersonalTagCloudSection($this, $this->user);
+        $cloud->show();
     }
 
     function showSubscriptions()

diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php
index 97e1ed736e91cbc56befa6725338d2ef565fcd71..5f71f716b3dd569f84ef557420b03517ecc7c2f9 100644 (file)
--- a/classes/Memcached_DataObject.php
+++ b/classes/Memcached_DataObject.php
@@ -218,10 +218,7 @@ class Memcached_DataObject extends DB_DataObject
         }
 
         $inst = new $cls();
-        $result = $inst->query($qry);
-        if (!$result) {
-            return $inst;
-        }
+        $inst->query($qry);
         $cached = array();
         while ($inst->fetch()) {
             $cached[] = clone($inst);

diff --git a/lib/personaltagcloudsection.php b/lib/personaltagcloudsection.php
new file mode 100644 (file)
index 0000000..0882822
--- /dev/null
+++ b/lib/personaltagcloudsection.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * Personal tag cloud 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);
+}
+
+/**
+ * Personal tag cloud 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 PersonalTagCloudSection extends TagCloudSection
+{
+    var $user = null;
+
+    function __construct($out=null, $user=null)
+    {
+        parent::__construct($out);
+        $this->user = $user;
+    }
+
+    function title()
+    {
+        return sprintf(_('Tags in %s\'s notices'), $this->user->nickname);
+    }
+
+    function getTags()
+    {
+        $qry = 'SELECT notice_tag.tag, '.
+          'sum(exp(-(now() - notice_tag.created)/%s)) as weight ' .
+          'FROM notice_tag JOIN notice ' .
+          'ON notice_tag.notice_id = notice.id ' .
+          'WHERE notice.profile_id = %d ' .
+          'GROUP BY notice_tag.tag ' .
+          'ORDER BY weight DESC ';
+
+        $limit = TAGS_PER_SECTION;
+        $offset = 0;
+
+        if (common_config('db','type') == 'pgsql') {
+            $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset;
+        } else {
+            $qry .= ' LIMIT ' . $offset . ', ' . $limit;
+        }
+
+        $tag = Memcached_DataObject::cachedQuery('Notice_tag',
+                                                 sprintf($qry,
+                                                         common_config('tag', 'dropoff'),
+                                                         $this->user->id),
+                                                 3600);
+        return $tag;
+    }
+
+}

diff --git a/lib/searchgroupnav.php b/lib/searchgroupnav.php
index 8ca5dd20092e9a840552b934b9dfdaf303476eb8..2a0f5a6ea279f26e96d37b57022a894bacce3027 100644 (file)
--- a/lib/searchgroupnav.php
+++ b/lib/searchgroupnav.php
@@ -71,9 +71,9 @@ class SearchGroupNav extends Widget
     {
         $action_name = $this->action->trimmed('action');
         $this->action->elementStart('ul', array('class' => 'nav'));
-        $this->out->menuItem(common_local_url('people'), _('People'),
+        $this->out->menuItem(common_local_url('peoplesearch'), _('People'),
             _('Find people on this site'), $action_name == 'peoplesearch', 'nav_search_people');
-        $this->out->menuItem(common_local_url('notice'), _('Notice'),
+        $this->out->menuItem(common_local_url('noticesearch'), _('Notice'),
             _('Find content of notices'), $action_name == 'noticesearch', 'nav_search_notice');
         $this->action->elementEnd('ul');
     }

diff --git a/lib/tagcloudsection.php b/lib/tagcloudsection.php
new file mode 100644 (file)
index 0000000..121dfc4
--- /dev/null
+++ b/lib/tagcloudsection.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * Base class for sections showing tag clouds
+ *
+ * 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('TAGS_PER_SECTION', 20);
+
+/**
+ * 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 TagCloudSection extends Section
+{
+    function showContent()
+    {
+        $tags = $this->getTags();
+
+        if (!$tags) {
+            return false;
+        }
+
+        $cnt = 0;
+
+        $tw = array();
+        $sum = 0;
+
+        while ($tags->fetch() && ++$cnt <= TAGS_PER_SECTION) {
+            $tw[$tags->tag] = $tags->weight;
+            $sum += $tags->weight;
+        }
+
+        ksort($tw);
+
+        $this->out->elementStart('ul', 'tags xoxo tag-cloud');
+        foreach ($tw as $tag => $weight) {
+            $this->showTag($tag, $weight, $weight/$sum);
+        }
+        $this->out->elementEnd('ul');
+
+        return ($cnt > TAGS_PER_SECTION);
+    }
+
+    function getTags()
+    {
+        return null;
+    }
+
+    function showTag($tag, $weight, $relative)
+    {
+        if ($relative > 0.1) {
+            $rel =  'tag-cloud-7';
+        } else if ($relative > 0.05) {
+            $rel = 'tag-cloud-6';
+        } else if ($relative > 0.02) {
+            $rel = 'tag-cloud-5';
+        } else if ($relative > 0.01) {
+            $rel = 'tag-cloud-4';
+        } else if ($relative > 0.005) {
+            $rel = 'tag-cloud-3';
+        } else if ($relative > 0.002) {
+            $rel = 'tag-cloud-2';
+        } else {
+            $rel = 'tag-cloud-1';
+        }
+
+        $this->out->elementStart('li', $rel);
+        $this->out->element('a', array('href' => $this->tagUrl($tag)),
+                       $tag);
+        $this->out->elementEnd('li');
+    }
+
+    function tagUrl($tag)
+    {
+        return common_local_url('tag', array('tag' => $tag));
+    }
+}