X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FCore%2FSystem.php;h=1db417eb88c4ac20dfcb34bea8563e2bc4b458a9;hb=493314a0677d852d2f8ce46888f4e9283494c1be;hp=36870af6d2cc2b7437e80f50ee4ab0df498f2581;hpb=a729519de974088308c3f07c363116eb199d56ec;p=friendica.git diff --git a/src/Core/System.php b/src/Core/System.php index 36870af6d2..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) { - $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, $depth + 2); + 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(); - foreach ($trace AS $func) { + $callstack = []; + $counter = 0; + $previous = ['class' => '', 'function' => '']; + + // The ignore list contains all functions that are only wrapper functions + $ignore = ['fetchUrl', 'call_user_func_array']; + + while ($func = array_pop($trace)) { if (!empty($func['class'])) { - $callstack[] = $func['class'].'::'.$func['function']; - } else { + // 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; + } + } elseif (!in_array($func['function'], $ignore)) { $callstack[] = $func['function']; + $previous = $func; } } - return implode(', ', $callstack); + $callstack2 = []; + while ((count($callstack2) < $depth) && (count($callstack) > 0)) { + $callstack2[] = array_pop($callstack); + } + + return implode(', ', $callstack2); + } + + /** + * @brief Called from db initialisation when db is dead. + */ + static public function unavailable() { +echo <<< EOT + +