Merge branch 'master' into FeedPoller

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

diff --git a/actions/repeat.php b/actions/repeat.php
index 333e1cd02eacac5de47b128b8f7a97dde4e5f146..9e527c526940a9600f79d2f0e7773d1142734e7b 100644 (file)
--- a/actions/repeat.php
+++ b/actions/repeat.php
@@ -45,18 +45,12 @@ class RepeatAction extends Action
     var $user = null;
     var $notice = null;
 
-    function prepare($args)
+    protected $needLogin = true;
+
+    protected function prepare(array $args=array())
     {
         parent::prepare($args);
 
-        $this->user = common_current_user();
-
-        if (empty($this->user)) {
-            // TRANS: Client error displayed when trying to repeat a notice while not logged in.
-            $this->clientError(_('Only logged-in users can repeat notices.'));
-            return false;
-        }
-
         $id = $this->trimmed('notice');
 
         if (empty($id)) {
@@ -65,15 +59,15 @@ class RepeatAction extends Action
             return false;
         }
 
-        $this->notice = Notice::staticGet('id', $id);
+        $this->notice = Notice::getKV('id', $id);
 
-        if (empty($this->notice)) {
+        if (!($this->notice instanceof Notice)) {
             // TRANS: Client error displayed when trying to repeat a non-existing notice.
             $this->clientError(_('No notice specified.'));
             return false;
         }
 
-        $token  = $this->trimmed('token-'.$id);
+        $token = $this->trimmed('token-'.$id);
 
         if (empty($token) || $token != common_session_token()) {
             // TRANS: Client error displayed when the session token does not match or is not given.
@@ -91,9 +85,11 @@ class RepeatAction extends Action
      *
      * @return void
      */
-    function handle($args)
+    protected function handle()
     {
-        $repeat = $this->notice->repeat($this->user->id, 'web');
+        parent::handle();
+
+        $repeat = $this->notice->repeat($this->scoped->id, 'web');
 
         if ($this->boolean('ajax')) {
             $this->startHTML('text/xml;charset=utf-8');
@@ -107,7 +103,7 @@ class RepeatAction extends Action
                                 // TRANS: Confirmation text after repeating a notice.
                                 _('Repeated!'));
             $this->elementEnd('body');
-            $this->elementEnd('html');
+            $this->endHTML();
         } else {
             // @todo FIXME!
         }