f500d4ea5b
Our mailbox actions (inbox and outbox) were doing their own display of messages. This was causing issues with especially showmessage, which since the more rigourous nickname checks were added, no longer works as a mailbox subclass. I've taken the time to rip out the message listing code from MailboxAction and moved it to a MessageList widget. The different mailboxes now have their own subclasses that show the correct profile in the list.
127 lines
3.3 KiB
PHP
127 lines
3.3 KiB
PHP
<?php
|
|
/**
|
|
* StatusNet, the distributed open-source microblogging tool
|
|
*
|
|
* action handler for message inbox
|
|
*
|
|
* 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
|
|
* 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/>.
|
|
*
|
|
* @category Message
|
|
* @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://status.net/
|
|
*/
|
|
|
|
if (!defined('STATUSNET') && !defined('LACONICA')) {
|
|
exit(1);
|
|
}
|
|
|
|
require_once INSTALLDIR.'/lib/mailbox.php';
|
|
|
|
/**
|
|
* action handler for message outbox
|
|
*
|
|
* @category Message
|
|
* @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://status.net/
|
|
* @see MailboxAction
|
|
*/
|
|
|
|
class OutboxAction extends MailboxAction
|
|
{
|
|
/**
|
|
* Title of the page
|
|
*
|
|
* @return string page title
|
|
*/
|
|
|
|
function title()
|
|
{
|
|
if ($this->page > 1) {
|
|
return sprintf(_('Outbox for %1$s - page %2$d'),
|
|
$this->user->nickname, $page);
|
|
} else {
|
|
return sprintf(_('Outbox for %s'), $this->user->nickname);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* retrieve the messages for this user and this page
|
|
*
|
|
* Does a query for the right messages
|
|
*
|
|
* @return Message data object with stream for messages
|
|
*
|
|
* @see MailboxAction::getMessages()
|
|
*/
|
|
|
|
function getMessages()
|
|
{
|
|
$message = new Message();
|
|
|
|
$message->from_profile = $this->user->id;
|
|
$message->orderBy('created DESC, id DESC');
|
|
$message->limit((($this->page - 1) * MESSAGES_PER_PAGE),
|
|
MESSAGES_PER_PAGE + 1);
|
|
|
|
if ($message->find()) {
|
|
return $message;
|
|
} else {
|
|
return null;
|
|
}
|
|
}
|
|
|
|
function getMessageList($message)
|
|
{
|
|
return new OutboxMessageList($this, $message);
|
|
}
|
|
|
|
/**
|
|
* instructions for using this page
|
|
*
|
|
* @return string localised instructions for using the page
|
|
*/
|
|
|
|
function getInstructions()
|
|
{
|
|
return _('This is your outbox, which lists private messages you have sent.');
|
|
}
|
|
}
|
|
|
|
class OutboxMessageList extends MessageList
|
|
{
|
|
function newItem($message)
|
|
{
|
|
return new OutboxMessageListItem($this->out, $message);
|
|
}
|
|
}
|
|
|
|
class OutboxMessageListItem extends MessageListItem
|
|
{
|
|
/**
|
|
* Returns the profile we want to show with the message
|
|
*
|
|
* @return Profile The profile that matches the message
|
|
*/
|
|
function getMessageProfile()
|
|
{
|
|
return $this->message->getTo();
|
|
}
|
|
} |