Rewrite continues:

[core.git] / framework / config-global.php

diff --git a/framework/config-global.php b/framework/config-global.php
index 31a7fdc0957aad1b3525528c68a972d2483942af..bd1623187d6c55359f5ffbd0b3b43756b71e681d 100644 (file)
--- a/framework/config-global.php
+++ b/framework/config-global.php
@@ -1,6 +1,5 @@
 <?php
 // Import framework stuff
-use CoreFramework\Configuration\FrameworkConfiguration;
 use CoreFramework\Bootstrap\FrameworkBootstrap;
 use CoreFramework\EntryPoint\ApplicationEntryPoint;
 
@@ -30,7 +29,7 @@ use CoreFramework\EntryPoint\ApplicationEntryPoint;
  */
 
 // Get a new configuration instance
-$cfg = FrameworkConfiguration::getSelfInstance();
+$cfg = FrameworkBootstrap::getConfigurationInstance();
 
 // CFG: ROOT-BASE-PATH
 $cfg->setConfigEntry('root_base_path', ApplicationEntryPoint::getRootPath() . DIRECTORY_SEPARATOR);
@@ -39,7 +38,7 @@ $cfg->setConfigEntry('root_base_path', ApplicationEntryPoint::getRootPath() . DI
 $cfg->setConfigEntry('framework_base_path', ApplicationEntryPoint::detectFrameworkPath());
 
 // CFG: BASE-URL
-$cfg->setConfigEntry('base_url', $cfg->detectBaseUrl());
+$cfg->setConfigEntry('base_url', FrameworkBootstrap::detectBaseUrl());
 
 // CFG: DATABASE-TYPE
 $cfg->setConfigEntry('database_type', 'local_file_database');
@@ -47,8 +46,8 @@ $cfg->setConfigEntry('database_type', 'local_file_database');
 // CFG: LOCAL-DATABASE-PATH
 $cfg->setConfigEntry('local_database_path', $cfg->getConfigEntry('root_base_path') . 'db/');
 
-// CFG: TIME-ZONE
-$cfg->setDefaultTimezone('Europe/Berlin');
+// Default timezone
+FrameworkBootstrap::setDefaultTimezone('Europe/Berlin');
 
 // CFG: CLASS-PREFIX
 $cfg->setConfigEntry('class_prefix', 'class_');
@@ -294,13 +293,13 @@ $cfg->setConfigEntry('guest_class', 'CoreFramework\User\Guest\Guest');
 $cfg->setConfigEntry('cookie_expire', (60*60*2)); // Two hours!
 
 // CFG: COOKIE-PATH
-$cfg->setConfigEntry('cookie_path', $cfg->detectScriptPath() . DIRECTORY_SEPARATOR);
+$cfg->setConfigEntry('cookie_path', FrameworkBootstrap::detectScriptPath() . DIRECTORY_SEPARATOR);
 
 // CFG: COOKIE-DOMAIN
-$cfg->setConfigEntry('cookie_domain', $cfg->detectDomain()); // Is mostly the same...
+$cfg->setConfigEntry('cookie_domain', FrameworkBootstrap::detectDomain()); // Is mostly the same...
 
 // CFG: COOKIE-SSL
-$cfg->setConfigEntry('cookie_ssl', $cfg->isHttpSecured());
+$cfg->setConfigEntry('cookie_ssl', FrameworkBootstrap::isHttpSecured());
 
 // CFG: CRYPT-FIXED-SALT
 $cfg->setConfigEntry('crypt_fixed_salt', 'N');