Cosmetic changes to common_redirect, clientError, serverError

[quix0rs-gnu-social.git] / plugins / SubMirror / actions / basemirror.php

diff --git a/plugins/SubMirror/actions/basemirror.php b/plugins/SubMirror/actions/basemirror.php
index 3e3431103f1a0b030e699b06c50af5d2f7c56297..8ed6c224e71a625ee05246a837fc2beb6c4c8001 100644 (file)
--- a/plugins/SubMirror/actions/basemirror.php
+++ b/plugins/SubMirror/actions/basemirror.php
@@ -26,9 +26,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
-    exit(1);
-}
+if (!defined('GNUSOCIAL') && !defined('STATUSNET')) { exit(1); }
 
 /**
  * Takes parameters:
@@ -57,7 +55,7 @@ abstract class BaseMirrorAction extends Action
      *
      * @return boolean success flag
      */
-    function prepare($args)
+    protected function prepare(array $args=array())
     {
         parent::prepare($args);
         return $this->sharedBoilerplate();
@@ -68,19 +66,22 @@ abstract class BaseMirrorAction extends Action
         if (common_valid_http_url($url)) {
             return $url;
         } else {
-            $this->clientError(_m("Invalid feed URL."));
+            // TRANS: Client error displayed when entering an invalid URL for a feed.
+            // TRANS: %s is the invalid feed URL.
+            $this->clientError(sprintf(_m("Invalid feed URL: %s."), $url));
         }
     }
 
     protected function validateProfile($id)
     {
         $id = intval($id);
-        $profile = Profile::staticGet('id', $id);
+        $profile = Profile::getKV('id', $id);
         if ($profile && $profile->id != $this->user->id) {
             return $profile;
         }
-        // TRANS: Error message returned to user when setting up feed mirroring, but we were unable to resolve the given URL to a working feed.
-        $this->clientError(_m("Invalid profile for mirroring."));
+        // TRANS: Error message returned to user when setting up feed mirroring,
+        // TRANS: but we were unable to resolve the given URL to a working feed.
+        $this->clientError(_m('Invalid profile for mirroring.'));
     }
 
     /**
@@ -98,9 +99,10 @@ abstract class BaseMirrorAction extends Action
             $oprofile = Ostatus_profile::ensureFeedURL($url);
         }
         if ($oprofile->isGroup()) {
-            $this->clientError(_m("Can't mirror a StatusNet group at this time."));
+            // TRANS: Client error displayed when trying to mirror a GNU social group feed.
+            $this->clientError(_m('Cannot mirror a GNU social group at this time.'));
         }
-        $this->oprofile = $oprofile; // @fixme ugly side effect :D
+        $this->oprofile = $oprofile; // @todo FIXME: ugly side effect :D
         return $oprofile->localProfile();
     }
 
@@ -112,17 +114,17 @@ abstract class BaseMirrorAction extends Action
     {
         // Only allow POST requests
         if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+            // TRANS: Client error displayed when trying to use another method than POST.
             $this->clientError(_m('This action only accepts POST requests.'));
-            return false;
         }
 
         // 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(_m('There was a problem with your session token.'.
                                  ' Try again, please.'));
-            return false;
         }
 
         // Only for logged-in users
@@ -130,8 +132,8 @@ abstract class BaseMirrorAction extends Action
         $this->user = common_current_user();
 
         if (empty($this->user)) {
+            // TRANS: Error message displayed when trying to perform an action that requires a logged in user.
             $this->clientError(_m('Not logged in.'));
-            return false;
         }
         return true;
     }
@@ -145,7 +147,7 @@ abstract class BaseMirrorAction extends Action
      *
      * @return void
      */
-    function handle($args)
+    protected function handle()
     {
         // Throws exception on error
         $this->saveMirror();
@@ -153,18 +155,19 @@ abstract class BaseMirrorAction extends Action
         if ($this->boolean('ajax')) {
             $this->startHTML('text/xml;charset=utf-8');
             $this->elementStart('head');
+            // TRANS: Page title for subscribed feed mirror.
             $this->element('title', null, _m('Subscribed'));
             $this->elementEnd('head');
             $this->elementStart('body');
             $unsubscribe = new EditMirrorForm($this, $this->profile);
             $unsubscribe->show();
             $this->elementEnd('body');
-            $this->elementEnd('html');
+            $this->endHTML();
         } else {
             $url = common_local_url('mirrorsettings');
             common_redirect($url, 303);
         }
     }
 
-    abstract function saveMirror();
+    abstract protected function saveMirror();
 }