Renamed Registry -> GenericRegistry to make it clear that this registry does

[core.git] / inc / config.php

diff --git a/inc/config.php b/inc/config.php
index 6ea2a793473a4cfc306444c6c6a16d4bbd8d0fdc..a1ba03c99104fe0aacbc62cd79121c277bdd3079 100644 (file)
--- a/inc/config.php
+++ b/inc/config.php
@@ -1,8 +1,4 @@
 <?php
-// Import framework stuff
-use CoreFramework\Configuration\FrameworkConfiguration;
-use CoreFramework\EntryPoint\ApplicationEntryPoint;
-
 /**
  * General configuration. Do not touch this file! If you need different settings
  * create a config-local.php in this directory at and set your changed
@@ -10,7 +6,7 @@ use CoreFramework\EntryPoint\ApplicationEntryPoint;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -52,7 +48,6 @@ $cfg->setConfigEntry('local_db_path', $cfg->getConfigEntry('base_path') . 'db/')
 $cfg->setDefaultTimezone('Europe/Berlin');
 
 // CFG: MAGIC-QUOTES-RUNTIME
-// @DEPRECATED As PHP is deprecating this
 $cfg->setMagicQuotesRuntime(FALSE);
 
 // CFG: CLASS-PREFIX
@@ -70,6 +65,9 @@ $cfg->setConfigEntry('code_template_extension', '.ctp');
 // CFG: SELECTOR-PATH
 $cfg->setConfigEntry('selector_path', 'selector');
 
+// CFG: APPLICATION-HELPER-CLASS
+$cfg->setConfigEntry('app_helper_class', 'ApplicationHelper');
+
 // CFG: LAUNCH-METHOD
 $cfg->setConfigEntry('entry_method', 'entryPoint');
 
@@ -284,10 +282,10 @@ $cfg->setConfigEntry('salt_length', 10);
 $cfg->setConfigEntry('rnd_str_length', 128);
 
 // CFG: HASH-EXTRA-MASK
-$cfg->setConfigEntry('hash_extra_mask', '%1s:%2s:%3s'); // 1=salt, 2=extra salt, 3=plain password/string
+$cfg->setConfigEntry('hash_extra_mask', "%1s:%2s:%3s"); // 1=salt, 2=extra salt, 3=plain password/string
 
 // CFG: HASH-NORMAL-MASK
-$cfg->setConfigEntry('hash_normal_mask', '%1s:%2s'); // 1=salt, 2=plain password/string
+$cfg->setConfigEntry('hash_normal_mask', "%1s:%2s"); // 1=salt, 2=plain password/string
 
 // CFG: IS-SINGLE-SERVER
 $cfg->setConfigEntry('is_single_server', 'Y');
@@ -471,6 +469,3 @@ $cfg->setConfigEntry('extension_scrypt_loaded', FALSE);
 
 // CFG: EXTENSION-UUID-LOADED (By default uuid is assumed absent and later tested being there)
 $cfg->setConfigEntry('extension_uuid_loaded', FALSE);
-
-// Remove config from this name-space. Don't worry, no configuration is cleared.
-unset($cfg);