[Tikiwiki-cvs] tiki/lib tikilib.php,1.591,1.592

[<rlp...@us...>]

Update of /cvsroot/tikiwiki/tiki/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27504/lib

Modified Files:
	tikilib.php 
Log Message:
Fixed Apache crashing on large ~pp~ or ~np~ strings; also made handling those much faster.


Index: tikilib.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/lib/tikilib.php,v
retrieving revision 1.591
retrieving revision 1.592
diff -u -d -r1.591 -r1.592
--- tikilib.php	14 Jul 2005 13:59:53 -0000	1.591
+++ tikilib.php	18 Jul 2005 07:16:01 -0000	1.592
@@ -3821,12 +3821,12 @@
 	    $data1 = $data;
 	    if (isset($noparsed["key"]) and count($noparsed["key"]) and count($noparsed["key"]) == count($noparsed["data"]))
 	    { 
-		$data = preg_replace($noparsed["key"], $noparsed["data"], $data);
+		$data = str_replace($noparsed["key"], $noparsed["data"], $data);
 	    }
 
 	    if (isset($preparsed["key"]) and count($preparsed["key"]) and count($preparsed["key"]) == count($preparsed["data"]))
 	    {
-		$data = preg_replace($preparsed["key"], $preparsed["data"], $data);
+		$data = str_replace($preparsed["key"], $preparsed["data"], $data);
 	    }
 	    $data2 = $data;
 	}
@@ -3942,7 +3942,7 @@
 	       print_r( $plugins );
 	       print "</pre>";
 	       print "<pre>start: :".htmlspecialchars( $plugin_start ) .":</pre>";
-	     */
+	    */
 
 	    if( count($plugins) > 1 )
 	    {
@@ -3953,8 +3953,8 @@
 
 	    $pos = strpos( $data, $plugins[0] ); // where the plugin starts
 
-		// where the part after the plugin arguments starts
-		$pos_middle = $pos + strlen( $plugins[0] );
+	    // where the part after the plugin arguments starts
+	    $pos_middle = $pos + strlen( $plugins[0] );
 
 	    // print "<pre>pos's: :$pos, $pos_middle:</pre>";
 
@@ -3963,28 +3963,31 @@
 	    {
 		$plugin_end='';
 		$pos_end = $pos + strlen($plugin_start);
-	    } else if( preg_match( "/^ *~pp~|^ *~np~/", $plugin_start ) ) {
-		$plugin_end = preg_replace( '/^(.)/', '$1/', $plugin_start );
+	    } else if( ! ( strpos( $plugin_start, '~pp~' ) === false ) ) {
+		$plugin_end = '~/pp~';
+		$pos_end = strpos($data, $plugin_end, $pos); // where plugin data ends
+	    } else if( ! ( strpos( $plugin_start, '~np~' ) === false ) ) {
+		$plugin_end = '~/np~';
 		$pos_end = strpos($data, $plugin_end, $pos); // where plugin data ends
 	    } else if( preg_match( "/^ *&lt;[pP][rR][eE]&gt;/", $plugin_start ) ) {
 		preg_match("/&lt;\/[pP][rR][eE]&gt;/", $data, $plugin_ends, 0, $pos); // where plugin data ends
 		$plugin_end = $plugin_ends[0];
 		$pos_end = strpos($data, $plugin_end, $pos); // where plugin data ends
-			} else {
-				$plugin_end = '{' . $plugin;
-				$count=1;
-				while($count) { // this takes care of possible nested plugins with same name
-					$pos_end = strpos($data, $plugin_end, $pos_middle);
-					if ($pos_end === false) {
-						$pos_end = strlen($data);
-						break;
-					}
-					$pos_middle = $pos_end+strlen($plugin_end);
-					if ($data{$pos_middle} == '}') $count--;
-					else if ($data{$pos_middle} == '(') $count++;
-				}
-				$plugin_end .= '}'; // where plugin data ends
-			}
+	    } else {
+		$plugin_end = '{' . $plugin;
+		$count=1;
+		while($count) { // this takes care of possible nested plugins with same name
+		    $pos_end = strpos($data, $plugin_end, $pos_middle);
+		    if ($pos_end === false) {
+			$pos_end = strlen($data);
+			break;
+		    }
+		    $pos_middle = $pos_end+strlen($plugin_end);
+		    if ($data{$pos_middle} == '}') $count--;
+		    else if ($data{$pos_middle} == '(') $count++;
+		}
+		$plugin_end .= '}'; // where plugin data ends
+	    }
 
 	    /*
 	       print "<pre>pos's2: :$pos, $pos_middle, $pos_end:</pre>";
@@ -4004,7 +4007,7 @@
 		// ~pp~ type "plugins"
 	    {
 		$key = md5($this->genPass());
-		$noparsed["key"][] = "/". preg_quote($key)."/";
+		$noparsed["key"][] = $key;
 
 		if( strstr( $plugin_data, '$' ) )
 		{
@@ -4087,7 +4090,7 @@
 			if( count( $stuff ) > 0 )
 			{
 			    $key = md5($this->genPass());
-			    $noparsed["key"][] = "/". preg_quote($key)."/";
+			    $noparsed["key"][] = $key;
 			    $noparsed["data"][] = $stuff[1];
 
 			    $ret = preg_replace( "/~np~.*~\/np~/s", $key, $ret );