From ae0e050d942a5aeebec7a24ece24b0bf5a156b33 Mon Sep 17 00:00:00 2001
From: rurban <rurban@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Sat, 29 Jan 2005 20:36:44 +0000
Subject: [PATCH] very important php5 fix! clone objects

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@4479 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 lib/BlockParser.php | 24 ++++++++++++++----------
 lib/config.php      | 27 +++++++++++++++++++++++++--
 2 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/lib/BlockParser.php b/lib/BlockParser.php
index 018787380..9be00b22f 100644
--- a/lib/BlockParser.php
+++ b/lib/BlockParser.php
@@ -1,4 +1,4 @@
-<?php rcs_id('$Id: BlockParser.php,v 1.52 2004-10-21 19:52:10 rurban Exp $');
+<?php rcs_id('$Id: BlockParser.php,v 1.53 2005-01-29 20:36:44 rurban Exp $');
 /* Copyright (C) 2002, Geoffrey T. Dairiki <dairiki@dairiki.org>
  *
  * This file is part of PhpWiki.
@@ -201,7 +201,8 @@ class BlockParser_Input {
     }
 
     function advance () {
-        $this->_atSpace = $this->_lines[$this->_pos++] === '';
+        $this->_atSpace = ($this->_lines[$this->_pos] === '');
+        $this->_pos++;
     }
     
     function getPos () {
@@ -347,7 +348,9 @@ class ParsedBlock extends Block_HtmlElement {
     }
 
     function _parse (&$input) {
-        for ($block = $this->_getBlock($input); $block; $block = $nextBlock) {
+        // php5 failed to advance the block. php5 copies objects by ref.
+        // nextBlock == block, both are the same objects. So we have to clone it.
+        for ($block = $this->_getBlock($input); $block; $block = clone($nextBlock)) {
             while ($nextBlock = $this->_getBlock($input)) {
                 // Attempt to merge current with following block.
                 if (! ($merged = $block->merge($nextBlock)) ) {
@@ -392,12 +395,14 @@ class ParsedBlock extends Block_HtmlElement {
         }
         $tight_top = !$this->_atSpace;
         $re_set = &$this->_regexpset;
+        //FIXME: php5 fails to advance here!
         for ($m = $re_set->match($line); $m; $m = $re_set->nextMatch($line, $m)) {
-            $block = $this->_block_types[$m->regexp_ind];
+            $block = clone($this->_block_types[$m->regexp_ind]);
             if (DEBUG & _DEBUG_PARSER)
                 $input->_debug('>', get_class($block));
             
             if ($block->_match($input, $m)) {
+            	//$block->_text = $line;
                 if (DEBUG & _DEBUG_PARSER)
                     $input->_debug('<', get_class($block));
                 $tight_bottom = ! $input->skipSpace();
@@ -479,7 +484,6 @@ class BlockMarkup {
 class Block_blockquote extends BlockMarkup
 {
     var $_depth;
-
     var $_re = '\ +(?=\S)';
 
     function _match (&$input, $m) {
@@ -511,7 +515,6 @@ class Block_list extends BlockMarkup
                   | [o](?=\ )
                   | [*] (?!(?=\S)[^*]*(?<=\S)[*](?:\\s|[-)}>"\'\\/:.,;!?_*=]) )
                 )\ *(?=\S)';
-
     var $_content = array();
 
     function _match (&$input, $m) {
@@ -1014,6 +1017,7 @@ class Block_p extends BlockMarkup
 {
     var $_tag = 'p';
     var $_re = '\S.*';
+    var $_text = '';
 
     function _match (&$input, $m) {
         $this->_text = $m->match;
@@ -1066,9 +1070,6 @@ function TransformTextPre ($text, $markup = 2.0, $basepage=false) {
     //set_time_limit(3);
     $output = new WikiText($text);
 
-    /* if (0 and DEBUG and DEBUG & _DEBUG_VERBOSE and check_php_version(5)) {
-        echo "<pre>"; var_dump($output); echo "</pre>"; 
-    } */
     return $output;
 }
 
@@ -1088,6 +1089,9 @@ function TransformText ($text, $markup = 2.0, $basepage=false) {
 }
 
 // $Log: not supported by cvs2svn $
+// Revision 1.52  2004/10/21 19:52:10  rurban
+// Patch #994487: Allow callers to get the parse tree for a page (danfr)
+//
 // Revision 1.51  2004/09/14 09:54:04  rurban
 // cache ParsedBlock::_initBlockTypes
 //
@@ -1117,4 +1121,4 @@ function TransformText ($text, $markup = 2.0, $basepage=false) {
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
 // End:   
-?>
+?>
\ No newline at end of file
diff --git a/lib/config.php b/lib/config.php
index 91b434d2b..92e0230e4 100644
--- a/lib/config.php
+++ b/lib/config.php
@@ -1,5 +1,5 @@
 <?php
-rcs_id('$Id: config.php,v 1.129 2005-01-08 22:53:50 rurban Exp $');
+rcs_id('$Id: config.php,v 1.130 2005-01-29 20:36:44 rurban Exp $');
 /*
  * NOTE: The settings here should probably not need to be changed.
  * The user-configurable settings have been moved to IniConfig.php
@@ -57,10 +57,13 @@ set_magic_quotes_runtime(0);
  */
 function browserAgent() {
     static $HTTP_USER_AGENT = false;
+    if ($HTTP_USER_AGENT !== false) return $HTTP_USER_AGENT;
     if (!$HTTP_USER_AGENT)
         $HTTP_USER_AGENT = @$GLOBALS['HTTP_SERVER_VARS']['HTTP_USER_AGENT'];
     if (!$HTTP_USER_AGENT) // CGI
-        $HTTP_USER_AGENT = $GLOBALS['HTTP_ENV_VARS']['HTTP_USER_AGENT'];
+        $HTTP_USER_AGENT = @$GLOBALS['HTTP_ENV_VARS']['HTTP_USER_AGENT'];
+    if (!$HTTP_USER_AGENT) // local CGI testing
+        $HTTP_USER_AGENT = 'none';
     return $HTTP_USER_AGENT;
 }
 function browserDetect($match) {
@@ -433,6 +436,21 @@ if (!function_exists('is_a')) {
     }
 }
 
+/**
+ * safe php4 definition for clone.
+ * php5 copies objects by reference, but we need to clone "deep copy" in some places.
+ * (BlockParser)
+ * We need to eval it as workaround for the php5 parser.
+ * See http://www.acko.net/node/54
+ */
+if (!check_php_version(5)) {
+    eval('
+    function clone($object) {
+      return $object;
+    }
+    ');
+}
+
 /** 
  * wordwrap() might crash between 4.1.2 and php-4.3.0RC2, fixed in 4.3.0
  * See http://bugs.php.net/bug.php?id=20927 and 
@@ -506,6 +524,11 @@ function getUploadDataPath() {
 }
 
 // $Log: not supported by cvs2svn $
+// Revision 1.129  2005/01/08 22:53:50  rurban
+// hardcode list of langs (file access is slow)
+// fix client detection
+// set proper locale on empty locale
+//
 // Revision 1.128  2005/01/04 20:22:46  rurban
 // guess $LANG based on client
 //
-- 
2.45.0