Using GNUSOCIAL_VERSION instead of STATUSNET_VERSION

[quix0rs-gnu-social.git] / actions / newmessage.php

diff --git a/actions/newmessage.php b/actions/newmessage.php
index 8a03aebfac4aa13c2ff1a38babe481b1006dbe74..96ada1cee8ef1d72249b5d66c6a37d07b5f6fa58 100644 (file)
--- a/actions/newmessage.php
+++ b/actions/newmessage.php
@@ -25,11 +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')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
@@ -45,15 +46,8 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  * @link     http://status.net/
  */
 
-class NewmessageAction extends Action
+class NewmessageAction extends FormAction
 {
-
-    /**
-     * Error message, if any
-     */
-
-    var $msg = null;
-
     var $content = null;
     var $to = null;
     var $other = null;
@@ -80,112 +74,71 @@ class NewmessageAction extends Action
      * @return void
      */
 
-    function handle($args)
-    {
-        parent::handle($args);
-
-        if (!common_logged_in()) {
-            // TRANS: Client error displayed trying to create a new direct message while not logged in.
-            $this->clientError(_('Not logged in.'), 403);
-        } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-            $this->saveNewMessage();
-        } else {
-            $this->showForm();
-        }
-    }
-
-    function prepare($args)
+    protected function prepare(array $args=array())
     {
         parent::prepare($args);
 
-        $user = common_current_user();
-
-        if (!$user) {
-            /* Go log in, and then come back. */
-            common_set_returnto($_SERVER['REQUEST_URI']);
-            common_redirect(common_local_url('login'));
-            return false;
-        }
+        $user = $this->scoped->getUser();
 
         $this->content = $this->trimmed('content');
         $this->to = $this->trimmed('to');
 
         if ($this->to) {
 
-            $this->other = User::staticGet('id', $this->to);
+            $this->other = User::getKV('id', $this->to);
 
             if (!$this->other) {
                 // TRANS: Client error displayed trying to send a direct message to a non-existing user.
                 $this->clientError(_('No such user.'), 404);
-                return false;
             }
 
             if (!$user->mutuallySubscribed($this->other)) {
                 // TRANS: Client error displayed trying to send a direct message to a user while sender and
                 // TRANS: receiver are not subscribed to each other.
                 $this->clientError(_('You cannot send a message to this user.'), 404);
-                return false;
             }
         }
 
         return true;
     }
 
-    function saveNewMessage()
+    protected function handlePost()
     {
-        // CSRF protection
+        parent::handlePost();
 
-        $token = $this->trimmed('token');
-        if (!$token || $token != common_session_token()) {
-            $this->showForm(_('There was a problem with your session token. ' .
-                'Try again, please.'));
-            return;
-        }
-
-        $user = common_current_user();
-        assert($user); // XXX: maybe an error instead...
+        assert($this->scoped); // XXX: maybe an error instead...
+        $user = $this->scoped->getUser();
 
         if (!$this->content) {
             // TRANS: Form validator error displayed trying to send a direct message without content.
-            $this->showForm(_('No content!'));
-            return;
+            $this->clientError(_('No content!'));
         } else {
             $content_shortened = $user->shortenLinks($this->content);
 
             if (Message::contentTooLong($content_shortened)) {
                 // TRANS: Form validation error displayed when message content is too long.
                 // TRANS: %d is the maximum number of characters for a message.
-                $this->showForm(sprintf(_m('That\'s too long. Maximum message size is %d character.',
+                $this->clientError(sprintf(_m('That\'s too long. Maximum message size is %d character.',
                                            'That\'s too long. Maximum message size is %d characters.',
                                            Message::maxContent()),
                                         Message::maxContent()));
-                return;
             }
         }
 
         if (!$this->other) {
             // TRANS: Form validation error displayed trying to send a direct message without specifying a recipient.
-            $this->showForm(_('No recipient specified.'));
-            return;
+            $this->clientError(_('No recipient specified.'));
         } else if (!$user->mutuallySubscribed($this->other)) {
             // TRANS: Client error displayed trying to send a direct message to a user while sender and
             // TRANS: receiver are not subscribed to each other.
             $this->clientError(_('You cannot send a message to this user.'), 404);
-            return;
-        } else if ($user->id == $this->other->id) {
+        } else if ($this->scoped->id == $this->other->id) {
             // TRANS: Client error displayed trying to send a direct message to self.
-            $this->clientError(_('Don\'t send a message to yourself; ' .
+            $this->clientError(_('Do not send a message to yourself; ' .
                 'just say it to yourself quietly instead.'), 403);
-            return;
-        }
-
-        $message = Message::saveNew($user->id, $this->other->id, $this->content, 'web');
-
-        if (is_string($message)) {
-            $this->showForm($message);
-            return;
         }
 
+        $message = Message::saveNew($this->scoped->id, $this->other->id, $this->content, 'web');
         $message->notify();
 
         if ($this->boolean('ajax')) {
@@ -201,10 +154,10 @@ class NewmessageAction extends Action
                 sprintf(_('Direct message to %s sent.'),
                     $this->other->nickname));
             $this->elementEnd('body');
-            $this->elementEnd('html');
+            $this->endHTML();
         } else {
             $url = common_local_url('outbox',
-                array('nickname' => $user->nickname));
+                array('nickname' => $this->scoped->nickname));
             common_redirect($url, 303);
         }
     }
@@ -229,7 +182,7 @@ class NewmessageAction extends Action
         $this->elementStart('body');
         $this->element('p', array('id' => 'error'), $msg);
         $this->elementEnd('body');
-        $this->elementEnd('html');
+        $this->endHTML();
     }
 
     function showForm($msg = null)
@@ -241,9 +194,7 @@ class NewmessageAction extends Action
 
         $this->msg = $msg;
         if ($this->trimmed('ajax')) {
-            header('Content-Type: text/xml;charset=utf-8');
-            $this->xw->startDocument('1.0', 'UTF-8');
-            $this->elementStart('html');
+            $this->startHTML('text/xml;charset=utf-8');
             $this->elementStart('head');
             // TRANS: Page title on page for sending a direct message.
             $this->element('title', null, _('New message'));