Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / lib / grouptagcloudsection.php

diff --git a/lib/grouptagcloudsection.php b/lib/grouptagcloudsection.php
index 9b7a10f6b9ea029e45bda11f64fa7604411f04b3..68af4d307446396b9842a64a46c424770bbe4936 100644 (file)
--- a/lib/grouptagcloudsection.php
+++ b/lib/grouptagcloudsection.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Laconica, the distributed open-source microblogging tool
+ * StatusNet, the distributed open-source microblogging tool
  *
  * Personal tag cloud section
  *
@@ -20,14 +20,14 @@
  * 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.
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
@@ -35,12 +35,11 @@ if (!defined('LACONICA')) {
  * Group tag cloud section
  *
  * @category Widget
- * @package  Laconica
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
-
 class GroupTagCloudSection extends TagCloudSection
 {
     var $group = null;
@@ -53,16 +52,15 @@ class GroupTagCloudSection extends TagCloudSection
 
     function title()
     {
-        return sprintf(_('Tags in %s group\'s notices'), $this->group->nickname);
+        // TRANS: Title for group tag cloud section.
+        // TRANS: %s is a group name.
+        return _('Tags');
     }
 
     function getTags()
     {
-        if (common_config('db', 'type') == 'pgsql') {
-            $weightexpr='sum(exp(-extract(epoch from (now() - notice_tag.created)) / %s))';
-        } else {
-            $weightexpr='sum(exp(-(now() - notice_tag.created) / %s))';
-        }
+        $weightexpr = common_sql_weight('notice_tag.created', common_config('tag', 'dropoff'));
+        // @fixme should we use the cutoff too? Doesn't help with indexing per-group.
 
         $names = $this->group->getAliases();
 
@@ -73,12 +71,12 @@ class GroupTagCloudSection extends TagCloudSection
         $quoted = array();
 
         foreach ($names as $name) {
-            $quoted[] = "\"$name\"";
+            $quoted[] = "'$name'";
         }
 
         $namestring = implode(',', $quoted);
 
-        $qry = 'SELECT notice_tag.tag, '.
+        $qry = 'SELECT notice_tag.tag, notice_tag.notice_id, '.
           $weightexpr . ' as weight ' .
           'FROM notice_tag JOIN notice ' .
           'ON notice_tag.notice_id = notice.id ' .
@@ -99,7 +97,6 @@ class GroupTagCloudSection extends TagCloudSection
 
         $tag = Memcached_DataObject::cachedQuery('Notice_tag',
                                                  sprintf($qry,
-                                                         common_config('tag', 'dropoff'),
                                                          $this->group->id,
                                                          $namestring),
                                                  3600);