X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpopularnoticesection.php;h=35b914a50c056303fe02222d3600f1837b7c8196;hb=093857c582a68b39e0d65523d27f25ede7b7fed6;hp=89daaa563ce7aa7a75e1f72c8e2e4a5157376630;hpb=a7c85bebd5be9ea019a8c80d74730d7eb28d4651;p=quix0rs-gnu-social.git

diff --git a/lib/popularnoticesection.php b/lib/popularnoticesection.php
index 89daaa563c..35b914a50c 100644
--- a/lib/popularnoticesection.php
+++ b/lib/popularnoticesection.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Laconica, the distributed open-source microblogging tool
+ * StatusNet, the distributed open-source microblogging tool
  *
  * Base class for sections showing lists of notices
  *
@@ -20,19 +20,17 @@
  * 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);
 }
 
-define('NOTICES_PER_SECTION', 6);
-
 /**
  * Base class for sections showing lists of notices
  *
@@ -40,30 +38,43 @@ define('NOTICES_PER_SECTION', 6);
  * group, or site.
  *
  * @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 PopularNoticeSection extends NoticeSection
 {
     function getNotices()
     {
-        $qry = 'SELECT notice.*, '.
-          'sum(exp(-(now() - fave.modified) / %s)) as weight ' .
-          'FROM notice JOIN fave ON notice.id = fave.notice_id ' .
-          'GROUP BY fave.notice_id ' .
-          'ORDER BY weight DESC';
+        if (common_config('db', 'type') == 'pgsql') {
+            $weightexpr='sum(exp(-extract(epoch from (now() - fave.modified)) / %s))';
+            if (!empty($this->out->tag)) {
+                $tag = pg_escape_string($this->out->tag);
+            }
+        } else {
+            $weightexpr='sum(exp(-(now() - fave.modified) / %s))';
+            if (!empty($this->out->tag)) {
+                 $tag = mysql_escape_string($this->out->tag);
+            }
+        }
+        $qry = "SELECT notice.*, $weightexpr as weight ";
+        if(isset($tag)) {
+            $qry .= 'FROM notice_tag, notice JOIN fave ON notice.id = fave.notice_id ' .
+                    "WHERE notice.id = notice_tag.notice_id and '$tag' = notice_tag.tag";
+        } else {
+            $qry .= 'FROM notice JOIN fave ON notice.id = fave.notice_id';
+        }
+        $qry .= ' GROUP BY notice.id,notice.profile_id,notice.content,notice.uri,' .
+                'notice.rendered,notice.url,notice.created,notice.modified,' .
+                'notice.reply_to,notice.is_local,notice.source,notice.conversation ' .
+                'ORDER BY weight DESC';
 
         $offset = 0;
         $limit  = NOTICES_PER_SECTION + 1;
 
-        if (common_config('db', 'type') == 'pgsql') {
-            $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset;
-        } else {
-            $qry .= ' LIMIT ' . $offset . ', ' . $limit;
-        }
+        $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset;
 
         $notice = Memcached_DataObject::cachedQuery('Notice',
                                                     sprintf($qry, common_config('popular', 'dropoff')),
@@ -80,4 +91,9 @@ class PopularNoticeSection extends NoticeSection
     {
         return 'popular_notices';
     }
+
+    function moreUrl()
+    {
+        return common_local_url('favorited');
+    }
 }