codysnider / tt-rss

opml.php

Spacing +3 added lines, -3 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-	set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+	set_include_path(dirname(__FILE__)."/include".PATH_SEPARATOR.
 		get_include_path());
 
 	require_once "autoload.php";
@@ -14,11 +14,11 @@ 
 
 	$op = $_REQUEST['op'];
 
-	if ($op == "publish"){
+	if ($op == "publish") {
 		$key = $_REQUEST["key"];
 		$pdo = Db::pdo();
 
-		$sth = $pdo->prepare( "SELECT owner_uid
+		$sth = $pdo->prepare("SELECT owner_uid
 				FROM ttrss_access_keys WHERE
 				access_key = ? AND feed_id = 'OPML:Publish'");
 		$sth->execute([$key]);

Indentation +24 added lines, -24 removed lines

@@ -1,35 +1,35 @@
 <?php
-	set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
-		get_include_path());
+    set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+        get_include_path());
 
-	require_once "autoload.php";
-	require_once "functions.php";
-	require_once "sessions.php";
-	require_once "sanity_check.php";
-	require_once "config.php";
-	require_once "db.php";
-	require_once "db-prefs.php";
+    require_once "autoload.php";
+    require_once "functions.php";
+    require_once "sessions.php";
+    require_once "sanity_check.php";
+    require_once "config.php";
+    require_once "db.php";
+    require_once "db-prefs.php";
 
-	if (!init_plugins()) return;
+    if (!init_plugins()) return;
 
-	$op = $_REQUEST['op'];
+    $op = $_REQUEST['op'];
 
-	if ($op == "publish"){
-		$key = $_REQUEST["key"];
-		$pdo = Db::pdo();
+    if ($op == "publish"){
+        $key = $_REQUEST["key"];
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare( "SELECT owner_uid
+        $sth = $pdo->prepare( "SELECT owner_uid
 				FROM ttrss_access_keys WHERE
 				access_key = ? AND feed_id = 'OPML:Publish'");
-		$sth->execute([$key]);
+        $sth->execute([$key]);
 
-		if ($row = $sth->fetch()) {
-			$owner_uid = $row['owner_uid'];
+        if ($row = $sth->fetch()) {
+            $owner_uid = $row['owner_uid'];
 
-			$opml = new Opml($_REQUEST);
-			$opml->opml_export("", $owner_uid, true, false);
+            $opml = new Opml($_REQUEST);
+            $opml->opml_export("", $owner_uid, true, false);
 
-		} else {
-			print "<error>User not found</error>";
-		}
-	}
+        } else {
+            print "<error>User not found</error>";
+        }
+    }

Braces +3 added lines, -1 removed lines

@@ -10,7 +10,9 @@
 	require_once "db.php";
 	require_once "db-prefs.php";
 
-	if (!init_plugins()) return;
+	if (!init_plugins()) {
+	    return;
+	}
 
 	$op = $_REQUEST['op'];
 

lib/MiniTemplator.class.php

Switch Indentation +47 added lines, -47 removed lines

@@ -295,23 +295,23 @@ 
    if (!$this->parseWord($cmdL,$p,$cmd)) return true;

    $parms = substr($cmdL,$p);

    switch (strtoupper($cmd)) {

-      case '$BEGINBLOCK':

-         if (!$this->processBeginBlockCmd($parms,$cmdTPosBegin,$cmdTPosEnd))

-            return false;

-         break;

-      case '$ENDBLOCK':

-         if (!$this->processEndBlockCmd($parms,$cmdTPosBegin,$cmdTPosEnd))

-            return false;

-         break;

-      case '$INCLUDE':

-         if (!$this->processincludeCmd($parms,$cmdTPosBegin,$cmdTPosEnd))

-            return false;

-         $resumeFromStart = true;

-         break;

-      default:

-         if ($cmd{0} == '$' && !(strlen($cmd) >= 2 && $cmd{1} == '{')) {

-            $this->triggerError ("Unknown command \"$cmd\" in template at offset $cmdTPosBegin.");

-            return false; }}

+   case '$BEGINBLOCK':

+      if (!$this->processBeginBlockCmd($parms,$cmdTPosBegin,$cmdTPosEnd))

+         return false;

+      break;

+   case '$ENDBLOCK':

+      if (!$this->processEndBlockCmd($parms,$cmdTPosBegin,$cmdTPosEnd))

+         return false;

+      break;

+   case '$INCLUDE':

+      if (!$this->processincludeCmd($parms,$cmdTPosBegin,$cmdTPosEnd))

+         return false;

+      $resumeFromStart = true;

+      break;

+   default:

+      if ($cmd{0} == '$' && !(strlen($cmd) >= 2 && $cmd{1} == '{')) {

+         $this->triggerError ("Unknown command \"$cmd\" in template at offset $cmdTPosBegin.");

+         return false; }}

     return true; }

 

 /**

@@ -765,25 +765,25 @@ 
       if ($tPos2 > $tPos)

          $this->writeString (substr($this->template,$tPos,$tPos2-$tPos));

       switch ($kind) {

-         case 0:         // end of block

-            return;

-         case 1:         // variable

-            $vrtr =& $this->varRefTab[$varRefNo];

-            if ($vrtr['blockNo'] != $blockNo)

-               $this->programLogicError (4);

-            $variableValue = $bitr['blockVarTab'][$vrtr['blockVarNo']];

-            $this->writeString ($variableValue);

-            $tPos = $vrtr['tPosEnd'];

-            $varRefNo += 1;

-            break;

-         case 2:         // sub block

-            $subBtr =& $this->blockTab[$subBlockNo];

-            if ($subBtr['parentBlockNo'] != $blockNo)

-               $this->programLogicError (3);

-            $this->writeBlockInstances ($subBlockNo, $bitr['instanceLevel']);  // recursive call

-            $tPos = $subBtr['tPosEnd'];

-            $subBlockNo += 1;

-            break; }}}

+      case 0:         // end of block

+         return;

+      case 1:         // variable

+         $vrtr =& $this->varRefTab[$varRefNo];

+         if ($vrtr['blockNo'] != $blockNo)

+            $this->programLogicError (4);

+         $variableValue = $bitr['blockVarTab'][$vrtr['blockVarNo']];

+         $this->writeString ($variableValue);

+         $tPos = $vrtr['tPosEnd'];

+         $varRefNo += 1;

+         break;

+      case 2:         // sub block

+         $subBtr =& $this->blockTab[$subBlockNo];

+         if ($subBtr['parentBlockNo'] != $blockNo)

+            $this->programLogicError (3);

+         $this->writeBlockInstances ($subBlockNo, $bitr['instanceLevel']);  // recursive call

+         $tPos = $subBtr['tPosEnd'];

+         $subBlockNo += 1;

+         break; }}}

 

 /**

 * @access private

@@ -791,17 +791,17 @@ 
 function writeString ($s) {

    if ($this->outputError) return;

    switch ($this->outputMode) {

-      case 0:            // output to PHP output stream

-         if (!print($s))

-            $this->outputError = true;

-         break;

-      case 1:            // output to file

-         $rc = fwrite($this->outputFileHandle, $s);

-         if ($rc === false) $this->outputError = true;

-         break;

-      case 2:            // output to string

-         $this->outputString .= $s;

-         break; }}

+   case 0:            // output to PHP output stream

+      if (!print($s))

+         $this->outputError = true;

+      break;

+   case 1:            // output to file

+      $rc = fwrite($this->outputFileHandle, $s);

+      if ($rc === false) $this->outputError = true;

+      break;

+   case 2:            // output to string

+      $this->outputString .= $s;

+      break; }}

 

 //--- name lookup routines ------------------------------------------------------------------------------------------

 

Spacing +165 added lines, -165 removed lines

@@ -89,16 +89,16 @@ 
 * @access private

 */

 

-var $maxNestingLevel = 50;            // maximum number of block nestings

-var $maxInclTemplateSize = 1000000;   // maximum length of template string when including subtemplates

-var $template;                        // Template file data

-var $varTab;                          // variables table, array index is variable no

+var $maxNestingLevel = 50; // maximum number of block nestings

+var $maxInclTemplateSize = 1000000; // maximum length of template string when including subtemplates

+var $template; // Template file data

+var $varTab; // variables table, array index is variable no

     // Fields:

     //  varName                       // variable name

     //  varValue                      // variable value

-var $varTabCnt;                       // no of entries used in VarTab

-var $varNameToNoMap;                  // maps variable names to variable numbers

-var $varRefTab;                       // variable references table

+var $varTabCnt; // no of entries used in VarTab

+var $varNameToNoMap; // maps variable names to variable numbers

+var $varRefTab; // variable references table

     // Contains an entry for each variable reference in the template. Ordered by TemplatePos.

     // Fields:

     //  varNo                         // variable no

@@ -106,8 +106,8 @@ 
     //  tPosEnd                       // template position of end of variable reference

     //  blockNo                       // block no of the (innermost) block that contains this variable reference

     //  blockVarNo                    // block variable no. Index into BlockInstTab.BlockVarTab

-var $varRefTabCnt;                    // no of entries used in VarRefTab

-var $blockTab;                        // Blocks table, array index is block no

+var $varRefTabCnt; // no of entries used in VarRefTab

+var $blockTab; // Blocks table, array index is block no

     // Contains an entry for each block in the template. Ordered by TPosBegin.

     // Fields:

     //  blockName                     // block name

@@ -126,12 +126,12 @@ 
     //  blockVarCnt                   // no of variables in block

     //  blockVarNoToVarNoMap          // maps block variable numbers to variable numbers

     //  firstVarRefNo                 // variable reference no of first variable of this block or -1

-var $blockTabCnt;                     // no of entries used in BlockTab

-var $blockNameToNoMap;                // maps block names to block numbers

+var $blockTabCnt; // no of entries used in BlockTab

+var $blockNameToNoMap; // maps block names to block numbers

 var $openBlocksTab;

     // During parsing, this table contains the block numbers of the open parent blocks (nested outer blocks).

     // Indexed by the block nesting level.

-var $blockInstTab;                    // block instances table

+var $blockInstTab; // block instances table

     // This table contains an entry for each block instance that has been added.

     // Indexed by BlockInstNo.

     // Fields:

@@ -143,14 +143,14 @@ 
     //  nextBlockInstNo               // pointer to next instance of this block or -1

     //     Forward chain for instances of same block.

     //  blockVarTab                   // block instance variables

-var $blockInstTabCnt;                 // no of entries used in BlockInstTab

+var $blockInstTabCnt; // no of entries used in BlockInstTab

 

-var $currentNestingLevel;             // Current block nesting level during parsing.

-var $templateValid;                   // true if a valid template is prepared

-var $outputMode;                      // 0 = to PHP output stream, 1 = to file, 2 = to string

-var $outputFileHandle;                // file handle during writing of output file

-var $outputError;                     // true when an output error occurred

-var $outputString;                    // string buffer for the generated HTML page

+var $currentNestingLevel; // Current block nesting level during parsing.

+var $templateValid; // true if a valid template is prepared

+var $outputMode; // 0 = to PHP output stream, 1 = to file, 2 = to string

+var $outputFileHandle; // file handle during writing of output file

+var $outputError; // true when an output error occurred

+var $outputString; // string buffer for the generated HTML page

 

 /**#@-*/

 

@@ -171,9 +171,9 @@ 
 * @return boolean  true on success, false on error.

 * @access public

 */

-function readTemplateFromFile ($fileName) {

-   if (!$this->readFileIntoString($fileName,$s)) {

-      $this->triggerError ("Error while reading template file " . $fileName . ".");

+function readTemplateFromFile($fileName) {

+   if (!$this->readFileIntoString($fileName, $s)) {

+      $this->triggerError("Error while reading template file ".$fileName.".");

       return false; }

    if (!$this->setTemplateString($s)) return false;

    return true; }

@@ -184,7 +184,7 @@ 
 * @return boolean  true on success, false on error.

 * @access public

 */

-function setTemplateString ($templateString) {

+function setTemplateString($templateString) {

    $this->templateValid = false;

    $this->template = $templateString;

    if (!$this->parseTemplate()) return false;

@@ -197,10 +197,10 @@ 
 * @return boolean  true on success, false on error.

 * @access private

 */

-function loadSubtemplate ($subtemplateName, &$s) {

-   $subtemplateFileName = $this->combineFileSystemPath($this->subtemplateBasePath,$subtemplateName);

-   if (!$this->readFileIntoString($subtemplateFileName,$s)) {

-      $this->triggerError ("Error while reading subtemplate file " . $subtemplateFileName . ".");

+function loadSubtemplate($subtemplateName, &$s) {

+   $subtemplateFileName = $this->combineFileSystemPath($this->subtemplateBasePath, $subtemplateName);

+   if (!$this->readFileIntoString($subtemplateFileName, $s)) {

+      $this->triggerError("Error while reading subtemplate file ".$subtemplateFileName.".");

       return false; }

    return true; }

 

@@ -243,7 +243,7 @@ 
 function beginMainBlock() {

    $blockNo = 0;

    $this->registerBlock('@@InternalMainBlock@@', $blockNo);

-   $bte =& $this->blockTab[$blockNo];

+   $bte = & $this->blockTab[$blockNo];

    $bte['tPosBegin'] = 0;

    $bte['tPosContentsBegin'] = 0;

    $bte['nestingLevel'] = 0;

@@ -257,7 +257,7 @@ 
 * @access private

 */

 function endMainBlock() {

-   $bte =& $this->blockTab[0];

+   $bte = & $this->blockTab[0];

    $bte['tPosContentsEnd'] = strlen($this->template);

    $bte['tPosEnd'] = strlen($this->template);

    $bte['definitionIsOpen'] = false;

@@ -271,15 +271,15 @@ 
 function parseTemplateCommands() {

    $p = 0;

    while (true) {

-      $p0 = strpos($this->template,'<!--',$p);

+      $p0 = strpos($this->template, '<!--', $p);

       if ($p0 === false) break;

-      $p = strpos($this->template,'-->',$p0);

+      $p = strpos($this->template, '-->', $p0);

       if ($p === false) {

-         $this->triggerError ("Invalid HTML comment in template at offset $p0.");

+         $this->triggerError("Invalid HTML comment in template at offset $p0.");

          return false; }

       $p += 3;

-      $cmdL = substr($this->template,$p0+4,$p-$p0-7);

-      if (!$this->processTemplateCommand($cmdL,$p0,$p,$resumeFromStart))

+      $cmdL = substr($this->template, $p0 + 4, $p - $p0 - 7);

+      if (!$this->processTemplateCommand($cmdL, $p0, $p, $resumeFromStart))

          return false;

       if ($resumeFromStart) $p = $p0; }

    return true; }

@@ -288,29 +288,29 @@ 
 * @return boolean  true on success, false on error.

 * @access private

 */

-function processTemplateCommand ($cmdL, $cmdTPosBegin, $cmdTPosEnd, &$resumeFromStart) {

+function processTemplateCommand($cmdL, $cmdTPosBegin, $cmdTPosEnd, &$resumeFromStart) {

    $resumeFromStart = false;

    $p = 0;

    $cmd = '';

-   if (!$this->parseWord($cmdL,$p,$cmd)) return true;

-   $parms = substr($cmdL,$p);

+   if (!$this->parseWord($cmdL, $p, $cmd)) return true;

+   $parms = substr($cmdL, $p);

    switch (strtoupper($cmd)) {

       case '$BEGINBLOCK':

-         if (!$this->processBeginBlockCmd($parms,$cmdTPosBegin,$cmdTPosEnd))

+         if (!$this->processBeginBlockCmd($parms, $cmdTPosBegin, $cmdTPosEnd))

             return false;

          break;

       case '$ENDBLOCK':

-         if (!$this->processEndBlockCmd($parms,$cmdTPosBegin,$cmdTPosEnd))

+         if (!$this->processEndBlockCmd($parms, $cmdTPosBegin, $cmdTPosEnd))

             return false;

          break;

       case '$INCLUDE':

-         if (!$this->processincludeCmd($parms,$cmdTPosBegin,$cmdTPosEnd))

+         if (!$this->processincludeCmd($parms, $cmdTPosBegin, $cmdTPosEnd))

             return false;

          $resumeFromStart = true;

          break;

       default:

          if ($cmd{0} == '$' && !(strlen($cmd) >= 2 && $cmd{1} == '{')) {

-            $this->triggerError ("Unknown command \"$cmd\" in template at offset $cmdTPosBegin.");

+            $this->triggerError("Unknown command \"$cmd\" in template at offset $cmdTPosBegin.");

             return false; }}

     return true; }

 

@@ -319,24 +319,24 @@ 
 * @return boolean  true on success, false on error.

 * @access private

 */

-function processBeginBlockCmd ($parms, $cmdTPosBegin, $cmdTPosEnd) {

+function processBeginBlockCmd($parms, $cmdTPosBegin, $cmdTPosEnd) {

    $p = 0;

-   if (!$this->parseWord($parms,$p,$blockName)) {

-      $this->triggerError ("Missing block name in \$BeginBlock command in template at offset $cmdTPosBegin.");

+   if (!$this->parseWord($parms, $p, $blockName)) {

+      $this->triggerError("Missing block name in \$BeginBlock command in template at offset $cmdTPosBegin.");

       return false; }

-   if (trim(substr($parms,$p)) != '') {

-      $this->triggerError ("Extra parameter in \$BeginBlock command in template at offset $cmdTPosBegin.");

+   if (trim(substr($parms, $p)) != '') {

+      $this->triggerError("Extra parameter in \$BeginBlock command in template at offset $cmdTPosBegin.");

       return false; }

-   $this->registerBlock ($blockName, $blockNo);

-   $btr =& $this->blockTab[$blockNo];

+   $this->registerBlock($blockName, $blockNo);

+   $btr = & $this->blockTab[$blockNo];

    $btr['tPosBegin'] = $cmdTPosBegin;

    $btr['tPosContentsBegin'] = $cmdTPosEnd;

    $btr['nestingLevel'] = $this->currentNestingLevel;

-   $btr['parentBlockNo'] = $this->openBlocksTab[$this->currentNestingLevel-1];

+   $btr['parentBlockNo'] = $this->openBlocksTab[$this->currentNestingLevel - 1];

    $this->openBlocksTab[$this->currentNestingLevel] = $blockNo;

    $this->currentNestingLevel += 1;

    if ($this->currentNestingLevel > $this->maxNestingLevel) {

-      $this->triggerError ("Block nesting overflow in template at offset $cmdTPosBegin.");

+      $this->triggerError("Block nesting overflow in template at offset $cmdTPosBegin.");

       return false; }

    return true; }

 

@@ -345,24 +345,24 @@ 
 * @return boolean  true on success, false on error.

 * @access private

 */

-function processEndBlockCmd ($parms, $cmdTPosBegin, $cmdTPosEnd) {

+function processEndBlockCmd($parms, $cmdTPosBegin, $cmdTPosEnd) {

    $p = 0;

-   if (!$this->parseWord($parms,$p,$blockName)) {

-      $this->triggerError ("Missing block name in \$EndBlock command in template at offset $cmdTPosBegin.");

+   if (!$this->parseWord($parms, $p, $blockName)) {

+      $this->triggerError("Missing block name in \$EndBlock command in template at offset $cmdTPosBegin.");

       return false; }

-   if (trim(substr($parms,$p)) != '') {

-      $this->triggerError ("Extra parameter in \$EndBlock command in template at offset $cmdTPosBegin.");

+   if (trim(substr($parms, $p)) != '') {

+      $this->triggerError("Extra parameter in \$EndBlock command in template at offset $cmdTPosBegin.");

       return false; }

-   if (!$this->lookupBlockName($blockName,$blockNo)) {

-      $this->triggerError ("Undefined block name \"$blockName\" in \$EndBlock command in template at offset $cmdTPosBegin.");

+   if (!$this->lookupBlockName($blockName, $blockNo)) {

+      $this->triggerError("Undefined block name \"$blockName\" in \$EndBlock command in template at offset $cmdTPosBegin.");

       return false; }

    $this->currentNestingLevel -= 1;

-   $btr =& $this->blockTab[$blockNo];

+   $btr = & $this->blockTab[$blockNo];

    if (!$btr['definitionIsOpen']) {

-      $this->triggerError ("Multiple \$EndBlock command for block \"$blockName\" in template at offset $cmdTPosBegin.");

+      $this->triggerError("Multiple \$EndBlock command for block \"$blockName\" in template at offset $cmdTPosBegin.");

       return false; }

    if ($btr['nestingLevel'] != $this->currentNestingLevel) {

-      $this->triggerError ("Block nesting level mismatch at \$EndBlock command for block \"$blockName\" in template at offset $cmdTPosBegin.");

+      $this->triggerError("Block nesting level mismatch at \$EndBlock command for block \"$blockName\" in template at offset $cmdTPosBegin.");

       return false; }

    $btr['tPosContentsEnd'] = $cmdTPosBegin;

    $btr['tPosEnd'] = $cmdTPosEnd;

@@ -374,10 +374,10 @@ 
 */

 function registerBlock($blockName, &$blockNo) {

    $blockNo = $this->blockTabCnt++;

-   $btr =& $this->blockTab[$blockNo];

+   $btr = & $this->blockTab[$blockNo];

    $btr = array();

    $btr['blockName'] = $blockName;

-   if (!$this->lookupBlockName($blockName,$btr['nextWithSameName']))

+   if (!$this->lookupBlockName($blockName, $btr['nextWithSameName']))

       $btr['nextWithSameName'] = -1;

    $btr['definitionIsOpen'] = true;

    $btr['instances'] = 0;

@@ -394,13 +394,13 @@ 
 * @access private

 */

 function checkBlockDefinitionsComplete() {

-   for ($blockNo=0; $blockNo < $this->blockTabCnt; $blockNo++) {

-      $btr =& $this->blockTab[$blockNo];

+   for ($blockNo = 0; $blockNo < $this->blockTabCnt; $blockNo++) {

+      $btr = & $this->blockTab[$blockNo];

       if ($btr['definitionIsOpen']) {

-         $this->triggerError ("Missing \$EndBlock command in template for block " . $btr['blockName'] . ".");

+         $this->triggerError("Missing \$EndBlock command in template for block ".$btr['blockName'].".");

          return false; }}

    if ($this->currentNestingLevel != 0) {

-      $this->triggerError ("Block nesting level error at end of template.");

+      $this->triggerError("Block nesting level error at end of template.");

       return false; }

    return true; }

 

@@ -409,29 +409,29 @@ 
 * @return boolean  true on success, false on error.

 * @access private

 */

-function processIncludeCmd ($parms, $cmdTPosBegin, $cmdTPosEnd) {

+function processIncludeCmd($parms, $cmdTPosBegin, $cmdTPosEnd) {

    $p = 0;

-   if (!$this->parseWordOrQuotedString($parms,$p,$subtemplateName)) {

-      $this->triggerError ("Missing or invalid subtemplate name in \$Include command in template at offset $cmdTPosBegin.");

+   if (!$this->parseWordOrQuotedString($parms, $p, $subtemplateName)) {

+      $this->triggerError("Missing or invalid subtemplate name in \$Include command in template at offset $cmdTPosBegin.");

       return false; }

-   if (trim(substr($parms,$p)) != '') {

-      $this->triggerError ("Extra parameter in \$include command in template at offset $cmdTPosBegin.");

+   if (trim(substr($parms, $p)) != '') {

+      $this->triggerError("Extra parameter in \$include command in template at offset $cmdTPosBegin.");

       return false; }

-   return $this->insertSubtemplate($subtemplateName,$cmdTPosBegin,$cmdTPosEnd); }

+   return $this->insertSubtemplate($subtemplateName, $cmdTPosBegin, $cmdTPosEnd); }

 

 /**

 * Processes the $Include command.

 * @return boolean  true on success, false on error.

 * @access private

 */

-function insertSubtemplate ($subtemplateName, $tPos1, $tPos2) {

+function insertSubtemplate($subtemplateName, $tPos1, $tPos2) {

    if (strlen($this->template) > $this->maxInclTemplateSize) {

-      $this->triggerError ("Subtemplate include aborted because the internal template string is longer than $this->maxInclTemplateSize characters.");

+      $this->triggerError("Subtemplate include aborted because the internal template string is longer than $this->maxInclTemplateSize characters.");

       return false; }

-   if (!$this->loadSubtemplate($subtemplateName,$subtemplate)) return false;

+   if (!$this->loadSubtemplate($subtemplateName, $subtemplate)) return false;

    // (Copying the template to insert a subtemplate is a bit slow. In a future implementation of MiniTemplator,

    // a table could be used that contains references to the string fragments.)

-   $this->template = substr($this->template,0,$tPos1) . $subtemplate . substr($this->template,$tPos2);

+   $this->template = substr($this->template, 0, $tPos1).$subtemplate.substr($this->template, $tPos2);

    return true; }

 

 /**

@@ -447,24 +447,24 @@ 
       $p0 = $p;

       $p = strpos($this->template, '}', $p);

       if ($p === false) {

-         $this->triggerError ("Invalid variable reference in template at offset $p0.");

+         $this->triggerError("Invalid variable reference in template at offset $p0.");

          return false; }

       $p += 1;

-      $varName = trim(substr($this->template, $p0+2, $p-$p0-3));

+      $varName = trim(substr($this->template, $p0 + 2, $p - $p0 - 3));

       if (strlen($varName) == 0) {

-         $this->triggerError ("Empty variable name in template at offset $p0.");

+         $this->triggerError("Empty variable name in template at offset $p0.");

          return false; }

-      $this->registerVariableReference ($varName, $p0, $p); }

+      $this->registerVariableReference($varName, $p0, $p); }

    return true; }

 

 /**

 * @access private

 */

-function registerVariableReference ($varName, $tPosBegin, $tPosEnd) {

-   if (!$this->lookupVariableName($varName,$varNo))

-      $this->registerVariable($varName,$varNo);

+function registerVariableReference($varName, $tPosBegin, $tPosEnd) {

+   if (!$this->lookupVariableName($varName, $varNo))

+      $this->registerVariable($varName, $varNo);

    $varRefNo = $this->varRefTabCnt++;

-   $vrtr =& $this->varRefTab[$varRefNo];

+   $vrtr = & $this->varRefTab[$varRefNo];

    $vrtr = array();

    $vrtr['tPosBegin'] = $tPosBegin;

    $vrtr['tPosEnd'] = $tPosEnd;

@@ -473,9 +473,9 @@ 
 /**

 * @access private

 */

-function registerVariable ($varName, &$varNo) {

+function registerVariable($varName, &$varNo) {

    $varNo = $this->varTabCnt++;

-   $vtr =& $this->varTab[$varNo];

+   $vtr = & $this->varTab[$varNo];

    $vtr = array();

    $vtr['varName'] = $varName;

    $vtr['varValue'] = '';

@@ -490,7 +490,7 @@ 
    $activeBlockNo = 0;

    $nextBlockNo = 1;

    while ($varRefNo < $this->varRefTabCnt) {

-      $vrtr =& $this->varRefTab[$varRefNo];

+      $vrtr = & $this->varRefTab[$varRefNo];

       $varRefTPos = $vrtr['tPosBegin'];

       $varNo = $vrtr['varNo'];

       if ($varRefTPos >= $this->blockTab[$activeBlockNo]['tPosEnd']) {

@@ -501,7 +501,7 @@ 
             $activeBlockNo = $nextBlockNo;

             $nextBlockNo += 1;

             continue; }}

-      $btr =& $this->blockTab[$activeBlockNo];

+      $btr = & $this->blockTab[$activeBlockNo];

       if ($varRefTPos < $btr['tPosBegin'])

          $this->programLogicError(1);

       $blockVarNo = $btr['blockVarCnt']++;

@@ -523,10 +523,10 @@ 
 * @access public

 */

 function reset() {

-   for ($varNo=0; $varNo<$this->varTabCnt; $varNo++)

+   for ($varNo = 0; $varNo < $this->varTabCnt; $varNo++)

       $this->varTab[$varNo]['varValue'] = '';

-   for ($blockNo=0; $blockNo<$this->blockTabCnt; $blockNo++) {

-      $btr =& $this->blockTab[$blockNo];

+   for ($blockNo = 0; $blockNo < $this->blockTabCnt; $blockNo++) {

+      $btr = & $this->blockTab[$blockNo];

       $btr['instances'] = 0;

       $btr['firstBlockInstNo'] = -1;

       $btr['lastBlockInstNo'] = -1; }

@@ -548,11 +548,11 @@ 
 *    $isOptional is false).

 * @access public

 */

-function setVariable ($variableName, $variableValue, $isOptional=false) {

-   if (!$this->templateValid) {$this->triggerError ("Template not valid."); return false; }

-   if (!$this->lookupVariableName($variableName,$varNo)) {

+function setVariable($variableName, $variableValue, $isOptional = false) {

+   if (!$this->templateValid) {$this->triggerError("Template not valid."); return false; }

+   if (!$this->lookupVariableName($variableName, $varNo)) {

       if ($isOptional) return true;

-      $this->triggerError ("Variable \"$variableName\" not defined in template.");

+      $this->triggerError("Variable \"$variableName\" not defined in template.");

       return false; }

    $this->varTab[$varNo]['varValue'] = $variableValue;

    return true; }

@@ -575,8 +575,8 @@ 
 *    $isOptional is false).

 * @access public

 */

-function setVariableEsc ($variableName, $variableValue, $isOptional=false) {

-   return $this->setVariable($variableName,htmlspecialchars($variableValue,ENT_QUOTES),$isOptional); }

+function setVariableEsc($variableName, $variableValue, $isOptional = false) {

+   return $this->setVariable($variableName, htmlspecialchars($variableValue, ENT_QUOTES), $isOptional); }

 

 /**

 * Checks whether a variable with the specified name exists within the template.

@@ -585,9 +585,9 @@ 
 *    variable with the specified name exists in the template.

 * @access public

 */

-function variableExists ($variableName) {

-   if (!$this->templateValid) {$this->triggerError ("Template not valid."); return false; }

-   return $this->lookupVariableName($variableName,$varNo); }

+function variableExists($variableName) {

+   if (!$this->templateValid) {$this->triggerError("Template not valid."); return false; }

+   return $this->lookupVariableName($variableName, $varNo); }

 

 /**

 * Adds an instance of a template block.

@@ -603,9 +603,9 @@ 
 * @access public

 */

 function addBlock($blockName) {

-   if (!$this->templateValid) {$this->triggerError ("Template not valid."); return false; }

-   if (!$this->lookupBlockName($blockName,$blockNo)) {

-      $this->triggerError ("Block \"$blockName\" not defined in template.");

+   if (!$this->templateValid) {$this->triggerError("Template not valid."); return false; }

+   if (!$this->lookupBlockName($blockName, $blockNo)) {

+      $this->triggerError("Block \"$blockName\" not defined in template.");

       return false; }

    while ($blockNo != -1) {

       $this->addBlockByNo($blockNo);

@@ -615,10 +615,10 @@ 
 /**

 * @access private

 */

-function addBlockByNo ($blockNo) {

-   $btr =& $this->blockTab[$blockNo];

-   $this->registerBlockInstance ($blockInstNo);

-   $bitr =& $this->blockInstTab[$blockInstNo];

+function addBlockByNo($blockNo) {

+   $btr = & $this->blockTab[$blockNo];

+   $this->registerBlockInstance($blockInstNo);

+   $bitr = & $this->blockInstTab[$blockInstNo];

    if ($btr['firstBlockInstNo'] == -1)

       $btr['firstBlockInstNo'] = $blockInstNo;

    if ($btr['lastBlockInstNo'] != -1)

@@ -636,14 +636,14 @@ 
    $bitr['nextBlockInstNo'] = -1;

    $bitr['blockVarTab'] = array();

    // copy instance variables for this block

-   for ($blockVarNo=0; $blockVarNo<$blockVarCnt; $blockVarNo++) {

+   for ($blockVarNo = 0; $blockVarNo < $blockVarCnt; $blockVarNo++) {

       $varNo = $btr['blockVarNoToVarNoMap'][$blockVarNo];

       $bitr['blockVarTab'][$blockVarNo] = $this->varTab[$varNo]['varValue']; }}

 

 /**

 * @access private

 */

-function registerBlockInstance (&$blockInstNo) {

+function registerBlockInstance(&$blockInstNo) {

    $blockInstNo = $this->blockInstTabCnt++; }

 

 /**

@@ -653,9 +653,9 @@ 
 *    block with the specified name exists in the template.

 * @access public

 */

-function blockExists ($blockName) {

-   if (!$this->templateValid) {$this->triggerError ("Template not valid."); return false; }

-   return $this->lookupBlockName($blockName,$blockNo); }

+function blockExists($blockName) {

+   if (!$this->templateValid) {$this->triggerError("Template not valid."); return false; }

+   return $this->lookupBlockName($blockName, $blockNo); }

 

 //--- output generation ---------------------------------------------------------------------------------------------

 

@@ -664,7 +664,7 @@ 
 * @return boolean  true on success, false on error.

 * @access public

 */

-function generateOutput () {

+function generateOutput() {

    $this->outputMode = 0;

    if (!$this->generateOutputPage()) return false;

    return true; }

@@ -675,13 +675,13 @@ 
 * @return boolean  true on success, false on error.

 * @access public

 */

-function generateOutputToFile ($fileName) {

-   $fh = fopen($fileName,"wb");

+function generateOutputToFile($fileName) {

+   $fh = fopen($fileName, "wb");

    if ($fh === false) return false;

    $this->outputMode = 1;

    $this->outputFileHandle = $fh;

    $ok = $this->generateOutputPage();

-   fclose ($fh);

+   fclose($fh);

    return $ok; }

 

 /**

@@ -691,7 +691,7 @@ 
 * @return boolean  true on success, false on error.

 * @access public

 */

-function generateOutputToString (&$outputString) {

+function generateOutputToString(&$outputString) {

    $outputString = "Error";

    $this->outputMode = 2;

    $this->outputString = "";

@@ -704,14 +704,14 @@ 
 * @return boolean  true on success, false on error.

 */

 function generateOutputPage() {

-   if (!$this->templateValid) {$this->triggerError ("Template not valid."); return false; }

+   if (!$this->templateValid) {$this->triggerError("Template not valid."); return false; }

    if ($this->blockTab[0]['instances'] == 0)

-      $this->addBlockByNo (0);        // add main block

-   for ($blockNo=0; $blockNo < $this->blockTabCnt; $blockNo++) {

-       $btr =& $this->blockTab[$blockNo];

+      $this->addBlockByNo(0); // add main block

+   for ($blockNo = 0; $blockNo < $this->blockTabCnt; $blockNo++) {

+       $btr = & $this->blockTab[$blockNo];

        $btr['currBlockInstNo'] = $btr['firstBlockInstNo']; }

    $this->outputError = false;

-   $this->writeBlockInstances (0, -1);

+   $this->writeBlockInstances(0, -1);

    if ($this->outputError) return false;

    return true; }

 

@@ -721,33 +721,33 @@ 
 * Called recursively.

 * @access private

 */

-function writeBlockInstances ($blockNo, $parentInstLevel) {

-   $btr =& $this->blockTab[$blockNo];

+function writeBlockInstances($blockNo, $parentInstLevel) {

+   $btr = & $this->blockTab[$blockNo];

    while (!$this->outputError) {

       $blockInstNo = $btr['currBlockInstNo'];

       if ($blockInstNo == -1) break;

-      $bitr =& $this->blockInstTab[$blockInstNo];

+      $bitr = & $this->blockInstTab[$blockInstNo];

       if ($bitr['parentInstLevel'] < $parentInstLevel)

-         $this->programLogicError (2);

+         $this->programLogicError(2);

       if ($bitr['parentInstLevel'] > $parentInstLevel) break;

-      $this->writeBlockInstance ($blockInstNo);

+      $this->writeBlockInstance($blockInstNo);

       $btr['currBlockInstNo'] = $bitr['nextBlockInstNo']; }}

 

 /**

 * @access private

 */

 function writeBlockInstance($blockInstNo) {

-   $bitr =& $this->blockInstTab[$blockInstNo];

+   $bitr = & $this->blockInstTab[$blockInstNo];

    $blockNo = $bitr['blockNo'];

-   $btr =& $this->blockTab[$blockNo];

+   $btr = & $this->blockTab[$blockNo];

    $tPos = $btr['tPosContentsBegin'];

    $subBlockNo = $blockNo + 1;

    $varRefNo = $btr['firstVarRefNo'];

    while (!$this->outputError) {

       $tPos2 = $btr['tPosContentsEnd'];

-      $kind = 0;                                // assume end-of-block

+      $kind = 0; // assume end-of-block

       if ($varRefNo != -1 && $varRefNo < $this->varRefTabCnt) {  // check for variable reference

-         $vrtr =& $this->varRefTab[$varRefNo];

+         $vrtr = & $this->varRefTab[$varRefNo];

          if ($vrtr['tPosBegin'] < $tPos) {

             $varRefNo += 1;

             continue; }

@@ -755,7 +755,7 @@ 
             $tPos2 = $vrtr['tPosBegin'];

             $kind = 1; }}

       if ($subBlockNo < $this->blockTabCnt) {   // check for subblock

-         $subBtr =& $this->blockTab[$subBlockNo];

+         $subBtr = & $this->blockTab[$subBlockNo];

          if ($subBtr['tPosBegin'] < $tPos) {

             $subBlockNo += 1;

             continue; }

@@ -763,24 +763,24 @@ 
             $tPos2 = $subBtr['tPosBegin'];

             $kind = 2; }}

       if ($tPos2 > $tPos)

-         $this->writeString (substr($this->template,$tPos,$tPos2-$tPos));

+         $this->writeString(substr($this->template, $tPos, $tPos2 - $tPos));

       switch ($kind) {

          case 0:         // end of block

             return;

          case 1:         // variable

-            $vrtr =& $this->varRefTab[$varRefNo];

+            $vrtr = & $this->varRefTab[$varRefNo];

             if ($vrtr['blockNo'] != $blockNo)

-               $this->programLogicError (4);

+               $this->programLogicError(4);

             $variableValue = $bitr['blockVarTab'][$vrtr['blockVarNo']];

-            $this->writeString ($variableValue);

+            $this->writeString($variableValue);

             $tPos = $vrtr['tPosEnd'];

             $varRefNo += 1;

             break;

          case 2:         // sub block

-            $subBtr =& $this->blockTab[$subBlockNo];

+            $subBtr = & $this->blockTab[$subBlockNo];

             if ($subBtr['parentBlockNo'] != $blockNo)

-               $this->programLogicError (3);

-            $this->writeBlockInstances ($subBlockNo, $bitr['instanceLevel']);  // recursive call

+               $this->programLogicError(3);

+            $this->writeBlockInstances($subBlockNo, $bitr['instanceLevel']); // recursive call

             $tPos = $subBtr['tPosEnd'];

             $subBlockNo += 1;

             break; }}}

@@ -788,7 +788,7 @@ 
 /**

 * @access private

 */

-function writeString ($s) {

+function writeString($s) {

    if ($this->outputError) return;

    switch ($this->outputMode) {

       case 0:            // output to PHP output stream

@@ -810,8 +810,8 @@ 
 * @return boolean  true on success, false if the variable is not found.

 * @access private

 */

-function lookupVariableName ($varName, &$varNo) {

-   $x =& $this->varNameToNoMap[strtoupper($varName)];

+function lookupVariableName($varName, &$varNo) {

+   $x = & $this->varNameToNoMap[strtoupper($varName)];

    if (!isset($x)) return false;

    $varNo = $x;

    return true; }

@@ -823,8 +823,8 @@ 
 * @return boolean  true on success, false when the block is not found.

 * @access private

 */

-function lookupBlockName ($blockName, &$blockNo) {

-   $x =& $this->blockNameToNoMap[strtoupper($blockName)];

+function lookupBlockName($blockName, &$blockNo) {

+   $x = & $this->blockNameToNoMap[strtoupper($blockName)];

    if (!isset($x)) return false;

    $blockNo = $x;

    return true; }

@@ -836,17 +836,17 @@ 
 * @return boolean  true on success, false on error.

 * @access private

 */

-function readFileIntoString ($fileName, &$s) {

-   if (function_exists('version_compare') && version_compare(phpversion(),"4.3.0",">=")) {

+function readFileIntoString($fileName, &$s) {

+   if (function_exists('version_compare') && version_compare(phpversion(), "4.3.0", ">=")) {

       $s = file_get_contents($fileName);

       if ($s === false) return false;

       return true; }

-   $fh = fopen($fileName,"rb");

+   $fh = fopen($fileName, "rb");

    if ($fh === false) return false;

    $fileSize = filesize($fileName);

-   if ($fileSize === false) {fclose ($fh); return false; }

-   $s = fread($fh,$fileSize);

-   fclose ($fh);

+   if ($fileSize === false) {fclose($fh); return false; }

+   $s = fread($fh, $fileSize);

+   fclose($fh);

    if (strlen($s) != $fileSize) return false;

    return true; }

 

@@ -854,7 +854,7 @@ 
 * @access private

 * @return boolean  true on success, false when the end of the string is reached.

 */

-function parseWord ($s, &$p, &$w) {

+function parseWord($s, &$p, &$w) {

    $sLen = strlen($s);

    while ($p < $sLen && ord($s{$p}) <= 32) $p++;

    if ($p >= $sLen) return false;

@@ -867,11 +867,11 @@ 
 * @access private

 * @return boolean  true on success, false on error.

 */

-function parseQuotedString ($s, &$p, &$w) {

+function parseQuotedString($s, &$p, &$w) {

    $sLen = strlen($s);

    while ($p < $sLen && ord($s{$p}) <= 32) $p++;

    if ($p >= $sLen) return false;

-   if (substr($s,$p,1) != '"') return false;

+   if (substr($s, $p, 1) != '"') return false;

    $p++; $p0 = $p;

    while ($p < $sLen && $s{$p} != '"') $p++;

    if ($p >= $sLen) return false;

@@ -883,39 +883,39 @@ 
 * @access private

 * @return boolean  true on success, false on error.

 */

-function parseWordOrQuotedString ($s, &$p, &$w) {

+function parseWordOrQuotedString($s, &$p, &$w) {

    $sLen = strlen($s);

    while ($p < $sLen && ord($s{$p}) <= 32) $p++;

    if ($p >= $sLen) return false;

-   if (substr($s,$p,1) == '"')

-      return $this->parseQuotedString($s,$p,$w);

+   if (substr($s, $p, 1) == '"')

+      return $this->parseQuotedString($s, $p, $w);

     else

-      return $this->parseWord($s,$p,$w); }

+      return $this->parseWord($s, $p, $w); }

 

 /**

 * Combine two file system paths.

 * @access private

 */

-function combineFileSystemPath ($path1, $path2) {

+function combineFileSystemPath($path1, $path2) {

    if ($path1 == '' || $path2 == '') return $path2;

    $s = $path1;

-   if (substr($s,-1) != '\\' && substr($s,-1) != '/') $s = $s . "/";

-   if (substr($path2,0,1) == '\\' || substr($path2,0,1) == '/')

-      $s = $s . substr($path2,1);

+   if (substr($s, -1) != '\\' && substr($s, -1) != '/') $s = $s."/";

+   if (substr($path2, 0, 1) == '\\' || substr($path2, 0, 1) == '/')

+      $s = $s.substr($path2, 1);

     else

-      $s = $s . $path2;

+      $s = $s.$path2;

    return $s; }

 

 /**

 * @access private

 */

-function triggerError ($msg) {

-   trigger_error ("MiniTemplator error: $msg", E_USER_ERROR); }

+function triggerError($msg) {

+   trigger_error("MiniTemplator error: $msg", E_USER_ERROR); }

 

 /**

 * @access private

 */

-function programLogicError ($errorId) {

+function programLogicError($errorId) {

    die ("MiniTemplator: Program logic error $errorId.\n"); }

 

 }

Indentation +383 added lines, -383 removed lines

@@ -161,7 +161,7 @@ 
 * @access public

 */

 function __construct() {

-   $this->templateValid = false; }

+    $this->templateValid = false; }

 

 //--- template string handling --------------------------------------------------------------------------------------

 

@@ -172,11 +172,11 @@ 
 * @access public

 */

 function readTemplateFromFile ($fileName) {

-   if (!$this->readFileIntoString($fileName,$s)) {

-      $this->triggerError ("Error while reading template file " . $fileName . ".");

-      return false; }

-   if (!$this->setTemplateString($s)) return false;

-   return true; }

+    if (!$this->readFileIntoString($fileName,$s)) {

+        $this->triggerError ("Error while reading template file " . $fileName . ".");

+        return false; }

+    if (!$this->setTemplateString($s)) return false;

+    return true; }

 

 /**

 * Assigns a new template string.

@@ -185,12 +185,12 @@ 
 * @access public

 */

 function setTemplateString ($templateString) {

-   $this->templateValid = false;

-   $this->template = $templateString;

-   if (!$this->parseTemplate()) return false;

-   $this->reset();

-   $this->templateValid = true;

-   return true; }

+    $this->templateValid = false;

+    $this->template = $templateString;

+    if (!$this->parseTemplate()) return false;

+    $this->reset();

+    $this->templateValid = true;

+    return true; }

 

 /**

 * Loads the template string for a subtemplate (used for the $Include command).

@@ -198,11 +198,11 @@ 
 * @access private

 */

 function loadSubtemplate ($subtemplateName, &$s) {

-   $subtemplateFileName = $this->combineFileSystemPath($this->subtemplateBasePath,$subtemplateName);

-   if (!$this->readFileIntoString($subtemplateFileName,$s)) {

-      $this->triggerError ("Error while reading subtemplate file " . $subtemplateFileName . ".");

-      return false; }

-   return true; }

+    $subtemplateFileName = $this->combineFileSystemPath($this->subtemplateBasePath,$subtemplateName);

+    if (!$this->readFileIntoString($subtemplateFileName,$s)) {

+        $this->triggerError ("Error while reading subtemplate file " . $subtemplateFileName . ".");

+        return false; }

+    return true; }

 

 //--- template parsing ----------------------------------------------------------------------------------------------

 

@@ -212,28 +212,28 @@ 
 * @access private

 */

 function parseTemplate() {

-   $this->initParsing();

-   $this->beginMainBlock();

-   if (!$this->parseTemplateCommands()) return false;

-   $this->endMainBlock();

-   if (!$this->checkBlockDefinitionsComplete()) return false;

-   if (!$this->parseTemplateVariables()) return false;

-   $this->associateVariablesWithBlocks();

-   return true; }

+    $this->initParsing();

+    $this->beginMainBlock();

+    if (!$this->parseTemplateCommands()) return false;

+    $this->endMainBlock();

+    if (!$this->checkBlockDefinitionsComplete()) return false;

+    if (!$this->parseTemplateVariables()) return false;

+    $this->associateVariablesWithBlocks();

+    return true; }

 

 /**

 * @access private

 */

 function initParsing() {

-   $this->varTab = array();

-   $this->varTabCnt = 0;

-   $this->varNameToNoMap = array();

-   $this->varRefTab = array();

-   $this->varRefTabCnt = 0;

-   $this->blockTab = array();

-   $this->blockTabCnt = 0;

-   $this->blockNameToNoMap = array();

-   $this->openBlocksTab = array(); }

+    $this->varTab = array();

+    $this->varTabCnt = 0;

+    $this->varNameToNoMap = array();

+    $this->varRefTab = array();

+    $this->varRefTabCnt = 0;

+    $this->blockTab = array();

+    $this->blockTabCnt = 0;

+    $this->blockNameToNoMap = array();

+    $this->openBlocksTab = array(); }

 

 /**

 * Registers the main block.

@@ -241,27 +241,27 @@ 
 * @access private

 */

 function beginMainBlock() {

-   $blockNo = 0;

-   $this->registerBlock('@@InternalMainBlock@@', $blockNo);

-   $bte =& $this->blockTab[$blockNo];

-   $bte['tPosBegin'] = 0;

-   $bte['tPosContentsBegin'] = 0;

-   $bte['nestingLevel'] = 0;

-   $bte['parentBlockNo'] = -1;

-   $bte['definitionIsOpen'] = true;

-   $this->openBlocksTab[0] = $blockNo;

-   $this->currentNestingLevel = 1; }

+    $blockNo = 0;

+    $this->registerBlock('@@InternalMainBlock@@', $blockNo);

+    $bte =& $this->blockTab[$blockNo];

+    $bte['tPosBegin'] = 0;

+    $bte['tPosContentsBegin'] = 0;

+    $bte['nestingLevel'] = 0;

+    $bte['parentBlockNo'] = -1;

+    $bte['definitionIsOpen'] = true;

+    $this->openBlocksTab[0] = $blockNo;

+    $this->currentNestingLevel = 1; }

 

 /**

 * Completes the main block registration.

 * @access private

 */

 function endMainBlock() {

-   $bte =& $this->blockTab[0];

-   $bte['tPosContentsEnd'] = strlen($this->template);

-   $bte['tPosEnd'] = strlen($this->template);

-   $bte['definitionIsOpen'] = false;

-   $this->currentNestingLevel -= 1; }

+    $bte =& $this->blockTab[0];

+    $bte['tPosContentsEnd'] = strlen($this->template);

+    $bte['tPosEnd'] = strlen($this->template);

+    $bte['definitionIsOpen'] = false;

+    $this->currentNestingLevel -= 1; }

 

 /**

 * Parses commands within the template in the format "<!-- $command parameters -->".

@@ -269,46 +269,46 @@ 
 * @access private

 */

 function parseTemplateCommands() {

-   $p = 0;

-   while (true) {

-      $p0 = strpos($this->template,'<!--',$p);

-      if ($p0 === false) break;

-      $p = strpos($this->template,'-->',$p0);

-      if ($p === false) {

-         $this->triggerError ("Invalid HTML comment in template at offset $p0.");

-         return false; }

-      $p += 3;

-      $cmdL = substr($this->template,$p0+4,$p-$p0-7);

-      if (!$this->processTemplateCommand($cmdL,$p0,$p,$resumeFromStart))

-         return false;

-      if ($resumeFromStart) $p = $p0; }

-   return true; }

+    $p = 0;

+    while (true) {

+        $p0 = strpos($this->template,'<!--',$p);

+        if ($p0 === false) break;

+        $p = strpos($this->template,'-->',$p0);

+        if ($p === false) {

+            $this->triggerError ("Invalid HTML comment in template at offset $p0.");

+            return false; }

+        $p += 3;

+        $cmdL = substr($this->template,$p0+4,$p-$p0-7);

+        if (!$this->processTemplateCommand($cmdL,$p0,$p,$resumeFromStart))

+            return false;

+        if ($resumeFromStart) $p = $p0; }

+    return true; }

 

 /**

 * @return boolean  true on success, false on error.

 * @access private

 */

 function processTemplateCommand ($cmdL, $cmdTPosBegin, $cmdTPosEnd, &$resumeFromStart) {

-   $resumeFromStart = false;

-   $p = 0;

-   $cmd = '';

-   if (!$this->parseWord($cmdL,$p,$cmd)) return true;

-   $parms = substr($cmdL,$p);

-   switch (strtoupper($cmd)) {

-      case '$BEGINBLOCK':

+    $resumeFromStart = false;

+    $p = 0;

+    $cmd = '';

+    if (!$this->parseWord($cmdL,$p,$cmd)) return true;

+    $parms = substr($cmdL,$p);

+    switch (strtoupper($cmd)) {

+        case '$BEGINBLOCK':

          if (!$this->processBeginBlockCmd($parms,$cmdTPosBegin,$cmdTPosEnd))

             return false;

-         break;

-      case '$ENDBLOCK':

+            break;

+        case '$ENDBLOCK':

          if (!$this->processEndBlockCmd($parms,$cmdTPosBegin,$cmdTPosEnd))

             return false;

-         break;

-      case '$INCLUDE':

+            break;

+        case '$INCLUDE':

          if (!$this->processincludeCmd($parms,$cmdTPosBegin,$cmdTPosEnd))

             return false;

-         $resumeFromStart = true;

-         break;

-      default:

+            $resumeFromStart = true;

+            break;

+        default:

          if ($cmd{0} == '$' && !(strlen($cmd) >= 2 && $cmd{1} == '{')) {

             $this->triggerError ("Unknown command \"$cmd\" in template at offset $cmdTPosBegin.");

             return false; }}

@@ -320,25 +320,25 @@ 
 * @access private

 */

 function processBeginBlockCmd ($parms, $cmdTPosBegin, $cmdTPosEnd) {

-   $p = 0;

-   if (!$this->parseWord($parms,$p,$blockName)) {

-      $this->triggerError ("Missing block name in \$BeginBlock command in template at offset $cmdTPosBegin.");

-      return false; }

-   if (trim(substr($parms,$p)) != '') {

-      $this->triggerError ("Extra parameter in \$BeginBlock command in template at offset $cmdTPosBegin.");

-      return false; }

-   $this->registerBlock ($blockName, $blockNo);

-   $btr =& $this->blockTab[$blockNo];

-   $btr['tPosBegin'] = $cmdTPosBegin;

-   $btr['tPosContentsBegin'] = $cmdTPosEnd;

-   $btr['nestingLevel'] = $this->currentNestingLevel;

-   $btr['parentBlockNo'] = $this->openBlocksTab[$this->currentNestingLevel-1];

-   $this->openBlocksTab[$this->currentNestingLevel] = $blockNo;

-   $this->currentNestingLevel += 1;

-   if ($this->currentNestingLevel > $this->maxNestingLevel) {

-      $this->triggerError ("Block nesting overflow in template at offset $cmdTPosBegin.");

-      return false; }

-   return true; }

+    $p = 0;

+    if (!$this->parseWord($parms,$p,$blockName)) {

+        $this->triggerError ("Missing block name in \$BeginBlock command in template at offset $cmdTPosBegin.");

+        return false; }

+    if (trim(substr($parms,$p)) != '') {

+        $this->triggerError ("Extra parameter in \$BeginBlock command in template at offset $cmdTPosBegin.");

+        return false; }

+    $this->registerBlock ($blockName, $blockNo);

+    $btr =& $this->blockTab[$blockNo];

+    $btr['tPosBegin'] = $cmdTPosBegin;

+    $btr['tPosContentsBegin'] = $cmdTPosEnd;

+    $btr['nestingLevel'] = $this->currentNestingLevel;

+    $btr['parentBlockNo'] = $this->openBlocksTab[$this->currentNestingLevel-1];

+    $this->openBlocksTab[$this->currentNestingLevel] = $blockNo;

+    $this->currentNestingLevel += 1;

+    if ($this->currentNestingLevel > $this->maxNestingLevel) {

+        $this->triggerError ("Block nesting overflow in template at offset $cmdTPosBegin.");

+        return false; }

+    return true; }

 

 /**

 * Processes the $EndBlock command.

@@ -346,47 +346,47 @@ 
 * @access private

 */

 function processEndBlockCmd ($parms, $cmdTPosBegin, $cmdTPosEnd) {

-   $p = 0;

-   if (!$this->parseWord($parms,$p,$blockName)) {

-      $this->triggerError ("Missing block name in \$EndBlock command in template at offset $cmdTPosBegin.");

-      return false; }

-   if (trim(substr($parms,$p)) != '') {

-      $this->triggerError ("Extra parameter in \$EndBlock command in template at offset $cmdTPosBegin.");

-      return false; }

-   if (!$this->lookupBlockName($blockName,$blockNo)) {

-      $this->triggerError ("Undefined block name \"$blockName\" in \$EndBlock command in template at offset $cmdTPosBegin.");

-      return false; }

-   $this->currentNestingLevel -= 1;

-   $btr =& $this->blockTab[$blockNo];

-   if (!$btr['definitionIsOpen']) {

-      $this->triggerError ("Multiple \$EndBlock command for block \"$blockName\" in template at offset $cmdTPosBegin.");

-      return false; }

-   if ($btr['nestingLevel'] != $this->currentNestingLevel) {

-      $this->triggerError ("Block nesting level mismatch at \$EndBlock command for block \"$blockName\" in template at offset $cmdTPosBegin.");

-      return false; }

-   $btr['tPosContentsEnd'] = $cmdTPosBegin;

-   $btr['tPosEnd'] = $cmdTPosEnd;

-   $btr['definitionIsOpen'] = false;

-   return true; }

+    $p = 0;

+    if (!$this->parseWord($parms,$p,$blockName)) {

+        $this->triggerError ("Missing block name in \$EndBlock command in template at offset $cmdTPosBegin.");

+        return false; }

+    if (trim(substr($parms,$p)) != '') {

+        $this->triggerError ("Extra parameter in \$EndBlock command in template at offset $cmdTPosBegin.");

+        return false; }

+    if (!$this->lookupBlockName($blockName,$blockNo)) {

+        $this->triggerError ("Undefined block name \"$blockName\" in \$EndBlock command in template at offset $cmdTPosBegin.");

+        return false; }

+    $this->currentNestingLevel -= 1;

+    $btr =& $this->blockTab[$blockNo];

+    if (!$btr['definitionIsOpen']) {

+        $this->triggerError ("Multiple \$EndBlock command for block \"$blockName\" in template at offset $cmdTPosBegin.");

+        return false; }

+    if ($btr['nestingLevel'] != $this->currentNestingLevel) {

+        $this->triggerError ("Block nesting level mismatch at \$EndBlock command for block \"$blockName\" in template at offset $cmdTPosBegin.");

+        return false; }

+    $btr['tPosContentsEnd'] = $cmdTPosBegin;

+    $btr['tPosEnd'] = $cmdTPosEnd;

+    $btr['definitionIsOpen'] = false;

+    return true; }

 

 /**

 * @access private

 */

 function registerBlock($blockName, &$blockNo) {

-   $blockNo = $this->blockTabCnt++;

-   $btr =& $this->blockTab[$blockNo];

-   $btr = array();

-   $btr['blockName'] = $blockName;

-   if (!$this->lookupBlockName($blockName,$btr['nextWithSameName']))

-      $btr['nextWithSameName'] = -1;

-   $btr['definitionIsOpen'] = true;

-   $btr['instances'] = 0;

-   $btr['firstBlockInstNo'] = -1;

-   $btr['lastBlockInstNo'] = -1;

-   $btr['blockVarCnt'] = 0;

-   $btr['firstVarRefNo'] = -1;

-   $btr['blockVarNoToVarNoMap'] = array();

-   $this->blockNameToNoMap[strtoupper($blockName)] = $blockNo; }

+    $blockNo = $this->blockTabCnt++;

+    $btr =& $this->blockTab[$blockNo];

+    $btr = array();

+    $btr['blockName'] = $blockName;

+    if (!$this->lookupBlockName($blockName,$btr['nextWithSameName']))

+        $btr['nextWithSameName'] = -1;

+    $btr['definitionIsOpen'] = true;

+    $btr['instances'] = 0;

+    $btr['firstBlockInstNo'] = -1;

+    $btr['lastBlockInstNo'] = -1;

+    $btr['blockVarCnt'] = 0;

+    $btr['firstVarRefNo'] = -1;

+    $btr['blockVarNoToVarNoMap'] = array();

+    $this->blockNameToNoMap[strtoupper($blockName)] = $blockNo; }

 

 /**

 * Checks that all block definitions are closed.

@@ -394,15 +394,15 @@ 
 * @access private

 */

 function checkBlockDefinitionsComplete() {

-   for ($blockNo=0; $blockNo < $this->blockTabCnt; $blockNo++) {

-      $btr =& $this->blockTab[$blockNo];

-      if ($btr['definitionIsOpen']) {

-         $this->triggerError ("Missing \$EndBlock command in template for block " . $btr['blockName'] . ".");

-         return false; }}

-   if ($this->currentNestingLevel != 0) {

-      $this->triggerError ("Block nesting level error at end of template.");

-      return false; }

-   return true; }

+    for ($blockNo=0; $blockNo < $this->blockTabCnt; $blockNo++) {

+        $btr =& $this->blockTab[$blockNo];

+        if ($btr['definitionIsOpen']) {

+            $this->triggerError ("Missing \$EndBlock command in template for block " . $btr['blockName'] . ".");

+            return false; }}

+    if ($this->currentNestingLevel != 0) {

+        $this->triggerError ("Block nesting level error at end of template.");

+        return false; }

+    return true; }

 

 /**

 * Processes the $Include command.

@@ -410,14 +410,14 @@ 
 * @access private

 */

 function processIncludeCmd ($parms, $cmdTPosBegin, $cmdTPosEnd) {

-   $p = 0;

-   if (!$this->parseWordOrQuotedString($parms,$p,$subtemplateName)) {

-      $this->triggerError ("Missing or invalid subtemplate name in \$Include command in template at offset $cmdTPosBegin.");

-      return false; }

-   if (trim(substr($parms,$p)) != '') {

-      $this->triggerError ("Extra parameter in \$include command in template at offset $cmdTPosBegin.");

-      return false; }

-   return $this->insertSubtemplate($subtemplateName,$cmdTPosBegin,$cmdTPosEnd); }

+    $p = 0;

+    if (!$this->parseWordOrQuotedString($parms,$p,$subtemplateName)) {

+        $this->triggerError ("Missing or invalid subtemplate name in \$Include command in template at offset $cmdTPosBegin.");

+        return false; }

+    if (trim(substr($parms,$p)) != '') {

+        $this->triggerError ("Extra parameter in \$include command in template at offset $cmdTPosBegin.");

+        return false; }

+    return $this->insertSubtemplate($subtemplateName,$cmdTPosBegin,$cmdTPosEnd); }

 

 /**

 * Processes the $Include command.

@@ -425,14 +425,14 @@ 
 * @access private

 */

 function insertSubtemplate ($subtemplateName, $tPos1, $tPos2) {

-   if (strlen($this->template) > $this->maxInclTemplateSize) {

-      $this->triggerError ("Subtemplate include aborted because the internal template string is longer than $this->maxInclTemplateSize characters.");

-      return false; }

-   if (!$this->loadSubtemplate($subtemplateName,$subtemplate)) return false;

-   // (Copying the template to insert a subtemplate is a bit slow. In a future implementation of MiniTemplator,

-   // a table could be used that contains references to the string fragments.)

-   $this->template = substr($this->template,0,$tPos1) . $subtemplate . substr($this->template,$tPos2);

-   return true; }

+    if (strlen($this->template) > $this->maxInclTemplateSize) {

+        $this->triggerError ("Subtemplate include aborted because the internal template string is longer than $this->maxInclTemplateSize characters.");

+        return false; }

+    if (!$this->loadSubtemplate($subtemplateName,$subtemplate)) return false;

+    // (Copying the template to insert a subtemplate is a bit slow. In a future implementation of MiniTemplator,

+    // a table could be used that contains references to the string fragments.)

+    $this->template = substr($this->template,0,$tPos1) . $subtemplate . substr($this->template,$tPos2);

+    return true; }

 

 /**

 * Parses variable references within the template in the format "${VarName}".

@@ -440,77 +440,77 @@ 
 * @access private

 */

 function parseTemplateVariables() {

-   $p = 0;

-   while (true) {

-      $p = strpos($this->template, '${', $p);

-      if ($p === false) break;

-      $p0 = $p;

-      $p = strpos($this->template, '}', $p);

-      if ($p === false) {

-         $this->triggerError ("Invalid variable reference in template at offset $p0.");

-         return false; }

-      $p += 1;

-      $varName = trim(substr($this->template, $p0+2, $p-$p0-3));

-      if (strlen($varName) == 0) {

-         $this->triggerError ("Empty variable name in template at offset $p0.");

-         return false; }

-      $this->registerVariableReference ($varName, $p0, $p); }

-   return true; }

+    $p = 0;

+    while (true) {

+        $p = strpos($this->template, '${', $p);

+        if ($p === false) break;

+        $p0 = $p;

+        $p = strpos($this->template, '}', $p);

+        if ($p === false) {

+            $this->triggerError ("Invalid variable reference in template at offset $p0.");

+            return false; }

+        $p += 1;

+        $varName = trim(substr($this->template, $p0+2, $p-$p0-3));

+        if (strlen($varName) == 0) {

+            $this->triggerError ("Empty variable name in template at offset $p0.");

+            return false; }

+        $this->registerVariableReference ($varName, $p0, $p); }

+    return true; }

 

 /**

 * @access private

 */

 function registerVariableReference ($varName, $tPosBegin, $tPosEnd) {

-   if (!$this->lookupVariableName($varName,$varNo))

-      $this->registerVariable($varName,$varNo);

-   $varRefNo = $this->varRefTabCnt++;

-   $vrtr =& $this->varRefTab[$varRefNo];

-   $vrtr = array();

-   $vrtr['tPosBegin'] = $tPosBegin;

-   $vrtr['tPosEnd'] = $tPosEnd;

-   $vrtr['varNo'] = $varNo; }

+    if (!$this->lookupVariableName($varName,$varNo))

+        $this->registerVariable($varName,$varNo);

+    $varRefNo = $this->varRefTabCnt++;

+    $vrtr =& $this->varRefTab[$varRefNo];

+    $vrtr = array();

+    $vrtr['tPosBegin'] = $tPosBegin;

+    $vrtr['tPosEnd'] = $tPosEnd;

+    $vrtr['varNo'] = $varNo; }

 

 /**

 * @access private

 */

 function registerVariable ($varName, &$varNo) {

-   $varNo = $this->varTabCnt++;

-   $vtr =& $this->varTab[$varNo];

-   $vtr = array();

-   $vtr['varName'] = $varName;

-   $vtr['varValue'] = '';

-   $this->varNameToNoMap[strtoupper($varName)] = $varNo; }

+    $varNo = $this->varTabCnt++;

+    $vtr =& $this->varTab[$varNo];

+    $vtr = array();

+    $vtr['varName'] = $varName;

+    $vtr['varValue'] = '';

+    $this->varNameToNoMap[strtoupper($varName)] = $varNo; }

 

 /**

 * Associates variable references with blocks.

 * @access private

 */

 function associateVariablesWithBlocks() {

-   $varRefNo = 0;

-   $activeBlockNo = 0;

-   $nextBlockNo = 1;

-   while ($varRefNo < $this->varRefTabCnt) {

-      $vrtr =& $this->varRefTab[$varRefNo];

-      $varRefTPos = $vrtr['tPosBegin'];

-      $varNo = $vrtr['varNo'];

-      if ($varRefTPos >= $this->blockTab[$activeBlockNo]['tPosEnd']) {

-         $activeBlockNo = $this->blockTab[$activeBlockNo]['parentBlockNo'];

-         continue; }

-      if ($nextBlockNo < $this->blockTabCnt) {

-         if ($varRefTPos >= $this->blockTab[$nextBlockNo]['tPosBegin']) {

+    $varRefNo = 0;

+    $activeBlockNo = 0;

+    $nextBlockNo = 1;

+    while ($varRefNo < $this->varRefTabCnt) {

+        $vrtr =& $this->varRefTab[$varRefNo];

+        $varRefTPos = $vrtr['tPosBegin'];

+        $varNo = $vrtr['varNo'];

+        if ($varRefTPos >= $this->blockTab[$activeBlockNo]['tPosEnd']) {

+            $activeBlockNo = $this->blockTab[$activeBlockNo]['parentBlockNo'];

+            continue; }

+        if ($nextBlockNo < $this->blockTabCnt) {

+            if ($varRefTPos >= $this->blockTab[$nextBlockNo]['tPosBegin']) {

             $activeBlockNo = $nextBlockNo;

             $nextBlockNo += 1;

             continue; }}

-      $btr =& $this->blockTab[$activeBlockNo];

-      if ($varRefTPos < $btr['tPosBegin'])

-         $this->programLogicError(1);

-      $blockVarNo = $btr['blockVarCnt']++;

-      $btr['blockVarNoToVarNoMap'][$blockVarNo] = $varNo;

-      if ($btr['firstVarRefNo'] == -1)

-         $btr['firstVarRefNo'] = $varRefNo;

-      $vrtr['blockNo'] = $activeBlockNo;

-      $vrtr['blockVarNo'] = $blockVarNo;

-      $varRefNo += 1; }}

+        $btr =& $this->blockTab[$activeBlockNo];

+        if ($varRefTPos < $btr['tPosBegin'])

+            $this->programLogicError(1);

+        $blockVarNo = $btr['blockVarCnt']++;

+        $btr['blockVarNoToVarNoMap'][$blockVarNo] = $varNo;

+        if ($btr['firstVarRefNo'] == -1)

+            $btr['firstVarRefNo'] = $varRefNo;

+        $vrtr['blockNo'] = $activeBlockNo;

+        $vrtr['blockVarNo'] = $blockVarNo;

+        $varRefNo += 1; }}

 

 //--- build up (template variables and blocks) ----------------------------------------------------------------------

 

@@ -523,15 +523,15 @@ 
 * @access public

 */

 function reset() {

-   for ($varNo=0; $varNo<$this->varTabCnt; $varNo++)

-      $this->varTab[$varNo]['varValue'] = '';

-   for ($blockNo=0; $blockNo<$this->blockTabCnt; $blockNo++) {

-      $btr =& $this->blockTab[$blockNo];

-      $btr['instances'] = 0;

-      $btr['firstBlockInstNo'] = -1;

-      $btr['lastBlockInstNo'] = -1; }

-   $this->blockInstTab = array();

-   $this->blockInstTabCnt = 0; }

+    for ($varNo=0; $varNo<$this->varTabCnt; $varNo++)

+        $this->varTab[$varNo]['varValue'] = '';

+    for ($blockNo=0; $blockNo<$this->blockTabCnt; $blockNo++) {

+        $btr =& $this->blockTab[$blockNo];

+        $btr['instances'] = 0;

+        $btr['firstBlockInstNo'] = -1;

+        $btr['lastBlockInstNo'] = -1; }

+    $this->blockInstTab = array();

+    $this->blockInstTabCnt = 0; }

 

 /**

 * Sets a template variable.

@@ -549,13 +549,13 @@ 
 * @access public

 */

 function setVariable ($variableName, $variableValue, $isOptional=false) {

-   if (!$this->templateValid) {$this->triggerError ("Template not valid."); return false; }

-   if (!$this->lookupVariableName($variableName,$varNo)) {

-      if ($isOptional) return true;

-      $this->triggerError ("Variable \"$variableName\" not defined in template.");

-      return false; }

-   $this->varTab[$varNo]['varValue'] = $variableValue;

-   return true; }

+    if (!$this->templateValid) {$this->triggerError ("Template not valid."); return false; }

+    if (!$this->lookupVariableName($variableName,$varNo)) {

+        if ($isOptional) return true;

+        $this->triggerError ("Variable \"$variableName\" not defined in template.");

+        return false; }

+    $this->varTab[$varNo]['varValue'] = $variableValue;

+    return true; }

 

 /**

 * Sets a template variable to an escaped string.

@@ -576,7 +576,7 @@ 
 * @access public

 */

 function setVariableEsc ($variableName, $variableValue, $isOptional=false) {

-   return $this->setVariable($variableName,htmlspecialchars($variableValue,ENT_QUOTES),$isOptional); }

+    return $this->setVariable($variableName,htmlspecialchars($variableValue,ENT_QUOTES),$isOptional); }

 

 /**

 * Checks whether a variable with the specified name exists within the template.

@@ -586,8 +586,8 @@ 
 * @access public

 */

 function variableExists ($variableName) {

-   if (!$this->templateValid) {$this->triggerError ("Template not valid."); return false; }

-   return $this->lookupVariableName($variableName,$varNo); }

+    if (!$this->templateValid) {$this->triggerError ("Template not valid."); return false; }

+    return $this->lookupVariableName($variableName,$varNo); }

 

 /**

 * Adds an instance of a template block.

@@ -603,48 +603,48 @@ 
 * @access public

 */

 function addBlock($blockName) {

-   if (!$this->templateValid) {$this->triggerError ("Template not valid."); return false; }

-   if (!$this->lookupBlockName($blockName,$blockNo)) {

-      $this->triggerError ("Block \"$blockName\" not defined in template.");

-      return false; }

-   while ($blockNo != -1) {

-      $this->addBlockByNo($blockNo);

-      $blockNo = $this->blockTab[$blockNo]['nextWithSameName']; }

-   return true; }

+    if (!$this->templateValid) {$this->triggerError ("Template not valid."); return false; }

+    if (!$this->lookupBlockName($blockName,$blockNo)) {

+        $this->triggerError ("Block \"$blockName\" not defined in template.");

+        return false; }

+    while ($blockNo != -1) {

+        $this->addBlockByNo($blockNo);

+        $blockNo = $this->blockTab[$blockNo]['nextWithSameName']; }

+    return true; }

 

 /**

 * @access private

 */

 function addBlockByNo ($blockNo) {

-   $btr =& $this->blockTab[$blockNo];

-   $this->registerBlockInstance ($blockInstNo);

-   $bitr =& $this->blockInstTab[$blockInstNo];

-   if ($btr['firstBlockInstNo'] == -1)

-      $btr['firstBlockInstNo'] = $blockInstNo;

-   if ($btr['lastBlockInstNo'] != -1)

-      $this->blockInstTab[$btr['lastBlockInstNo']]['nextBlockInstNo'] = $blockInstNo;

-         // set forward pointer of chain

-   $btr['lastBlockInstNo'] = $blockInstNo;

-   $parentBlockNo = $btr['parentBlockNo'];

-   $blockVarCnt = $btr['blockVarCnt'];

-   $bitr['blockNo'] = $blockNo;

-   $bitr['instanceLevel'] = $btr['instances']++;

-   if ($parentBlockNo == -1)

-      $bitr['parentInstLevel'] = -1;

+    $btr =& $this->blockTab[$blockNo];

+    $this->registerBlockInstance ($blockInstNo);

+    $bitr =& $this->blockInstTab[$blockInstNo];

+    if ($btr['firstBlockInstNo'] == -1)

+        $btr['firstBlockInstNo'] = $blockInstNo;

+    if ($btr['lastBlockInstNo'] != -1)

+        $this->blockInstTab[$btr['lastBlockInstNo']]['nextBlockInstNo'] = $blockInstNo;

+            // set forward pointer of chain

+    $btr['lastBlockInstNo'] = $blockInstNo;

+    $parentBlockNo = $btr['parentBlockNo'];

+    $blockVarCnt = $btr['blockVarCnt'];

+    $bitr['blockNo'] = $blockNo;

+    $bitr['instanceLevel'] = $btr['instances']++;

+    if ($parentBlockNo == -1)

+        $bitr['parentInstLevel'] = -1;

     else

-      $bitr['parentInstLevel'] = $this->blockTab[$parentBlockNo]['instances'];

-   $bitr['nextBlockInstNo'] = -1;

-   $bitr['blockVarTab'] = array();

-   // copy instance variables for this block

-   for ($blockVarNo=0; $blockVarNo<$blockVarCnt; $blockVarNo++) {

-      $varNo = $btr['blockVarNoToVarNoMap'][$blockVarNo];

-      $bitr['blockVarTab'][$blockVarNo] = $this->varTab[$varNo]['varValue']; }}

+        $bitr['parentInstLevel'] = $this->blockTab[$parentBlockNo]['instances'];

+    $bitr['nextBlockInstNo'] = -1;

+    $bitr['blockVarTab'] = array();

+    // copy instance variables for this block

+    for ($blockVarNo=0; $blockVarNo<$blockVarCnt; $blockVarNo++) {

+        $varNo = $btr['blockVarNoToVarNoMap'][$blockVarNo];

+        $bitr['blockVarTab'][$blockVarNo] = $this->varTab[$varNo]['varValue']; }}

 

 /**

 * @access private

 */

 function registerBlockInstance (&$blockInstNo) {

-   $blockInstNo = $this->blockInstTabCnt++; }

+    $blockInstNo = $this->blockInstTabCnt++; }

 

 /**

 * Checks whether a block with the specified name exists within the template.

@@ -654,8 +654,8 @@ 
 * @access public

 */

 function blockExists ($blockName) {

-   if (!$this->templateValid) {$this->triggerError ("Template not valid."); return false; }

-   return $this->lookupBlockName($blockName,$blockNo); }

+    if (!$this->templateValid) {$this->triggerError ("Template not valid."); return false; }

+    return $this->lookupBlockName($blockName,$blockNo); }

 

 //--- output generation ---------------------------------------------------------------------------------------------

 

@@ -665,9 +665,9 @@ 
 * @access public

 */

 function generateOutput () {

-   $this->outputMode = 0;

-   if (!$this->generateOutputPage()) return false;

-   return true; }

+    $this->outputMode = 0;

+    if (!$this->generateOutputPage()) return false;

+    return true; }

 

 /**

 * Generates the HTML page and writes it to a file.

@@ -676,13 +676,13 @@ 
 * @access public

 */

 function generateOutputToFile ($fileName) {

-   $fh = fopen($fileName,"wb");

-   if ($fh === false) return false;

-   $this->outputMode = 1;

-   $this->outputFileHandle = $fh;

-   $ok = $this->generateOutputPage();

-   fclose ($fh);

-   return $ok; }

+    $fh = fopen($fileName,"wb");

+    if ($fh === false) return false;

+    $this->outputMode = 1;

+    $this->outputFileHandle = $fh;

+    $ok = $this->generateOutputPage();

+    fclose ($fh);

+    return $ok; }

 

 /**

 * Generates the HTML page and writes it to a string.

@@ -692,28 +692,28 @@ 
 * @access public

 */

 function generateOutputToString (&$outputString) {

-   $outputString = "Error";

-   $this->outputMode = 2;

-   $this->outputString = "";

-   if (!$this->generateOutputPage()) return false;

-   $outputString = $this->outputString;

-   return true; }

+    $outputString = "Error";

+    $this->outputMode = 2;

+    $this->outputString = "";

+    if (!$this->generateOutputPage()) return false;

+    $outputString = $this->outputString;

+    return true; }

 

 /**

 * @access private

 * @return boolean  true on success, false on error.

 */

 function generateOutputPage() {

-   if (!$this->templateValid) {$this->triggerError ("Template not valid."); return false; }

-   if ($this->blockTab[0]['instances'] == 0)

-      $this->addBlockByNo (0);        // add main block

-   for ($blockNo=0; $blockNo < $this->blockTabCnt; $blockNo++) {

-       $btr =& $this->blockTab[$blockNo];

-       $btr['currBlockInstNo'] = $btr['firstBlockInstNo']; }

-   $this->outputError = false;

-   $this->writeBlockInstances (0, -1);

-   if ($this->outputError) return false;

-   return true; }

+    if (!$this->templateValid) {$this->triggerError ("Template not valid."); return false; }

+    if ($this->blockTab[0]['instances'] == 0)

+        $this->addBlockByNo (0);        // add main block

+    for ($blockNo=0; $blockNo < $this->blockTabCnt; $blockNo++) {

+        $btr =& $this->blockTab[$blockNo];

+        $btr['currBlockInstNo'] = $btr['firstBlockInstNo']; }

+    $this->outputError = false;

+    $this->writeBlockInstances (0, -1);

+    if ($this->outputError) return false;

+    return true; }

 

 /**

 * Writes all instances of a block that are contained within a specific

@@ -722,64 +722,64 @@ 
 * @access private

 */

 function writeBlockInstances ($blockNo, $parentInstLevel) {

-   $btr =& $this->blockTab[$blockNo];

-   while (!$this->outputError) {

-      $blockInstNo = $btr['currBlockInstNo'];

-      if ($blockInstNo == -1) break;

-      $bitr =& $this->blockInstTab[$blockInstNo];

-      if ($bitr['parentInstLevel'] < $parentInstLevel)

-         $this->programLogicError (2);

-      if ($bitr['parentInstLevel'] > $parentInstLevel) break;

-      $this->writeBlockInstance ($blockInstNo);

-      $btr['currBlockInstNo'] = $bitr['nextBlockInstNo']; }}

+    $btr =& $this->blockTab[$blockNo];

+    while (!$this->outputError) {

+        $blockInstNo = $btr['currBlockInstNo'];

+        if ($blockInstNo == -1) break;

+        $bitr =& $this->blockInstTab[$blockInstNo];

+        if ($bitr['parentInstLevel'] < $parentInstLevel)

+            $this->programLogicError (2);

+        if ($bitr['parentInstLevel'] > $parentInstLevel) break;

+        $this->writeBlockInstance ($blockInstNo);

+        $btr['currBlockInstNo'] = $bitr['nextBlockInstNo']; }}

 

 /**

 * @access private

 */

 function writeBlockInstance($blockInstNo) {

-   $bitr =& $this->blockInstTab[$blockInstNo];

-   $blockNo = $bitr['blockNo'];

-   $btr =& $this->blockTab[$blockNo];

-   $tPos = $btr['tPosContentsBegin'];

-   $subBlockNo = $blockNo + 1;

-   $varRefNo = $btr['firstVarRefNo'];

-   while (!$this->outputError) {

-      $tPos2 = $btr['tPosContentsEnd'];

-      $kind = 0;                                // assume end-of-block

-      if ($varRefNo != -1 && $varRefNo < $this->varRefTabCnt) {  // check for variable reference

-         $vrtr =& $this->varRefTab[$varRefNo];

-         if ($vrtr['tPosBegin'] < $tPos) {

+    $bitr =& $this->blockInstTab[$blockInstNo];

+    $blockNo = $bitr['blockNo'];

+    $btr =& $this->blockTab[$blockNo];

+    $tPos = $btr['tPosContentsBegin'];

+    $subBlockNo = $blockNo + 1;

+    $varRefNo = $btr['firstVarRefNo'];

+    while (!$this->outputError) {

+        $tPos2 = $btr['tPosContentsEnd'];

+        $kind = 0;                                // assume end-of-block

+        if ($varRefNo != -1 && $varRefNo < $this->varRefTabCnt) {  // check for variable reference

+            $vrtr =& $this->varRefTab[$varRefNo];

+            if ($vrtr['tPosBegin'] < $tPos) {

             $varRefNo += 1;

             continue; }

-         if ($vrtr['tPosBegin'] < $tPos2) {

+            if ($vrtr['tPosBegin'] < $tPos2) {

             $tPos2 = $vrtr['tPosBegin'];

             $kind = 1; }}

-      if ($subBlockNo < $this->blockTabCnt) {   // check for subblock

-         $subBtr =& $this->blockTab[$subBlockNo];

-         if ($subBtr['tPosBegin'] < $tPos) {

+        if ($subBlockNo < $this->blockTabCnt) {   // check for subblock

+            $subBtr =& $this->blockTab[$subBlockNo];

+            if ($subBtr['tPosBegin'] < $tPos) {

             $subBlockNo += 1;

             continue; }

-         if ($subBtr['tPosBegin'] < $tPos2) {

+            if ($subBtr['tPosBegin'] < $tPos2) {

             $tPos2 = $subBtr['tPosBegin'];

             $kind = 2; }}

-      if ($tPos2 > $tPos)

-         $this->writeString (substr($this->template,$tPos,$tPos2-$tPos));

-      switch ($kind) {

-         case 0:         // end of block

+        if ($tPos2 > $tPos)

+            $this->writeString (substr($this->template,$tPos,$tPos2-$tPos));

+        switch ($kind) {

+            case 0:         // end of block

             return;

-         case 1:         // variable

+            case 1:         // variable

             $vrtr =& $this->varRefTab[$varRefNo];

             if ($vrtr['blockNo'] != $blockNo)

-               $this->programLogicError (4);

+                $this->programLogicError (4);

             $variableValue = $bitr['blockVarTab'][$vrtr['blockVarNo']];

             $this->writeString ($variableValue);

             $tPos = $vrtr['tPosEnd'];

             $varRefNo += 1;

             break;

-         case 2:         // sub block

+            case 2:         // sub block

             $subBtr =& $this->blockTab[$subBlockNo];

             if ($subBtr['parentBlockNo'] != $blockNo)

-               $this->programLogicError (3);

+                $this->programLogicError (3);

             $this->writeBlockInstances ($subBlockNo, $bitr['instanceLevel']);  // recursive call

             $tPos = $subBtr['tPosEnd'];

             $subBlockNo += 1;

@@ -789,19 +789,19 @@ 
 * @access private

 */

 function writeString ($s) {

-   if ($this->outputError) return;

-   switch ($this->outputMode) {

-      case 0:            // output to PHP output stream

+    if ($this->outputError) return;

+    switch ($this->outputMode) {

+        case 0:            // output to PHP output stream

          if (!print($s))

             $this->outputError = true;

-         break;

-      case 1:            // output to file

+            break;

+        case 1:            // output to file

          $rc = fwrite($this->outputFileHandle, $s);

-         if ($rc === false) $this->outputError = true;

-         break;

-      case 2:            // output to string

+            if ($rc === false) $this->outputError = true;

+            break;

+        case 2:            // output to string

          $this->outputString .= $s;

-         break; }}

+            break; }}

 

 //--- name lookup routines ------------------------------------------------------------------------------------------

 

@@ -811,10 +811,10 @@ 
 * @access private

 */

 function lookupVariableName ($varName, &$varNo) {

-   $x =& $this->varNameToNoMap[strtoupper($varName)];

-   if (!isset($x)) return false;

-   $varNo = $x;

-   return true; }

+    $x =& $this->varNameToNoMap[strtoupper($varName)];

+    if (!isset($x)) return false;

+    $varNo = $x;

+    return true; }

 

 /**

 * Maps block name to block number.

@@ -824,10 +824,10 @@ 
 * @access private

 */

 function lookupBlockName ($blockName, &$blockNo) {

-   $x =& $this->blockNameToNoMap[strtoupper($blockName)];

-   if (!isset($x)) return false;

-   $blockNo = $x;

-   return true; }

+    $x =& $this->blockNameToNoMap[strtoupper($blockName)];

+    if (!isset($x)) return false;

+    $blockNo = $x;

+    return true; }

 

 //--- general utility routines -----------------------------------------------------------------------------------------

 

@@ -837,86 +837,86 @@ 
 * @access private

 */

 function readFileIntoString ($fileName, &$s) {

-   if (function_exists('version_compare') && version_compare(phpversion(),"4.3.0",">=")) {

-      $s = file_get_contents($fileName);

-      if ($s === false) return false;

-      return true; }

-   $fh = fopen($fileName,"rb");

-   if ($fh === false) return false;

-   $fileSize = filesize($fileName);

-   if ($fileSize === false) {fclose ($fh); return false; }

-   $s = fread($fh,$fileSize);

-   fclose ($fh);

-   if (strlen($s) != $fileSize) return false;

-   return true; }

+    if (function_exists('version_compare') && version_compare(phpversion(),"4.3.0",">=")) {

+        $s = file_get_contents($fileName);

+        if ($s === false) return false;

+        return true; }

+    $fh = fopen($fileName,"rb");

+    if ($fh === false) return false;

+    $fileSize = filesize($fileName);

+    if ($fileSize === false) {fclose ($fh); return false; }

+    $s = fread($fh,$fileSize);

+    fclose ($fh);

+    if (strlen($s) != $fileSize) return false;

+    return true; }

 

 /**

 * @access private

 * @return boolean  true on success, false when the end of the string is reached.

 */

 function parseWord ($s, &$p, &$w) {

-   $sLen = strlen($s);

-   while ($p < $sLen && ord($s{$p}) <= 32) $p++;

-   if ($p >= $sLen) return false;

-   $p0 = $p;

-   while ($p < $sLen && ord($s{$p}) > 32) $p++;

-   $w = substr($s, $p0, $p - $p0);

-   return true; }

+    $sLen = strlen($s);

+    while ($p < $sLen && ord($s{$p}) <= 32) $p++;

+    if ($p >= $sLen) return false;

+    $p0 = $p;

+    while ($p < $sLen && ord($s{$p}) > 32) $p++;

+    $w = substr($s, $p0, $p - $p0);

+    return true; }

 

 /**

 * @access private

 * @return boolean  true on success, false on error.

 */

 function parseQuotedString ($s, &$p, &$w) {

-   $sLen = strlen($s);

-   while ($p < $sLen && ord($s{$p}) <= 32) $p++;

-   if ($p >= $sLen) return false;

-   if (substr($s,$p,1) != '"') return false;

-   $p++; $p0 = $p;

-   while ($p < $sLen && $s{$p} != '"') $p++;

-   if ($p >= $sLen) return false;

-   $w = substr($s, $p0, $p - $p0);

-   $p++;

-   return true; }

+    $sLen = strlen($s);

+    while ($p < $sLen && ord($s{$p}) <= 32) $p++;

+    if ($p >= $sLen) return false;

+    if (substr($s,$p,1) != '"') return false;

+    $p++; $p0 = $p;

+    while ($p < $sLen && $s{$p} != '"') $p++;

+    if ($p >= $sLen) return false;

+    $w = substr($s, $p0, $p - $p0);

+    $p++;

+    return true; }

 

 /**

 * @access private

 * @return boolean  true on success, false on error.

 */

 function parseWordOrQuotedString ($s, &$p, &$w) {

-   $sLen = strlen($s);

-   while ($p < $sLen && ord($s{$p}) <= 32) $p++;

-   if ($p >= $sLen) return false;

-   if (substr($s,$p,1) == '"')

-      return $this->parseQuotedString($s,$p,$w);

+    $sLen = strlen($s);

+    while ($p < $sLen && ord($s{$p}) <= 32) $p++;

+    if ($p >= $sLen) return false;

+    if (substr($s,$p,1) == '"')

+        return $this->parseQuotedString($s,$p,$w);

     else

-      return $this->parseWord($s,$p,$w); }

+        return $this->parseWord($s,$p,$w); }

 

 /**

 * Combine two file system paths.

 * @access private

 */

 function combineFileSystemPath ($path1, $path2) {

-   if ($path1 == '' || $path2 == '') return $path2;

-   $s = $path1;

-   if (substr($s,-1) != '\\' && substr($s,-1) != '/') $s = $s . "/";

-   if (substr($path2,0,1) == '\\' || substr($path2,0,1) == '/')

-      $s = $s . substr($path2,1);

+    if ($path1 == '' || $path2 == '') return $path2;

+    $s = $path1;

+    if (substr($s,-1) != '\\' && substr($s,-1) != '/') $s = $s . "/";

+    if (substr($path2,0,1) == '\\' || substr($path2,0,1) == '/')

+        $s = $s . substr($path2,1);

     else

-      $s = $s . $path2;

-   return $s; }

+        $s = $s . $path2;

+    return $s; }

 

 /**

 * @access private

 */

 function triggerError ($msg) {

-   trigger_error ("MiniTemplator error: $msg", E_USER_ERROR); }

+    trigger_error ("MiniTemplator error: $msg", E_USER_ERROR); }

 

 /**

 * @access private

 */

 function programLogicError ($errorId) {

-   die ("MiniTemplator: Program logic error $errorId.\n"); }

+    die ("MiniTemplator: Program logic error $errorId.\n"); }

 

 }

 ?>

Braces +177 added lines, -82 removed lines

@@ -175,7 +175,9 @@ 
    if (!$this->readFileIntoString($fileName,$s)) {

       $this->triggerError ("Error while reading template file " . $fileName . ".");

       return false; }

-   if (!$this->setTemplateString($s)) return false;

+   if (!$this->setTemplateString($s)) {
+       return false;
+   }
    return true; }

 

 /**

@@ -187,7 +189,9 @@ 
 function setTemplateString ($templateString) {

    $this->templateValid = false;

    $this->template = $templateString;

-   if (!$this->parseTemplate()) return false;

+   if (!$this->parseTemplate()) {
+       return false;
+   }
    $this->reset();

    $this->templateValid = true;

    return true; }

@@ -214,10 +218,16 @@ 
 function parseTemplate() {

    $this->initParsing();

    $this->beginMainBlock();

-   if (!$this->parseTemplateCommands()) return false;

+   if (!$this->parseTemplateCommands()) {
+       return false;
+   }
    $this->endMainBlock();

-   if (!$this->checkBlockDefinitionsComplete()) return false;

-   if (!$this->parseTemplateVariables()) return false;

+   if (!$this->checkBlockDefinitionsComplete()) {
+       return false;
+   }
+   if (!$this->parseTemplateVariables()) {
+       return false;
+   }
    $this->associateVariablesWithBlocks();

    return true; }

 

@@ -272,16 +282,22 @@ 
    $p = 0;

    while (true) {

       $p0 = strpos($this->template,'<!--',$p);

-      if ($p0 === false) break;

+      if ($p0 === false) {
+          break;
+      }
       $p = strpos($this->template,'-->',$p0);

       if ($p === false) {

          $this->triggerError ("Invalid HTML comment in template at offset $p0.");

          return false; }

       $p += 3;

       $cmdL = substr($this->template,$p0+4,$p-$p0-7);

-      if (!$this->processTemplateCommand($cmdL,$p0,$p,$resumeFromStart))

-         return false;

-      if ($resumeFromStart) $p = $p0; }

+      if (!$this->processTemplateCommand($cmdL,$p0,$p,$resumeFromStart)) {
+               return false;
+      }
+      if ($resumeFromStart) {
+          $p = $p0;
+      }
+      }

    return true; }

 

 /**

@@ -292,20 +308,25 @@ 
    $resumeFromStart = false;

    $p = 0;

    $cmd = '';

-   if (!$this->parseWord($cmdL,$p,$cmd)) return true;

+   if (!$this->parseWord($cmdL,$p,$cmd)) {
+       return true;
+   }
    $parms = substr($cmdL,$p);

    switch (strtoupper($cmd)) {

       case '$BEGINBLOCK':

-         if (!$this->processBeginBlockCmd($parms,$cmdTPosBegin,$cmdTPosEnd))

-            return false;

+         if (!$this->processBeginBlockCmd($parms,$cmdTPosBegin,$cmdTPosEnd)) {
+                     return false;
+         }
          break;

       case '$ENDBLOCK':

-         if (!$this->processEndBlockCmd($parms,$cmdTPosBegin,$cmdTPosEnd))

-            return false;

+         if (!$this->processEndBlockCmd($parms,$cmdTPosBegin,$cmdTPosEnd)) {
+                     return false;
+         }
          break;

       case '$INCLUDE':

-         if (!$this->processincludeCmd($parms,$cmdTPosBegin,$cmdTPosEnd))

-            return false;

+         if (!$this->processincludeCmd($parms,$cmdTPosBegin,$cmdTPosEnd)) {
+                     return false;
+         }
          $resumeFromStart = true;

          break;

       default:

@@ -377,8 +398,9 @@ 
    $btr =& $this->blockTab[$blockNo];

    $btr = array();

    $btr['blockName'] = $blockName;

-   if (!$this->lookupBlockName($blockName,$btr['nextWithSameName']))

-      $btr['nextWithSameName'] = -1;

+   if (!$this->lookupBlockName($blockName,$btr['nextWithSameName'])) {
+         $btr['nextWithSameName'] = -1;
+   }
    $btr['definitionIsOpen'] = true;

    $btr['instances'] = 0;

    $btr['firstBlockInstNo'] = -1;

@@ -428,7 +450,9 @@ 
    if (strlen($this->template) > $this->maxInclTemplateSize) {

       $this->triggerError ("Subtemplate include aborted because the internal template string is longer than $this->maxInclTemplateSize characters.");

       return false; }

-   if (!$this->loadSubtemplate($subtemplateName,$subtemplate)) return false;

+   if (!$this->loadSubtemplate($subtemplateName,$subtemplate)) {
+       return false;
+   }
    // (Copying the template to insert a subtemplate is a bit slow. In a future implementation of MiniTemplator,

    // a table could be used that contains references to the string fragments.)

    $this->template = substr($this->template,0,$tPos1) . $subtemplate . substr($this->template,$tPos2);

@@ -443,7 +467,9 @@ 
    $p = 0;

    while (true) {

       $p = strpos($this->template, '${', $p);

-      if ($p === false) break;

+      if ($p === false) {
+          break;
+      }
       $p0 = $p;

       $p = strpos($this->template, '}', $p);

       if ($p === false) {

@@ -461,8 +487,9 @@ 
 * @access private

 */

 function registerVariableReference ($varName, $tPosBegin, $tPosEnd) {

-   if (!$this->lookupVariableName($varName,$varNo))

-      $this->registerVariable($varName,$varNo);

+   if (!$this->lookupVariableName($varName,$varNo)) {
+         $this->registerVariable($varName,$varNo);
+   }
    $varRefNo = $this->varRefTabCnt++;

    $vrtr =& $this->varRefTab[$varRefNo];

    $vrtr = array();

@@ -502,12 +529,14 @@ 
             $nextBlockNo += 1;

             continue; }}

       $btr =& $this->blockTab[$activeBlockNo];

-      if ($varRefTPos < $btr['tPosBegin'])

-         $this->programLogicError(1);

+      if ($varRefTPos < $btr['tPosBegin']) {
+               $this->programLogicError(1);
+      }
       $blockVarNo = $btr['blockVarCnt']++;

       $btr['blockVarNoToVarNoMap'][$blockVarNo] = $varNo;

-      if ($btr['firstVarRefNo'] == -1)

-         $btr['firstVarRefNo'] = $varRefNo;

+      if ($btr['firstVarRefNo'] == -1) {
+               $btr['firstVarRefNo'] = $varRefNo;
+      }
       $vrtr['blockNo'] = $activeBlockNo;

       $vrtr['blockVarNo'] = $blockVarNo;

       $varRefNo += 1; }}

@@ -523,8 +552,9 @@ 
 * @access public

 */

 function reset() {

-   for ($varNo=0; $varNo<$this->varTabCnt; $varNo++)

-      $this->varTab[$varNo]['varValue'] = '';

+   for ($varNo=0; $varNo<$this->varTabCnt; $varNo++) {
+         $this->varTab[$varNo]['varValue'] = '';
+   }
    for ($blockNo=0; $blockNo<$this->blockTabCnt; $blockNo++) {

       $btr =& $this->blockTab[$blockNo];

       $btr['instances'] = 0;

@@ -551,7 +581,9 @@ 
 function setVariable ($variableName, $variableValue, $isOptional=false) {

    if (!$this->templateValid) {$this->triggerError ("Template not valid."); return false; }

    if (!$this->lookupVariableName($variableName,$varNo)) {

-      if ($isOptional) return true;

+      if ($isOptional) {
+          return true;
+      }
       $this->triggerError ("Variable \"$variableName\" not defined in template.");

       return false; }

    $this->varTab[$varNo]['varValue'] = $variableValue;

@@ -619,20 +651,23 @@ 
    $btr =& $this->blockTab[$blockNo];

    $this->registerBlockInstance ($blockInstNo);

    $bitr =& $this->blockInstTab[$blockInstNo];

-   if ($btr['firstBlockInstNo'] == -1)

-      $btr['firstBlockInstNo'] = $blockInstNo;

-   if ($btr['lastBlockInstNo'] != -1)

-      $this->blockInstTab[$btr['lastBlockInstNo']]['nextBlockInstNo'] = $blockInstNo;

+   if ($btr['firstBlockInstNo'] == -1) {
+         $btr['firstBlockInstNo'] = $blockInstNo;
+   }
+   if ($btr['lastBlockInstNo'] != -1) {
+         $this->blockInstTab[$btr['lastBlockInstNo']]['nextBlockInstNo'] = $blockInstNo;
+   }
          // set forward pointer of chain

    $btr['lastBlockInstNo'] = $blockInstNo;

    $parentBlockNo = $btr['parentBlockNo'];

    $blockVarCnt = $btr['blockVarCnt'];

    $bitr['blockNo'] = $blockNo;

    $bitr['instanceLevel'] = $btr['instances']++;

-   if ($parentBlockNo == -1)

-      $bitr['parentInstLevel'] = -1;

-    else

-      $bitr['parentInstLevel'] = $this->blockTab[$parentBlockNo]['instances'];

+   if ($parentBlockNo == -1) {
+         $bitr['parentInstLevel'] = -1;
+   } else {
+          $bitr['parentInstLevel'] = $this->blockTab[$parentBlockNo]['instances'];
+    }
    $bitr['nextBlockInstNo'] = -1;

    $bitr['blockVarTab'] = array();

    // copy instance variables for this block

@@ -666,7 +701,9 @@ 
 */

 function generateOutput () {

    $this->outputMode = 0;

-   if (!$this->generateOutputPage()) return false;

+   if (!$this->generateOutputPage()) {
+       return false;
+   }
    return true; }

 

 /**

@@ -677,7 +714,9 @@ 
 */

 function generateOutputToFile ($fileName) {

    $fh = fopen($fileName,"wb");

-   if ($fh === false) return false;

+   if ($fh === false) {
+       return false;
+   }
    $this->outputMode = 1;

    $this->outputFileHandle = $fh;

    $ok = $this->generateOutputPage();

@@ -695,7 +734,9 @@ 
    $outputString = "Error";

    $this->outputMode = 2;

    $this->outputString = "";

-   if (!$this->generateOutputPage()) return false;

+   if (!$this->generateOutputPage()) {
+       return false;
+   }
    $outputString = $this->outputString;

    return true; }

 

@@ -705,14 +746,18 @@ 
 */

 function generateOutputPage() {

    if (!$this->templateValid) {$this->triggerError ("Template not valid."); return false; }

-   if ($this->blockTab[0]['instances'] == 0)

-      $this->addBlockByNo (0);        // add main block

+   if ($this->blockTab[0]['instances'] == 0) {
+         $this->addBlockByNo (0);
+   }
+   // add main block

    for ($blockNo=0; $blockNo < $this->blockTabCnt; $blockNo++) {

        $btr =& $this->blockTab[$blockNo];

        $btr['currBlockInstNo'] = $btr['firstBlockInstNo']; }

    $this->outputError = false;

    $this->writeBlockInstances (0, -1);

-   if ($this->outputError) return false;

+   if ($this->outputError) {
+       return false;
+   }
    return true; }

 

 /**

@@ -725,11 +770,16 @@ 
    $btr =& $this->blockTab[$blockNo];

    while (!$this->outputError) {

       $blockInstNo = $btr['currBlockInstNo'];

-      if ($blockInstNo == -1) break;

+      if ($blockInstNo == -1) {
+          break;
+      }
       $bitr =& $this->blockInstTab[$blockInstNo];

-      if ($bitr['parentInstLevel'] < $parentInstLevel)

-         $this->programLogicError (2);

-      if ($bitr['parentInstLevel'] > $parentInstLevel) break;

+      if ($bitr['parentInstLevel'] < $parentInstLevel) {
+               $this->programLogicError (2);
+      }
+      if ($bitr['parentInstLevel'] > $parentInstLevel) {
+          break;
+      }
       $this->writeBlockInstance ($blockInstNo);

       $btr['currBlockInstNo'] = $bitr['nextBlockInstNo']; }}

 

@@ -762,15 +812,17 @@ 
          if ($subBtr['tPosBegin'] < $tPos2) {

             $tPos2 = $subBtr['tPosBegin'];

             $kind = 2; }}

-      if ($tPos2 > $tPos)

-         $this->writeString (substr($this->template,$tPos,$tPos2-$tPos));

+      if ($tPos2 > $tPos) {
+               $this->writeString (substr($this->template,$tPos,$tPos2-$tPos));
+      }
       switch ($kind) {

          case 0:         // end of block

             return;

          case 1:         // variable

             $vrtr =& $this->varRefTab[$varRefNo];

-            if ($vrtr['blockNo'] != $blockNo)

-               $this->programLogicError (4);

+            if ($vrtr['blockNo'] != $blockNo) {
+                           $this->programLogicError (4);
+            }
             $variableValue = $bitr['blockVarTab'][$vrtr['blockVarNo']];

             $this->writeString ($variableValue);

             $tPos = $vrtr['tPosEnd'];

@@ -778,8 +830,9 @@ 
             break;

          case 2:         // sub block

             $subBtr =& $this->blockTab[$subBlockNo];

-            if ($subBtr['parentBlockNo'] != $blockNo)

-               $this->programLogicError (3);

+            if ($subBtr['parentBlockNo'] != $blockNo) {
+                           $this->programLogicError (3);
+            }
             $this->writeBlockInstances ($subBlockNo, $bitr['instanceLevel']);  // recursive call

             $tPos = $subBtr['tPosEnd'];

             $subBlockNo += 1;

@@ -789,15 +842,20 @@ 
 * @access private

 */

 function writeString ($s) {

-   if ($this->outputError) return;

+   if ($this->outputError) {
+       return;
+   }
    switch ($this->outputMode) {

       case 0:            // output to PHP output stream

-         if (!print($s))

-            $this->outputError = true;

+         if (!print($s)) {
+                     $this->outputError = true;
+         }
          break;

       case 1:            // output to file

          $rc = fwrite($this->outputFileHandle, $s);

-         if ($rc === false) $this->outputError = true;

+         if ($rc === false) {
+             $this->outputError = true;
+         }
          break;

       case 2:            // output to string

          $this->outputString .= $s;

@@ -812,7 +870,9 @@ 
 */

 function lookupVariableName ($varName, &$varNo) {

    $x =& $this->varNameToNoMap[strtoupper($varName)];

-   if (!isset($x)) return false;

+   if (!isset($x)) {
+       return false;
+   }
    $varNo = $x;

    return true; }

 

@@ -825,7 +885,9 @@ 
 */

 function lookupBlockName ($blockName, &$blockNo) {

    $x =& $this->blockNameToNoMap[strtoupper($blockName)];

-   if (!isset($x)) return false;

+   if (!isset($x)) {
+       return false;
+   }
    $blockNo = $x;

    return true; }

 

@@ -839,15 +901,21 @@ 
 function readFileIntoString ($fileName, &$s) {

    if (function_exists('version_compare') && version_compare(phpversion(),"4.3.0",">=")) {

       $s = file_get_contents($fileName);

-      if ($s === false) return false;

+      if ($s === false) {
+          return false;
+      }
       return true; }

    $fh = fopen($fileName,"rb");

-   if ($fh === false) return false;

+   if ($fh === false) {
+       return false;
+   }
    $fileSize = filesize($fileName);

    if ($fileSize === false) {fclose ($fh); return false; }

    $s = fread($fh,$fileSize);

    fclose ($fh);

-   if (strlen($s) != $fileSize) return false;

+   if (strlen($s) != $fileSize) {
+       return false;
+   }
    return true; }

 

 /**

@@ -856,10 +924,16 @@ 
 */

 function parseWord ($s, &$p, &$w) {

    $sLen = strlen($s);

-   while ($p < $sLen && ord($s{$p}) <= 32) $p++;

-   if ($p >= $sLen) return false;

+   while ($p < $sLen && ord($s{$p}) <= 32) {
+       $p++;
+   }
+   if ($p >= $sLen) {
+       return false;
+   }
    $p0 = $p;

-   while ($p < $sLen && ord($s{$p}) > 32) $p++;

+   while ($p < $sLen && ord($s{$p}) > 32) {
+       $p++;
+   }
    $w = substr($s, $p0, $p - $p0);

    return true; }

 

@@ -869,12 +943,22 @@ 
 */

 function parseQuotedString ($s, &$p, &$w) {

    $sLen = strlen($s);

-   while ($p < $sLen && ord($s{$p}) <= 32) $p++;

-   if ($p >= $sLen) return false;

-   if (substr($s,$p,1) != '"') return false;

+   while ($p < $sLen && ord($s{$p}) <= 32) {
+       $p++;
+   }
+   if ($p >= $sLen) {
+       return false;
+   }
+   if (substr($s,$p,1) != '"') {
+       return false;
+   }
    $p++; $p0 = $p;

-   while ($p < $sLen && $s{$p} != '"') $p++;

-   if ($p >= $sLen) return false;

+   while ($p < $sLen && $s{$p} != '"') {
+       $p++;
+   }
+   if ($p >= $sLen) {
+       return false;
+   }
    $w = substr($s, $p0, $p - $p0);

    $p++;

    return true; }

@@ -885,25 +969,36 @@ 
 */

 function parseWordOrQuotedString ($s, &$p, &$w) {

    $sLen = strlen($s);

-   while ($p < $sLen && ord($s{$p}) <= 32) $p++;

-   if ($p >= $sLen) return false;

-   if (substr($s,$p,1) == '"')

-      return $this->parseQuotedString($s,$p,$w);

-    else

-      return $this->parseWord($s,$p,$w); }

+   while ($p < $sLen && ord($s{$p}) <= 32) {
+       $p++;
+   }
+   if ($p >= $sLen) {
+       return false;
+   }
+   if (substr($s,$p,1) == '"') {
+         return $this->parseQuotedString($s,$p,$w);
+   } else {
+          return $this->parseWord($s,$p,$w);
+    }
+    }

 

 /**

 * Combine two file system paths.

 * @access private

 */

 function combineFileSystemPath ($path1, $path2) {

-   if ($path1 == '' || $path2 == '') return $path2;

+   if ($path1 == '' || $path2 == '') {
+       return $path2;
+   }
    $s = $path1;

-   if (substr($s,-1) != '\\' && substr($s,-1) != '/') $s = $s . "/";

-   if (substr($path2,0,1) == '\\' || substr($path2,0,1) == '/')

-      $s = $s . substr($path2,1);

-    else

-      $s = $s . $path2;

+   if (substr($s,-1) != '\\' && substr($s,-1) != '/') {
+       $s = $s . "/";
+   }
+   if (substr($path2,0,1) == '\\' || substr($path2,0,1) == '/') {
+         $s = $s . substr($path2,1);
+   } else {
+          $s = $s . $path2;
+    }
    return $s; }

 

 /**

lib/jimIcon.php

Spacing +18 added lines, -18 removed lines

@@ -67,13 +67,13 @@ 
                         $entry = substr($ico, 6 + 16 * $i, 16);
                         if (!$entry || strlen($entry) < 16)
                                 continue;
-                        $e = unpack("Cwidth/" .
-                                    "Cheight/" .
-                                    "Ccolors/" .
-                                    "Czero/" .
-                                    "vplanes/" .
-                                    "vbpp/" .
-                                    "Vsize/" .
+                        $e = unpack("Cwidth/".
+                                    "Cheight/".
+                                    "Ccolors/".
+                                    "Czero/".
+                                    "vplanes/".
+                                    "vbpp/".
+                                    "Vsize/".
                                     "Voffset/",
                                     $entry);
                         if ($e["width"] == 0)
@@ -122,16 +122,16 @@ 
                 // directory entry.
                 $bitmapinfo = unpack("Vsize", $data);
                 if ($bitmapinfo["size"] == 40) {
-                        $info = unpack("Vsize/" .
-                                       "Vwidth/" .
-                                       "Vheight/" .
-                                       "vplanes/" .
-                                       "vbpp/" .
-                                       "Vcompress/" .
-                                       "Vsize/" .
-                                       "Vxres/" .
-                                       "Vyres/" .
-                                       "Vpalcolors/" .
+                        $info = unpack("Vsize/".
+                                       "Vwidth/".
+                                       "Vheight/".
+                                       "vplanes/".
+                                       "vbpp/".
+                                       "Vcompress/".
+                                       "Vsize/".
+                                       "Vxres/".
+                                       "Vyres/".
+                                       "Vpalcolors/".
                                        "Vimpcolors/", $data);
                         if ($e["bpp"] == 0) {
                                 $e["bpp"] = $info["bpp"];
@@ -212,7 +212,7 @@ 
                                         $pixel1 = $palette[$p >> 4];
                                         $pixel2 = $palette[$p & 0x0f];
                                         $XOR[$y][$x] = $pixel1;
-                                        $XOR[$y][$x+1] = $pixel2;
+                                        $XOR[$y][$x + 1] = $pixel2;
                                         $x += 2;
                                         $offset++;
                                 } elseif ($bpp == 8) {

Braces +21 added lines, -14 removed lines

@@ -24,13 +24,15 @@ 
                 $r = ord($str[2]);
                 if (strlen($str) > 3) {
                         $a = 127 - (ord($str[3]) / 2);
-                        if ($a != 0 && $a != 127)
-                                $this->had_alpha = 1;
+                        if ($a != 0 && $a != 127) {
+                                                        $this->had_alpha = 1;
+                        }
                 } else {
                         $a = 0;
                 }
-                if ($a != 127)
-                        $this->all_transaprent = 0;
+                if ($a != 127) {
+                                        $this->all_transaprent = 0;
+                }
                 return imagecolorallocatealpha($img, $r, $g, $b, $a);
         }
 
@@ -65,8 +67,9 @@ 
                 $most_pixels = 0;
                 for ($i = 0; $i < $h["num"]; $i++) {
                         $entry = substr($ico, 6 + 16 * $i, 16);
-                        if (!$entry || strlen($entry) < 16)
-                                continue;
+                        if (!$entry || strlen($entry) < 16) {
+                                                        continue;
+                        }
                         $e = unpack("Cwidth/" .
                                     "Cheight/" .
                                     "Ccolors/" .
@@ -76,10 +79,12 @@ 
                                     "Vsize/" .
                                     "Voffset/",
                                     $entry);
-                        if ($e["width"] == 0)
-                                $e["width"] = 256;
-                        if ($e["height"] == 0)
-                                $e["height"] = 256;
+                        if ($e["width"] == 0) {
+                                                        $e["width"] = 256;
+                        }
+                        if ($e["height"] == 0) {
+                                                        $e["height"] = 256;
+                        }
                         if ($e["zero"] != 0) {
                                 $this->error = "nonzero reserved field";
                                 return false;
@@ -226,8 +231,9 @@ 
                                 }
                         }
                         // End of row padding
-                        while ($offset & 3)
-                                $offset++;
+                        while ($offset & 3) {
+                                                        $offset++;
+                        }
                 }
 
                 // Now the "AND" image, which is 1 bit per pixel.  Ignore
@@ -261,8 +267,9 @@ 
                         }
 
                         // End of row padding
-                        while ($offset & 3)
-                                $offset++;
+                        while ($offset & 3) {
+                                                        $offset++;
+                        }
                 }
                 return $img;
         }

Indentation +13 added lines, -13 removed lines

@@ -123,16 +123,16 @@ 
                 $bitmapinfo = unpack("Vsize", $data);
                 if ($bitmapinfo["size"] == 40) {
                         $info = unpack("Vsize/" .
-                                       "Vwidth/" .
-                                       "Vheight/" .
-                                       "vplanes/" .
-                                       "vbpp/" .
-                                       "Vcompress/" .
-                                       "Vsize/" .
-                                       "Vxres/" .
-                                       "Vyres/" .
-                                       "Vpalcolors/" .
-                                       "Vimpcolors/", $data);
+                                        "Vwidth/" .
+                                        "Vheight/" .
+                                        "vplanes/" .
+                                        "vbpp/" .
+                                        "Vcompress/" .
+                                        "Vsize/" .
+                                        "Vxres/" .
+                                        "Vyres/" .
+                                        "Vpalcolors/" .
+                                        "Vimpcolors/", $data);
                         if ($e["bpp"] == 0) {
                                 $e["bpp"] = $info["bpp"];
                         }
@@ -239,7 +239,7 @@ 
                         for ($y = 0; $y < $height; $y++) {
                                 for ($x = 0; $x < $width; $x++) {
                                         imagesetpixel($img, $x, $y,
-                                                      $XOR[$y][$x]);
+                                                        $XOR[$y][$x]);
                                 }
                         }
                         return $img;
@@ -250,10 +250,10 @@ 
                         $x = 0;
                         while ($x < $width) {
                                 for ($b = 0x80;
-                                     $b > 0 && $x < $width; $b >>= 1) {
+                                        $b > 0 && $x < $width; $b >>= 1) {
                                         if (!(ord($data[$offset]) & $b)) {
                                                 imagesetpixel($img, $x, $y,
-                                                              $XOR[$y][$x]);
+                                                                $XOR[$y][$x]);
                                         }
                                         $x++;
                                 }

lib/phpqrcode/qrconst.php

Spacing +2 added lines, -2 removed lines

@@ -45,10 +45,10 @@
 	// Supported output formats

 	

 	define('QR_FORMAT_TEXT', 0);

-	define('QR_FORMAT_PNG',  1);

+	define('QR_FORMAT_PNG', 1);

 	

 	class qrstr {

 		public static function set(&$srctab, $x, $y, $repl, $replLen = false) {

-			$srctab[$y] = substr_replace($srctab[$y], ($replLen !== false)?substr($repl,0,$replLen):$repl, $x, ($replLen !== false)?$replLen:strlen($repl));

+			$srctab[$y] = substr_replace($srctab[$y], ($replLen !== false) ?substr($repl, 0, $replLen) : $repl, $x, ($replLen !== false) ? $replLen : strlen($repl));

 		}

 	}	
\ No newline at end of file

Indentation +20 added lines, -20 removed lines

@@ -26,29 +26,29 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

  */

  

-	// Encoding modes

+    // Encoding modes

 	 

-	define('QR_MODE_NUL', -1);

-	define('QR_MODE_NUM', 0);

-	define('QR_MODE_AN', 1);

-	define('QR_MODE_8', 2);

-	define('QR_MODE_KANJI', 3);

-	define('QR_MODE_STRUCTURE', 4);

+    define('QR_MODE_NUL', -1);

+    define('QR_MODE_NUM', 0);

+    define('QR_MODE_AN', 1);

+    define('QR_MODE_8', 2);

+    define('QR_MODE_KANJI', 3);

+    define('QR_MODE_STRUCTURE', 4);

 

-	// Levels of error correction.

+    // Levels of error correction.

 

-	define('QR_ECLEVEL_L', 0);

-	define('QR_ECLEVEL_M', 1);

-	define('QR_ECLEVEL_Q', 2);

-	define('QR_ECLEVEL_H', 3);

+    define('QR_ECLEVEL_L', 0);

+    define('QR_ECLEVEL_M', 1);

+    define('QR_ECLEVEL_Q', 2);

+    define('QR_ECLEVEL_H', 3);

 	

-	// Supported output formats

+    // Supported output formats

 	

-	define('QR_FORMAT_TEXT', 0);

-	define('QR_FORMAT_PNG',  1);

+    define('QR_FORMAT_TEXT', 0);

+    define('QR_FORMAT_PNG',  1);

 	

-	class qrstr {

-		public static function set(&$srctab, $x, $y, $repl, $replLen = false) {

-			$srctab[$y] = substr_replace($srctab[$y], ($replLen !== false)?substr($repl,0,$replLen):$repl, $x, ($replLen !== false)?$replLen:strlen($repl));

-		}

-	}	
\ No newline at end of file
+    class qrstr {

+        public static function set(&$srctab, $x, $y, $repl, $replLen = false) {

+            $srctab[$y] = substr_replace($srctab[$y], ($replLen !== false)?substr($repl,0,$replLen):$repl, $x, ($replLen !== false)?$replLen:strlen($repl));

+        }

+    }	
\ No newline at end of file

lib/phpqrcode/tools/merge.php

Spacing +3 added lines, -3 removed lines

@@ -51,11 +51,11 @@
     

     $outputCode = '';

     

-    foreach($fileList as $fileName) {

+    foreach ($fileList as $fileName) {

         $outputCode .= "\n\n".'//---- '.basename($fileName).' -----------------------------'."\n\n";

         $anotherCode = file_get_contents($fileName);

-        $anotherCode = preg_replace ('/^<\?php/', '', $anotherCode);

-        $anotherCode = preg_replace ('/\?>\*$/', '', $anotherCode);

+        $anotherCode = preg_replace('/^<\?php/', '', $anotherCode);

+        $anotherCode = preg_replace('/\?>\*$/', '', $anotherCode);

         $outputCode .= "\n\n".$anotherCode."\n\n";

     }

     

Indentation +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
         $outputCode .= "\n\n".$anotherCode."\n\n";

     }

     

-	$versionDataEx = explode("\n", file_get_contents($versionFile));

+    $versionDataEx = explode("\n", file_get_contents($versionFile));

 	

     $outputContents = file_get_contents($headerFile);

     $outputContents .= "\n\n/*\n * Version: ".trim($versionDataEx[0])."\n * Build: ".trim($versionDataEx[1])."\n */\n\n";

lib/phpqrcode/tools/merged_config.php

Spacing +7 added lines, -7 removed lines

@@ -5,13 +5,13 @@
  * Config file, tuned-up for merged verion

  */

      

-    define('QR_CACHEABLE', false);       // use cache - more disk reads but less CPU power, masks and format templates are stored there

-    define('QR_CACHE_DIR', false);       // used when QR_CACHEABLE === true

-    define('QR_LOG_DIR', false);         // default error logs dir   

+    define('QR_CACHEABLE', false); // use cache - more disk reads but less CPU power, masks and format templates are stored there

+    define('QR_CACHE_DIR', false); // used when QR_CACHEABLE === true

+    define('QR_LOG_DIR', false); // default error logs dir   

     

-    define('QR_FIND_BEST_MASK', true);                                                          // if true, estimates best mask (spec. default, but extremally slow; set to false to significant performance boost but (propably) worst quality code

-    define('QR_FIND_FROM_RANDOM', 2);                                                       // if false, checks all masks available, otherwise value tells count of masks need to be checked, mask id are got randomly

-    define('QR_DEFAULT_MASK', 2);                                                               // when QR_FIND_BEST_MASK === false

+    define('QR_FIND_BEST_MASK', true); // if true, estimates best mask (spec. default, but extremally slow; set to false to significant performance boost but (propably) worst quality code

+    define('QR_FIND_FROM_RANDOM', 2); // if false, checks all masks available, otherwise value tells count of masks need to be checked, mask id are got randomly

+    define('QR_DEFAULT_MASK', 2); // when QR_FIND_BEST_MASK === false

                                                   

-    define('QR_PNG_MAXIMUM_SIZE',  1024);                                                       // maximum allowed png image width (in pixels), tune to make sure GD and PHP can handle such big images

+    define('QR_PNG_MAXIMUM_SIZE', 1024); // maximum allowed png image width (in pixels), tune to make sure GD and PHP can handle such big images

                                                   
\ No newline at end of file

Indentation +1 added lines, -1 removed lines

@@ -14,4 +14,4 @@
     define('QR_DEFAULT_MASK', 2);                                                               // when QR_FIND_BEST_MASK === false

                                                   

     define('QR_PNG_MAXIMUM_SIZE',  1024);                                                       // maximum allowed png image width (in pixels), tune to make sure GD and PHP can handle such big images

-                                                  
\ No newline at end of file
+                                                    
\ No newline at end of file

lib/phpqrcode/qrbitstream.php

Spacing +17 added lines, -17 removed lines

@@ -49,8 +49,8 @@ 
             $bstream->allocate($bits);

             

             $mask = 1 << ($bits - 1);

-            for($i=0; $i<$bits; $i++) {

-                if($num & $mask) {

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

+                if ($num & $mask) {

                     $bstream->data[$i] = 1;

                 } else {

                     $bstream->data[$i] = 0;

@@ -66,12 +66,12 @@ 
         {

             $bstream = new QRbitstream();

             $bstream->allocate($size * 8);

-            $p=0;

+            $p = 0;

 

-            for($i=0; $i<$size; $i++) {

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

                 $mask = 0x80;

-                for($j=0; $j<8; $j++) {

-                    if($data[$i] & $mask) {

+                for ($j = 0; $j < 8; $j++) {

+                    if ($data[$i] & $mask) {

                         $bstream->data[$p] = 1;

                     } else {

                         $bstream->data[$p] = 0;

@@ -91,11 +91,11 @@ 
                 return -1;

             }

             

-            if($arg->size() == 0) {

+            if ($arg->size() == 0) {

                 return 0;

             }

             

-            if($this->size() == 0) {

+            if ($this->size() == 0) {

                 $this->data = $arg->data;

                 return 0;

             }

@@ -113,7 +113,7 @@ 
 

             $b = QRbitstream::newFromNum($bits, $num);

             

-            if(is_null($b))

+            if (is_null($b))

                 return -1;

 

             $ret = $this->append($b);

@@ -130,7 +130,7 @@ 
 

             $b = QRbitstream::newFromBytes($size, $data);

             

-            if(is_null($b))

+            if (is_null($b))

                 return -1;

 

             $ret = $this->append($b);

@@ -145,18 +145,18 @@ 
         

             $size = $this->size();

 

-            if($size == 0) {

+            if ($size == 0) {

                 return array();

             }

             

-            $data = array_fill(0, (int)(($size + 7) / 8), 0);

-            $bytes = (int)($size / 8);

+            $data = array_fill(0, (int) (($size + 7) / 8), 0);

+            $bytes = (int) ($size / 8);

 

             $p = 0;

             

-            for($i=0; $i<$bytes; $i++) {

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

                 $v = 0;

-                for($j=0; $j<8; $j++) {

+                for ($j = 0; $j < 8; $j++) {

                     $v = $v << 1;

                     $v |= $this->data[$p];

                     $p++;

@@ -164,9 +164,9 @@ 
                 $data[$i] = $v;

             }

             

-            if($size & 7) {

+            if ($size & 7) {

                 $v = 0;

-                for($j=0; $j<($size & 7); $j++) {

+                for ($j = 0; $j < ($size & 7); $j++) {

                     $v = $v << 1;

                     $v |= $this->data[$p];

                     $p++;

Braces +12 added lines, -8 removed lines

@@ -108,13 +108,15 @@ 
         //----------------------------------------------------------------------

         public function appendNum($bits, $num)

         {

-            if ($bits == 0) 

-                return 0;

+            if ($bits == 0) {
+                            return 0;
+            }
 

             $b = QRbitstream::newFromNum($bits, $num);

             

-            if(is_null($b))

-                return -1;

+            if(is_null($b)) {
+                            return -1;
+            }
 

             $ret = $this->append($b);

             unset($b);

@@ -125,13 +127,15 @@ 
         //----------------------------------------------------------------------

         public function appendBytes($size, $data)

         {

-            if ($size == 0) 

-                return 0;

+            if ($size == 0) {
+                            return 0;
+            }
 

             $b = QRbitstream::newFromBytes($size, $data);

             

-            if(is_null($b))

-                return -1;

+            if(is_null($b)) {
+                            return -1;
+            }
 

             $ret = $this->append($b);

             unset($b);

lib/phpqrcode/qrsplit.php

Switch Indentation +8 added lines, -8 removed lines

@@ -255,14 +255,14 @@
                 $mode = $this->identifyMode(0);

                 

                 switch ($mode) {

-                    case QR_MODE_NUM: $length = $this->eatNum(); break;

-                    case QR_MODE_AN:  $length = $this->eatAn(); break;

-                    case QR_MODE_KANJI:

-                        if ($this->modeHint == QR_MODE_KANJI)

-                                $length = $this->eatKanji();

-                        else    $length = $this->eat8();

-                        break;

-                    default: $length = $this->eat8(); break;

+                case QR_MODE_NUM: $length = $this->eatNum(); break;

+                case QR_MODE_AN:  $length = $this->eatAn(); break;

+                case QR_MODE_KANJI:

+                    if ($this->modeHint == QR_MODE_KANJI)

+                            $length = $this->eatKanji();

+                    else    $length = $this->eat8();

+                    break;

+                default: $length = $this->eat8(); break;

                 

                 }

 

Spacing +40 added lines, -40 removed lines

@@ -50,7 +50,7 @@ 
             if ($pos >= strlen($str))

                 return false;

             

-            return ((ord($str[$pos]) >= ord('0'))&&(ord($str[$pos]) <= ord('9')));

+            return ((ord($str[$pos]) >= ord('0')) && (ord($str[$pos]) <= ord('9')));

         }

         

         //----------------------------------------------------------------------

@@ -70,17 +70,17 @@ 
                 

             $c = $this->dataStr[$pos];

             

-            if(self::isdigitat($this->dataStr, $pos)) {

+            if (self::isdigitat($this->dataStr, $pos)) {

                 return QR_MODE_NUM;

-            } else if(self::isalnumat($this->dataStr, $pos)) {

+            } else if (self::isalnumat($this->dataStr, $pos)) {

                 return QR_MODE_AN;

-            } else if($this->modeHint == QR_MODE_KANJI) {

+            } else if ($this->modeHint == QR_MODE_KANJI) {

             

-                if ($pos+1 < strlen($this->dataStr)) 

+                if ($pos + 1 < strlen($this->dataStr)) 

                 {

-                    $d = $this->dataStr[$pos+1];

+                    $d = $this->dataStr[$pos + 1];

                     $word = (ord($c) << 8) | ord($d);

-                    if(($word >= 0x8140 && $word <= 0x9ffc) || ($word >= 0xe040 && $word <= 0xebbf)) {

+                    if (($word >= 0x8140 && $word <= 0x9ffc) || ($word >= 0xe040 && $word <= 0xebbf)) {

                         return QR_MODE_KANJI;

                     }

                 }

@@ -95,32 +95,32 @@ 
             $ln = QRspec::lengthIndicator(QR_MODE_NUM, $this->input->getVersion());

 

             $p = 0;

-            while(self::isdigitat($this->dataStr, $p)) {

+            while (self::isdigitat($this->dataStr, $p)) {

                 $p++;

             }

             

             $run = $p;

             $mode = $this->identifyMode($p);

             

-            if($mode == QR_MODE_8) {

+            if ($mode == QR_MODE_8) {

                 $dif = QRinput::estimateBitsModeNum($run) + 4 + $ln

                      + QRinput::estimateBitsMode8(1)         // + 4 + l8

                      - QRinput::estimateBitsMode8($run + 1); // - 4 - l8

-                if($dif > 0) {

+                if ($dif > 0) {

                     return $this->eat8();

                 }

             }

-            if($mode == QR_MODE_AN) {

+            if ($mode == QR_MODE_AN) {

                 $dif = QRinput::estimateBitsModeNum($run) + 4 + $ln

                      + QRinput::estimateBitsModeAn(1)        // + 4 + la

-                     - QRinput::estimateBitsModeAn($run + 1);// - 4 - la

-                if($dif > 0) {

+                     - QRinput::estimateBitsModeAn($run + 1); // - 4 - la

+                if ($dif > 0) {

                     return $this->eatAn();

                 }

             }

             

             $ret = $this->input->append(QR_MODE_NUM, $run, str_split($this->dataStr));

-            if($ret < 0)

+            if ($ret < 0)

                 return -1;

 

             return $run;

@@ -129,15 +129,15 @@ 
         //----------------------------------------------------------------------

         public function eatAn()

         {

-            $la = QRspec::lengthIndicator(QR_MODE_AN,  $this->input->getVersion());

+            $la = QRspec::lengthIndicator(QR_MODE_AN, $this->input->getVersion());

             $ln = QRspec::lengthIndicator(QR_MODE_NUM, $this->input->getVersion());

 

             $p = 0;

             

-            while(self::isalnumat($this->dataStr, $p)) {

-                if(self::isdigitat($this->dataStr, $p)) {

+            while (self::isalnumat($this->dataStr, $p)) {

+                if (self::isdigitat($this->dataStr, $p)) {

                     $q = $p;

-                    while(self::isdigitat($this->dataStr, $q)) {

+                    while (self::isdigitat($this->dataStr, $q)) {

                         $q++;

                     }

                     

@@ -145,7 +145,7 @@ 
                          + QRinput::estimateBitsModeNum($q - $p) + 4 + $ln

                          - QRinput::estimateBitsModeAn($q); // - 4 - la

                          

-                    if($dif < 0) {

+                    if ($dif < 0) {

                         break;

                     } else {

                         $p = $q;

@@ -157,17 +157,17 @@ 
 

             $run = $p;

 

-            if(!self::isalnumat($this->dataStr, $p)) {

+            if (!self::isalnumat($this->dataStr, $p)) {

                 $dif = QRinput::estimateBitsModeAn($run) + 4 + $la

                      + QRinput::estimateBitsMode8(1) // + 4 + l8

                       - QRinput::estimateBitsMode8($run + 1); // - 4 - l8

-                if($dif > 0) {

+                if ($dif > 0) {

                     return $this->eat8();

                 }

             }

 

             $ret = $this->input->append(QR_MODE_AN, $run, str_split($this->dataStr));

-            if($ret < 0)

+            if ($ret < 0)

                 return -1;

 

             return $run;

@@ -178,12 +178,12 @@ 
         {

             $p = 0;

             

-            while($this->identifyMode($p) == QR_MODE_KANJI) {

+            while ($this->identifyMode($p) == QR_MODE_KANJI) {

                 $p += 2;

             }

             

             $ret = $this->input->append(QR_MODE_KANJI, $p, str_split($this->dataStr));

-            if($ret < 0)

+            if ($ret < 0)

                 return -1;

 

             return $ret;

@@ -198,34 +198,34 @@ 
             $p = 1;

             $dataStrLen = strlen($this->dataStr);

             

-            while($p < $dataStrLen) {

+            while ($p < $dataStrLen) {

                 

                 $mode = $this->identifyMode($p);

-                if($mode == QR_MODE_KANJI) {

+                if ($mode == QR_MODE_KANJI) {

                     break;

                 }

-                if($mode == QR_MODE_NUM) {

+                if ($mode == QR_MODE_NUM) {

                     $q = $p;

-                    while(self::isdigitat($this->dataStr, $q)) {

+                    while (self::isdigitat($this->dataStr, $q)) {

                         $q++;

                     }

                     $dif = QRinput::estimateBitsMode8($p) // + 4 + l8

                          + QRinput::estimateBitsModeNum($q - $p) + 4 + $ln

                          - QRinput::estimateBitsMode8($q); // - 4 - l8

-                    if($dif < 0) {

+                    if ($dif < 0) {

                         break;

                     } else {

                         $p = $q;

                     }

-                } else if($mode == QR_MODE_AN) {

+                } else if ($mode == QR_MODE_AN) {

                     $q = $p;

-                    while(self::isalnumat($this->dataStr, $q)) {

+                    while (self::isalnumat($this->dataStr, $q)) {

                         $q++;

                     }

                     $dif = QRinput::estimateBitsMode8($p)  // + 4 + l8

                          + QRinput::estimateBitsModeAn($q - $p) + 4 + $la

                          - QRinput::estimateBitsMode8($q); // - 4 - l8

-                    if($dif < 0) {

+                    if ($dif < 0) {

                         break;

                     } else {

                         $p = $q;

@@ -238,7 +238,7 @@ 
             $run = $p;

             $ret = $this->input->append(QR_MODE_8, $run, str_split($this->dataStr));

             

-            if($ret < 0)

+            if ($ret < 0)

                 return -1;

 

             return $run;

@@ -249,7 +249,7 @@ 
         {

             while (strlen($this->dataStr) > 0)

             {

-                if($this->dataStr == '')

+                if ($this->dataStr == '')

                     return 0;

 

                 $mode = $this->identifyMode(0);

@@ -266,8 +266,8 @@ 
                 

                 }

 

-                if($length == 0) return 0;

-                if($length < 0)  return -1;

+                if ($length == 0) return 0;

+                if ($length < 0)  return -1;

                 

                 $this->dataStr = substr($this->dataStr, $length);

             }

@@ -279,9 +279,9 @@ 
             $stringLen = strlen($this->dataStr);

             $p = 0;

             

-            while ($p<$stringLen) {

+            while ($p < $stringLen) {

                 $mode = self::identifyMode(substr($this->dataStr, $p));

-                if($mode == QR_MODE_KANJI) {

+                if ($mode == QR_MODE_KANJI) {

                     $p += 2;

                 } else {

                     if (ord($this->dataStr[$p]) >= ord('a') && ord($this->dataStr[$p]) <= ord('z')) {

@@ -297,13 +297,13 @@ 
         //----------------------------------------------------------------------

         public static function splitStringToQRinput($string, QRinput $input, $modeHint, $casesensitive = true)

         {

-            if(is_null($string) || $string == '\0' || $string == '') {

+            if (is_null($string) || $string == '\0' || $string == '') {

                 throw new Exception('empty string!!!');

             }

 

             $split = new QRsplit($string, $input, $modeHint);

             

-            if(!$casesensitive)

+            if (!$casesensitive)

                 $split->toUpper();

                 

             return $split->splitString();

Braces +38 added lines, -23 removed lines

@@ -47,8 +47,9 @@ 
         //----------------------------------------------------------------------

         public static function isdigitat($str, $pos)

         {    

-            if ($pos >= strlen($str))

-                return false;

+            if ($pos >= strlen($str)) {
+                            return false;
+            }
             

             return ((ord($str[$pos]) >= ord('0'))&&(ord($str[$pos]) <= ord('9')));

         }

@@ -56,8 +57,9 @@ 
         //----------------------------------------------------------------------

         public static function isalnumat($str, $pos)

         {

-            if ($pos >= strlen($str))

-                return false;

+            if ($pos >= strlen($str)) {
+                            return false;
+            }
                 

             return (QRinput::lookAnTable(ord($str[$pos])) >= 0);

         }

@@ -65,8 +67,9 @@ 
         //----------------------------------------------------------------------

         public function identifyMode($pos)

         {

-            if ($pos >= strlen($this->dataStr)) 

-                return QR_MODE_NUL;

+            if ($pos >= strlen($this->dataStr)) {
+                            return QR_MODE_NUL;
+            }
                 

             $c = $this->dataStr[$pos];

             

@@ -120,8 +123,9 @@ 
             }

             

             $ret = $this->input->append(QR_MODE_NUM, $run, str_split($this->dataStr));

-            if($ret < 0)

-                return -1;

+            if($ret < 0) {
+                            return -1;
+            }
 

             return $run;

         }

@@ -167,8 +171,9 @@ 
             }

 

             $ret = $this->input->append(QR_MODE_AN, $run, str_split($this->dataStr));

-            if($ret < 0)

-                return -1;

+            if($ret < 0) {
+                            return -1;
+            }
 

             return $run;

         }

@@ -183,8 +188,9 @@ 
             }

             

             $ret = $this->input->append(QR_MODE_KANJI, $p, str_split($this->dataStr));

-            if($ret < 0)

-                return -1;

+            if($ret < 0) {
+                            return -1;
+            }
 

             return $ret;

         }

@@ -238,8 +244,9 @@ 
             $run = $p;

             $ret = $this->input->append(QR_MODE_8, $run, str_split($this->dataStr));

             

-            if($ret < 0)

-                return -1;

+            if($ret < 0) {
+                            return -1;
+            }
 

             return $run;

         }

@@ -249,8 +256,9 @@ 
         {

             while (strlen($this->dataStr) > 0)

             {

-                if($this->dataStr == '')

-                    return 0;

+                if($this->dataStr == '') {
+                                    return 0;
+                }
 

                 $mode = $this->identifyMode(0);

                 

@@ -258,16 +266,22 @@ 
                     case QR_MODE_NUM: $length = $this->eatNum(); break;

                     case QR_MODE_AN:  $length = $this->eatAn(); break;

                     case QR_MODE_KANJI:

-                        if ($this->modeHint == QR_MODE_KANJI)

-                                $length = $this->eatKanji();

-                        else    $length = $this->eat8();

+                        if ($this->modeHint == QR_MODE_KANJI) {
+                                                        $length = $this->eatKanji();
+                        } else {
+                            $length = $this->eat8();
+                        }
                         break;

                     default: $length = $this->eat8(); break;

                 

                 }

 

-                if($length == 0) return 0;

-                if($length < 0)  return -1;

+                if($length == 0) {
+                    return 0;
+                }
+                if($length < 0) {
+                    return -1;
+                }
                 

                 $this->dataStr = substr($this->dataStr, $length);

             }

@@ -303,8 +317,9 @@ 
 

             $split = new QRsplit($string, $input, $modeHint);

             

-            if(!$casesensitive)

-                $split->toUpper();

+            if(!$casesensitive) {
+                            $split->toUpper();
+            }
                 

             return $split->splitString();

         }

lib/phpqrcode/qrinput.php

Switch Indentation +58 added lines, -58 removed lines

@@ -201,13 +201,13 @@ 
                 $version = 1;

 

             switch($this->mode) {

-                case QR_MODE_NUM:        $bits = QRinput::estimateBitsModeNum($this->size);    break;

-                case QR_MODE_AN:        $bits = QRinput::estimateBitsModeAn($this->size);    break;

-                case QR_MODE_8:            $bits = QRinput::estimateBitsMode8($this->size);    break;

-                case QR_MODE_KANJI:        $bits = QRinput::estimateBitsModeKanji($this->size);break;

-                case QR_MODE_STRUCTURE:    return STRUCTURE_HEADER_BITS;            

-                default:

-                    return 0;

+            case QR_MODE_NUM:        $bits = QRinput::estimateBitsModeNum($this->size);    break;

+            case QR_MODE_AN:        $bits = QRinput::estimateBitsModeAn($this->size);    break;

+            case QR_MODE_8:            $bits = QRinput::estimateBitsMode8($this->size);    break;

+            case QR_MODE_KANJI:        $bits = QRinput::estimateBitsModeKanji($this->size);break;

+            case QR_MODE_STRUCTURE:    return STRUCTURE_HEADER_BITS;            

+            default:

+                return 0;

             }

 

             $l = QRspec::lengthIndicator($this->mode, $version);

@@ -247,14 +247,14 @@ 
                     $ret = 0;

                     

                     switch($this->mode) {

-                        case QR_MODE_NUM:        $ret = $this->encodeModeNum($version);    break;

-                        case QR_MODE_AN:        $ret = $this->encodeModeAn($version);    break;

-                        case QR_MODE_8:            $ret = $this->encodeMode8($version);    break;

-                        case QR_MODE_KANJI:        $ret = $this->encodeModeKanji($version);break;

-                        case QR_MODE_STRUCTURE:    $ret = $this->encodeModeStructure();    break;

+                    case QR_MODE_NUM:        $ret = $this->encodeModeNum($version);    break;

+                    case QR_MODE_AN:        $ret = $this->encodeModeAn($version);    break;

+                    case QR_MODE_8:            $ret = $this->encodeMode8($version);    break;

+                    case QR_MODE_KANJI:        $ret = $this->encodeModeKanji($version);break;

+                    case QR_MODE_STRUCTURE:    $ret = $this->encodeModeStructure();    break;

                         

-                        default:

-                            break;

+                    default:

+                        break;

                     }

                     

                     if($ret < 0)

@@ -404,14 +404,14 @@ 
             $bits = $w * 10;

             

             switch($size - $w * 3) {

-                case 1:

-                    $bits += 4;

-                    break;

-                case 2:

-                    $bits += 7;

-                    break;

-                default:

-                    break;

+            case 1:

+                $bits += 4;

+                break;

+            case 2:

+                $bits += 7;

+                break;

+            default:

+                break;

             }

 

             return $bits;

@@ -500,14 +500,14 @@ 
                 return false;

 

             switch($mode) {

-                case QR_MODE_NUM:       return self::checkModeNum($size, $data);   break;

-                case QR_MODE_AN:        return self::checkModeAn($size, $data);    break;

-                case QR_MODE_KANJI:     return self::checkModeKanji($size, $data); break;

-                case QR_MODE_8:         return true; break;

-                case QR_MODE_STRUCTURE: return true; break;

+            case QR_MODE_NUM:       return self::checkModeNum($size, $data);   break;

+            case QR_MODE_AN:        return self::checkModeAn($size, $data);    break;

+            case QR_MODE_KANJI:     return self::checkModeKanji($size, $data); break;

+            case QR_MODE_8:         return true; break;

+            case QR_MODE_STRUCTURE: return true; break;

                 

-                default:

-                    break;

+            default:

+                break;

             }

 

             return false;

@@ -548,35 +548,35 @@ 
         {

             $payload = $bits - 4 - QRspec::lengthIndicator($mode, $version);

             switch($mode) {

-                case QR_MODE_NUM:

-                    $chunks = (int)($payload / 10);

-                    $remain = $payload - $chunks * 10;

-                    $size = $chunks * 3;

-                    if($remain >= 7) {

-                        $size += 2;

-                    } else if($remain >= 4) {

-                        $size += 1;

-                    }

-                    break;

-                case QR_MODE_AN:

-                    $chunks = (int)($payload / 11);

-                    $remain = $payload - $chunks * 11;

-                    $size = $chunks * 2;

-                    if($remain >= 6) 

-                        $size++;

-                    break;

-                case QR_MODE_8:

-                    $size = (int)($payload / 8);

-                    break;

-                case QR_MODE_KANJI:

-                    $size = (int)(($payload / 13) * 2);

-                    break;

-                case QR_MODE_STRUCTURE:

-                    $size = (int)($payload / 8);

-                    break;

-                default:

-                    $size = 0;

-                    break;

+            case QR_MODE_NUM:

+                $chunks = (int)($payload / 10);

+                $remain = $payload - $chunks * 10;

+                $size = $chunks * 3;

+                if($remain >= 7) {

+                    $size += 2;

+                } else if($remain >= 4) {

+                    $size += 1;

+                }

+                break;

+            case QR_MODE_AN:

+                $chunks = (int)($payload / 11);

+                $remain = $payload - $chunks * 11;

+                $size = $chunks * 2;

+                if($remain >= 6) 

+                    $size++;

+                break;

+            case QR_MODE_8:

+                $size = (int)($payload / 8);

+                break;

+            case QR_MODE_KANJI:

+                $size = (int)(($payload / 13) * 2);

+                break;

+            case QR_MODE_STRUCTURE:

+                $size = (int)($payload / 8);

+                break;

+            default:

+                $size = 0;

+                break;

             }

             

             $maxsize = QRspec::maximumWords($mode, $version);

Spacing +98 added lines, -98 removed lines

@@ -25,7 +25,7 @@ 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

  */

  

-    define('STRUCTURE_HEADER_BITS',  20);

+    define('STRUCTURE_HEADER_BITS', 20);

     define('MAX_STRUCTURED_SYMBOLS', 16);

 

     class QRinputItem {

@@ -40,11 +40,11 @@ 
             $setData = array_slice($data, 0, $size);

             

             if (count($setData) < $size) {

-                $setData = array_merge($setData, array_fill(0,$size-count($setData),0));

+                $setData = array_merge($setData, array_fill(0, $size - count($setData), 0));

             }

         

-            if(!QRinput::check($mode, $size, $setData)) {

-                throw new Exception('Error m:'.$mode.',s:'.$size.',d:'.join(',',$setData));

+            if (!QRinput::check($mode, $size, $setData)) {

+                throw new Exception('Error m:'.$mode.',s:'.$size.',d:'.join(',', $setData));

                 return null;

             }

             

@@ -59,26 +59,26 @@ 
         {

             try {

             

-                $words = (int)($this->size / 3);

+                $words = (int) ($this->size / 3);

                 $bs = new QRbitstream();

                 

                 $val = 0x1;

                 $bs->appendNum(4, $val);

                 $bs->appendNum(QRspec::lengthIndicator(QR_MODE_NUM, $version), $this->size);

 

-                for($i=0; $i<$words; $i++) {

-                    $val  = (ord($this->data[$i*3  ]) - ord('0')) * 100;

-                    $val += (ord($this->data[$i*3+1]) - ord('0')) * 10;

-                    $val += (ord($this->data[$i*3+2]) - ord('0'));

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

+                    $val  = (ord($this->data[$i * 3]) - ord('0')) * 100;

+                    $val += (ord($this->data[$i * 3 + 1]) - ord('0')) * 10;

+                    $val += (ord($this->data[$i * 3 + 2]) - ord('0'));

                     $bs->appendNum(10, $val);

                 }

 

-                if($this->size - $words * 3 == 1) {

-                    $val = ord($this->data[$words*3]) - ord('0');

+                if ($this->size - $words * 3 == 1) {

+                    $val = ord($this->data[$words * 3]) - ord('0');

                     $bs->appendNum(4, $val);

-                } else if($this->size - $words * 3 == 2) {

-                    $val  = (ord($this->data[$words*3  ]) - ord('0')) * 10;

-                    $val += (ord($this->data[$words*3+1]) - ord('0'));

+                } else if ($this->size - $words * 3 == 2) {

+                    $val  = (ord($this->data[$words * 3]) - ord('0')) * 10;

+                    $val += (ord($this->data[$words * 3 + 1]) - ord('0'));

                     $bs->appendNum(7, $val);

                 }

 

@@ -94,20 +94,20 @@ 
         public function encodeModeAn($version)

         {

             try {

-                $words = (int)($this->size / 2);

+                $words = (int) ($this->size / 2);

                 $bs = new QRbitstream();

                 

                 $bs->appendNum(4, 0x02);

                 $bs->appendNum(QRspec::lengthIndicator(QR_MODE_AN, $version), $this->size);

 

-                for($i=0; $i<$words; $i++) {

-                    $val  = (int)QRinput::lookAnTable(ord($this->data[$i*2  ])) * 45;

-                    $val += (int)QRinput::lookAnTable(ord($this->data[$i*2+1]));

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

+                    $val  = (int) QRinput::lookAnTable(ord($this->data[$i * 2])) * 45;

+                    $val += (int) QRinput::lookAnTable(ord($this->data[$i * 2 + 1]));

 

                     $bs->appendNum(11, $val);

                 }

 

-                if($this->size & 1) {

+                if ($this->size & 1) {

                     $val = QRinput::lookAnTable(ord($this->data[$words * 2]));

                     $bs->appendNum(6, $val);

                 }

@@ -129,7 +129,7 @@ 
                 $bs->appendNum(4, 0x4);

                 $bs->appendNum(QRspec::lengthIndicator(QR_MODE_8, $version), $this->size);

 

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

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

                     $bs->appendNum(8, ord($this->data[$i]));

                 }

 

@@ -149,11 +149,11 @@ 
                 $bs = new QRbitrtream();

                 

                 $bs->appendNum(4, 0x8);

-                $bs->appendNum(QRspec::lengthIndicator(QR_MODE_KANJI, $version), (int)($this->size / 2));

+                $bs->appendNum(QRspec::lengthIndicator(QR_MODE_KANJI, $version), (int) ($this->size / 2));

 

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

-                    $val = (ord($this->data[$i]) << 8) | ord($this->data[$i+1]);

-                    if($val <= 0x9ffc) {

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

+                    $val = (ord($this->data[$i]) << 8) | ord($this->data[$i + 1]);

+                    if ($val <= 0x9ffc) {

                         $val -= 0x8140;

                     } else {

                         $val -= 0xc140;

@@ -177,7 +177,7 @@ 
         public function encodeModeStructure()

         {

             try {

-                $bs =  new QRbitstream();

+                $bs = new QRbitstream();

                 

                 $bs->appendNum(4, 0x03);

                 $bs->appendNum(4, ord($this->data[1]) - 1);

@@ -197,14 +197,14 @@ 
         {

             $bits = 0;

 

-            if($version == 0) 

+            if ($version == 0) 

                 $version = 1;

 

-            switch($this->mode) {

-                case QR_MODE_NUM:        $bits = QRinput::estimateBitsModeNum($this->size);    break;

-                case QR_MODE_AN:        $bits = QRinput::estimateBitsModeAn($this->size);    break;

-                case QR_MODE_8:            $bits = QRinput::estimateBitsMode8($this->size);    break;

-                case QR_MODE_KANJI:        $bits = QRinput::estimateBitsModeKanji($this->size);break;

+            switch ($this->mode) {

+                case QR_MODE_NUM:        $bits = QRinput::estimateBitsModeNum($this->size); break;

+                case QR_MODE_AN:        $bits = QRinput::estimateBitsModeAn($this->size); break;

+                case QR_MODE_8:            $bits = QRinput::estimateBitsMode8($this->size); break;

+                case QR_MODE_KANJI:        $bits = QRinput::estimateBitsModeKanji($this->size); break;

                 case QR_MODE_STRUCTURE:    return STRUCTURE_HEADER_BITS;            

                 default:

                     return 0;

@@ -212,7 +212,7 @@ 
 

             $l = QRspec::lengthIndicator($this->mode, $version);

             $m = 1 << $l;

-            $num = (int)(($this->size + $m - 1) / $m);

+            $num = (int) (($this->size + $m - 1) / $m);

 

             $bits += $num * (4 + $l);

 

@@ -227,7 +227,7 @@ 
                 unset($this->bstream);

                 $words = QRspec::maximumWords($this->mode, $version);

                 

-                if($this->size > $words) {

+                if ($this->size > $words) {

                 

                     $st1 = new QRinputItem($this->mode, $words, $this->data);

                     $st2 = new QRinputItem($this->mode, $this->size - $words, array_slice($this->data, $words));

@@ -246,18 +246,18 @@ 
                     

                     $ret = 0;

                     

-                    switch($this->mode) {

-                        case QR_MODE_NUM:        $ret = $this->encodeModeNum($version);    break;

-                        case QR_MODE_AN:        $ret = $this->encodeModeAn($version);    break;

-                        case QR_MODE_8:            $ret = $this->encodeMode8($version);    break;

-                        case QR_MODE_KANJI:        $ret = $this->encodeModeKanji($version);break;

-                        case QR_MODE_STRUCTURE:    $ret = $this->encodeModeStructure();    break;

+                    switch ($this->mode) {

+                        case QR_MODE_NUM:        $ret = $this->encodeModeNum($version); break;

+                        case QR_MODE_AN:        $ret = $this->encodeModeAn($version); break;

+                        case QR_MODE_8:            $ret = $this->encodeMode8($version); break;

+                        case QR_MODE_KANJI:        $ret = $this->encodeModeKanji($version); break;

+                        case QR_MODE_STRUCTURE:    $ret = $this->encodeModeStructure(); break;

                         

                         default:

                             break;

                     }

                     

-                    if($ret < 0)

+                    if ($ret < 0)

                         return -1;

                 }

 

@@ -299,7 +299,7 @@ 
         //----------------------------------------------------------------------

         public function setVersion($version)

         {

-            if($version < 0 || $version > QRSPEC_VERSION_MAX) {

+            if ($version < 0 || $version > QRSPEC_VERSION_MAX) {

                 throw new Exception('Invalid version no');

                 return -1;

             }

@@ -318,7 +318,7 @@ 
         //----------------------------------------------------------------------

         public function setErrorCorrectionLevel($level)

         {

-            if($level > QR_ECLEVEL_H) {

+            if ($level > QR_ECLEVEL_H) {

                 throw new Exception('Invalid ECLEVEL');

                 return -1;

             }

@@ -350,11 +350,11 @@ 
         

         public function insertStructuredAppendHeader($size, $index, $parity)

         {

-            if( $size > MAX_STRUCTURED_SYMBOLS ) {

+            if ($size > MAX_STRUCTURED_SYMBOLS) {

                 throw new Exception('insertStructuredAppendHeader wrong size');

             }

             

-            if( $index <= 0 || $index > MAX_STRUCTURED_SYMBOLS ) {

+            if ($index <= 0 || $index > MAX_STRUCTURED_SYMBOLS) {

                 throw new Exception('insertStructuredAppendHeader wrong index');

             }

 

@@ -374,9 +374,9 @@ 
         {

             $parity = 0;

             

-            foreach($this->items as $item) {

-                if($item->mode != QR_MODE_STRUCTURE) {

-                    for($i=$item->size-1; $i>=0; $i--) {

+            foreach ($this->items as $item) {

+                if ($item->mode != QR_MODE_STRUCTURE) {

+                    for ($i = $item->size - 1; $i >= 0; $i--) {

                         $parity ^= $item->data[$i];

                     }

                 }

@@ -388,8 +388,8 @@ 
         //----------------------------------------------------------------------

         public static function checkModeNum($size, $data)

         {

-            for($i=0; $i<$size; $i++) {

-                if((ord($data[$i]) < ord('0')) || (ord($data[$i]) > ord('9'))){

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

+                if ((ord($data[$i]) < ord('0')) || (ord($data[$i]) > ord('9'))) {

                     return false;

                 }

             }

@@ -400,10 +400,10 @@ 
         //----------------------------------------------------------------------

         public static function estimateBitsModeNum($size)

         {

-            $w = (int)$size / 3;

+            $w = (int) $size / 3;

             $bits = $w * 10;

             

-            switch($size - $w * 3) {

+            switch ($size - $w * 3) {

                 case 1:

                     $bits += 4;

                     break;

@@ -422,7 +422,7 @@ 
             -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,

             -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,

             36, -1, -1, -1, 37, 38, -1, -1, -1, -1, 39, 40, -1, 41, 42, 43,

-             0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 44, -1, -1, -1, -1, -1,

+             0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 44, -1, -1, -1, -1, -1,

             -1, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,

             25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, -1, -1, -1, -1, -1,

             -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,

@@ -432,13 +432,13 @@ 
         //----------------------------------------------------------------------

         public static function lookAnTable($c)

         {

-            return (($c > 127)?-1:self::$anTable[$c]);

+            return (($c > 127) ?-1 : self::$anTable[$c]);

         }

         

         //----------------------------------------------------------------------

         public static function checkModeAn($size, $data)

         {

-            for($i=0; $i<$size; $i++) {

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

                 if (self::lookAnTable(ord($data[$i])) == -1) {

                     return false;

                 }

@@ -450,10 +450,10 @@ 
         //----------------------------------------------------------------------

         public static function estimateBitsModeAn($size)

         {

-            $w = (int)($size / 2);

+            $w = (int) ($size / 2);

             $bits = $w * 11;

             

-            if($size & 1) {

+            if ($size & 1) {

                 $bits += 6;

             }

 

@@ -469,18 +469,18 @@ 
         //----------------------------------------------------------------------

         public function estimateBitsModeKanji($size)

         {

-            return (int)(($size / 2) * 13);

+            return (int) (($size / 2) * 13);

         }

         

         //----------------------------------------------------------------------

         public static function checkModeKanji($size, $data)

         {

-            if($size & 1)

+            if ($size & 1)

                 return false;

 

-            for($i=0; $i<$size; $i+=2) {

-                $val = (ord($data[$i]) << 8) | ord($data[$i+1]);

-                if( $val < 0x8140 

+            for ($i = 0; $i < $size; $i += 2) {

+                $val = (ord($data[$i]) << 8) | ord($data[$i + 1]);

+                if ($val < 0x8140 

                 || ($val > 0x9ffc && $val < 0xe040) 

                 || $val > 0xebbf) {

                     return false;

@@ -496,12 +496,12 @@ 
 

         public static function check($mode, $size, $data)

         {

-            if($size <= 0) 

+            if ($size <= 0) 

                 return false;

 

-            switch($mode) {

-                case QR_MODE_NUM:       return self::checkModeNum($size, $data);   break;

-                case QR_MODE_AN:        return self::checkModeAn($size, $data);    break;

+            switch ($mode) {

+                case QR_MODE_NUM:       return self::checkModeNum($size, $data); break;

+                case QR_MODE_AN:        return self::checkModeAn($size, $data); break;

                 case QR_MODE_KANJI:     return self::checkModeKanji($size, $data); break;

                 case QR_MODE_8:         return true; break;

                 case QR_MODE_STRUCTURE: return true; break;

@@ -519,7 +519,7 @@ 
         {

             $bits = 0;

 

-            foreach($this->items as $item) {

+            foreach ($this->items as $item) {

                 $bits += $item->estimateBitStreamSizeOfEntry($version);

             }

 

@@ -534,7 +534,7 @@ 
             do {

                 $prev = $version;

                 $bits = $this->estimateBitStreamSize($prev);

-                $version = QRspec::getMinimumVersion((int)(($bits + 7) / 8), $this->level);

+                $version = QRspec::getMinimumVersion((int) (($bits + 7) / 8), $this->level);

                 if ($version < 0) {

                     return -1;

                 }

@@ -547,32 +547,32 @@ 
         public static function lengthOfCode($mode, $version, $bits)

         {

             $payload = $bits - 4 - QRspec::lengthIndicator($mode, $version);

-            switch($mode) {

+            switch ($mode) {

                 case QR_MODE_NUM:

-                    $chunks = (int)($payload / 10);

+                    $chunks = (int) ($payload / 10);

                     $remain = $payload - $chunks * 10;

                     $size = $chunks * 3;

-                    if($remain >= 7) {

+                    if ($remain >= 7) {

                         $size += 2;

-                    } else if($remain >= 4) {

+                    } else if ($remain >= 4) {

                         $size += 1;

                     }

                     break;

                 case QR_MODE_AN:

-                    $chunks = (int)($payload / 11);

+                    $chunks = (int) ($payload / 11);

                     $remain = $payload - $chunks * 11;

                     $size = $chunks * 2;

-                    if($remain >= 6) 

+                    if ($remain >= 6) 

                         $size++;

                     break;

                 case QR_MODE_8:

-                    $size = (int)($payload / 8);

+                    $size = (int) ($payload / 8);

                     break;

                 case QR_MODE_KANJI:

-                    $size = (int)(($payload / 13) * 2);

+                    $size = (int) (($payload / 13) * 2);

                     break;

                 case QR_MODE_STRUCTURE:

-                    $size = (int)($payload / 8);

+                    $size = (int) ($payload / 8);

                     break;

                 default:

                     $size = 0;

@@ -580,8 +580,8 @@ 
             }

             

             $maxsize = QRspec::maximumWords($mode, $version);

-            if($size < 0) $size = 0;

-            if($size > $maxsize) $size = $maxsize;

+            if ($size < 0) $size = 0;

+            if ($size > $maxsize) $size = $maxsize;

 

             return $size;

         }

@@ -591,10 +591,10 @@ 
         {

             $total = 0;

 

-            foreach($this->items as $item) {

+            foreach ($this->items as $item) {

                 $bits = $item->encodeBitStream($this->version);

                 

-                if($bits < 0) 

+                if ($bits < 0) 

                     return -1;

                     

                 $total += $bits;

@@ -607,21 +607,21 @@ 
         public function convertData()

         {

             $ver = $this->estimateVersion();

-            if($ver > $this->getVersion()) {

+            if ($ver > $this->getVersion()) {

                 $this->setVersion($ver);

             }

 

-            for(;;) {

+            for (;;) {

                 $bits = $this->createBitStream();

                 

-                if($bits < 0) 

+                if ($bits < 0) 

                     return -1;

                     

-                $ver = QRspec::getMinimumVersion((int)(($bits + 7) / 8), $this->level);

-                if($ver < 0) {

+                $ver = QRspec::getMinimumVersion((int) (($bits + 7) / 8), $this->level);

+                if ($ver < 0) {

                     throw new Exception('WRONG VERSION');

                     return -1;

-                } else if($ver > $this->getVersion()) {

+                } else if ($ver > $this->getVersion()) {

                     $this->setVersion($ver);

                 } else {

                     break;

@@ -647,26 +647,26 @@ 
             }

 

             $bits += 4;

-            $words = (int)(($bits + 7) / 8);

+            $words = (int) (($bits + 7) / 8);

 

             $padding = new QRbitstream();

             $ret = $padding->appendNum($words * 8 - $bits + 4, 0);

             

-            if($ret < 0) 

+            if ($ret < 0) 

                 return $ret;

 

             $padlen = $maxwords - $words;

             

-            if($padlen > 0) {

+            if ($padlen > 0) {

                 

                 $padbuf = array();

-                for($i=0; $i<$padlen; $i++) {

-                    $padbuf[$i] = ($i&1)?0x11:0xec;

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

+                    $padbuf[$i] = ($i & 1) ? 0x11 : 0xec;

                 }

                 

                 $ret = $padding->appendBytes($padlen, $padbuf);

                 

-                if($ret < 0)

+                if ($ret < 0)

                     return $ret;

                 

             }

@@ -679,15 +679,15 @@ 
         //----------------------------------------------------------------------

         public function mergeBitStream()

         {

-            if($this->convertData() < 0) {

+            if ($this->convertData() < 0) {

                 return null;

             }

 

             $bstream = new QRbitstream();

             

-            foreach($this->items as $item) {

+            foreach ($this->items as $item) {

                 $ret = $bstream->append($item->bstream);

-                if($ret < 0) {

+                if ($ret < 0) {

                     return null;

                 }

             }

@@ -701,12 +701,12 @@ 
 

             $bstream = $this->mergeBitStream();

             

-            if($bstream == null) {

+            if ($bstream == null) {

                 return null;

             }

             

             $ret = $this->appendPaddingBit($bstream);

-            if($ret < 0) {

+            if ($ret < 0) {

                 return null;

             }

 

@@ -717,7 +717,7 @@ 
         public function getByteStream()

         {

             $bstream = $this->getBitStream();

-            if($bstream == null) {

+            if ($bstream == null) {

                 return null;

             }

             

Indentation +1 added lines, -1 removed lines

@@ -422,7 +422,7 @@
             -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,

             -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,

             36, -1, -1, -1, 37, 38, -1, -1, -1, -1, 39, 40, -1, 41, 42, 43,

-             0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 44, -1, -1, -1, -1, -1,

+                0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 44, -1, -1, -1, -1, -1,

             -1, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,

             25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, -1, -1, -1, -1, -1,

             -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,

Braces +33 added lines, -20 removed lines

@@ -197,8 +197,9 @@ 
         {

             $bits = 0;

 

-            if($version == 0) 

-                $version = 1;

+            if($version == 0) {
+                            $version = 1;
+            }
 

             switch($this->mode) {

                 case QR_MODE_NUM:        $bits = QRinput::estimateBitsModeNum($this->size);    break;

@@ -257,8 +258,9 @@ 
                             break;

                     }

                     

-                    if($ret < 0)

-                        return -1;

+                    if($ret < 0) {
+                                            return -1;
+                    }
                 }

 

                 return $this->bstream->size();

@@ -475,8 +477,9 @@ 
         //----------------------------------------------------------------------

         public static function checkModeKanji($size, $data)

         {

-            if($size & 1)

-                return false;

+            if($size & 1) {
+                            return false;
+            }
 

             for($i=0; $i<$size; $i+=2) {

                 $val = (ord($data[$i]) << 8) | ord($data[$i+1]);

@@ -496,8 +499,9 @@ 
 

         public static function check($mode, $size, $data)

         {

-            if($size <= 0) 

-                return false;

+            if($size <= 0) {
+                            return false;
+            }
 

             switch($mode) {

                 case QR_MODE_NUM:       return self::checkModeNum($size, $data);   break;

@@ -562,8 +566,9 @@ 
                     $chunks = (int)($payload / 11);

                     $remain = $payload - $chunks * 11;

                     $size = $chunks * 2;

-                    if($remain >= 6) 

-                        $size++;

+                    if($remain >= 6) {
+                                            $size++;
+                    }
                     break;

                 case QR_MODE_8:

                     $size = (int)($payload / 8);

@@ -580,8 +585,12 @@ 
             }

             

             $maxsize = QRspec::maximumWords($mode, $version);

-            if($size < 0) $size = 0;

-            if($size > $maxsize) $size = $maxsize;

+            if($size < 0) {
+                $size = 0;
+            }
+            if($size > $maxsize) {
+                $size = $maxsize;
+            }
 

             return $size;

         }

@@ -594,8 +603,9 @@ 
             foreach($this->items as $item) {

                 $bits = $item->encodeBitStream($this->version);

                 

-                if($bits < 0) 

-                    return -1;

+                if($bits < 0) {
+                                    return -1;
+                }
                     

                 $total += $bits;

             }

@@ -614,8 +624,9 @@ 
             for(;;) {

                 $bits = $this->createBitStream();

                 

-                if($bits < 0) 

-                    return -1;

+                if($bits < 0) {
+                                    return -1;
+                }
                     

                 $ver = QRspec::getMinimumVersion((int)(($bits + 7) / 8), $this->level);

                 if($ver < 0) {

@@ -652,8 +663,9 @@ 
             $padding = new QRbitstream();

             $ret = $padding->appendNum($words * 8 - $bits + 4, 0);

             

-            if($ret < 0) 

-                return $ret;

+            if($ret < 0) {
+                            return $ret;
+            }
 

             $padlen = $maxwords - $words;

             

@@ -666,8 +678,9 @@ 
                 

                 $ret = $padding->appendBytes($padlen, $padbuf);

                 

-                if($ret < 0)

-                    return $ret;

+                if($ret < 0) {
+                                    return $ret;
+                }
                 

             }