From de365b158cd301b8a5c43d01e683ff2fdfe1d214 Mon Sep 17 00:00:00 2001
From: rurban <rurban@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Mon, 26 Apr 2004 13:22:32 +0000
Subject: [PATCH] calculate bool old or dynamic constants later

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@3374 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 lib/IniConfig.php | 30 +++++++++++++++++++++---------
 lib/config.php    |  6 +++++-
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/lib/IniConfig.php b/lib/IniConfig.php
index 21d200414..738705da3 100644
--- a/lib/IniConfig.php
+++ b/lib/IniConfig.php
@@ -1,5 +1,5 @@
 <?php
-rcs_id('$Id: IniConfig.php,v 1.9 2004-04-26 12:15:01 rurban Exp $');
+rcs_id('$Id: IniConfig.php,v 1.10 2004-04-26 13:22:32 rurban Exp $');
 
 /**
  * A configurator intended to read it's config from a PHP-style INI file,
@@ -99,6 +99,7 @@ function IniConfig($file) {
             define($item, $rs[$item]);
         } elseif (array_key_exists($item, $rsdef)) {
             define($item, $rsdef[$item]);
+        // calculate them later:
         } elseif (in_array($item,array('SERVER_NAME', 'SERVER_PORT',
          	'SCRIPT_NAME', 'DATA_PATH', 'PHPWIKI_DIR', 'VIRTUAL_PATH'))) {
             ;
@@ -120,18 +121,26 @@ function IniConfig($file) {
         } else {
             ; //trigger_error(sprintf("missing boolean config setting for %s",$item));
         }
-        if (!$val and !defined($item)) {
+        
+        // calculate them later: old or dynamic constants
+        if (in_array($item,array('USE_PATH_INFO','USE_DB_SESSION',
+                                 'ALLOW_HTTP_AUTH_LOGIN','ALLOW_LDAP_LOGIN',
+                                 'ALLOW_IMAP_LOGIN','ALLOW_USER_LOGIN',
+                                 'REQUIRE_SIGNIN_BEFORE_EDIT',
+                                 'WIKIDB_NOCACHE_MARKUP')))
+        {
+            ;
+        }
+        elseif (!$val) {
             define($item, false);
         }
-        else if (strtolower($val) == 'false' ||
-                 strtolower($val) == 'no' ||
-                 $val == '0') {
-            if (!defined($item))
-                define($item, false);
+        elseif (strtolower($val) == 'false' ||
+                strtolower($val) == 'no' ||
+                $val == '0') {
+            define($item, false);
         }
         else {
-            if (!defined($item))
-                define($item, true);
+            define($item, true);
         }
     }
 
@@ -482,6 +491,9 @@ function fix_configs() {
 }
 
 // $Log: not supported by cvs2svn $
+// Revision 1.9  2004/04/26 12:15:01  rurban
+// check default config values
+//
 // Revision 1.8  2004/04/23 16:55:59  zorloc
 // If using Db auth and DBAUTH_AUTH_DSN is empty set DBAUTH_AUTH_DSN to $DBParams['dsn']
 //
diff --git a/lib/config.php b/lib/config.php
index 401dc0a31..50ccd2cdd 100644
--- a/lib/config.php
+++ b/lib/config.php
@@ -1,5 +1,5 @@
 <?php
-rcs_id('$Id: config.php,v 1.100 2004-04-26 12:15:01 rurban Exp $');
+rcs_id('$Id: config.php,v 1.101 2004-04-26 13:22:32 rurban Exp $');
 /*
  * NOTE: The settings here should probably not need to be changed.
  * The user-configurable settings have been moved to IniConfig.php
@@ -66,6 +66,7 @@ function isBrowserIE55() {
     return (isBrowserIE() and 
             browserVersion() > 5.1 and browserVersion() < 6.0);
 }
+// old Netscape prior to Mozilla
 function isBrowserNetscape() {
     return (browserDetect('Mozilla/') and 
             ! browserDetect('Gecko/') and
@@ -282,6 +283,9 @@ function IsProbablyRedirectToIndex () {
 }
 
 // $Log: not supported by cvs2svn $
+// Revision 1.100  2004/04/26 12:15:01  rurban
+// check default config values
+//
 // Revision 1.99  2004/04/21 14:04:24  zorloc
 // 'Require lib/FileFinder.php' necessary to allow for call to FindLocalizedFile().
 //
-- 
2.45.0