X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FSystem.php;h=1db417eb88c4ac20dfcb34bea8563e2bc4b458a9;hb=d2d6200669ddce44ead1813d06c855d75aa6706b;hp=a2c6f6509cbfcdb32c8afa3e0e50c22067039035;hpb=c309c8bde4fe225047e504c8b2c6289d8aa0c88f;p=friendica.git diff --git a/src/Core/System.php b/src/Core/System.php index a2c6f6509c..1db417eb88 100644 --- a/src/Core/System.php +++ b/src/Core/System.php @@ -1,7 +1,11 @@ get_baseurl($ssl); + public static function baseUrl($ssl = false) + { + return self::getApp()->get_baseurl($ssl); } /** * @brief Removes the baseurl from an url. This avoids some mixed content problems. * - * @param string $orig_url + * @param string $orig_url The url to be cleaned * * @return string The cleaned url */ - public static function removedBaseUrl($orig_url) { - self::init(); - return self::$a->remove_baseurl($orig_url); + public static function removedBaseUrl($orig_url) + { + return self::getApp()->remove_baseurl($orig_url); } /** * @brief Returns a string with a callstack. Can be used for logging. - * + * @param integer $depth optional, default 4 * @return string */ - public static function callstack($depth = 4) { + public static function callstack($depth = 4) + { $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); // We remove the first two items from the list since they contain data that we don't need. array_shift($trace); array_shift($trace); - $callstack = array(); + $callstack = []; $counter = 0; - $previous = array('class' => '', 'function' => ''); + $previous = ['class' => '', 'function' => '']; // The ignore list contains all functions that are only wrapper functions - $ignore = array('get_config', 'get_pconfig', 'set_config', 'set_pconfig', 'fetch_url', 'probe_url'); + $ignore = ['fetchUrl', 'call_user_func_array']; while ($func = array_pop($trace)) { if (!empty($func['class'])) { - // Don't show multiple calls from the same function (mostly used for "dba" class) - if (($previous['class'] != $func['class']) && ($previous['function'] != 'q')) { + // Don't show multiple calls from the "dba" class to show the essential parts of the callstack + if ((($previous['class'] != $func['class']) || ($func['class'] != 'dba')) && ($previous['function'] != 'q')) { $classparts = explode("\\", $func['class']); $callstack[] = array_pop($classparts).'::'.$func['function']; $previous = $func; @@ -84,7 +76,7 @@ class System { } } - $callstack2 = array(); + $callstack2 = []; while ((count($callstack2) < $depth) && (count($callstack) > 0)) { $callstack2[] = array_pop($callstack); } @@ -92,6 +84,100 @@ class System { return implode(', ', $callstack2); } + /** + * @brief Called from db initialisation when db is dead. + */ + static public function unavailable() { +echo <<< EOT + +