Update favorited for new layout and framework

diff --git a/actions/favorited.php b/actions/favorited.php
index 9369057322d98e4590c85dcacd50e6780a614dc9..0223564f34e754fbdc27eba4bea23d723b3d29ce 100644 (file)
--- a/actions/favorited.php
+++ b/actions/favorited.php
@@ -1,105 +1,196 @@
 <?php
-/*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+/**
+ * Laconica, the distributed open-source microblogging tool
  *
- * This program is free software: you can redistribute it and/or modify
+ * List of popular notices
+ *
+ * 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
+ * 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/>.
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Public
+ * @package   Laconica
+ * @author    Zach Copley <zach@controlyourself.ca>
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @copyright 2008-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); }
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/publicgroupnav.php';
+require_once INSTALLDIR.'/lib/noticelist.php';
 
-require_once(INSTALLDIR.'/lib/stream.php');
+/**
+ * List of popular notices
+ *
+ * We provide a list of the most popular notices. Popularity
+ * is measured by
+ *
+ * @category Personal
+ * @package  Laconica
+ * @author   Zach Copley <zach@controlyourself.ca>
+ * @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 FavoritedAction extends StreamAction
+class FavoritedAction extends Action
 {
+    var $page = null;
 
-    function handle($args)
+    /**
+     * Title of the page
+     *
+     * @return string Title of the page
+     */
+
+    function title()
     {
-        parent::handle($args);
+        if ($this->page == 1) {
+            return _('Popular notices');
+        } else {
+            return sprintf(_('Popular notices, page %d'), $this->page);
+        }
+    }
 
-        $page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
+    /**
+     * Instructions for use
+     *
+     * @return instructions for use
+     */
 
-        common_show_header(_('Popular notices'),
-                           array($this, 'show_header'), null,
-                           array($this, 'show_top'));
+    function getInstructions()
+    {
+        return _('The most popular notices on the site right now.');
+    }
 
-        $this->show_notices($page);
+    /**
+     * Is this page read-only?
+     *
+     * @return boolean true
+     */
 
-        common_show_footer();
+    function isReadOnly()
+    {
+        return true;
     }
 
-    function show_top()
+    /**
+     * Take arguments for running
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     *
+     * @todo move queries from showContent() to here
+     */
+
+    function prepare($args)
     {
-        $instr = $this->get_instructions();
+        parent::prepare($args);
+        $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
+        return true;
+    }
+
+    /**
+     * Handle request
+     *
+     * Shows a page with list of favorite notices
+     *
+     * @param array $args $_REQUEST args; handled in prepare()
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        parent::handle($args);
+
+        $this->showPage();
+    }
+
+    /**
+     * Show the page notice
+     *
+     * Shows instructions for the page
+     *
+     * @return void
+     */
+
+    function showPageNotice()
+    {
+        $instr  = $this->getInstructions();
         $output = common_markup_to_html($instr);
+
         $this->elementStart('div', 'instructions');
         $this->raw($output);
         $this->elementEnd('div');
-        $this->public_views_menu();
     }
 
-    function show_header()
-    {
-        return;
-    }
+    /**
+     * Local navigation
+     *
+     * This page is part of the public group, so show that.
+     *
+     * @return void
+     */
 
-    function get_instructions()
+    function showLocalNav()
     {
-        return _('Showing recently popular notices');
+        $nav = new PublicGroupNav($this);
+        $nav->show();
     }
 
-    function show_notices($page)
-    {
+    /**
+     * Content area
+     *
+     * Shows the list of popular notices
+     *
+     * @return void
+     */
 
-        $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';
+    function showContent()
+    {
+        $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';
 
-        $offset = ($page - 1) * NOTICES_PER_PAGE;
-        $limit = NOTICES_PER_PAGE + 1;
+        $offset = ($this->page - 1) * NOTICES_PER_PAGE;
+        $limit  = NOTICES_PER_PAGE + 1;
 
-        if (common_config('db','type') == 'pgsql') {
+        if (common_config('db', 'type') == 'pgsql') {
             $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset;
         } else {
             $qry .= ' LIMIT ' . $offset . ', ' . $limit;
         }
 
-        # Figure out how to cache this query
+        // XXX: Figure out how to cache this query
 
         $notice = new Notice;
         $notice->query(sprintf($qry, common_config('popular', 'dropoff')));
 
-        $this->elementStart('ul', array('id' => 'notices'));
-
-        $cnt = 0;
-
-        while ($notice->fetch() && $cnt <= NOTICES_PER_PAGE) {
-            $cnt++;
+        $nl = new NoticeList($notice, $this);
 
-            if ($cnt > NOTICES_PER_PAGE) {
-                break;
-            }
+        $cnt = $nl->show();
 
-            $item = new NoticeListItem($notice);
-            $item->show();
-        }
-
-        $this->elementEnd('ul');
-
-        common_pagination($page > 1, $cnt > NOTICES_PER_PAGE,
-                          $page, 'favorited');
+        $this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE,
+                          $this->page, 'favorited');
     }
-
 }