X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fnewnotice.php;h=ccc3f94fd4105ce86d76140937e55aa76d6eb048;hb=4de125dd843359c8a705c7c76eb2aa5f74efce68;hp=7c324aaded4ca054d4114e34477e158006e37ef2;hpb=64df40e409812249748723b8acb0b48920ed786b;p=quix0rs-gnu-social.git diff --git a/actions/newnotice.php b/actions/newnotice.php index 7c324aaded..ccc3f94fd4 100644 --- a/actions/newnotice.php +++ b/actions/newnotice.php @@ -30,9 +30,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { - exit(1); -} +if (!defined('GNUSOCIAL')) { exit(1); } /** * Action for posting new notices @@ -47,6 +45,8 @@ if (!defined('STATUSNET')) { */ class NewnoticeAction extends FormAction { + protected $form = 'Notice'; + /** * Title of the page * @@ -56,12 +56,32 @@ class NewnoticeAction extends FormAction */ function title() { + 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'); } + protected function doPreparation() + { + foreach(array('inreplyto') as $opt) { + if ($this->trimmed($opt)) { + $this->formOpts[$opt] = $this->trimmed($opt); + } + } + + // Backwards compatibility for "share this" widget things. + // If no 'content', use 'status_textarea' + $this->formOpts['content'] = $this->trimmed('content') ?: $this->trimmed('status_textarea'); + } + /** - * This handlePost saves 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. @@ -71,17 +91,15 @@ class NewnoticeAction extends FormAction * * @return void */ - protected function handlePost() + protected function doPost() { - parent::handlePost(); - - assert($this->scoped); // 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!')); } @@ -91,7 +109,7 @@ class NewnoticeAction extends FormAction $cmd = $inter->handle_command($user, $content); if ($cmd) { - if (StatusNet::isAjax()) { + if (GNUsocial::isAjax()) { $cmd->execute(new AjaxWebChannel($this)); } else { $cmd->execute(new WebChannel($this)); @@ -109,16 +127,15 @@ class NewnoticeAction extends FormAction Notice::maxContent())); } - $replyto = intval($this->trimmed('inreplyto')); + $replyto = $this->int('inreplyto'); if ($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(); } @@ -133,9 +150,12 @@ class NewnoticeAction extends FormAction 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'), @@ -163,177 +183,31 @@ class NewnoticeAction extends FormAction if (Event::handle('StartNoticeSaveWeb', array($this, &$author_id, &$text, &$options))) { - $notice = Notice::saveNew($this->scoped->id, $content_shortened, 'web', $options); + $this->stored = Notice::saveNew($this->scoped->id, $content_shortened, 'web', $options); - if (isset($upload)) { - $upload->attachToNotice($notice); + if ($upload instanceof MediaFile) { + $upload->attachToNotice($this->stored); } - Event::handle('EndNoticeSaveWeb', array($this, $notice)); + Event::handle('EndNoticeSaveWeb', array($this, $this->stored)); } - Event::handle('EndSaveNewNoticeWeb', array($this, $user, &$content_shortened, &$options)); - if (StatusNet::isAjax()) { - $this->startHTML('text/xml;charset=utf-8'); - $this->elementStart('head'); - // TRANS: Page title after sending a notice. - $this->element('title', null, _('Notice posted')); - $this->elementEnd('head'); - $this->elementStart('body'); - $this->showNotice($notice); - $this->elementEnd('body'); - $this->endHTML(); - exit; - } else { - $returnto = $this->trimmed('returnto'); + Event::handle('EndSaveNewNoticeWeb', array($this, $user, &$content_shortened, &$options)); - if ($returnto) { - $url = common_local_url($returnto, - array('nickname' => $this->scoped->nickname)); - } else { - $url = common_local_url('shownotice', - array('notice' => $notice->id)); - } + if (!GNUsocial::isAjax()) { + $url = common_local_url('shownotice', array('notice' => $this->stored->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 - */ - 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'); - $this->element('p', array('id' => 'error'), $msg); - $this->elementEnd('body'); - $this->endHTML(); + return _('Saved the notice!'); } - /** - * 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() + protected function showContent() { - $this->startHTML('text/xml;charset=utf-8', true); - $this->elementStart('head'); - // TRANS: Title for form to send a new notice. - $this->element('title', null, _m('TITLE','New notice')); - $this->elementEnd('head'); - $this->elementStart('body'); - - $form = new NoticeForm($this); - $form->show(); - - $this->elementEnd('body'); - $this->endHTML(); - } - - /** - * 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/info message, if any - * @param boolean $success false for error indication, true for info - * - * @return void - */ - function showForm($msg=null, $success=false) - { - if (StatusNet::isAjax()) { - if ($msg) { - $this->ajaxErrorMsg($msg); - } else { - $this->ajaxShowForm(); - } - return; - } - - parent::showForm($msg, $success); - } - - /** - * // XXX: Should we be showing the notice form with microapps here? - * - * Overload for replies or bad results - * - * We show content in the notice form if there were replies or results. - * - * @return void - */ - function showNoticeForm() - { - $content = $this->trimmed('status_textarea'); - if (!$content) { - $replyto = $this->trimmed('replyto'); - $inreplyto = $this->trimmed('inreplyto'); - $profile = Profile::getKV('nickname', $replyto); - if ($profile) { - $content = '@' . $profile->nickname . ' '; - } - } else { - // @fixme most of these bits above aren't being passed on above - $inreplyto = null; - } - - $this->elementStart('div', 'input_forms'); - $this->elementStart( - 'div', - array( - 'id' => 'input_form_status', - 'class' => 'input_form current nonav' - ) - ); - - $notice_form = new NoticeForm( - $this, - array( - 'content' => $content, - 'inreplyto' => $inreplyto - ) - ); - - $notice_form->show(); - - $this->elementEnd('div'); - $this->elementEnd('div'); - } - - /** - * Show an error message - * - * Shows an error message if there is one. - * - * @return void - * - * @todo maybe show some instructions? - */ - function showPageNotice() - { - 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(); } } @@ -346,9 +220,14 @@ class NewnoticeAction extends FormAction * * @return void */ - function showNotice($notice) + function showNotice(Notice $notice) { $nli = new NoticeListItem($notice, $this); $nli->show(); } + + public function showNoticeForm() + { + // pass + } }