summaryrefslogtreecommitdiff
path: root/actions/subedit.php
diff options
context:
space:
mode:
authorEvan Prodromou <git@evanprodromou.name>2009-01-23 08:58:31 +0100
committerEvan Prodromou <git@evanprodromou.name>2009-01-23 08:58:31 +0100
commita7c85bebd5be9ea019a8c80d74730d7eb28d4651 (patch)
treec3fdf9575a342624bc71aad1d439ae73594f558c /actions/subedit.php
parent4873277b58941ae6ec16543f437f4267ccab5ac0 (diff)
parent7aa496cd8a939960eeaf79f3397f6fe94097e047 (diff)
Merge branch 'master' of /var/www/mublog
Conflicts: actions/api.php actions/deletenotice.php actions/recoverpassword.php actions/remotesubscribe.php actions/tag.php actions/tagrss.php actions/twitapiaccount.php actions/twitapiusers.php classes/Notice.php classes/User.php lib/common.php lib/language.php lib/subs.php lib/twitterapi.php lib/util.php scripts/inbox_users.php scripts/update_translations.php Merged development trunk into laconica head. woohoo!
Diffstat (limited to 'actions/subedit.php')
-rw-r--r--actions/subedit.php34
1 files changed, 18 insertions, 16 deletions
diff --git a/actions/subedit.php b/actions/subedit.php
index e7505e3fe..89081ffc7 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,7 +80,7 @@ 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;
}