summaryrefslogtreecommitdiff
path: root/actions/postnotice.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-01-15 23:03:38 +0000
committerEvan Prodromou <evan@controlyourself.ca>2009-01-15 23:03:38 +0000
commit4b0cf99e56f965e10eeb8b8b19e7b405bda49eaf (patch)
tree094c2948648d79290326130f9cd75a95afc6035d /actions/postnotice.php
parenteaa81d25fa7bd954132ce7f901fae69b0d46ec1a (diff)
Convert use of common_server_error and common_user_error to methods on Action
Diffstat (limited to 'actions/postnotice.php')
-rw-r--r--actions/postnotice.php14
1 files changed, 7 insertions, 7 deletions
diff --git a/actions/postnotice.php b/actions/postnotice.php
index dec62a678..0b4735296 100644
--- a/actions/postnotice.php
+++ b/actions/postnotice.php
@@ -36,7 +36,7 @@ class PostnoticeAction extends Action
print "omb_version=".OMB_VERSION_01;
}
} catch (OAuthException $e) {
- common_server_error($e->getMessage());
+ $this->serverError($e->getMessage());
return;
}
}
@@ -45,36 +45,36 @@ class PostnoticeAction extends Action
{
$version = $req->get_parameter('omb_version');
if ($version != OMB_VERSION_01) {
- common_user_error(_('Unsupported OMB version'), 400);
+ $this->clientError(_('Unsupported OMB version'), 400);
return false;
}
# First, check to see
$listenee = $req->get_parameter('omb_listenee');
$remote_profile = Remote_profile::staticGet('uri', $listenee);
if (!$remote_profile) {
- common_user_error(_('Profile unknown'), 403);
+ $this->clientError(_('Profile unknown'), 403);
return false;
}
$sub = Subscription::staticGet('token', $token->key);
if (!$sub) {
- common_user_error(_('No such subscription'), 403);
+ $this->clientError(_('No such subscription'), 403);
return false;
}
$content = $req->get_parameter('omb_notice_content');
$content_shortened = common_shorten_links($content);
if (mb_strlen($content_shortened) > 140) {
- common_user_error(_('Invalid notice content'), 400);
+ $this->clientError(_('Invalid notice content'), 400);
return false;
}
$notice_uri = $req->get_parameter('omb_notice');
if (!Validate::uri($notice_uri) &&
!common_valid_tag($notice_uri)) {
- common_user_error(_('Invalid notice uri'), 400);
+ $this->clientError(_('Invalid notice uri'), 400);
return false;
}
$notice_url = $req->get_parameter('omb_notice_url');
if ($notice_url && !common_valid_http_url($notice_url)) {
- common_user_error(_('Invalid notice url'), 400);
+ $this->clientError(_('Invalid notice url'), 400);
return false;
}
$notice = Notice::staticGet('uri', $notice_uri);