From 7b6c185275437df2cf303884e6f2d3f6201fad0a Mon Sep 17 00:00:00 2001
From: rurban <rurban@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Mon, 26 Apr 2004 12:15:01 +0000
Subject: [PATCH] check default config values

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@3369 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 lib/IniConfig.php | 79 ++++++++++++++++++++++++++++++-----------------
 lib/config.php    |  8 +++--
 lib/main.php      | 12 +++++--
 3 files changed, 64 insertions(+), 35 deletions(-)

diff --git a/lib/IniConfig.php b/lib/IniConfig.php
index e35672a5a..21d200414 100644
--- a/lib/IniConfig.php
+++ b/lib/IniConfig.php
@@ -1,5 +1,5 @@
 <?php
-rcs_id('$Id: IniConfig.php,v 1.8 2004-04-23 16:55:59 zorloc Exp $');
+rcs_id('$Id: IniConfig.php,v 1.9 2004-04-26 12:15:01 rurban Exp $');
 
 /**
  * A configurator intended to read it's config from a PHP-style INI file,
@@ -48,22 +48,24 @@ rcs_id('$Id: IniConfig.php,v 1.8 2004-04-23 16:55:59 zorloc Exp $');
  *      pcre_fix_posix_classes (probably with redefines()).
  */
 
-include_once "lib/config.php";
- 
-function IniConfig($file)
-{
+include_once (dirname(__FILE__)."/config.php");
+include_once (dirname(__FILE__)."/FileFinder.php");
+
+function IniConfig($file) {
+    
+    //FindFile("pear/Config.php");
+    //require_once("Config.php");
  
     // List of all valid config options to be define()d which take "values" (not
-    // booleans). Needs to be categorised, and generally made a lot tidier.
-    $_IC_VALID_VALUE = array
-        ('WIKI_NAME', 'ADMIN_USER', 'ADMIN_PASSWD',
+    // booleans). Needs to be categorised, and generally made a lot tidier. 
+   $_IC_VALID_VALUE = array
+        ('DEBUG', 'WIKI_NAME', 'ADMIN_USER', 'ADMIN_PASSWD',
          'HTML_DUMP_SUFFIX', 'MAX_UPLOAD_SIZE', 'MINOR_EDIT_TIMEOUT',
          'ACCESS_LOG', 'CACHE_CONTROL', 'CACHE_CONTROL_MAX_AGE',
          'PASSWORD_LENGTH_MINIMUM', 'USER_AUTH_POLICY', 'LDAP_AUTH_HOST',
          'LDAP_BASE_DN', 'LDAP_AUTH_USER', 'LDAP_AUTH_PASSWORD',
          'LDAP_SEARCH_FIELD', 'IMAP_AUTH_HOST', 'POP3_AUTH_HOST',
-         'POP3_AUTH_PORT', 'AUTH_USER_FILE', 'AUTH_SESS_USER', 
-         'AUTH_SESS_LEVEL', 'GROUP_METHOD',
+         'AUTH_USER_FILE', 'AUTH_SESS_USER', 'AUTH_SESS_LEVEL', 'GROUP_METHOD',
          'AUTH_GROUP_FILE', 'EDITING_POLICY', 'THEME', 'CHARSET',
          'DEFAULT_LANGUAGE', 'WIKI_PGSRC', 'DEFAULT_WIKI_PGSRC',
          'ALLOWED_PROTOCOLS', 'INLINE_IMAGES', 'SUBPAGE_SEPARATOR',
@@ -73,7 +75,7 @@ function IniConfig($file)
 
     // List of all valid config options to be define()d which take booleans.
     $_IC_VALID_BOOL = array
-        ('DEBUG', 'ENABLE_USER_NEW', 'JS_SEARCHREPLACE',
+        ('ENABLE_USER_NEW', 'ENABLE_EDIT_TOOLBAR', 'JS_SEARCHREPLACE',
          'ENABLE_REVERSE_DNS', 'ENCRYPTED_PASSWD', 'ZIPDUMP_AUTH', 
          'ENABLE_RAW_HTML', 'STRICT_MAILABLE_PAGEDUMPS', 'COMPRESS_OUTPUT',
          'WIKIDB_NOCACHE_MARKUP', 'ALLOW_ANON_USER', 'ALLOW_ANON_EDIT',
@@ -89,10 +91,19 @@ function IniConfig($file)
     }
          
     $rs = @parse_ini_file($file);
+    $rsdef = @parse_ini_file(dirname(__FILE__)."/../config/config-default.ini");
 
     foreach ($_IC_VALID_VALUE as $item) {
-        if (array_key_exists($item, $rs) and !defined($item)) {
+        if (defined($item)) continue;
+        if (array_key_exists($item, $rs)) {
             define($item, $rs[$item]);
+        } elseif (array_key_exists($item, $rsdef)) {
+            define($item, $rsdef[$item]);
+        } elseif (in_array($item,array('SERVER_NAME', 'SERVER_PORT',
+         	'SCRIPT_NAME', 'DATA_PATH', 'PHPWIKI_DIR', 'VIRTUAL_PATH'))) {
+            ;
+        } else {
+            trigger_error(sprintf("missing config setting for %s",$item));
         }
     }
 
@@ -101,21 +112,26 @@ function IniConfig($file)
     // be a boolean false, otherwise if there is anything set it'll
     // be true.
     foreach ($_IC_VALID_BOOL as $item) {
+        if (defined($item)) continue;
         if (array_key_exists($item, $rs)) {
             $val = $rs[$item];
-            if (!$val and !defined($item)) {
+        } elseif (array_key_exists($item, $rsdef)) {
+            $val = $rsdef[$item];
+        } else {
+            ; //trigger_error(sprintf("missing boolean config setting for %s",$item));
+        }
+        if (!$val and !defined($item)) {
+            define($item, false);
+        }
+        else if (strtolower($val) == 'false' ||
+                 strtolower($val) == 'no' ||
+                 $val == '0') {
+            if (!defined($item))
                 define($item, false);
-            }
-            else if (strtolower($val) == 'false' ||
-                     strtolower($val) == 'no' ||
-                     $val == '0') {
-                if (!defined($item))
-                    define($item, false);
-            }
-            else {
-                if (!defined($item))
-                    define($item, true);
-            }
+        }
+        else {
+            if (!defined($item))
+                define($item, true);
         }
     }
 
@@ -205,14 +221,15 @@ function IniConfig($file)
                       );
 
     foreach ($DBAP_MAP as $rskey => $apkey) {
-        $val = @$rs[$rskey];
-        if ($val) {
-            $DBAuthParams[$apkey] = $val;
+        if (isset($rs[$rskey])) {
+            $DBAuthParams[$apkey] = $rs[$rskey];
         }
     }
 
     // Default Wiki pages
     global $GenericPages;
+    if (!isset($rs['DEFAULT_WIKI_PAGES']))
+        $rs['DEFAULT_WIKI_PAGES'] = "ReleaseNotes:SteveWainstead:TestPage";
     $GenericPages = preg_split('/\s*:\s*/', @$rs['DEFAULT_WIKI_PAGES']);
 
     // Wiki name regexp.  Should be a define(), but too many places want
@@ -223,7 +240,9 @@ function IniConfig($file)
 
     // Another "too-tricky" redefine
     global $KeywordLinkRegexp;
-    $keywords = preg_split('/\s*:\s*/', @$rs['KEYWORDS']);
+    if (!isset($rs['KEYWORDS']))
+        $rs['KEYWORDS'] = "Category:Topic";
+    $keywords = preg_split('/\s*:\s*/', $rs['KEYWORDS']);
     $KeywordLinkRegexp = '(?<=' . implode('|^', $keywords) . ')[[:upper:]].*$';
         
     global $DisabledActions;
@@ -462,8 +481,10 @@ function fix_configs() {
 
 }
 
-
 // $Log: not supported by cvs2svn $
+// 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']
+//
 // Revision 1.7  2004/04/20 22:26:27  zorloc
 // Removed Pear_Config for parse_ini_file().
 //
diff --git a/lib/config.php b/lib/config.php
index d90a3ea7a..401dc0a31 100644
--- a/lib/config.php
+++ b/lib/config.php
@@ -1,13 +1,11 @@
 <?php
-rcs_id('$Id: config.php,v 1.99 2004-04-21 14:04:24 zorloc Exp $');
+rcs_id('$Id: config.php,v 1.100 2004-04-26 12:15:01 rurban Exp $');
 /*
  * NOTE: The settings here should probably not need to be changed.
  * The user-configurable settings have been moved to IniConfig.php
  * The run-time code have been moved to lib/IniConfig.php:fix_configs()
  */
  
-require_once 'lib/FileFinder.php';
-
 if (!defined("LC_ALL")) {
     // Backward compatibility (for PHP < 4.0.5)
     define("LC_ALL",   0);
@@ -135,6 +133,7 @@ function guessing_setlocale ($category, $locale) {
 }
 
 function update_locale($loc) {
+    require_once(dirname(__FILE__)."/FileFinder.php");
     $newlocale = guessing_setlocale(LC_ALL, $loc);
     if (!$newlocale) {
         //trigger_error(sprintf(_("Can't setlocale(LC_ALL,'%s')"), $loc), E_USER_NOTICE);
@@ -283,6 +282,9 @@ function IsProbablyRedirectToIndex () {
 }
 
 // $Log: not supported by cvs2svn $
+// Revision 1.99  2004/04/21 14:04:24  zorloc
+// 'Require lib/FileFinder.php' necessary to allow for call to FindLocalizedFile().
+//
 // Revision 1.98  2004/04/20 18:10:28  rurban
 // config refactoring:
 //   FileFinder is needed for WikiFarm scripts calling index.php
diff --git a/lib/main.php b/lib/main.php
index cce4aae2a..1b9f4f8ab 100644
--- a/lib/main.php
+++ b/lib/main.php
@@ -1,5 +1,5 @@
 <?php //-*-php-*-
-rcs_id('$Id: main.php,v 1.134 2004-04-23 06:46:37 zorloc Exp $');
+rcs_id('$Id: main.php,v 1.135 2004-04-26 12:15:01 rurban Exp $');
 
 define ('USE_PREFS_IN_PAGE', true);
 
@@ -23,7 +23,7 @@ class WikiRequest extends Request {
             include_once('lib/DB_Session.php');
             $prefix = isset($GLOBALS['DBParams']['prefix']) ? $GLOBALS['DBParams']['prefix'] : '';
             if (in_array('File',$GLOBALS['USER_AUTH_ORDER'])) {
-                include_once 'lib/pear/File_Passwd.php';
+                include_once('lib/pear/File_Passwd.php');
             }
             $this->_dbsession = & new DB_Session($this->getDbh(),
                                                  $prefix . $GLOBALS['DBParams']['db_session_table']);
@@ -476,7 +476,6 @@ class WikiRequest extends Request {
             $this->_dbi->close();
         unset($this->_dbi);
 
-
         global $ErrorManager;
         $ErrorManager->flushPostponedErrors();
 
@@ -490,6 +489,10 @@ class WikiRequest extends Request {
         }
 
         Request::finish();
+        if (!empty($this->_dbi))
+            $this->_dbi->close();
+        unset($this->_dbi);
+        
         exit;
     }
 
@@ -882,6 +885,9 @@ main();
 
 
 // $Log: not supported by cvs2svn $
+// Revision 1.134  2004/04/23 06:46:37  zorloc
+// Leave DB connection open when USE_DB_SESSION is true so that session info can be written to the DB.
+//
 // Revision 1.133  2004/04/20 18:10:31  rurban
 // config refactoring:
 //   FileFinder is needed for WikiFarm scripts calling index.php
-- 
2.45.0