harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use http_status() instead of homegrowing it. Adapt http_status to handle replies with data.

Browse Source
This commit is contained in:
ken restivo 2015-11-20 18:56:41 -08:00
parent d11e80e1b3
commit fabf7081d3
2 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
include/network.php
View File

@ -320,6 +320,29 @@ function xml_status($st, $message = '') {
killme(); killme();
} }
/**
* @brief Send HTTP status header
*
* @param int $val
* integer HTTP status result value
* @param string $msg
* optional message
* @returns nil
*/
function http_status($val, $msg = '') {
if ($val >= 400)
$msg = (($msg) ? $msg : 'Error');
if ($val >= 200 && $val < 300)
$msg = (($msg) ? $msg : 'OK');
logger('http_status_exit ' . $val . ' ' . $msg);
header($_SERVER['SERVER_PROTOCOL'] . ' ' . $val . ' ' . $msg);
}
/** /**
* @brief Send HTTP status header and exit. * @brief Send HTTP status header and exit.
* *
@ -330,18 +353,12 @@ function xml_status($st, $message = '') {
* @returns (does not return, process is terminated) * @returns (does not return, process is terminated)
*/ */
function http_status_exit($val, $msg = '') { function http_status_exit($val, $msg = '') {
http_status($val, $msg);
if ($val >= 400)
$msg = (($msg) ? $msg : 'Error');
if ($val >= 200 && $val < 300)
$msg = (($msg) ? $msg : 'OK');
logger('http_status_exit ' . $val . ' ' . $msg);
header($_SERVER['SERVER_PROTOCOL'] . ' ' . $val . ' ' . $msg);
killme(); killme();
} }
// convert an XML document to a normalised, case-corrected array // convert an XML document to a normalised, case-corrected array
// used by webfinger // used by webfinger

4
include/system_unavailable.php
View File

@ -1,7 +1,9 @@
<?php /** @file */ <?php /** @file */
require_once("include/network.php");
function system_down() { function system_down() {
header('HTTP/1.0 503 Service Unavailable'); http_status(503, 'Service Unavailable');
echo <<< EOT echo <<< EOT
<html> <html>
<head><title>System Unavailable</title></head> <head><title>System Unavailable</title></head>