Even more conflicting calls fixed

[shipsimu.git] / inc / config.php

diff --git a/inc/config.php b/inc/config.php
index 7ac8fa91962417b1ad1cf694c797fc7c0826ccc8..ec15729d04f62e7f200cbec40a692e615e5199d5 100644 (file)
--- 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, this is free software
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -90,7 +90,7 @@ $cfg->setConfigEntry('application_path', "application");
 $cfg->setConfigEntry('compile_output_path', "templates/_compiled/"); // DON'T MISS THE TRAILING SLASH!
 
 // CFG: TEMPLATE-ENGINE
-$cfg->setConfigEntry('template_class', "TemplateEngine");
+$cfg->setConfigEntry('template_class', "WebTemplateEngine");
 
 // CFG: DEBUG-ENGINE
 $cfg->setConfigEntry('debug_class', "DebugWebOutput");
@@ -188,15 +188,21 @@ $cfg->setConfigEntry('password_validator_class', "PasswordValidatorFilter");
 // CFG: RULES-ACCEPTED-CLASS
 $cfg->setConfigEntry('rules_accepted_class', "RulesAcceptedFilter");
 
-// CFG: USERNAME-VERIFIER
+// CFG: USERNAME-VERIFIER-CLASS
 $cfg->setConfigEntry('username_verifier_class', "UserNameVerifierFilter");
 
+// CFG: USER-GUEST-VERIFIER-CLASS
+$cfg->setConfigEntry('user_guest_verifier_class', "UserGuestVerifierFilter");
+
 // CFG: EMAIL-VERIFIER
 $cfg->setConfigEntry('email_verifier_class', "EmailVerifierFilter");
 
-// CFG: PASSWORD-VERIFIER
+// CFG: PASSWORD-VERIFIER-CLASS
 $cfg->setConfigEntry('password_verifier_class', "PasswordVerifierFilter");
 
+// CFG: PASSWD-GUEST-VERIFIER-CLASS
+$cfg->setConfigEntry('passwd_guest_verifier_class', "PasswordGuestVerifierFilter");
+
 // CFG: EMAIL-CHANGE-CLASS
 $cfg->setConfigEntry('email_change_class', "EmailChangeFilter");
 
@@ -212,21 +218,27 @@ $cfg->setConfigEntry('user_status_class', "UserStatusVerifierFilter");
 // CFG: USER-UNCONFIRMED-CLASS
 $cfg->setConfigEntry('user_unconfirmed_class', "UserUnconfirmedVerifierFilter");
 
-// CFG: CRYPTO-HELPER
+// CFG: CRYPTO-CLASS
 $cfg->setConfigEntry('crypto_class', "CryptoHelper");
 
 // CFG: RNG-CLASS
 $cfg->setConfigEntry('rng_class', "RandomNumberGenerator");
 
-// CFG: USER-DB-WRAPPER
+// CFG: USER-DB-WRAPPER-CLASS
 $cfg->setConfigEntry('user_db_wrapper_class', "UserDatabaseWrapper");
 
-// CFG: NEWS-DB-WRAPPER
+// CFG: NEWS-DB-WRAPPER-CLASS
 $cfg->setConfigEntry('news_db_wrapper_class', "NewsDatabaseWrapper");
 
-// CFG: WEB-CMD-RESOLVER
+// CFG: WEB-CMD-RESOLVER-CLASS
 $cfg->setConfigEntry('web_cmd_resolver_class', "WebCommandResolver");
 
+// CFG: IMAGE-CMD-RESOLVER-CLASS
+$cfg->setConfigEntry('image_cmd_resolver_class', "ImageCommandResolver");
+
+// CFG: MAILER-CLASS
+$cfg->setConfigEntry('mailer_class', "DebugMailer");
+
 // CFG: MATH-PRIME
 $cfg->setConfigEntry('math_prime', 591623);
 
@@ -266,5 +278,11 @@ $cfg->setConfigEntry('cookie_domain', $cfg->detectDomain()); // Is mostly the sa
 // CFG: COOKIE-SSL
 $cfg->setConfigEntry('cookie_ssl', (isset($_SERVER['HTTPS'])));
 
+// CFG: CRYPT-FIXED-SALT
+$cfg->setConfigEntry('crypt_fixed_salt', "N");
+
+// CFG: DB-UPDATE-PRIMARY-FORCED
+$cfg->setConfigEntry('db_update_primary_forced', "Y");
+
 // [EOF]
 ?>