Commit acd36698 authored by mmn's avatar mmn

A bunch of clientError that were called as serverError

Calling serverError with a clientError status code (4xx) means it will
automatically default to Internal Server Error (500) which is in the
server error status code range (5xx). That is undesirable.
parent 95751331
......@@ -57,8 +57,8 @@ class AllAction extends ProfileAction
NOTICES_PER_PAGE + 1);
if ($this->page > 1 && $this->notice->N == 0) {
// TRANS: Server error when page not found (404).
$this->serverError(_('No such page.'), 404);
// TRANS: Client error when page not found (404).
$this->clientError(_('No such page.'), 404);
}
return true;
......
......@@ -84,8 +84,8 @@ class PublicAction extends ManagedAction
}
if ($this->page > 1 && $this->notice->N == 0){
// TRANS: Server error when page not found (404).
$this->serverError(_('No such page.'),$code=404);
// TRANS: Client error when page not found (404).
$this->clientError(_('No such page.'), 404);
}
return true;
......
......@@ -90,8 +90,8 @@ class RepliesAction extends Action
NOTICES_PER_PAGE + 1);
if($this->page > 1 && $this->notice->N == 0){
// TRANS: Server error when page not found (404)
$this->serverError(_('No such page.'),$code=404);
// TRANS: Client error when page not found (404)
$this->clientError(_('No such page.'), 404);
}
return true;
......
......@@ -96,8 +96,8 @@ class ShowprofiletagAction extends Action
NOTICES_PER_PAGE + 1);
if ($this->page > 1 && $this->notice->N == 0) {
// TRANS: Server error when page not found (404).
$this->serverError(_('No such page.'), $code = 404);
// TRANS: Client error when page not found (404).
$this->clientError(_('No such page.'), 404);
}
return true;
......
......@@ -49,8 +49,8 @@ class TagAction extends ManagedAction
$this->notice = Notice_tag::getStream($this->tag, (($this->page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE + 1);
if($this->page > 1 && $this->notice->N == 0){
// TRANS: Server error when page not found (404).
$this->serverError(_('No such page.'),$code=404);
// TRANS: Client error when page not found (404).
$this->clientError(_('No such page.'), 404);
}
return true;
......
......@@ -130,8 +130,8 @@ class ShowfavoritesAction extends Action
}
if($this->page > 1 && $this->notice->N == 0){
// TRANS: Server error when page not found (404)
$this->serverError(_('No such page.'),$code=404);
// TRANS: Client error when page not found (404)
$this->clientError(_('No such page.'), 404);
}
return true;
......
......@@ -51,9 +51,9 @@ class OembedAction extends Action
$proxy_args = $r->map($path);
if (!$proxy_args) {
// TRANS: Server error displayed in oEmbed action when path not found.
// TRANS: Client error displayed in oEmbed action when path not found.
// TRANS: %s is a path.
$this->serverError(sprintf(_('"%s" not found.'),$path), 404);
$this->clientError(sprintf(_('"%s" not found.'),$path), 404);
}
$oembed=array();
......@@ -67,9 +67,9 @@ class OembedAction extends Action
$id = $proxy_args['notice'];
$notice = Notice::getKV($id);
if(empty($notice)){
// TRANS: Server error displayed in oEmbed action when notice not found.
// TRANS: Client error displayed in oEmbed action when notice not found.
// TRANS: %s is a notice.
$this->serverError(sprintf(_("Notice %s not found."),$id), 404);
$this->clientError(sprintf(_("Notice %s not found."),$id), 404);
}
$profile = $notice->getProfile();
if (empty($profile)) {
......@@ -91,9 +91,9 @@ class OembedAction extends Action
$id = $proxy_args['attachment'];
$attachment = File::getKV($id);
if(empty($attachment)){
// TRANS: Server error displayed in oEmbed action when attachment not found.
// TRANS: Client error displayed in oEmbed action when attachment not found.
// TRANS: %d is an attachment ID.
$this->serverError(sprintf(_('Attachment %s not found.'),$id), 404);
$this->clientError(sprintf(_('Attachment %s not found.'),$id), 404);
}
if (empty($attachment->filename) && $file_oembed = File_oembed::getKV('file_id', $attachment->id)) {
// Proxy the existing oembed information
......@@ -174,6 +174,7 @@ class OembedAction extends Action
}
} else {
// TRANS: Error message displaying attachments. %s is the site's base URL.
// FIXME: 404 not found?! (this will automatically become a 500 because it's not a serverError!)
$this->serverError(sprintf(_('Only %s URLs over plain HTTP please.'), common_root_url()), 404);
}
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment