X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fnewmessage.php;h=4ff9d8e9e93f627b96e060026f914095b97d1f63;hb=e5e3aeb4e67cece90f04ae89c8e2714af4817e56;hp=eac4ab210444404a372530792b2203a81046ea47;hpb=a2302e5b76b827f906c5ded028e7c120c6200b76;p=quix0rs-gnu-social.git diff --git a/actions/newmessage.php b/actions/newmessage.php index eac4ab2104..4ff9d8e9e9 100644 --- a/actions/newmessage.php +++ b/actions/newmessage.php @@ -45,15 +45,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; @@ -68,6 +61,7 @@ class NewmessageAction extends Action function title() { + // TRANS: Page title for new direct message page. return _('New message'); } @@ -79,110 +73,88 @@ class NewmessageAction extends Action * @return void */ - function handle($args) + protected function prepare($args) { - parent::handle($args); + parent::prepare($args); if (!common_logged_in()) { - $this->clientError(_('Not logged in.'), 403); - } else if ($_SERVER['REQUEST_METHOD'] == 'POST') { - $this->saveNewMessage(); - } else { - $this->showForm(); + $this->needLogin(); } - } - function prepare($args) - { - 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; - } + $user = $this->scoped->getUser(); $this->content = $this->trimmed('content'); $this->to = $this->trimmed('to'); if ($this->to) { - $this->other = User::staticGet('id', $this->to); + $this->other = User::getKV('id', $this->to); if (!$this->other) { - $this->clientError(_('No such user'), 404); - return false; + // TRANS: Client error displayed trying to send a direct message to a non-existing user. + $this->clientError(_('No such user.'), 404); } if (!$user->mutuallySubscribed($this->other)) { - $this->clientError(_('You can\'t send a message to this user.'), 404); - return false; + // 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 true; } - function saveNewMessage() + protected function handlePost() { - // CSRF protection + parent::handlePost(); - $token = $this->trimmed('token'); - if (!$token || $token != common_session_token()) { - $this->showForm(_('There was a problem with your session token. ' . - 'Try again, please.')); - return; - } - - $user = common_current_user(); - assert($user); // XXX: maybe an error instead... + assert($this->scoped); // XXX: maybe an error instead... + $user = $this->scoped->getUser(); if (!$this->content) { - $this->showForm(_('No content!')); - return; + // TRANS: Form validator error displayed trying to send a direct message without content. + $this->clientError(_('No content!')); } else { - $content_shortened = common_shorten_links($this->content); + $content_shortened = $user->shortenLinks($this->content); if (Message::contentTooLong($content_shortened)) { - $this->showForm(sprintf(_('That\'s too long. ' . - 'Max message size is %d chars.'), + // TRANS: Form validation error displayed when message content is too long. + // TRANS: %d is the maximum number of characters for a message. + $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) { - $this->showForm(_('No recipient specified.')); - return; + // TRANS: Form validation error displayed trying to send a direct message without specifying a recipient. + $this->clientError(_('No recipient specified.')); } else if (!$user->mutuallySubscribed($this->other)) { - $this->clientError(_('You can\'t send a message to this user.'), 404); - return; + // 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); } else if ($user->id == $this->other->id) { - $this->clientError(_('Don\'t send a message to yourself; ' . + // TRANS: Client error displayed trying to send a direct message to self. + $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; - } - - $this->notify($user, $this->other, $message); + $message->notify(); if ($this->boolean('ajax')) { $this->startHTML('text/xml;charset=utf-8'); $this->elementStart('head'); + // TRANS: Page title after sending a direct message. $this->element('title', null, _('Message sent')); $this->elementEnd('head'); $this->elementStart('body'); $this->element('p', array('id' => 'command_result'), - sprintf(_('Direct message to %s sent'), + // TRANS: Confirmation text after sending a direct message. + // TRANS: %s is the direct message recipient. + sprintf(_('Direct message to %s sent.'), $this->other->nickname)); $this->elementEnd('body'); $this->elementEnd('html'); @@ -207,6 +179,7 @@ class NewmessageAction extends Action { $this->startHTML('text/xml;charset=utf-8', true); $this->elementStart('head'); + // TRANS: Page title after an AJAX error occurred on the "send direct message" page. $this->element('title', null, _('Ajax Error')); $this->elementEnd('head'); $this->elementStart('body'); @@ -223,7 +196,22 @@ class NewmessageAction extends Action } $this->msg = $msg; - $this->showPage(); + if ($this->trimmed('ajax')) { + header('Content-Type: text/xml;charset=utf-8'); + $this->xw->startDocument('1.0', 'UTF-8'); + $this->elementStart('html'); + $this->elementStart('head'); + // TRANS: Page title on page for sending a direct message. + $this->element('title', null, _('New message')); + $this->elementEnd('head'); + $this->elementStart('body'); + $this->showNoticeForm(); + $this->elementEnd('body'); + $this->endHTML(); + } + else { + $this->showPage(); + } } function showPageNotice() @@ -233,12 +221,6 @@ class NewmessageAction extends Action } } - function notify($from, $to, $message) - { - mail_notify_message($message, $from, $to); - // XXX: Jabber, SMS notifications... probably queued - } - // Do nothing (override) function showNoticeForm()