Merged

[quix0rs-gnu-social.git] / plugins / DirectMessage / lib / inboxmessagelist.php

diff --git a/plugins/DirectMessage/lib/inboxmessagelist.php b/plugins/DirectMessage/lib/inboxmessagelist.php
index f24f540b04b9067bd169585e4aee18ba293b1c26..07c62ac850c0d9fc59fa4540745fb39267660623 100644 (file)
--- a/plugins/DirectMessage/lib/inboxmessagelist.php
+++ b/plugins/DirectMessage/lib/inboxmessagelist.php
@@ -4,7 +4,126 @@ if (!defined('GNUSOCIAL')) { exit(1); }
 
 class InboxMessageList extends MessageList
 {
+<<<<<<< .merge_file_NIw5Kk
     function newItem($message)
+=======
+    var $page = null;
+
+    function prepare(array $args=array())
+    {
+        parent::prepare($args);
+
+        $nickname   = common_canonical_nickname($this->arg('nickname'));
+        $this->user = User::getKV('nickname', $nickname);
+        $this->page = $this->trimmed('page');
+
+        if (!$this->page) {
+            $this->page = 1;
+        }
+
+        common_set_returnto($this->selfUrl());
+
+        return true;
+    }
+
+    /**
+     * output page based on arguments
+     *
+     * @param array $args HTTP arguments (from $_REQUEST)
+     *
+     * @return void
+     */
+    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);
+        }
+
+        $cur = common_current_user();
+
+        if (!$cur || $cur->id != $this->user->id) {
+            // 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();
+    }
+
+    function showNoticeForm()
+    {
+        $message_form = new MessageForm($this);
+        $message_form->show();
+    }
+
+    function showContent()
+    {
+        $message = $this->getMessages();
+
+        if ($message) {
+
+            $ml = $this->getMessageList($message);
+
+            $cnt = $ml->show();
+
+            $this->pagination($this->page > 1,
+                              $cnt > MESSAGES_PER_PAGE,
+                              $this->page,
+                              $this->trimmed('action'),
+                              array('nickname' => $this->user->nickname));
+        } else {
+            $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.'));
+        }
+    }
+
+    function getMessages()
+    {
+        return null;
+    }
+
+    function getMessageList($message)
+    {
+        return null;
+    }
+
+    /**
+     * 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');
+    }
+
+    /**
+     * Mailbox actions are read only
+     *
+     * @param array $args other arguments
+     *
+     * @return boolean
+     */
+    function isReadOnly(array $args=array())
+    {
+         return true;
+    }
+
+    function showObjectNav()
+>>>>>>> .merge_file_WapUGk
     {
         return new InboxMessageListItem($this->out, $message);
     }