X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fnewnotice.php;h=3e601ae3628ce1c71151e91569d63666faa49e64;hb=27ef3b1d905cdf8f47b47293a757624dda88fdc7;hp=8f1fb1c40f74a79349d9cb65c071541988d2b232;hpb=4cf58c4bc79bc2809435c9af0f60b746b898dd58;p=quix0rs-gnu-social.git diff --git a/actions/newnotice.php b/actions/newnotice.php index 8f1fb1c40f..3e601ae362 100644 --- a/actions/newnotice.php +++ b/actions/newnotice.php @@ -47,13 +47,11 @@ require_once INSTALLDIR . '/lib/mediafile.php'; * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ - class NewnoticeAction extends Action { /** * Error message, if any */ - var $msg = null; /** @@ -63,9 +61,9 @@ class NewnoticeAction extends Action * * @return string page title */ - function title() { + // TRANS: Page title for sending a new notice. return _('New notice'); } @@ -82,18 +80,21 @@ class NewnoticeAction extends Action * * @return void */ - function handle($args) { if (!common_logged_in()) { + // TRANS: Client error displayed trying to send a notice while not logged in. $this->clientError(_('Not logged in.')); } else if ($_SERVER['REQUEST_METHOD'] == 'POST') { // check for this before token since all POST and FILES data // is losts when size is exceeded if (empty($_POST) && $_SERVER['CONTENT_LENGTH']) { - $this->clientError(sprintf(_('The server was unable to handle ' . - 'that much POST data (%s bytes) due to its current configuration.'), - $_SERVER['CONTENT_LENGTH'])); + // TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit. + // TRANS: %s is the number of bytes of the CONTENT_LENGTH. + $msg = _m('The server was unable to handle that much POST data (%s byte) due to its current configuration.', + 'The server was unable to handle that much POST data (%s bytes) due to its current configuration.', + intval($_SERVER['CONTENT_LENGTH'])); + $this->clientError(sprintf($msg,$_SERVER['CONTENT_LENGTH'])); } parent::handle($args); @@ -125,7 +126,6 @@ class NewnoticeAction extends Action * * @return void */ - function saveNewNotice() { $user = common_current_user(); @@ -135,6 +135,7 @@ class NewnoticeAction extends Action Event::handle('StartSaveNewNoticeWeb', array($this, $user, &$content, &$options)); if (!$content) { + // TRANS: Client error displayed trying to send a notice without content. $this->clientError(_('No content!')); return; } @@ -152,16 +153,19 @@ class NewnoticeAction extends Action return; } - $content_shortened = common_shorten_links($content); + $content_shortened = $user->shortenLinks($content); if (Notice::contentTooLong($content_shortened)) { - $this->clientError(sprintf(_('That\'s too long. '. - 'Max notice size is %d chars.'), + // TRANS: Client error displayed when the parameter "status" is missing. + // TRANS: %d is the maximum number of character for a notice. + $this->clientError(sprintf(_m('That\'s too long. Maximum notice size is %d character.', + 'That\'s too long. Maximum notice size is %d characters.', + Notice::maxContent()), Notice::maxContent())); } $replyto = intval($this->trimmed('inreplyto')); if ($replyto) { - $options['replyto'] = $replyto; + $options['reply_to'] = $replyto; } $upload = null; @@ -176,12 +180,10 @@ class NewnoticeAction extends Action if (Notice::contentTooLong($content_shortened)) { $upload->delete(); - $this->clientError( - sprintf( - _('Max notice size is %d chars, including attachment URL.'), - Notice::maxContent() - ) - ); + $this->clientError(sprintf(_m('Maximum notice size is %d character, including attachment URL.', + 'Maximum notice size is %d characters, including attachment URL.', + Notice::maxContent()), + Notice::maxContent())); } } @@ -204,10 +206,18 @@ class NewnoticeAction extends Action $options = array_merge($options, $locOptions); } - $notice = Notice::saveNew($user->id, $content_shortened, 'web', $options); + $author_id = $user->id; + $text = $content_shortened; - if (isset($upload)) { - $upload->attachToNotice($notice); + if (Event::handle('StartNoticeSaveWeb', array($this, &$author_id, &$text, &$options))) { + + $notice = Notice::saveNew($user->id, $content_shortened, 'web', $options); + + if (isset($upload)) { + $upload->attachToNotice($notice); + } + + Event::handle('EndNoticeSaveWeb', array($this, $notice)); } Event::handle('EndSaveNewNoticeWeb', array($this, $user, &$content_shortened, &$options)); @@ -216,6 +226,7 @@ class NewnoticeAction extends Action $this->xw->startDocument('1.0', 'UTF-8'); $this->elementStart('html'); $this->elementStart('head'); + // TRANS: Page title after sending a notice. $this->element('title', null, _('Notice posted')); $this->elementEnd('head'); $this->elementStart('body'); @@ -245,11 +256,11 @@ class NewnoticeAction extends Action * * @return void */ - function ajaxErrorMsg($msg) { $this->startHTML('text/xml;charset=utf-8', true); $this->elementStart('head'); + // TRANS: Page title after an AJAX error occurs on the send notice page. $this->element('title', null, _('Ajax Error')); $this->elementEnd('head'); $this->elementStart('body'); @@ -258,6 +269,30 @@ class NewnoticeAction extends Action $this->elementEnd('html'); } + /** + * Show an Ajax-y notice form + * + * Goes back to the browser, where it's shown in a popup. + * + * @param string $msg Message to show + * + * @return void + */ + function ajaxShowForm() + { + $this->startHTML('text/xml;charset=utf-8', true); + $this->elementStart('head'); + $this->element('title', null, _('New notice')); + $this->elementEnd('head'); + $this->elementStart('body'); + + $form = new NoticeForm($this); + $form->show(); + + $this->elementEnd('body'); + $this->elementEnd('html'); + } + /** * Formerly page output * @@ -272,11 +307,14 @@ class NewnoticeAction extends Action * * @return void */ - function showForm($msg=null) { - if ($msg && $this->boolean('ajax')) { - $this->ajaxErrorMsg($msg); + if ($this->boolean('ajax')) { + if ($msg) { + $this->ajaxErrorMsg($msg); + } else { + $this->ajaxShowForm(); + } return; } @@ -291,7 +329,6 @@ class NewnoticeAction extends Action * * @return void */ - function showNoticeForm() { $content = $this->trimmed('status_textarea'); @@ -320,7 +357,6 @@ class NewnoticeAction extends Action * * @todo maybe show some instructions? */ - function showPageNotice() { if ($this->msg) { @@ -337,11 +373,9 @@ class NewnoticeAction extends Action * * @return void */ - function showNotice($notice) { $nli = new NoticeListItem($notice, $this); $nli->show(); } } -