Merge branch 'locshunt' into 0.9.x

[quix0rs-gnu-social.git] / actions / outbox.php

diff --git a/actions/outbox.php b/actions/outbox.php
index 9fb6dbf9f8c1132203e17cd69d070f2dace63cbd..537fad3ef4560bdcada86358536d89fb16443695 100644 (file)
--- a/actions/outbox.php
+++ b/actions/outbox.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Laconica, the distributed open-source microblogging tool
+ * StatusNet, the distributed open-source microblogging tool
  *
  * action handler for message inbox
  *
@@ -20,14 +20,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @category  Message
- * @package   Laconica
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @copyright 2008 Control Yourself, Inc.
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2008 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);
 }
 
@@ -37,34 +37,29 @@ require_once INSTALLDIR.'/lib/mailbox.php';
  * action handler for message outbox
  *
  * @category Message
- * @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/
  * @see      MailboxAction
  */
 
 class OutboxAction extends MailboxAction
 {
     /**
-     * returns the title of the page
+     * Title of the page
      *
-     * @param User $user current user
-     * @param int  $page current page
-     *
-     * @return string localised title of the page
-     *
-     * @see MailboxAction::getTitle()
+     * @return string page title
      */
 
-    function getTitle($user, $page)
+    function title()
     {
-        if ($page > 1) {
-            $title = sprintf(_("Outbox for %s - page %d"), $user->nickname, $page);
+        if ($this->page > 1) {
+            return sprintf(_("Outbox for %s - page %d"),
+                $this->user->nickname, $page);
         } else {
-            $title = sprintf(_("Outbox for %s"), $user->nickname);
+            return sprintf(_("Outbox for %s"), $this->user->nickname);
         }
-        return $title;
     }
 
     /**
@@ -72,21 +67,19 @@ class OutboxAction extends MailboxAction
      *
      * Does a query for the right messages
      *
-     * @param User $user The current user
-     * @param int  $page The page the user is on
-     *
      * @return Message data object with stream for messages
      *
      * @see MailboxAction::getMessages()
      */
 
-    function getMessages($user, $page)
+    function getMessages()
     {
         $message = new Message();
 
-        $message->from_profile = $user->id;
+        $message->from_profile = $this->user->id;
         $message->orderBy('created DESC, id DESC');
-        $message->limit((($page-1)*MESSAGES_PER_PAGE), MESSAGES_PER_PAGE + 1);
+        $message->limit((($this->page - 1) * MESSAGES_PER_PAGE),
+            MESSAGES_PER_PAGE + 1);
 
         if ($message->find()) {
             return $message;