ErrorAction and InfoAction fixes, are now ManagedAction

diff --git a/lib/clienterroraction.php b/lib/clienterroraction.php
index c2e35e62ee8e0f5f24822e451395314597eba7ff..5c4ef37d18674893704e9ae933952e810875309a 100644 (file)
--- a/lib/clienterroraction.php
+++ b/lib/clienterroraction.php
@@ -64,27 +64,13 @@ class ClientErrorAction extends ErrorAction
     {
         parent::__construct($message, $code);
         $this->default = 400;
-    }
-
-    // XXX: Should these error actions even be invokable via URI?
-
-    protected function handle()
-    {
-        parent::handle();
 
-        $this->code = $this->trimmed('code');
-
-        if (!$this->code || $code < 400 || $code > 499) {
+        if (!$this->code || $this->code < 400 || $this->code > 499) {
             $this->code = $this->default;
         }
-
-        $this->message = $this->trimmed('message');
-
         if (!$this->message) {
             $this->message = "Client Error $this->code";
         }
-
-        $this->showPage();
     }
 
     /**

diff --git a/lib/infoaction.php b/lib/infoaction.php
index f72bed59d62a437b3714c7807c7c9ad357cc5775..27563b7efc19c6158773a849fc9bc2306d63a627 100644 (file)
--- a/lib/infoaction.php
+++ b/lib/infoaction.php
@@ -44,7 +44,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  * @see ErrorAction
  */
 
-class InfoAction extends Action
+class InfoAction extends ManagedAction
 {
     var $message = null;
 

diff --git a/lib/servererroraction.php b/lib/servererroraction.php
index 2f9a6585c2cf23044a513083c7f132866321af3e..8ca281614b86de301c628c3cfca3fbb1ed593e5b 100644 (file)
--- a/lib/servererroraction.php
+++ b/lib/servererroraction.php
@@ -64,32 +64,21 @@ class ServerErrorAction extends ErrorAction
 
         $this->default = 500;
 
-        // Server errors must be logged.
-        $log = "ServerErrorAction: $code $message";
-        if ($ex) {
-            $log .= "\n" . $ex->getTraceAsString();
-        }
-        common_log(LOG_ERR, $log);
-    }
-
-    // XXX: Should these error actions even be invokable via URI?
-
-    protected function handle()
-    {
-        parent::handle();
-
-        $this->code = $this->trimmed('code');
-
-        if (!$this->code || $code < 500 || $code > 599) {
+        if (!$this->code || $this->code < 500 || $this->code > 599) {
             $this->code = $this->default;
         }
 
-        $this->message = $this->trimmed('message');
-
         if (!$this->message) {
             $this->message = "Server Error $this->code";
         }
 
+        // Server errors must be logged.
+        $log = "ServerErrorAction: $code $message";
+        if ($ex) {
+            $log .= "\n" . $ex->getTraceAsString();
+        }
+        common_log(LOG_ERR, $log);
+
         $this->showPage();
     }