GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

move HTTP error code strings to class variables

Browse Source
This commit is contained in:
Evan Prodromou 2009-09-29 17:43:45 -04:00
parent 155ba6c103
commit 5252c43804
3 changed files with 30 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/clienterroraction.php
View File

@ -46,11 +46,7 @@ require_once INSTALLDIR.'/lib/error.php';
*/ */
class ClientErrorAction extends ErrorAction class ClientErrorAction extends ErrorAction
{ {
function __construct($message='Error', $code=400) static $status = array(400 => 'Bad Request',
{
parent::__construct($message, $code);
$this->status = array(400 => 'Bad Request',
401 => 'Unauthorized', 401 => 'Unauthorized',
402 => 'Payment Required', 402 => 'Payment Required',
403 => 'Forbidden', 403 => 'Forbidden',
@ -68,6 +64,10 @@ class ClientErrorAction extends ErrorAction
415 => 'Unsupported Media Type', 415 => 'Unsupported Media Type',
416 => 'Requested Range Not Satisfiable', 416 => 'Requested Range Not Satisfiable',
417 => 'Expectation Failed'); 417 => 'Expectation Failed');
function __construct($message='Error', $code=400)
{
parent::__construct($message, $code);
$this->default = 400; $this->default = 400;
} }
@ -91,9 +91,4 @@ class ClientErrorAction extends ErrorAction
$this->showPage(); $this->showPage();
} }
function title()
{
return $this->status[$this->code];
}
} }

6
lib/error.php
View File

@ -44,9 +44,10 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
*/ */
class ErrorAction extends Action class ErrorAction extends Action
{ {
static $status = array();
var $code = null; var $code = null;
var $message = null; var $message = null;
var $status = null;
var $default = null; var $default = null;
function __construct($message, $code, $output='php://output', $indent=true) function __construct($message, $code, $output='php://output', $indent=true)
@ -88,9 +89,10 @@ class ErrorAction extends Action
* *
* @return page title * @return page title
*/ */
function title() function title()
{ {
return $this->message; return self::$status[$this->code];
} }
function isReadOnly($args) function isReadOnly($args)

15
lib/servererroraction.php
View File

@ -55,17 +55,17 @@ require_once INSTALLDIR.'/lib/error.php';
class ServerErrorAction extends ErrorAction class ServerErrorAction extends ErrorAction
{ {
function __construct($message='Error', $code=500) static $status = array(500 => 'Internal Server Error',
{
parent::__construct($message, $code);
$this->status = array(500 => 'Internal Server Error',
501 => 'Not Implemented', 501 => 'Not Implemented',
502 => 'Bad Gateway', 502 => 'Bad Gateway',
503 => 'Service Unavailable', 503 => 'Service Unavailable',
504 => 'Gateway Timeout', 504 => 'Gateway Timeout',
505 => 'HTTP Version Not Supported'); 505 => 'HTTP Version Not Supported');
function __construct($message='Error', $code=500)
{
parent::__construct($message, $code);
$this->default = 500; $this->default = 500;
// Server errors must be logged. // Server errors must be logged.
@ -93,9 +93,4 @@ class ServerErrorAction extends ErrorAction
$this->showPage(); $this->showPage();
} }
function title()
{
return $this->status[$this->code];
}
} }