X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fconfig.php;h=64bd8a384633c8b839fdd3df60ed9c67817bb72a;hb=0e286b4f5a72309b0d7b957919733cc71303bc11;hp=441e0caf3043e3538fe73fa3030afd26791e4543;hpb=fc5010729854b1f9c9bc60249460d092ea6694b6;p=core.git

diff --git a/inc/config.php b/inc/config.php
index 441e0caf..64bd8a38 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -6,7 +6,7 @@
  *
  * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2011 Core Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *
@@ -30,7 +30,7 @@ require(ApplicationEntryPoint::detectCorePath() . '/inc/classes/interfaces/regis
 require(ApplicationEntryPoint::detectCorePath() . '/inc/config/class_FrameworkConfiguration.php');
 
 // Get a new configuration instance
-$cfg = FrameworkConfiguration::getInstance();
+$cfg = FrameworkConfiguration::getSelfInstance();
 
 // CFG: SERVER-PATH
 $cfg->setConfigEntry('base_path', ApplicationEntryPoint::detectCorePath() . '/');
@@ -269,8 +269,11 @@ $cfg->setConfigEntry('salt_length', 10);
 // CFG: RND-STR-LENGTH
 $cfg->setConfigEntry('rnd_str_length', 128);
 
-// CFG: HASH-MASK
-$cfg->setConfigEntry('hash_mask', "%1s:%2s:%3s"); // 1=salt, 2=extra salt, 3=plain password
+// CFG: HASH-EXTRA-MASK
+$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: IS-SINGLE-SERVER
 $cfg->setConfigEntry('is_single_server', 'Y');