Use ToSelector choice again.

[quix0rs-gnu-social.git] / lib / servererroraction.php

diff --git a/lib/servererroraction.php b/lib/servererroraction.php
index 9b5a553dc64a341e578e2efd6bb08285b017d868..8ca281614b86de301c628c3cfca3fbb1ed593e5b 100644 (file)
--- a/lib/servererroraction.php
+++ b/lib/servererroraction.php
@@ -29,11 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
-
-require_once INSTALLDIR.'/lib/error.php';
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 /**
  * Class for displaying HTTP server errors
@@ -68,32 +64,44 @@ class ServerErrorAction extends ErrorAction
 
         $this->default = 500;
 
+        if (!$this->code || $this->code < 500 || $this->code > 599) {
+            $this->code = $this->default;
+        }
+
+        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);
-    }
 
-    // XXX: Should these error actions even be invokable via URI?
+        $this->showPage();
+    }
 
-    function handle($args)
+    /**
+     *  To specify additional HTTP headers for the action
+     *
+     *  @return void
+     */
+    function extraHeaders()
     {
-        parent::handle($args);
-
-        $this->code = $this->trimmed('code');
-
-        if (!$this->code || $code < 500 || $code > 599) {
-            $this->code = $this->default;
-        }
-
-        $this->message = $this->trimmed('message');
+        $status_string = @self::$status[$this->code];
+        header('HTTP/1.1 '.$this->code.' '.$status_string);
+    }
 
-        if (!$this->message) {
-            $this->message = "Server Error $this->code";
-        }
+    /**
+     * Page title.
+     *
+     * @return page title
+     */
 
-        $this->showPage();
+    function title()
+    {
+        return @self::$status[$this->code];
     }
+
 }