X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fnewmessage.php;h=428a55762ce60b3e2b19701c0fdf7fba1f4d6151;hb=627d84a1e2db2aca5d2ce1272f6e83fb7faa8ad2;hp=dd7c5357ba0f2980f3b13de4a56b1be217271bd3;hpb=c97048d01bea468e0cf8865b60c3c250b4515c39;p=quix0rs-gnu-social.git diff --git a/actions/newmessage.php b/actions/newmessage.php index dd7c5357ba..428a55762c 100644 --- a/actions/newmessage.php +++ b/actions/newmessage.php @@ -25,11 +25,12 @@ * @author Zach Copley * @author Sarven Capadisli * @copyright 2008-2009 StatusNet, Inc. + * @copyright 2013 Free Software Foundation, 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')) { +if (!defined('STATUSNET')) { exit(1); } @@ -45,15 +46,8 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { * @link http://status.net/ */ -class NewmessageAction extends Action +class NewmessageAction extends FormAction { - - /** - * Error message, if any - */ - - var $msg = null; - var $content = null; var $to = null; var $other = null; @@ -80,113 +74,73 @@ class NewmessageAction extends Action * @return void */ - function handle($args) - { - parent::handle($args); - - if (!common_logged_in()) { - // TRANS: Error message displayed when trying to perform an action that requires a logged in user. - $this->clientError(_('Not logged in.'), 403); - } else if ($_SERVER['REQUEST_METHOD'] == 'POST') { - $this->saveNewMessage(); - } else { - $this->showForm(); - } - } - - function prepare($args) + protected function prepare(array $args=array()) { parent::prepare($args); - $user = common_current_user(); - - if (!$user) { - /* Go log in, and then come back. */ - common_set_returnto($_SERVER['REQUEST_URI']); - common_redirect(common_local_url('login')); - return false; - } - $this->content = $this->trimmed('content'); $this->to = $this->trimmed('to'); if ($this->to) { - $this->other = User::staticGet('id', $this->to); + $this->other = Profile::getKV('id', $this->to); - if (!$this->other) { + if (!$this->other instanceof Profile) { // TRANS: Client error displayed trying to send a direct message to a non-existing user. $this->clientError(_('No such user.'), 404); - return false; } - if (!$user->mutuallySubscribed($this->other)) { + if (!$this->other->isLocal()) { + // TRANS: Explains that current federation does not support direct, private messages yet. + $this->clientError(_('You cannot send direct messages to federated users yet.')); + } + + if (!$this->scoped->mutuallySubscribed($this->other)) { // TRANS: Client error displayed trying to send a direct message to a user while sender and // TRANS: receiver are not subscribed to each other. $this->clientError(_('You cannot send a message to this user.'), 404); - return false; } } return true; } - function saveNewMessage() + protected function handlePost() { - // CSRF protection - - $token = $this->trimmed('token'); - if (!$token || $token != common_session_token()) { - // TRANS: Client error displayed when the session token does not match or is not given. - $this->showForm(_('There was a problem with your session token. ' . - 'Try again, please.')); - return; - } + parent::handlePost(); - $user = common_current_user(); - assert($user); // XXX: maybe an error instead... + assert($this->scoped instanceof Profile); // XXX: maybe an error instead... if (!$this->content) { // TRANS: Form validator error displayed trying to send a direct message without content. - $this->showForm(_('No content!')); - return; + $this->clientError(_('No content!')); } else { - $content_shortened = $user->shortenLinks($this->content); + $content_shortened = $this->scoped->shortenLinks($this->content); if (Message::contentTooLong($content_shortened)) { // TRANS: Form validation error displayed when message content is too long. // TRANS: %d is the maximum number of characters for a message. - $this->showForm(sprintf(_m('That\'s too long. Maximum message size is %d character.', + $this->clientError(sprintf(_m('That\'s too long. Maximum message size is %d character.', 'That\'s too long. Maximum message size is %d characters.', Message::maxContent()), Message::maxContent())); - return; } } if (!$this->other) { // TRANS: Form validation error displayed trying to send a direct message without specifying a recipient. - $this->showForm(_('No recipient specified.')); - return; - } else if (!$user->mutuallySubscribed($this->other)) { + $this->clientError(_('No recipient specified.')); + } else if (!$this->scoped->mutuallySubscribed($this->other)) { // TRANS: Client error displayed trying to send a direct message to a user while sender and // TRANS: receiver are not subscribed to each other. $this->clientError(_('You cannot send a message to this user.'), 404); - return; - } else if ($user->id == $this->other->id) { + } else if ($this->scoped->id == $this->other->id) { // TRANS: Client error displayed trying to send a direct message to self. - $this->clientError(_('Don\'t send a message to yourself; ' . + $this->clientError(_('Do not send a message to yourself; ' . 'just say it to yourself quietly instead.'), 403); - return; - } - - $message = Message::saveNew($user->id, $this->other->id, $this->content, 'web'); - - if (is_string($message)) { - $this->showForm($message); - return; } + $message = Message::saveNew($this->scoped->id, $this->other->id, $this->content, 'web'); $message->notify(); if ($this->boolean('ajax')) { @@ -202,10 +156,10 @@ class NewmessageAction extends Action sprintf(_('Direct message to %s sent.'), $this->other->nickname)); $this->elementEnd('body'); - $this->elementEnd('html'); + $this->endHTML(); } else { $url = common_local_url('outbox', - array('nickname' => $user->nickname)); + array('nickname' => $this->scoped->nickname)); common_redirect($url, 303); } } @@ -230,7 +184,7 @@ class NewmessageAction extends Action $this->elementStart('body'); $this->element('p', array('id' => 'error'), $msg); $this->elementEnd('body'); - $this->elementEnd('html'); + $this->endHTML(); } function showForm($msg = null) @@ -242,9 +196,7 @@ class NewmessageAction extends Action $this->msg = $msg; if ($this->trimmed('ajax')) { - header('Content-Type: text/xml;charset=utf-8'); - $this->xw->startDocument('1.0', 'UTF-8'); - $this->elementStart('html'); + $this->startHTML('text/xml;charset=utf-8'); $this->elementStart('head'); // TRANS: Page title on page for sending a direct message. $this->element('title', null, _('New message'));