[Tikiwiki-cvs] tiki/lib tikilib.php,1.96,1.97

[<lra...@us...>]

Update of /cvsroot/tikiwiki/tiki/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv18490/lib

Modified Files:
	tikilib.php 
Log Message:
Plugins can be nested.
Plugins are re-entrant.


Index: tikilib.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/lib/tikilib.php,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- tikilib.php	12 Mar 2003 23:56:11 -0000	1.96
+++ tikilib.php	14 Mar 2003 12:57:45 -0000	1.97
@@ -7678,23 +7678,14 @@
     //$page='';
 
     // Now search for plugins
-    $smc = new Smarty_Compiler();
+    //$smc = new Smarty_Compiler();
     preg_match_all("/\{([A-Z]+)\(([^\)]*)\)\}/",$data,$plugins);
-    
-    for($i=0;$i<count($plugins[0]);$i++) {
+    for($i=count($plugins[0])-1;$i>=0;$i--) {
       $plugin_start = $plugins[0][$i];
-      $plugin_start_base = '{'.$plugins[1][$i].'(';
       $plugin_end = '{'.$plugins[1][$i].'}';
-      // Find first occurrence of start tag
-      // Build start tag using 
-
-
+      $plugin_start_base = '{'.$plugins[1][$i].'(';
       $pos = strpos($data,$plugin_start);
-      // And now find the LAST occurrence of the end tag
       $pos_end = strpos($data,$plugin_end,$pos);
-      
-      
-      
       if($pos_end>$pos) {
         $plugin_data_len=$pos_end-$pos-strlen($plugins[0][$i]);
         $plugin_data = substr($data,$pos+strlen($plugin_start),$plugin_data_len);
@@ -7719,7 +7710,8 @@
         }
       }
     }
-    unset($smc);
+    
+    //unset($smc);
 
 
     // Now search for images uploaded by users
@@ -8239,14 +8231,26 @@
     }
     //$page='';
 
+
     // Now search for plugins
     preg_match_all("/\{([A-Z]+)\(([^\)]*)\)\}/",$data,$plugins);
     //print_r($plugins);
     for($i=0;$i<count($plugins[0]);$i++) {
       $plugin_start = $plugins[0][$i];
       $plugin_end = '{'.$plugins[1][$i].'}';
+      $plugin_start_base = '{'.$plugins[1][$i].'(';
       $pos = strpos($data,$plugin_start);
       $pos_end = strpos($data,$plugin_end);
+      
+      $pos_base_new = strpos($data,$plugin_start_base);
+      $pos_base = $pos_base_new;
+      while($pos_base_new) {
+        $pos_base = $pos_base_new;
+        $pos_base_new = strpos($data,$plugin_start_base,$pos_base+1);	
+      }
+      print("akjhdkjhdkahkdhas");
+      print("Posbase: $pos_base<br/>");
+      
       if($pos_end>$pos) {
         $plugin_data_len=$pos_end-$pos-strlen($plugins[0][$i]);
         $plugin_data = substr($data,$pos+strlen($plugin_start),$plugin_data_len);