Convert use of common_server_error and common_user_error to methods on Action

1 files changed, 18 insertions, 18 deletions

diff --git a/actions/updateprofile.php b/actions/updateprofile.php
index abb034c81..c79112dac 100644
--- a/actions/updateprofile.php
+++ b/actions/updateprofile.php
@@ -37,7 +37,7 @@ class UpdateprofileAction extends Action
                 print "omb_version=".OMB_VERSION_01;
             }
         } catch (OAuthException $e) {
-            $this->server_error($e->getMessage());
+            $this->serverError($e->getMessage());
             return;
         }
     }
@@ -46,14 +46,14 @@ class UpdateprofileAction extends Action
     {
         $version = $req->get_parameter('omb_version');
         if ($version != OMB_VERSION_01) {
-            $this->client_error(_('Unsupported OMB version'), 400);
+            $this->clientError(_('Unsupported OMB version'), 400);
             return false;
         }
         # First, check to see if listenee exists
         $listenee =  $req->get_parameter('omb_listenee');
         $remote = Remote_profile::staticGet('uri', $listenee);
         if (!$remote) {
-            $this->client_error(_('Profile unknown'), 404);
+            $this->clientError(_('Profile unknown'), 404);
             return false;
         }
         # Second, check to see if they should be able to post updates!
@@ -64,72 +64,72 @@ class UpdateprofileAction extends Action
         $sub->subscribed = $remote->id;
         $sub->token = $token->key;
         if (!$sub->find(true)) {
-            $this->client_error(_('You did not send us that profile'), 403);
+            $this->clientError(_('You did not send us that profile'), 403);
             return false;
         }
 
         $profile = Profile::staticGet('id', $remote->id);
         if (!$profile) {
             # This one is our fault
-            $this->server_error(_('Remote profile with no matching profile'), 500);
+            $this->serverError(_('Remote profile with no matching profile'), 500);
             return false;
         }
         $nickname = $req->get_parameter('omb_listenee_nickname');
         if ($nickname && !Validate::string($nickname, array('min_length' => 1,
                                                             'max_length' => 64,
                                                             'format' => VALIDATE_NUM . VALIDATE_ALPHA_LOWER))) {
-            $this->client_error(_('Nickname must have only lowercase letters and numbers and no spaces.'));
+            $this->clientError(_('Nickname must have only lowercase letters and numbers and no spaces.'));
             return false;
         }
         $license = $req->get_parameter('omb_listenee_license');
         if ($license && !common_valid_http_url($license)) {
-            $this->client_error(sprintf(_("Invalid license URL '%s'"), $license));
+            $this->clientError(sprintf(_("Invalid license URL '%s'"), $license));
             return false;
         }
         $profile_url = $req->get_parameter('omb_listenee_profile');
         if ($profile_url && !common_valid_http_url($profile_url)) {
-            $this->client_error(sprintf(_("Invalid profile URL '%s'."), $profile_url));
+            $this->clientError(sprintf(_("Invalid profile URL '%s'."), $profile_url));
             return false;
         }
         # optional stuff
         $fullname = $req->get_parameter('omb_listenee_fullname');
         if ($fullname && strlen($fullname) > 255) {
-            $this->client_error(_("Full name is too long (max 255 chars)."));
+            $this->clientError(_("Full name is too long (max 255 chars)."));
             return false;
         }
         $homepage = $req->get_parameter('omb_listenee_homepage');
         if ($homepage && (!common_valid_http_url($homepage) || strlen($homepage) > 255)) {
-            $this->client_error(sprintf(_("Invalid homepage '%s'"), $homepage));
+            $this->clientError(sprintf(_("Invalid homepage '%s'"), $homepage));
             return false;
         }
         $bio = $req->get_parameter('omb_listenee_bio');
         if ($bio && strlen($bio) > 140) {
-            $this->client_error(_("Bio is too long (max 140 chars)."));
+            $this->clientError(_("Bio is too long (max 140 chars)."));
             return false;
         }
         $location = $req->get_parameter('omb_listenee_location');
         if ($location && strlen($location) > 255) {
-            $this->client_error(_("Location is too long (max 255 chars)."));
+            $this->clientError(_("Location is too long (max 255 chars)."));
             return false;
         }
         $avatar = $req->get_parameter('omb_listenee_avatar');
         if ($avatar) {
             if (!common_valid_http_url($avatar) || strlen($avatar) > 255) {
-                $this->client_error(sprintf(_("Invalid avatar URL '%s'"), $avatar));
+                $this->clientError(sprintf(_("Invalid avatar URL '%s'"), $avatar));
                 return false;
             }
             $size = @getimagesize($avatar);
             if (!$size) {
-                $this->client_error(sprintf(_("Can't read avatar URL '%s'"), $avatar));
+                $this->clientError(sprintf(_("Can't read avatar URL '%s'"), $avatar));
                 return false;
             }
             if ($size[0] != AVATAR_PROFILE_SIZE || $size[1] != AVATAR_PROFILE_SIZE) {
-                $this->client_error(sprintf(_("Wrong size image at '%s'"), $avatar));
+                $this->clientError(sprintf(_("Wrong size image at '%s'"), $avatar));
                 return false;
             }
             if (!in_array($size[2], array(IMAGETYPE_GIF, IMAGETYPE_JPEG,
                                           IMAGETYPE_PNG))) {
-                $this->client_error(sprintf(_("Wrong image type for '%s'"), $avatar));
+                $this->clientError(sprintf(_("Wrong image type for '%s'"), $avatar));
                 return false;
             }
         }
@@ -156,14 +156,14 @@ class UpdateprofileAction extends Action
         }
 
         if (!$profile->update($orig_profile)) {
-            $this->server_error(_('Could not save new profile info'), 500);
+            $this->serverError(_('Could not save new profile info'), 500);
             return false;
         } else {
             if ($avatar) {
                 $temp_filename = tempnam(sys_get_temp_dir(), 'listenee_avatar');
                 copy($avatar, $temp_filename);
                 if (!$profile->setOriginal($temp_filename)) {
-                    $this->server_error(_('Could not save avatar info'), 500);
+                    $this->serverError(_('Could not save avatar info'), 500);
                     return false;
                 }
             }