X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fnewmessage.php;h=dd7c5357ba0f2980f3b13de4a56b1be217271bd3;hb=4331b8b4f12f7c55afbe80fe828d77da6eaf9b84;hp=82276ff341c6e6d8ea54d033fe2588aba48e21c3;hpb=bdd9f6ce1d9bafc1c534aec224fa0ad1452779c1;p=quix0rs-gnu-social.git diff --git a/actions/newmessage.php b/actions/newmessage.php index 82276ff341..dd7c5357ba 100644 --- a/actions/newmessage.php +++ b/actions/newmessage.php @@ -1,6 +1,6 @@ . * * @category Personal - * @package Laconica - * @author Evan Prodromou - * @author Zach Copley - * @author Sarven Capadisli - * @copyright 2008-2009 Control Yourself, Inc. + * @package StatusNet + * @author Evan Prodromou + * @author Zach Copley + * @author Sarven Capadisli + * @copyright 2008-2009 StatusNet, Inc. * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://laconi.ca/ + * @link http://status.net/ */ -if (!defined('LACONICA')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } @@ -37,12 +37,12 @@ if (!defined('LACONICA')) { * Action for posting new direct messages * * @category Personal - * @package Laconica - * @author Evan Prodromou - * @author Zach Copley - * @author Sarven Capadisli + * @package StatusNet + * @author Evan Prodromou + * @author Zach Copley + * @author Sarven Capadisli * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://laconi.ca/ + * @link http://status.net/ */ class NewmessageAction extends Action @@ -68,6 +68,7 @@ class NewmessageAction extends Action function title() { + // TRANS: Page title for new direct message page. return _('New message'); } @@ -84,6 +85,7 @@ class NewmessageAction extends Action 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(); @@ -99,7 +101,9 @@ class NewmessageAction extends Action $user = common_current_user(); if (!$user) { - $this->clientError(_('Only logged-in users can send direct messages.'), 403); + /* Go log in, and then come back. */ + common_set_returnto($_SERVER['REQUEST_URI']); + common_redirect(common_local_url('login')); return false; } @@ -111,12 +115,15 @@ class NewmessageAction extends Action $this->other = User::staticGet('id', $this->to); if (!$this->other) { - $this->clientError(_('No such user'), 404); + // 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)) { - $this->clientError(_('You can\'t send a message to this user.'), 404); + // 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; } } @@ -130,6 +137,7 @@ class NewmessageAction extends Action $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; @@ -139,25 +147,34 @@ class NewmessageAction extends Action assert($user); // 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; } else { - $content_shortened = common_shorten_links($this->content); - - if (mb_strlen($content_shortened) > 140) { - $this->showForm(_('That\'s too long. ' . - 'Max message size is 140 chars.')); + $content_shortened = $user->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.', + '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(_('You can\'t send a message to this user.'), 404); + // 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) { + // TRANS: Client error displayed trying to send a direct message to self. $this->clientError(_('Don\'t send a message to yourself; ' . 'just say it to yourself quietly instead.'), 403); return; @@ -170,18 +187,76 @@ class NewmessageAction extends Action 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'), + // 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'); + } else { + $url = common_local_url('outbox', + array('nickname' => $user->nickname)); + common_redirect($url, 303); + } + } - $url = common_local_url('outbox', array('nickname' => $user->nickname)); + /** + * Show an Ajax-y error message + * + * Goes back to the browser, where it's shown in a popup. + * + * @param string $msg Message to show + * + * @return void + */ - common_redirect($url, 303); + function ajaxErrorMsg($msg) + { + $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'); + $this->element('p', array('id' => 'error'), $msg); + $this->elementEnd('body'); + $this->elementEnd('html'); } function showForm($msg = null) { - $this->msg = $msg; + if ($msg && $this->boolean('ajax')) { + $this->ajaxErrorMsg($msg); + return; + } - $this->showPage(); + $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->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() @@ -191,12 +266,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()