Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x

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

diff --git a/lib/servererroraction.php b/lib/servererroraction.php
index a398865915fafe338634010e4fde50bb8f5b933e..c6400605ea9bdc1936829b8e2d92e19c3350159c 100644 (file)
--- a/lib/servererroraction.php
+++ b/lib/servererroraction.php
@@ -6,14 +6,14 @@
  * PHP version 5
  *
  * @category Action
- * @package  Laconica
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Zach Copley <zach@controlyourself.ca>
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
@@ -42,34 +42,39 @@ require_once INSTALLDIR.'/lib/error.php';
  * says that 500 errors should be treated similarly to 400 errors, and
  * it's easier to give an HTML response.  Maybe we can customize these
  * to display some funny animal cartoons.  If not, we can probably role
- * these classes up into a single class. 
+ * these classes up into a single class.
  *
  * See: http://tools.ietf.org/html/rfc2616#section-10
  *
  * @category Action
- * @package  Laconica
- * @author   Zach Copley <zach@controlyourself.ca>
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
+
 class ServerErrorAction extends ErrorAction
 {
     function __construct($message='Error', $code=500)
     {
         parent::__construct($message, $code);
-        
+
         $this->status  = array(500 => 'Internal Server Error',
                                501 => 'Not Implemented',
                                502 => 'Bad Gateway',
                                503 => 'Service Unavailable',
                                504 => 'Gateway Timeout',
                                505 => 'HTTP Version Not Supported');
-        
+
         $this->default = 500;
+
+        // Server errors must be logged.
+
+        common_log(LOG_ERR, "ServerErrorAction: $code $message");
     }
-    
+
     // XXX: Should these error actions even be invokable via URI?
-    
+
     function handle($args)
     {
         parent::handle($args);
@@ -81,12 +86,16 @@ class ServerErrorAction extends ErrorAction
         }
 
         $this->message = $this->trimmed('message');
-        
+
         if (!$this->message) {
-            $this->message = "Server Error $this->code"; 
-        }        
+            $this->message = "Server Error $this->code";
+        }
 
         $this->showPage();
     }
-     
+
+    function title()
+    {
+        return $this->status[$this->code];
+    }
 }