X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fsubedit.php;h=47fe19ea244f0c2cee9ed8cc77a9e4e08cfb0d3f;hb=a254f38a238179a88b08149e5dc44052cf4dd399;hp=874102857362535892df2107a830e876a23b9e73;hpb=04ef1ba8eee7a9e2a565d7b4b747ef607665d562;p=quix0rs-gnu-social.git

diff --git a/actions/subedit.php b/actions/subedit.php
index 8741028573..47fe19ea24 100644
--- a/actions/subedit.php
+++ b/actions/subedit.php
@@ -1,7 +1,7 @@
 <?php
 /*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -17,41 +17,42 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
-
-class SubeditAction extends Action {
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
+// @todo FIXME: Documentation needed.
+class SubeditAction extends Action
+{
     var $profile = null;
 
     function prepare($args)
     {
-
         parent::prepare($args);
 
         if (!common_logged_in()) {
-            $this->client_error(_('Not logged in.'));
-            return false;
+            // TRANS: Error message displayed when trying to perform an action that requires a logged in user.
+            $this->clientError(_('Not logged in.'));
         }
 
         $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;
+            // 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.'));
         }
 
         $id = $this->trimmed('profile');
 
         if (!$id) {
-            $this->client_error(_('No profile specified.'));
-            return false;
+            // TRANS: Client error displayed trying a change a subscription without providing a profile.
+            $this->clientError(_('No profile specified.'));
         }
 
-        $this->profile = Profile::staticGet('id', $id);
+        $this->profile = Profile::getKV('id', $id);
 
         if (!$this->profile) {
-            $this->client_error(_('No profile with that ID.'));
-            return false;
+            // TRANS: Client error displayed trying a change a subscription for a non-existant profile ID.
+            $this->clientError(_('No profile with that ID.'));
         }
 
         return true;
@@ -67,8 +68,8 @@ class SubeditAction extends Action {
                                                'subscribed' => $this->profile->id));
 
             if (!$sub) {
-                $this->client_error(_('You are not subscribed to that profile.'));
-                return false;
+                // TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
+                $this->clientError(_('You are not subscribed to that profile.'));
             }
 
             $orig = clone($sub);
@@ -80,12 +81,11 @@ class SubeditAction extends Action {
 
             if (!$result) {
                 common_log_db_error($sub, 'UPDATE', __FILE__);
-                $this->server_error(_('Could not save subscription.'));
-                return false;
+                // TRANS: Server error displayed when updating a subscription fails with a database error.
+                $this->serverError(_('Could not save subscription.'));
             }
 
-            common_redirect(common_local_url('subscriptions',
-                                             array('nickname' => $cur->nickname)));
+            common_redirect(common_local_url('subscriptions', array('nickname' => $cur->nickname)), 303);
         }
     }
 }