From fbd1cf4dfa452166a5985d9a9177d57e8554f09f Mon Sep 17 00:00:00 2001
From: Robin Millette <millette@controlyourself.ca>
Date: Fri, 23 Jan 2009 05:57:08 +0000
Subject: [PATCH] use new error actions classes to display error

---
 .../clienterroraction.php                     |  0
 .../servererroraction.php                     |  0
 lib/util.php                                  | 53 ++-----------------
 3 files changed, 4 insertions(+), 49 deletions(-)
 rename actions/clienterror.php => lib/clienterroraction.php (100%)
 rename actions/servererror.php => lib/servererroraction.php (100%)

diff --git a/actions/clienterror.php b/lib/clienterroraction.php
similarity index 100%
rename from actions/clienterror.php
rename to lib/clienterroraction.php
diff --git a/actions/servererror.php b/lib/servererroraction.php
similarity index 100%
rename from actions/servererror.php
rename to lib/servererroraction.php
diff --git a/lib/util.php b/lib/util.php
index 42bc08e7ee..0b5abfa480 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -23,60 +23,15 @@
 
 function common_server_error($msg, $code=500)
 {
-    static $status = array(500 => 'Internal Server Error',
-                           501 => 'Not Implemented',
-                           502 => 'Bad Gateway',
-                           503 => 'Service Unavailable',
-                           504 => 'Gateway Timeout',
-                           505 => 'HTTP Version Not Supported');
-
-    if (!array_key_exists($code, $status)) {
-        $code = 500;
-    }
-
-    $status_string = $status[$code];
-
-    header('HTTP/1.1 '.$code.' '.$status_string);
-    header('Content-type: text/plain');
-
-    print $msg;
-    print "\n";
-    exit();
+    $err = new ServerErrorAction($msg, $code);
+    $err->showPage();
 }
 
 // Show a user error
 function common_user_error($msg, $code=400)
 {
-    static $status = array(400 => 'Bad Request',
-                           401 => 'Unauthorized',
-                           402 => 'Payment Required',
-                           403 => 'Forbidden',
-                           404 => 'Not Found',
-                           405 => 'Method Not Allowed',
-                           406 => 'Not Acceptable',
-                           407 => 'Proxy Authentication Required',
-                           408 => 'Request Timeout',
-                           409 => 'Conflict',
-                           410 => 'Gone',
-                           411 => 'Length Required',
-                           412 => 'Precondition Failed',
-                           413 => 'Request Entity Too Large',
-                           414 => 'Request-URI Too Long',
-                           415 => 'Unsupported Media Type',
-                           416 => 'Requested Range Not Satisfiable',
-                           417 => 'Expectation Failed');
-
-    if (!array_key_exists($code, $status)) {
-        $code = 400;
-    }
-
-    $status_string = $status[$code];
-
-    header('HTTP/1.1 '.$code.' '.$status_string);
-
-    common_show_header('Error');
-    common_element('div', array('class' => 'error'), $msg);
-    common_show_footer();
+    $err = new ClientErrorAction($msg, $code);
+    $err->showPage();
 }
 
 function common_init_locale($language=null)
-- 
2.39.5