diff options
Diffstat (limited to 'actions/updateprofile.php')
| -rw-r--r-- | actions/updateprofile.php | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/actions/updateprofile.php b/actions/updateprofile.php index 16afba618..2d523b342 100644 --- a/actions/updateprofile.php +++ b/actions/updateprofile.php @@ -37,100 +37,100 @@ class UpdateprofileAction extends Action { return; } } - + function update_profile($req, $consumer, $token) { $version = $req->get_parameter('omb_version'); if ($version != OMB_VERSION_01) { - $this->client_error(_t('Unsupported OMB version'), 400); + $this->client_error(_('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(_t('Profile unknown'), 404); + $this->client_error(_('Profile unknown'), 404); return false; } # Second, check to see if they should be able to post updates! # We see if there are any subscriptions to that remote user with # the given token. - + $sub = new Subscription(); $sub->subscribed = $remote->id; $sub->token = $token->key; if (!$sub->find(true)) { - $this->client_error(_t('You did not send us that profile'), 403); + $this->client_error(_('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(_t('Remote profile with no matching profile'), 500); + $this->server_error(_('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(_t('Nickname must have only letters and numbers and no spaces.')); + $this->client_error(_('Nickname must have only 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(_t("Invalid license URL '$license'")); + $this->client_error(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(_t("Invalid profile URL '$profile_url'.")); + $this->client_error(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(_t("Full name '$fullname' too long.")); + $this->client_error(sprintf(_("Full name '%s' too long."), $fullname)); return false; } $homepage = $req->get_parameter('omb_listenee_homepage'); if ($homepage && (!common_valid_http_url($homepage) || strlen($homepage) > 255)) { - $this->client_error(_t("Invalid homepage '$homepage'")); + $this->client_error(sprintf(_("Invalid homepage '%s'"), $homepage)); return false; } $bio = $req->get_parameter('omb_listenee_bio'); if ($bio && strlen($bio) > 140) { - $this->client_error(_t("Bio too long '$bio'")); + $this->client_error(sprintf(_("Bio too long '%s'"), $bio)); return false; } $location = $req->get_parameter('omb_listenee_location'); if ($location && strlen($location) > 255) { - $this->client_error(_t("Location too long '$location'")); + $this->client_error(sprintf(_("Location too long '%s'"), $location)); return false; } $avatar = $req->get_parameter('omb_listenee_avatar'); if ($avatar) { if (!common_valid_http_url($avatar) || strlen($avatar) > 255) { - $this->client_error(_t("Invalid avatar URL '$avatar'")); + $this->client_error(sprintf(_("Invalid avatar URL '%s'"), $avatar)); return false; } $size = @getimagesize($avatar); if (!$size) { - $this->client_error(_t("Can't read avatar URL '$avatar'")); + $this->client_error(sprintf(_("Can't read avatar URL '%s'"), $avatar)); return false; } if ($size[0] != AVATAR_PROFILE_SIZE || $size[1] != AVATAR_PROFILE_SIZE) { - $this->client_error(_t("Wrong size image at '$avatar'")); + $this->client_error(sprintf(_("Wrong size image at '%s'"), $avatar)); return false; } if (!in_array($size[2], array(IMAGETYPE_GIF, IMAGETYPE_JPEG, IMAGETYPE_PNG))) { - $this->client_error(_t("Wrong image type for '$avatar'")); + $this->client_error(sprintf(_("Wrong image type for '%s'"), $avatar)); return false; } } - + $orig_profile = clone($profile); - + if ($nickname) { $profile->nickname = $nickname; } @@ -149,16 +149,16 @@ class UpdateprofileAction extends Action { if ($location) { $profile->location = $location; } - + if (!$profile->update($orig_profile)) { - $this->server_error(_t('Could not save new profile info'), 500); + $this->server_error(_('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(_t('Could not save avatar info'), 500); + $this->server_error(_('Could not save avatar info'), 500); return false; } } |