Merge pull request #8141 from annando/brief2

[friendica.git] / boot.php

diff --git a/boot.php b/boot.php
index f36e770da189ccddde55ef7c70569f8222c71165..0835f7ffae1ce9efadbc9013934ba8e6d16b8139 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -17,9 +17,7 @@
  * easily as email does today.
  */
 
-use Friendica\App;
 use Friendica\Core\Config;
-use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
@@ -36,7 +34,7 @@ define('DFRN_PROTOCOL_VERSION',  '2.23');
 define('NEW_UPDATE_ROUTINE_VERSION', 1170);
 
 /**
- * @brief Constant with a HTML line break.
+ * Constant with a HTML line break.
  *
  * Contains a HTML line break (br) element and a real carriage return with line
  * feed for the source.
@@ -45,7 +43,7 @@ define('NEW_UPDATE_ROUTINE_VERSION', 1170);
 define('EOL',                    "<br />\r\n");
 
 /**
- * @brief Image storage quality.
+ * Image storage quality.
  *
  * Lower numbers save space at cost of image detail.
  * For ease of upgrade, please do not change here. Set system.jpegquality = n in config/local.config.php,
@@ -235,7 +233,7 @@ if (!defined('CURLE_OPERATION_TIMEDOUT')) {
 }
 
 /**
- * @brief Returns the user id of locally logged in user or false.
+ * Returns the user id of locally logged in user or false.
  *
  * @return int|bool user id or false
  */
@@ -248,7 +246,7 @@ function local_user()
 }
 
 /**
- * @brief Returns the public contact id of logged in user or false.
+ * Returns the public contact id of logged in user or false.
  *
  * @return int|bool public contact id or false
  */
@@ -272,7 +270,7 @@ function public_contact()
 }
 
 /**
- * @brief Returns contact id of authenticated site visitor or false
+ * Returns contact id of authenticated site visitor or false
  *
  * @return int|bool visitor_id or false
  */
@@ -290,7 +288,7 @@ function remote_user()
 }
 
 /**
- * @brief Show an error message to user.
+ * Show an error message to user.
  *
  * This function save text in session, to be shown to the user at next page load
  *
@@ -312,7 +310,7 @@ function notice($s)
 }
 
 /**
- * @brief Show an info message to user.
+ * Show an info message to user.
  *
  * This function save text in session, to be shown to the user at next page load
  *
@@ -322,7 +320,7 @@ function info($s)
 {
        $a = DI::app();
 
-       if (local_user() && PConfig::get(local_user(), 'system', 'ignore_info')) {
+       if (local_user() && DI::pConfig()->get(local_user(), 'system', 'ignore_info')) {
                return;
        }
 
@@ -377,7 +375,7 @@ function feed_birthday($uid, $tz)
 }
 
 /**
- * @brief Check if current user has admin role.
+ * Check if current user has admin role.
  *
  * @return bool true if user is an admin
  */
@@ -446,17 +444,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");
@@ -584,7 +571,7 @@ function get_itemcachepath()
 }
 
 /**
- * @brief Returns the path where spool files are stored
+ * Returns the path where spool files are stored
  *
  * @return string Spool path
  */
@@ -660,22 +647,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);
-       }
-}