mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #4060 from annando/system-unavailable

Browse source 
"system_unavailable.php" is unavailable now
This commit is contained in:
Hypolite Petovan 2017-12-13 17:01:47 -05:00 committed by GitHub
parent 74767ad321 0457bd995f
commit 369fcb7bae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
boot.php
View file

@ -563,16 +563,6 @@ function x($s, $k = null)
} }
} }
/**
* @brief Called from db initialisation if db is dead.
*/
function system_unavailable()
{
include 'system_unavailable.php';
system_down();
killme();
}
/** /**
* @brief Returns the baseurl. * @brief Returns the baseurl.
* *

2
include/dba.php
View file

@ -97,7 +97,7 @@ class dba {
if (!self::$connected) { if (!self::$connected) {
self::$db = null; self::$db = null;
if (!$install) { if (!$install) {
system_unavailable(); System::unavailable();
} }
} }
$a->save_timestamp($stamp1, "network"); $a->save_timestamp($stamp1, "network");

12
include/system_unavailable.php
View file

@ -1,12 +0,0 @@
<?php
function system_down() {
echo <<< EOT
<html>
<head><title>System Unavailable</title></head>
<body>
Apologies but this site is unavailable at the moment. Please try again later.
</body>
</html>
EOT;
}

14
src/Core/System.php
View file

@ -100,6 +100,20 @@ class System
return implode(', ', $callstack2); return implode(', ', $callstack2);
} }
/**
* @brief Called from db initialisation when db is dead.
*/
static public function unavailable() {
echo <<< EOT
<html>
<head><title>System Unavailable</title></head>
<body>Apologies but this site is unavailable at the moment. Please try again later.</body>
</html>
EOT;
killme();
}
/// @todo Move the following functions from boot.php /// @todo Move the following functions from boot.php
/* /*
function get_guid($size = 16, $prefix = "") function get_guid($size = 16, $prefix = "")