Merge pull request #8158 from tobiasd/20200123-de

[friendica.git] / boot.php

diff --git a/boot.php b/boot.php
index 0835f7ffae1ce9efadbc9013934ba8e6d16b8139..4e1249e197ce14bfb2d2f6bc58c3a43ea9ecafdc 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -17,7 +17,6 @@
  * easily as email does today.
  */
 
-use Friendica\Core\Config;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
@@ -383,7 +382,7 @@ function is_site_admin()
 {
        $a = DI::app();
 
-       $admin_email = Config::get('config', 'admin_email');
+       $admin_email = DI::config()->get('config', 'admin_email');
 
        $adminlist = explode(',', str_replace(' ', '', $admin_email));
 
@@ -446,7 +445,7 @@ function curPageURL()
 
 function get_temppath()
 {
-       $temppath = Config::get("system", "temppath");
+       $temppath = DI::config()->get("system", "temppath");
 
        if (($temppath != "") && System::isDirectoryUsable($temppath)) {
                // We have a temp path and it is usable
@@ -470,7 +469,7 @@ function get_temppath()
 
                if (System::isDirectoryUsable($new_temppath)) {
                        // The new path is usable, we are happy
-                       Config::set("system", "temppath", $new_temppath);
+                       DI::config()->set("system", "temppath", $new_temppath);
                        return $new_temppath;
                } else {
                        // We can't create a subdirectory, strange.
@@ -520,7 +519,7 @@ function clear_cache($basepath = "", $path = "")
                return;
        }
 
-       $cachetime = (int) Config::get('system', 'itemcache_duration');
+       $cachetime = (int) DI::config()->get('system', 'itemcache_duration');
        if ($cachetime == 0) {
                $cachetime = 86400;
        }
@@ -544,12 +543,12 @@ function clear_cache($basepath = "", $path = "")
 function get_itemcachepath()
 {
        // Checking, if the cache is deactivated
-       $cachetime = (int) Config::get('system', 'itemcache_duration');
+       $cachetime = (int) DI::config()->get('system', 'itemcache_duration');
        if ($cachetime < 0) {
                return "";
        }
 
-       $itemcache = Config::get('system', 'itemcache');
+       $itemcache = DI::config()->get('system', 'itemcache');
        if (($itemcache != "") && System::isDirectoryUsable($itemcache)) {
                return BasePath::getRealPath($itemcache);
        }
@@ -563,7 +562,7 @@ function get_itemcachepath()
                }
 
                if (System::isDirectoryUsable($itemcache)) {
-                       Config::set("system", "itemcache", $itemcache);
+                       DI::config()->set("system", "itemcache", $itemcache);
                        return $itemcache;
                }
        }
@@ -577,7 +576,7 @@ function get_itemcachepath()
  */
 function get_spoolpath()
 {
-       $spoolpath = Config::get('system', 'spoolpath');
+       $spoolpath = DI::config()->get('system', 'spoolpath');
        if (($spoolpath != "") && System::isDirectoryUsable($spoolpath)) {
                // We have a spool path and it is usable
                return $spoolpath;
@@ -595,7 +594,7 @@ function get_spoolpath()
 
                if (System::isDirectoryUsable($spoolpath)) {
                        // The new path is usable, we are happy
-                       Config::set("system", "spoolpath", $spoolpath);
+                       DI::config()->set("system", "spoolpath", $spoolpath);
                        return $spoolpath;
                } else {
                        // We can't create a subdirectory, strange.