Merge pull request #1 from Zigazou/master

Now delete unused blocks

class.TplBlock.php

@@ -20,6 +20,7 @@ class TplBlock {
   public $name = '';
   private $vars = array();
   private $subBlocs = array();
+  private $unusedRegex = "";
 
   /*
   * Initialise TplBlock
@@ -29,6 +30,18 @@ class TplBlock {
 
   public function __construct($name = NULL){
     $this->name = $name;
+
+    $this->unusedRegex = '/'
+                       . self::blockStartStart
+                       . ' *([a-z][a-z.]*) *'
+                       . self::blockStartEnd
+                       . '(.*?)'
+                       . self::blockEndStart
+                       . ' *\1 *'
+                       . self::blockEndEnd
+                       . '/is'
+                       ;
+
   }
 
   /*
@@ -52,6 +65,18 @@ class TplBlock {
     $this->subBlocs[$bloc->name][] = $bloc;
   }
 
+  private function subBlockRegex($prefix, $blocName) {
+    return '/'
+         . self::blockStartStart
+         . preg_quote($prefix . $blocName)
+         . self::blockStartEnd
+         . '(.*?)'
+         . self::blockEndStart
+         . preg_quote($prefix . $blocName)
+         . self::blockEndEnd
+         . '/is';
+  }
+
   /*
   * Shake template and input vars and returns the text
   * Input: 
@@ -75,10 +100,7 @@ class TplBlock {
     //parse blocs
     foreach($this->subBlocs as $blocName => $blocsArr){
       $str = preg_replace_callback(
-        '/' . self::blockStartStart . preg_quote($prefix . $blocName) . self::blockStartEnd .
+        $this->subBlockRegex($prefix, $blocName),
-          '(.*?)'.
-          self::blockEndStart . preg_quote($prefix . $blocName). self::blockEndEnd. 
-          '/is',
         function($m) use($blocName,$blocsArr,$prefix, $trim) {
           $out = "";
           foreach($blocsArr as $bloc){
@@ -86,14 +108,13 @@ class TplBlock {
             $out.=$bloc->apply_tpl_str( $m[1] , $prefix . $blocName , $trim );
           }
           return $out;
-        },
+        }
-        $str
+        ,$str
       );
     }
 
-    //delete unused blocs
+    // Delete unused blocs
-    // TODO
+    $str = preg_replace($this->unusedRegex, "", $str);
-
 
     if($trim){
       return trim($str,"\n");