Improved type-hint for following methods:

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

diff --git a/lib/mailbox.php b/lib/mailbox.php
index e9e4f78c6b07091486a1c95b7eec4720a2d6d380..bc5ff76661a67925f47538d52cdcbcc0362effc3 100644 (file)
--- a/lib/mailbox.php
+++ b/lib/mailbox.php
@@ -42,17 +42,16 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  * @see      InboxAction
  * @see      OutboxAction
  */
-
-class MailboxAction extends CurrentUserDesignAction
+class MailboxAction extends Action
 {
     var $page = null;
 
-    function prepare($args)
+    function prepare(array $args=array())
     {
         parent::prepare($args);
 
         $nickname   = common_canonical_nickname($this->arg('nickname'));
-        $this->user = User::staticGet('nickname', $nickname);
+        $this->user = User::getKV('nickname', $nickname);
         $this->page = $this->trimmed('page');
 
         if (!$this->page) {
@@ -71,22 +70,20 @@ class MailboxAction extends CurrentUserDesignAction
      *
      * @return void
      */
-
-    function handle($args)
+    function handle(array $args=array())
     {
         parent::handle($args);
 
         if (!$this->user) {
+            // TRANS: Client error displayed when trying to access a mailbox without providing a user.
             $this->clientError(_('No such user.'), 404);
-            return;
         }
 
         $cur = common_current_user();
 
         if (!$cur || $cur->id != $this->user->id) {
-            $this->clientError(_('Only the user can read their own mailboxes.'),
-                403);
-            return;
+            // TRANS: Client error displayed when trying to access a mailbox that is not of the logged in user.
+            $this->clientError(_('Only the user can read their own mailboxes.'), 403);
         }
 
         $this->showPage();
@@ -114,8 +111,9 @@ class MailboxAction extends CurrentUserDesignAction
                               $this->trimmed('action'),
                               array('nickname' => $this->user->nickname));
         } else {
-            $this->element('p', 
-                           'guide', 
+            $this->element('p',
+                           'guide',
+                           // TRANS: Message displayed when there are no private messages in the inbox of a user.
                            _('You have no private messages. '.
                              'You can send private message to engage other users in conversation. '.
                              'People can send you messages for your eyes only.'));
@@ -139,7 +137,6 @@ class MailboxAction extends CurrentUserDesignAction
      *
      * @return void
      */
-
     function showPageNotice()
     {
         $instr  = $this->getInstructions();
@@ -157,8 +154,7 @@ class MailboxAction extends CurrentUserDesignAction
      *
      * @return boolean
      */
-
-    function isReadOnly($args)
+    function isReadOnly(array $args=array())
     {
          return true;
     }