X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=boot.php;h=390a6ef9c2ba852b8f7d213af2e496272f64b977;hb=86320317f493d0bf26fac7860d2e0c388633ab0c;hp=fa99a7bb3922a062fc0f7c6b834f83cdeba3be8e;hpb=03038e7a3bb74bdab497d26b7f829a5c3036d1c2;p=friendica.git diff --git a/boot.php b/boot.php index fa99a7bb39..390a6ef9c2 100644 --- a/boot.php +++ b/boot.php @@ -234,29 +234,6 @@ if (!defined('CURLE_OPERATION_TIMEDOUT')) { define('CURLE_OPERATION_TIMEDOUT', CURLE_OPERATION_TIMEOUTED); } -/** - * @brief Retrieve the App structure - * - * Useful in functions which require it but don't get it passed to them - * - * @deprecated since version 2018.09 - * @see DI::app() - * @return App - */ -function get_app() -{ - return DI::app(); -} - -/** - * @brief Used to end the current process, after saving session state. - * @deprecated - */ -function killme() -{ - exit(); -} - /** * @brief Returns the user id of locally logged in user or false. * @@ -325,7 +302,7 @@ function notice($s) return; } - $a = \get_app(); + $a = DI::app(); if (empty($_SESSION['sysmsg'])) { $_SESSION['sysmsg'] = []; } @@ -343,7 +320,7 @@ function notice($s) */ function info($s) { - $a = \get_app(); + $a = DI::app(); if (local_user() && PConfig::get(local_user(), 'system', 'ignore_info')) { return; @@ -406,7 +383,7 @@ function feed_birthday($uid, $tz) */ function is_site_admin() { - $a = \get_app(); + $a = DI::app(); $admin_email = Config::get('config', 'admin_email'); @@ -469,17 +446,6 @@ function curPageURL() return $pageURL; } -function get_server() -{ - $server = Config::get("system", "directory"); - - if ($server == "") { - $server = "https://dir.friendica.social"; - } - - return $server; -} - function get_temppath() { $temppath = Config::get("system", "temppath"); @@ -683,22 +649,3 @@ function validate_include(&$file) // Simply return flag return $valid; } - -/** - * PHP 5 compatible dirname() with count parameter - * - * @see http://php.net/manual/en/function.dirname.php#113193 - * - * @deprecated with PHP 7 - * @param string $path - * @param int $levels - * @return string - */ -function rdirname($path, $levels = 1) -{ - if ($levels > 1) { - return dirname(rdirname($path, --$levels)); - } else { - return dirname($path); - } -}