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.

diff --git a/actions/all.php b/actions/all.php
index d6dd8e8af53715bd5ac7995c61f003d75075da33..fb0b63577afbb17377f4cb4ebd4dc0a163ec4551 100644 (file)
--- a/actions/all.php
+++ b/actions/all.php
@@ -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;

diff --git a/actions/public.php b/actions/public.php
index 4f91b77e1ec44334f81383ad065da0314d38546b..06ee75b8d1c5fa9b72b52393b0554c90f1669f3a 100644 (file)
--- a/actions/public.php
+++ b/actions/public.php
@@ -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;

diff --git a/actions/replies.php b/actions/replies.php
index 4932520fd6fe53a61c981c210c21f8cdfe83e840..2b5455e23cb0d8a34f4bf14104bc5309a2cbd343 100644 (file)
--- a/actions/replies.php
+++ b/actions/replies.php
@@ -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;

diff --git a/actions/showprofiletag.php b/actions/showprofiletag.php
index d96acec5909971179af04fcd377f599fd1f5fc7c..6ba0c18f90fdb65d3ad6b6cd1b1483402b626913 100644 (file)
--- a/actions/showprofiletag.php
+++ b/actions/showprofiletag.php
@@ -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;

diff --git a/actions/tag.php b/actions/tag.php
index 0fc2c5152e530acb3b186503ba4b305819a1bc64..09de8b3c25638973434ced16539b2c5e78716c42 100644 (file)
--- a/actions/tag.php
+++ b/actions/tag.php
@@ -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;

diff --git a/plugins/Favorite/actions/showfavorites.php b/plugins/Favorite/actions/showfavorites.php
index cc355b1beff070bdc06a3b1ab2eb062b28463b63..98a6bfc5bfbe30dfb7a7e05903b0c446792fa470 100644 (file)
--- a/plugins/Favorite/actions/showfavorites.php
+++ b/plugins/Favorite/actions/showfavorites.php
@@ -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;

diff --git a/plugins/Oembed/actions/oembed.php b/plugins/Oembed/actions/oembed.php
index 509c3a73ee2c5b608bd0b1f8a9a29ee650b82e3f..bf3e71c5056578e3ae86ea0e6ed0627e38e4bd39 100644 (file)
--- a/plugins/Oembed/actions/oembed.php
+++ b/plugins/Oembed/actions/oembed.php
@@ -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);
         }
     }