X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fsubedit.php;h=8ca2d791465ce34ce9e067051c18df0f1682321f;hb=b4e649fe906a793cd5e62d6390065ea5d41c40db;hp=e7505e3fef44f1c137878c8efa82e6a132720138;hpb=29146a13f295a13a4ee4470cffaaa7fde6858689;p=quix0rs-gnu-social.git

diff --git a/actions/subedit.php b/actions/subedit.php
index e7505e3fef..8ca2d79146 100644
--- a/actions/subedit.php
+++ b/actions/subedit.php
@@ -19,44 +19,46 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class SubeditAction extends Action {
-
-    var $profile = NULL;
-
-    function prepare($args) {
+class SubeditAction extends Action
+{
+    var $profile = null;
 
+    function prepare($args)
+    {
         parent::prepare($args);
 
         if (!common_logged_in()) {
-            $this->client_error(_('Not logged in.'));
+            $this->clientError(_('Not logged in.'));
             return false;
         }
 
-		$token = $this->trimmed('token');
+        $token = $this->trimmed('token');
 
-		if (!$token || $token != common_session_token()) {
-			$this->client_error(_('There was a problem with your session token. Try again, please.'));
-			return;
-		}
+        if (!$token || $token != common_session_token()) {
+            $this->clientError(_('There was a problem with your session token. '.
+                                 'Try again, please.'));
+            return false;
+        }
 
         $id = $this->trimmed('profile');
 
         if (!$id) {
-            $this->client_error(_('No profile specified.'));
+            $this->clientError(_('No profile specified.'));
             return false;
         }
 
         $this->profile = Profile::staticGet('id', $id);
 
         if (!$this->profile) {
-            $this->client_error(_('No profile with that ID.'));
+            $this->clientError(_('No profile with that ID.'));
             return false;
         }
 
         return true;
     }
 
-    function handle($args) {
+    function handle($args)
+    {
         parent::handle($args);
         if ($_SERVER['REQUEST_METHOD'] == 'POST') {
             $cur = common_current_user();
@@ -65,7 +67,7 @@ class SubeditAction extends Action {
                                                'subscribed' => $this->profile->id));
 
             if (!$sub) {
-                $this->client_error(_('You are not subscribed to that profile.'));
+                $this->clientError(_('You are not subscribed to that profile.'));
                 return false;
             }
 
@@ -78,12 +80,13 @@ class SubeditAction extends Action {
 
             if (!$result) {
                 common_log_db_error($sub, 'UPDATE', __FILE__);
-                $this->server_error(_('Could not save subscription.'));
+                $this->serverError(_('Could not save subscription.'));
                 return false;
             }
 
             common_redirect(common_local_url('subscriptions',
-                                             array('nickname' => $cur->nickname)));
+                                             array('nickname' => $cur->nickname)),
+                            303);
         }
     }
 }