X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fnewnotice.php;h=ccc3f94fd4105ce86d76140937e55aa76d6eb048;hb=1ae5ea8f4cf40113a14a183b754101177f99ba32;hp=8f1fb1c40f74a79349d9cb65c071541988d2b232;hpb=b1c5cb9db99993fcea7c060bffa6d5d50f22a41f;p=quix0rs-gnu-social.git diff --git a/actions/newnotice.php b/actions/newnotice.php index 8f1fb1c40f..ccc3f94fd4 100644 --- a/actions/newnotice.php +++ b/actions/newnotice.php @@ -25,16 +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')) { - exit(1); -} - -require_once INSTALLDIR . '/lib/noticelist.php'; -require_once INSTALLDIR . '/lib/mediafile.php'; +if (!defined('GNUSOCIAL')) { exit(1); } /** * Action for posting new notices @@ -47,14 +43,9 @@ 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 +class NewnoticeAction extends FormAction { - /** - * Error message, if any - */ - - var $msg = null; + protected $form = 'Notice'; /** * Title of the page @@ -63,59 +54,34 @@ class NewnoticeAction extends Action * * @return string page title */ - function title() { - return _('New notice'); + if ($this->getInfo() && $this->stored instanceof Notice) { + // TRANS: Page title after sending a notice. + return _('Notice posted'); + } + if ($this->int('inreplyto')) { + return _m('TITLE', 'New reply'); + } + // TRANS: Page title for sending a new notice. + return _m('TITLE','New notice'); } - /** - * Handle input, produce output - * - * Switches based on GET or POST method. On GET, shows a form - * for posting a notice. On POST, saves the results of that form. - * - * Results may be a full page, or just a single notice list item, - * depending on whether AJAX was requested. - * - * @param array $args $_REQUEST contents - * - * @return void - */ - - function handle($args) + protected function doPreparation() { - if (!common_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'])); - } - parent::handle($args); - - // CSRF protection - $token = $this->trimmed('token'); - if (!$token || $token != common_session_token()) { - $this->clientError(_('There was a problem with your session token. '. - 'Try again, please.')); + foreach(array('inreplyto') as $opt) { + if ($this->trimmed($opt)) { + $this->formOpts[$opt] = $this->trimmed($opt); } - try { - $this->saveNewNotice(); - } catch (Exception $e) { - $this->showForm($e->getMessage()); - return; - } - } else { - $this->showForm(); } + + // Backwards compatibility for "share this" widget things. + // If no 'content', use 'status_textarea' + $this->formOpts['content'] = $this->trimmed('content') ?: $this->trimmed('status_textarea'); } /** - * Save a new notice, based on arguments + * This doPost saves a new notice, based on arguments * * If successful, will show the notice, or return an Ajax-y result. * If not, it will show an error message -- possibly Ajax-y. @@ -125,18 +91,17 @@ class NewnoticeAction extends Action * * @return void */ - - function saveNewNotice() + protected function doPost() { - $user = common_current_user(); - assert($user); // XXX: maybe an error instead... + assert($this->scoped instanceof Profile); // XXX: maybe an error instead... + $user = $this->scoped->getUser(); $content = $this->trimmed('status_textarea'); $options = array(); Event::handle('StartSaveNewNoticeWeb', array($this, $user, &$content, &$options)); - if (!$content) { + if (empty($content)) { + // TRANS: Client error displayed trying to send a notice without content. $this->clientError(_('No content!')); - return; } $inter = new CommandInterpreter(); @@ -144,7 +109,7 @@ class NewnoticeAction extends Action $cmd = $inter->handle_command($user, $content); if ($cmd) { - if ($this->boolean('ajax')) { + if (GNUsocial::isAjax()) { $cmd->execute(new AjaxWebChannel($this)); } else { $cmd->execute(new WebChannel($this)); @@ -152,23 +117,25 @@ 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')); + $replyto = $this->int('inreplyto'); if ($replyto) { - $options['replyto'] = $replyto; + $options['reply_to'] = $replyto; } $upload = null; - $upload = MediaFile::fromUpload('attach'); - - if (isset($upload)) { - + try { + // throws exception on failure + $upload = MediaFile::fromUpload('attach', $this->scoped); if (Event::handle('StartSaveNewNoticeAppendAttachment', array($this, $upload, &$content_shortened, &$options))) { $content_shortened .= ' ' . $upload->shortUrl(); } @@ -176,155 +143,71 @@ 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() - ) - ); + // TRANS: Client error displayed exceeding the maximum notice length. + // TRANS: %d is the maximum length for a notice. + $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())); } + } catch (NoUploadedMediaException $e) { + // simply no attached media to the new notice } - if ($user->shareLocation()) { + + if ($this->scoped->shareLocation()) { // use browser data if checked; otherwise profile data if ($this->arg('notice_data-geo')) { $locOptions = Notice::locationOptions($this->trimmed('lat'), $this->trimmed('lon'), $this->trimmed('location_id'), $this->trimmed('location_ns'), - $user->getProfile()); + $this->scoped); } else { $locOptions = Notice::locationOptions(null, null, null, null, - $user->getProfile()); + $this->scoped); } $options = array_merge($options, $locOptions); } - $notice = Notice::saveNew($user->id, $content_shortened, 'web', $options); + $author_id = $this->scoped->id; + $text = $content_shortened; - if (isset($upload)) { - $upload->attachToNotice($notice); - } - Event::handle('EndSaveNewNoticeWeb', array($this, $user, &$content_shortened, &$options)); + // Does the heavy-lifting for getting "To:" information - if ($this->boolean('ajax')) { - header('Content-Type: text/xml;charset=utf-8'); - $this->xw->startDocument('1.0', 'UTF-8'); - $this->elementStart('html'); - $this->elementStart('head'); - $this->element('title', null, _('Notice posted')); - $this->elementEnd('head'); - $this->elementStart('body'); - $this->showNotice($notice); - $this->elementEnd('body'); - $this->elementEnd('html'); - } else { - $returnto = $this->trimmed('returnto'); + ToSelector::fillOptions($this, $options); - if ($returnto) { - $url = common_local_url($returnto, - array('nickname' => $user->nickname)); - } else { - $url = common_local_url('shownotice', - array('notice' => $notice->id)); - } - common_redirect($url, 303); - } - } - - /** - * 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 - */ + if (Event::handle('StartNoticeSaveWeb', array($this, &$author_id, &$text, &$options))) { - function ajaxErrorMsg($msg) - { - $this->startHTML('text/xml;charset=utf-8', true); - $this->elementStart('head'); - $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'); - } + $this->stored = Notice::saveNew($this->scoped->id, $content_shortened, 'web', $options); - /** - * Formerly page output - * - * This used to be the whole page output; now that's been largely - * subsumed by showPage. So this just stores an error message, if - * it was passed, and calls showPage. - * - * Note that since we started doing Ajax output, this page is rarely - * seen. - * - * @param string $msg An error message, if any - * - * @return void - */ + if ($upload instanceof MediaFile) { + $upload->attachToNotice($this->stored); + } - function showForm($msg=null) - { - if ($msg && $this->boolean('ajax')) { - $this->ajaxErrorMsg($msg); - return; + Event::handle('EndNoticeSaveWeb', array($this, $this->stored)); } - $this->msg = $msg; - $this->showPage(); - } - - /** - * Overload for replies or bad results - * - * We show content in the notice form if there were replies or results. - * - * @return void - */ + Event::handle('EndSaveNewNoticeWeb', array($this, $user, &$content_shortened, &$options)); - function showNoticeForm() - { - $content = $this->trimmed('status_textarea'); - if (!$content) { - $replyto = $this->trimmed('replyto'); - $inreplyto = $this->trimmed('inreplyto'); - $profile = Profile::staticGet('nickname', $replyto); - if ($profile) { - $content = '@' . $profile->nickname . ' '; - } - } else { - // @fixme most of these bits above aren't being passed on above - $inreplyto = null; + if (!GNUsocial::isAjax()) { + $url = common_local_url('shownotice', array('notice' => $this->stored->id)); + common_redirect($url, 303); } - $notice_form = new NoticeForm($this, '', $content, null, $inreplyto); - $notice_form->show(); + return _('Saved the notice!'); } - /** - * Show an error message - * - * Shows an error message if there is one. - * - * @return void - * - * @todo maybe show some instructions? - */ - - function showPageNotice() + protected function showContent() { - if ($this->msg) { - $this->element('p', array('id' => 'error'), $this->msg); + if ($this->getInfo() && $this->stored instanceof Notice) { + $this->showNotice($this->stored); + } elseif (!$this->getError()) { + parent::showContent(); } } @@ -337,11 +220,14 @@ class NewnoticeAction extends Action * * @return void */ - - function showNotice($notice) + function showNotice(Notice $notice) { $nli = new NoticeListItem($notice, $this); $nli->show(); } -} + public function showNoticeForm() + { + // pass + } +}