X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fnewnotice.php;h=0c12c7d74ad70ca022dfe57b9c0f71ff462473da;hb=33e2f5b449d477e55bda7029f9e826d889e41eb5;hp=faafd9551d97511709f82e716ceb7c223dfc8f79;hpb=6e894c010fc0e7ddaaafa8795634d6343019aafb;p=quix0rs-gnu-social.git diff --git a/actions/newnotice.php b/actions/newnotice.php index faafd9551d..0c12c7d74a 100644 --- a/actions/newnotice.php +++ b/actions/newnotice.php @@ -25,17 +25,15 @@ * @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')) { +if (!defined('STATUSNET')) { exit(1); } -require_once INSTALLDIR . '/lib/noticelist.php'; -require_once INSTALLDIR . '/lib/mediafile.php'; - /** * Action for posting new notices * @@ -47,15 +45,8 @@ 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; - /** * Title of the page * @@ -63,61 +54,14 @@ class NewnoticeAction extends Action * * @return string page title */ - function title() { - return _('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) - { - 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']) { - // 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); - - // 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.')); - } - try { - $this->saveNewNotice(); - } catch (Exception $e) { - $this->showForm($e->getMessage()); - return; - } - } else { - $this->showForm(); - } + // TRANS: Page title for sending a new notice. + return _m('TITLE','New notice'); } /** - * Save a new notice, based on arguments + * This handlePost 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. @@ -127,18 +71,19 @@ class NewnoticeAction extends Action * * @return void */ - - function saveNewNotice() + protected function handlePost() { - $user = common_current_user(); - assert($user); // XXX: maybe an error instead... + parent::handlePost(); + + assert($this->scoped); // 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) { + // TRANS: Client error displayed trying to send a notice without content. $this->clientError(_('No content!')); - return; } $inter = new CommandInterpreter(); @@ -146,7 +91,7 @@ class NewnoticeAction extends Action $cmd = $inter->handle_command($user, $content); if ($cmd) { - if ($this->boolean('ajax')) { + if (StatusNet::isAjax()) { $cmd->execute(new AjaxWebChannel($this)); } else { $cmd->execute(new WebChannel($this)); @@ -169,8 +114,7 @@ class NewnoticeAction extends Action $options['reply_to'] = $replyto; } - $upload = null; - $upload = MediaFile::fromUpload('attach'); + $upload = MediaFile::fromUpload('attach', $this->scoped); if (isset($upload)) { @@ -181,6 +125,8 @@ class NewnoticeAction extends Action if (Notice::contentTooLong($content_shortened)) { $upload->delete(); + // 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()), @@ -188,31 +134,35 @@ class NewnoticeAction extends Action } } - 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); } - $author_id = $user->id; + $author_id = $this->scoped->id; $text = $content_shortened; + // Does the heavy-lifting for getting "To:" information + + ToSelector::fillOptions($this, $options); + if (Event::handle('StartNoticeSaveWeb', array($this, &$author_id, &$text, &$options))) { - $notice = Notice::saveNew($user->id, $content_shortened, 'web', $options); + $notice = Notice::saveNew($this->scoped->id, $content_shortened, 'web', $options); if (isset($upload)) { $upload->attachToNotice($notice); @@ -222,23 +172,23 @@ class NewnoticeAction extends Action } Event::handle('EndSaveNewNoticeWeb', array($this, $user, &$content_shortened, &$options)); - if ($this->boolean('ajax')) { - header('Content-Type: text/xml;charset=utf-8'); - $this->xw->startDocument('1.0', 'UTF-8'); - $this->elementStart('html'); + 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->elementEnd('html'); + $this->endHTML(); + exit; } else { $returnto = $this->trimmed('returnto'); if ($returnto) { $url = common_local_url($returnto, - array('nickname' => $user->nickname)); + array('nickname' => $this->scoped->nickname)); } else { $url = common_local_url('shownotice', array('notice' => $notice->id)); @@ -256,17 +206,42 @@ 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'); $this->element('p', array('id' => 'error'), $msg); $this->elementEnd('body'); - $this->elementEnd('html'); + $this->endHTML(); + } + + /** + * 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'); + // 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(); } /** @@ -279,37 +254,41 @@ class NewnoticeAction extends Action * Note that since we started doing Ajax output, this page is rarely * seen. * - * @param string $msg An error message, if any + * @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) + function showForm($msg=null, $success=false) { - if ($msg && $this->boolean('ajax')) { - $this->ajaxErrorMsg($msg); + if (StatusNet::isAjax()) { + if ($msg) { + $this->ajaxErrorMsg($msg); + } else { + $this->ajaxShowForm(); + } return; } - $this->msg = $msg; - $this->showPage(); + 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::staticGet('nickname', $replyto); + $profile = Profile::getKV('nickname', $replyto); if ($profile) { $content = '@' . $profile->nickname . ' '; } @@ -318,8 +297,27 @@ class NewnoticeAction extends Action $inreplyto = null; } - $notice_form = new NoticeForm($this, '', $content, null, $inreplyto); + $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'); } /** @@ -331,7 +329,6 @@ class NewnoticeAction extends Action * * @todo maybe show some instructions? */ - function showPageNotice() { if ($this->msg) { @@ -348,7 +345,6 @@ class NewnoticeAction extends Action * * @return void */ - function showNotice($notice) { $nli = new NoticeListItem($notice, $this);