X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fnewnotice.php;h=4a864b25c3c926e2b2964c4892484096d69fb58e;hb=1f02dc639ec3dfa44df87c4fa031b3f298ffee7e;hp=0aafcd41c6f2dc623497d59cbc212d0ee1a04132;hpb=7a9777df053a9007b5eaa71f5437584065b615a5;p=quix0rs-gnu-social.git

diff --git a/actions/newnotice.php b/actions/newnotice.php
index 0aafcd41c6..4a864b25c3 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -25,16 +25,12 @@
  * @author    Zach Copley <zach@status.net>
  * @author    Sarven Capadisli <csarven@status.net>
  * @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,12 +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,61 +56,32 @@ class NewnoticeAction extends Action
      */
     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');
     }
 
-    /**
-     * 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()) {
-            // TRANS: Error message displayed when trying to perform an action that requires a logged in user.
-            $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()) {
-                // TRANS: Client error displayed when the session token does not match or is not given.
-                $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.
@@ -127,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();
+        $options = array('source' => 'web');
         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();
@@ -146,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));
@@ -154,242 +117,115 @@ class NewnoticeAction extends Action
             return;
         }
 
-        $content_shortened = $user->shortenLinks($content);
-        if (Notice::contentTooLong($content_shortened)) {
+        if ($this->int('inreplyto')) {
+            // Throws exception if the inreplyto Notice is given but not found.
+            $parent = Notice::getByID($this->int('inreplyto'));
+        } else {
+            $parent = null;
+        }
+
+        $act = new Activity();
+        $act->verb = ActivityVerb::POST;
+        $act->time = time();
+        $act->actor = $this->scoped->asActivityObject();
+
+        $upload = null;
+        try {
+            // throws exception on failure
+            $upload = MediaFile::fromUpload('attach', $this->scoped);
+            if (Event::handle('StartSaveNewNoticeAppendAttachment', array($this, $upload, &$content, &$options))) {
+                $content .= ' ' . $upload->shortUrl();
+            }
+            Event::handle('EndSaveNewNoticeAppendAttachment', array($this, $upload, &$content, &$options));
+
+            // We could check content length here if the URL was added, but I'll just let it slide for now...
+
+            $act->enclosures[] = $upload->getEnclosure();
+        } catch (NoUploadedMediaException $e) {
+            // simply no attached media to the new notice
+        }
+
+        $content = $this->scoped->shortenLinks($content);
+
+        // Reject notice if it is too long (without the HTML)
+        // This is done after MediaFile::fromUpload etc. just to act the same as the ApiStatusesUpdateAction
+        if (Notice::contentTooLong($content)) {
             // 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()));
+            throw new ClientException(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['reply_to'] = $replyto;
-        }
+        $actobj = new ActivityObject();
+        $actobj->type = ActivityObject::NOTE;
+        $actobj->content = common_render_content($content, $this->scoped, $parent);
 
-        $upload = null;
-        $upload = MediaFile::fromUpload('attach');
+        $act->objects[] = $actobj;
 
-        if (isset($upload)) {
 
-            if (Event::handle('StartSaveNewNoticeAppendAttachment', array($this, $upload, &$content_shortened, &$options))) {
-                $content_shortened .= ' ' . $upload->shortUrl();
-            }
-            Event::handle('EndSaveNewNoticeAppendAttachment', array($this, $upload, &$content_shortened, &$options));
-
-            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()),
-                                           Notice::maxContent()));
-            }
+        $act->context = new ActivityContext();
+
+        if ($parent instanceof Notice) {
+            $act->context->replyToID = $parent->getUri();
+            $act->context->replyToUrl = $parent->getUrl(true);  // maybe we don't have to send true here to force a URL?
         }
 
-        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);
+            $act->context->location = Location::fromOptions($locOptions);
         }
 
-        $author_id = $user->id;
-        $text      = $content_shortened;
+        $author_id = $this->scoped->id;
+        $text      = $content;
 
         // Does the heavy-lifting for getting "To:" information
 
         ToSelector::fillOptions($this, $options);
 
+        // FIXME: Make sure NoticeTitle plugin gets a change to add the title to our activityobject!
         if (Event::handle('StartNoticeSaveWeb', array($this, &$author_id, &$text, &$options))) {
 
-            $notice = Notice::saveNew($user->id, $content_shortened, 'web', $options);
+            $this->stored = Notice::saveActivity($act, $this->scoped, $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 ($this->boolean('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 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');
-        } else {
-            $returnto = $this->trimmed('returnto');
+        Event::handle('EndSaveNewNoticeWeb', array($this, $user, &$content, &$options));
 
-            if ($returnto) {
-                $url = common_local_url($returnto,
-                                        array('nickname' => $user->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->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');
-        // 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->elementEnd('html');
-    }
-
-    /**
-     * 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
-     */
-    function showForm($msg=null)
-    {
-        if ($this->boolean('ajax')) {
-            if ($msg) {
-                $this->ajaxErrorMsg($msg);
-            } else {
-                $this->ajaxShowForm();
-            }
-            return;
-        }
 
-        $this->msg = $msg;
-        $this->showPage();
+        return _('Saved the notice!');
     }
 
-    /**
-     * // 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()
+    protected function showContent()
     {
-        $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;
-        }
-
-        $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();
         }
     }
 
@@ -402,9 +238,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
+    }
 }