From 07d71b4c981b8937baeb67a5dd50639b1a8b2042 Mon Sep 17 00:00:00 2001
From: rurban <rurban@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Thu, 12 Oct 2006 06:36:09 +0000
Subject: [PATCH] Guard against unwanted DEBUG="DEBUG" logic. In detail
 (WikiDB), and generally by forcing all int constants to be defined as int.

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@5174 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 lib/IniConfig.php | 31 ++++++++++++++++++++++++++++---
 lib/WikiDB.php    | 22 +++++++++++++---------
 2 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/lib/IniConfig.php b/lib/IniConfig.php
index c53dc16f0..60395ab00 100644
--- a/lib/IniConfig.php
+++ b/lib/IniConfig.php
@@ -1,5 +1,5 @@
 <?php
-rcs_id('$Id: IniConfig.php,v 1.103 2006-08-15 13:36:23 rurban Exp $');
+rcs_id('$Id: IniConfig.php,v 1.104 2006-10-12 06:36:09 rurban Exp $');
 /**
  * A configurator intended to read its config from a PHP-style INI file,
  * instead of a PHP file.
@@ -100,6 +100,13 @@ function save_dump($file) {
     fclose($fp);
 }
 
+function _check_int_constant(&$c) {
+  // if int value == string value, force int type
+  if (sprintf("%d",(int)$c) === $c) { // DEBUG & _DEBUG_bla
+    $c = (int)$c;
+  }
+}
+
 function IniConfig($file) {
 
     // check config/config.php dump for faster startup
@@ -147,7 +154,7 @@ function IniConfig($file) {
          'PLUGIN_CACHED_DATABASE', 'PLUGIN_CACHED_FILENAME_PREFIX',
          'PLUGIN_CACHED_HIGHWATER', 'PLUGIN_CACHED_LOWWATER', 'PLUGIN_CACHED_MAXLIFETIME',
          'PLUGIN_CACHED_MAXARGLEN', 'PLUGIN_CACHED_IMGTYPES',
-         'WYSIWYG_BACKEND',
+         'WYSIWYG_BACKEND', 'PLUGIN_MARKUP_MAP',
          // extra logic:
          'SERVER_NAME','SERVER_PORT','SCRIPT_NAME', 'DATA_PATH', 'PHPWIKI_DIR', 'VIRTUAL_PATH',
          );
@@ -206,6 +213,7 @@ function IniConfig($file) {
             continue;
         }
         if (array_key_exists($item, $rs)) {
+            _check_int_constant($rs[$item]);
             define($item, $rs[$item]);
             unset($rs[$item]);
         //} elseif (array_key_exists($item, $rsdef)) {
@@ -348,12 +356,13 @@ function IniConfig($file) {
     unset($item); unset($major); unset($max); 
     
     // User authentication
-    if (!isset($GLOBALS['USER_AUTH_ORDER']))
+    if (!isset($GLOBALS['USER_AUTH_ORDER'])) {
         if (isset($rs['USER_AUTH_ORDER']))
             $GLOBALS['USER_AUTH_ORDER'] = preg_split('/\s*:\s*/', 
                                                      $rs['USER_AUTH_ORDER']);
         else 
             $GLOBALS['USER_AUTH_ORDER'] = array("PersonalPage");
+    }
 
     // Now it's the external DB authentication stuff's turn
     if (in_array('Db', $GLOBALS['USER_AUTH_ORDER']) && empty($rs['DBAUTH_AUTH_DSN'])) {
@@ -402,6 +411,17 @@ function IniConfig($file) {
                in_array(DATABASE_TYPE, array('SQL','ADODB','PDO')) ? 2 : 0);
     }
 
+    global $PLUGIN_MARKUP_MAP;
+    $PLUGIN_MARKUP_MAP = array();
+    if (defined('PLUGIN_MARKUP_MAP') and trim(PLUGIN_MARKUP_MAP) != "") {
+	$_map = preg_split('/\s*/', PLUGIN_MARKUP_MAP);
+	foreach ($_map as $v) {
+	    list($xml,$plugin) = split(':', $v);
+	    $PLUGIN_MARKUP_MAP[$xml] = $plugin;
+	}
+	unset($_map); unset($xml); unset($plugin); unset($v);
+    }
+
     // optional values will be set to '' to simplify the logic.
     foreach ($_IC_OPTIONAL_VALUE as $item) {
         if (defined($item)) {
@@ -409,6 +429,7 @@ function IniConfig($file) {
             continue;
         }
         if (array_key_exists($item, $rs)) {
+	    _check_int_constant($rs[$item]);
             define($item, $rs[$item]);
             unset($rs[$item]);
         } else 
@@ -494,6 +515,7 @@ function IniConfig($file) {
         if (defined($item)) {
             continue;
         } else {
+	    _check_int_constant($v);
             define($item, $v);
         }
     }
@@ -882,6 +904,9 @@ function fixup_dynamic_configs($file) {
 }
 
 // $Log: not supported by cvs2svn $
+// Revision 1.103  2006/08/15 13:36:23  rurban
+// support iso-8859-2
+//
 // Revision 1.102  2006/05/14 18:02:27  rurban
 // patch from bug #1480077 by Kai Krakow
 //
diff --git a/lib/WikiDB.php b/lib/WikiDB.php
index 01d1de772..cf5bf7544 100644
--- a/lib/WikiDB.php
+++ b/lib/WikiDB.php
@@ -1,5 +1,5 @@
 <?php //-*-php-*-
-rcs_id('$Id: WikiDB.php,v 1.143 2006-09-06 05:46:40 rurban Exp $');
+rcs_id('$Id: WikiDB.php,v 1.144 2006-10-12 06:36:09 rurban Exp $');
 
 require_once('lib/PageType.php');
 
@@ -123,9 +123,10 @@ class WikiDB {
             $this->touch();
         
         // devel checking.
-        if (DEBUG || _DEBUG_SQL)
+        if ((int)DEBUG & _DEBUG_SQL) {
             $this->_backend->check();
     }
+    }
     
     /**
      * Close database connection.
@@ -156,7 +157,7 @@ class WikiDB {
     function getPage($pagename) {
         static $error_displayed = false;
         $pagename = (string) $pagename;
-        if (DEBUG) {
+        if ((int)DEBUG) {
             if ($pagename === '') {
                 if ($error_displayed) return false;
                 $error_displayed = true;
@@ -669,7 +670,7 @@ class WikiDB_Page
     function WikiDB_Page(&$wikidb, $pagename) {
         $this->_wikidb = &$wikidb;
         $this->_pagename = $pagename;
-        if (DEBUG) {
+        if ((int)DEBUG) {
             if (!(is_string($pagename) and $pagename != '')) {
                 if (function_exists("xdebug_get_function_stack")) {
                     echo "xdebug_get_function_stack(): "; var_dump(xdebug_get_function_stack());
@@ -925,11 +926,11 @@ class WikiDB_Page
         //
         // We're doing this here rather than in createRevision because
         // postgresql can't optimize while locked.
-        if ((DEBUG & _DEBUG_SQL)
+        if (((int)DEBUG & _DEBUG_SQL)
 	    or (DATABASE_OPTIMISE_FREQUENCY > 0 and 
                 (time() % DATABASE_OPTIMISE_FREQUENCY == 0))) {
             if ($backend->optimize()) {
-                if (DEBUG)
+                if ((int)DEBUG)
                     trigger_error(_("Optimizing database"), E_USER_NOTICE);
             }
         }
@@ -1981,19 +1982,19 @@ class WikiDB_PageRevisionIterator
         $pagename = $next['pagename'];
         $version = $next['version'];
         $versiondata = $next['versiondata'];
-        if (DEBUG) {
+        if ((int)DEBUG) {
             if (!(is_string($pagename) and $pagename != '')) {
                 trigger_error("empty pagename",E_USER_WARNING);
                 return false;
             }
         } else assert(is_string($pagename) and $pagename != '');
-        if (DEBUG) {
+        if ((int)DEBUG) {
             if (!is_array($versiondata)) {
                 trigger_error("empty versiondata",E_USER_WARNING);
                 return false;
             }
         } else assert(is_array($versiondata));
-        if (DEBUG) {
+        if ((int)DEBUG) {
             if (!($version > 0)) {
                 trigger_error("invalid version",E_USER_WARNING);
                 return false;
@@ -2271,6 +2272,9 @@ function _sql_debuglog_shutdown_function() {
 }
 
 // $Log: not supported by cvs2svn $
+// Revision 1.143  2006/09/06 05:46:40  rurban
+// do db backend check on _DEBUG_SQL
+//
 // Revision 1.142  2006/06/10 11:55:58  rurban
 // print optimize only when DEBUG
 //
-- 
2.45.0