codysnider / tt-rss

classes/auth/base.php

Braces +3 added lines, -1 removed lines

@@ -28,7 +28,9 @@
 		if ($login && defined('AUTH_AUTO_CREATE') && AUTH_AUTO_CREATE) {
 			$user_id = $this->find_user_by_login($login);
 
-			if (!$password) $password = make_password();
+			if (!$password) {
+				$password = make_password();
+			}
 
 			if (!$user_id) {
 				$salt = substr(bin2hex(get_random_bytes(125)), 0, 250);

install/index.php

Indentation +10 added lines, -10 removed lines

@@ -143,9 +143,9 @@ 
 
 			return $pdo;
 		} catch (Exception $e) {
-		    print "<div class='alert alert-danger'>" . $e->getMessage() . "</div>";
-		    return null;
-        }
+			print "<div class='alert alert-danger'>" . $e->getMessage() . "</div>";
+			return null;
+		}
 	}
 
 	function make_config($DB_TYPE, $DB_HOST, $DB_USER, $DB_NAME, $DB_PASS,
@@ -322,13 +322,13 @@ 
 			array_push($notices, "PHP support for Internationalization Functions is required to handle Internationalized Domain Names.");
 		}
 
-        if ($DB_TYPE == "mysql" && !function_exists("mysqli_connect")) {
-            array_push($notices, "PHP extension for MySQL (mysqli) is missing. This may prevent legacy plugins from working.");
-        }
+		if ($DB_TYPE == "mysql" && !function_exists("mysqli_connect")) {
+			array_push($notices, "PHP extension for MySQL (mysqli) is missing. This may prevent legacy plugins from working.");
+		}
 
-        if ($DB_TYPE == "pgsql" && !function_exists("pg_connect")) {
+		if ($DB_TYPE == "pgsql" && !function_exists("pg_connect")) {
 			array_push($notices, "PHP extension for PostgreSQL is missing. This may prevent legacy plugins from working.");
-        }
+		}
 
 		if (count($notices) > 0) {
 			print_notice("Configuration check succeeded with minor problems:");
@@ -429,7 +429,7 @@ 
 				print "<h2>Initializing database...</h2>";
 
 				$lines = explode(";", preg_replace("/[\r\n]/", "",
-                    file_get_contents("../schema/ttrss_schema_".basename($DB_TYPE).".sql")));
+					file_get_contents("../schema/ttrss_schema_".basename($DB_TYPE).".sql")));
 
 				foreach ($lines as $line) {
 					if (strpos($line, "--") !== 0 && $line) {
@@ -438,7 +438,7 @@ 
 						if (!$res) {
 							print_notice("Query: $line");
 							print_error("Error: " . implode(", ", $pdo->errorInfo()));
-                        }
+						}
 					}
 				}
 

Spacing +8 added lines, -8 removed lines

@@ -11,7 +11,7 @@ 
 		$query = "";
 
 		if (!(strpos($filename, "?") === FALSE)) {
-			$query = substr($filename, strpos($filename, "?")+1);
+			$query = substr($filename, strpos($filename, "?") + 1);
 			$filename = substr($filename, 0, strpos($filename, "?"));
 		}
 
@@ -85,7 +85,7 @@ 
 		$errors = array();
 
 		if (version_compare(PHP_VERSION, '5.6.0', '<')) {
-			array_push($errors, "PHP version 5.6.0 or newer required. You're using " . PHP_VERSION . ".");
+			array_push($errors, "PHP version 5.6.0 or newer required. You're using ".PHP_VERSION.".");
 		}
 
 		if (!function_exists("curl_init") && !ini_get("allow_url_fopen")) {
@@ -133,17 +133,17 @@ 
 
 	function pdo_connect($host, $user, $pass, $db, $type, $port = false) {
 
-		$db_port = $port ? ';port=' . $port : '';
-		$db_host = $host ? ';host=' . $host : '';
+		$db_port = $port ? ';port='.$port : '';
+		$db_host = $host ? ';host='.$host : '';
 
 		try {
-			$pdo = new PDO($type . ':dbname=' . $db . $db_host . $db_port,
+			$pdo = new PDO($type.':dbname='.$db.$db_host.$db_port,
 				$user,
 				$pass);
 
 			return $pdo;
 		} catch (Exception $e) {
-		    print "<div class='alert alert-danger'>" . $e->getMessage() . "</div>";
+		    print "<div class='alert alert-danger'>".$e->getMessage()."</div>";
 		    return null;
         }
 	}
@@ -189,7 +189,7 @@ 
 	}
 
 	function make_self_url_path() {
-		$url_path = (is_server_https() ? 'https://' :  'http://') . $_SERVER["HTTP_HOST"] . parse_url($_SERVER["REQUEST_URI"], PHP_URL_PATH);
+		$url_path = (is_server_https() ? 'https://' : 'http://').$_SERVER["HTTP_HOST"].parse_url($_SERVER["REQUEST_URI"], PHP_URL_PATH);
 
 		return $url_path;
 	}
@@ -437,7 +437,7 @@ 
 
 						if (!$res) {
 							print_notice("Query: $line");
-							print_error("Error: " . implode(", ", $pdo->errorInfo()));
+							print_error("Error: ".implode(", ", $pdo->errorInfo()));
                         }
 					}
 				}

Braces +3 added lines, -1 removed lines

@@ -17,7 +17,9 @@
 
 		$timestamp = filemtime($filename);
 
-		if ($query) $timestamp .= "&$query";
+		if ($query) {
+			$timestamp .= "&$query";
+		}
 
 		return "<script type=\"text/javascript\" charset=\"utf-8\" src=\"$filename?$timestamp\"></script>\n";
 	}

update_daemon2.php

Indentation +18 added lines, -18 removed lines

@@ -87,8 +87,8 @@ 
 	}
 
 	/**
-	* @SuppressWarnings(unused)
- 	*/
+	 * @SuppressWarnings(unused)
+	 */
 	function sigchld_handler($signal) {
 		$running_jobs = reap_children();
 
@@ -142,7 +142,7 @@ 
 		print "Tiny Tiny RSS update daemon.\n\n";
 		print "Options:\n";
 		print "  --log FILE           - log messages to FILE\n";
-        print "  --log-level N        - log verbosity level\n";
+		print "  --log-level N        - log verbosity level\n";
 		print "  --tasks N            - amount of update tasks to spawn\n";
 		print "                         default: " . MAX_JOBS . "\n";
 		print "  --interval N         - task spawn interval\n";
@@ -151,21 +151,21 @@ 
 		return;
 	}
 
-    Debug::set_enabled(true);
-
-    if (isset($options["log-level"])) {
-        Debug::set_loglevel((int)$options["log-level"]);
-    }
-
-    if (isset($options["log"])) {
-        Debug::set_quiet(isset($options['quiet']));
-        Debug::set_logfile($options["log"]);
-        Debug::log("Logging to " . $options["log"]);
-    } else {
-        if (isset($options['quiet'])) {
-            Debug::set_loglevel(Debug::$LOG_DISABLED);
-        }
-    }
+	Debug::set_enabled(true);
+
+	if (isset($options["log-level"])) {
+		Debug::set_loglevel((int)$options["log-level"]);
+	}
+
+	if (isset($options["log"])) {
+		Debug::set_quiet(isset($options['quiet']));
+		Debug::set_logfile($options["log"]);
+		Debug::log("Logging to " . $options["log"]);
+	} else {
+		if (isset($options['quiet'])) {
+			Debug::set_loglevel(Debug::$LOG_DISABLED);
+		}
+	}
 
 	if (isset($options["tasks"])) {
 		Debug::log("Set to spawn " . $options["tasks"] . " children.");

Spacing +14 added lines, -14 removed lines

@@ -1,9 +1,9 @@ 
 #!/usr/bin/env php
 <?php
-	set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+	set_include_path(dirname(__FILE__)."/include".PATH_SEPARATOR.
 		get_include_path());
 
-	declare(ticks = 1);
+	declare(ticks=1);
 	chdir(dirname(__FILE__));
 
 	define('DISABLE_SESSIONS', true);
@@ -99,9 +99,9 @@ 
 
 	function shutdown($caller_pid) {
 		if ($caller_pid == posix_getpid()) {
-			if (file_exists(LOCK_DIRECTORY . "/update_daemon.lock")) {
+			if (file_exists(LOCK_DIRECTORY."/update_daemon.lock")) {
 				Debug::log("removing lockfile (master)...");
-				unlink(LOCK_DIRECTORY . "/update_daemon.lock");
+				unlink(LOCK_DIRECTORY."/update_daemon.lock");
 			}
 		}
 	}
@@ -109,9 +109,9 @@ 
 	function task_shutdown() {
 		$pid = posix_getpid();
 
-		if (file_exists(LOCK_DIRECTORY . "/update_daemon-$pid.lock")) {
+		if (file_exists(LOCK_DIRECTORY."/update_daemon-$pid.lock")) {
 			Debug::log("removing lockfile ($pid)...");
-			unlink(LOCK_DIRECTORY . "/update_daemon-$pid.lock");
+			unlink(LOCK_DIRECTORY."/update_daemon-$pid.lock");
 		}
 	}
 
@@ -138,15 +138,15 @@ 
 
 	$options = getopt("", $longopts);
 
-	if (isset($options["help"]) ) {
+	if (isset($options["help"])) {
 		print "Tiny Tiny RSS update daemon.\n\n";
 		print "Options:\n";
 		print "  --log FILE           - log messages to FILE\n";
         print "  --log-level N        - log verbosity level\n";
 		print "  --tasks N            - amount of update tasks to spawn\n";
-		print "                         default: " . MAX_JOBS . "\n";
+		print "                         default: ".MAX_JOBS."\n";
 		print "  --interval N         - task spawn interval\n";
-		print "                         default: " . SPAWN_INTERVAL . " seconds.\n";
+		print "                         default: ".SPAWN_INTERVAL." seconds.\n";
 		print "  --quiet              - don't output messages to stdout\n";
 		return;
 	}
@@ -154,13 +154,13 @@ 
     Debug::set_enabled(true);
 
     if (isset($options["log-level"])) {
-        Debug::set_loglevel((int)$options["log-level"]);
+        Debug::set_loglevel((int) $options["log-level"]);
     }
 
     if (isset($options["log"])) {
         Debug::set_quiet(isset($options['quiet']));
         Debug::set_logfile($options["log"]);
-        Debug::log("Logging to " . $options["log"]);
+        Debug::log("Logging to ".$options["log"]);
     } else {
         if (isset($options['quiet'])) {
             Debug::set_loglevel(Debug::$LOG_DISABLED);
@@ -168,14 +168,14 @@ 
     }
 
 	if (isset($options["tasks"])) {
-		Debug::log("Set to spawn " . $options["tasks"] . " children.");
+		Debug::log("Set to spawn ".$options["tasks"]." children.");
 		$max_jobs = $options["tasks"];
 	} else {
 		$max_jobs = MAX_JOBS;
 	}
 
 	if (isset($options["interval"])) {
-		Debug::log("Spawn interval: " . $options["interval"] . " seconds.");
+		Debug::log("Spawn interval: ".$options["interval"]." seconds.");
 		$spawn_interval = $options["interval"];
 	} else {
 		$spawn_interval = SPAWN_INTERVAL;
@@ -250,7 +250,7 @@ 
 
 					$my_pid = posix_getpid();
 
-					passthru(PHP_EXECUTABLE . " update.php --daemon-loop $quiet $log --task $j --pidlock $my_pid");
+					passthru(PHP_EXECUTABLE." update.php --daemon-loop $quiet $log --task $j --pidlock $my_pid");
 
 					sleep(1);
 

errors.php

Spacing +3 added lines, -3 removed lines

@@ -1,15 +1,15 @@
 <?php
-	set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+	set_include_path(dirname(__FILE__)."/include".PATH_SEPARATOR.
 		get_include_path());
 
 	require_once "functions.php";
 
 	$ERRORS[0] = "";
 
-	$ERRORS[1] = __("This program requires XmlHttpRequest " .
+	$ERRORS[1] = __("This program requires XmlHttpRequest ".
 			"to function properly. Your browser doesn't seem to support it.");
 
-	$ERRORS[2] = __("This program requires cookies " .
+	$ERRORS[2] = __("This program requires cookies ".
 			"to function properly. Your browser doesn't seem to support them.");
 
 	$ERRORS[3] = __("Backend sanity check failed.");

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]);

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

Indentation +229 added lines, -229 removed lines

@@ -93,56 +93,56 @@ 
 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

+	// 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

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

-    // Fields:

-    //  varNo                         // variable no

-    //  tPosBegin                     // template position of begin of variable reference

-    //  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

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

+	// Fields:

+	//  varNo                         // variable no

+	//  tPosBegin                     // template position of begin of variable reference

+	//  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

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

-    // Fields:

-    //  blockName                     // block name

-    //  nextWithSameName;             // block no of next block with same name or -1 (blocks are backward linked in relation to template position)

-    //  tPosBegin                     // template position of begin of block

-    //  tPosContentsBegin             // template pos of begin of block contents

-    //  tPosContentsEnd               // template pos of end of block contents

-    //  tPosEnd                       // template position of end of block

-    //  nestingLevel                  // block nesting level

-    //  parentBlockNo                 // block no of parent block

-    //  definitionIsOpen              // true while $BeginBlock processed but no $EndBlock

-    //  instances                     // number of instances of this block

-    //  firstBlockInstNo              // block instance no of first instance of this block or -1

-    //  lastBlockInstNo               // block instance no of last instance of this block or -1

-    //  currBlockInstNo               // current block instance no, used during generation of output file

-    //  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

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

+	// Fields:

+	//  blockName                     // block name

+	//  nextWithSameName;             // block no of next block with same name or -1 (blocks are backward linked in relation to template position)

+	//  tPosBegin                     // template position of begin of block

+	//  tPosContentsBegin             // template pos of begin of block contents

+	//  tPosContentsEnd               // template pos of end of block contents

+	//  tPosEnd                       // template position of end of block

+	//  nestingLevel                  // block nesting level

+	//  parentBlockNo                 // block no of parent block

+	//  definitionIsOpen              // true while $BeginBlock processed but no $EndBlock

+	//  instances                     // number of instances of this block

+	//  firstBlockInstNo              // block instance no of first instance of this block or -1

+	//  lastBlockInstNo               // block instance no of last instance of this block or -1

+	//  currBlockInstNo               // current block instance no, used during generation of output file

+	//  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 $openBlocksTab;

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

-    // Indexed by the block nesting level.

+	// 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

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

-    // Indexed by BlockInstNo.

-    // Fields:

-    //  blockNo                       // block number

-    //  instanceLevel                 // instance level of this block

-    //     InstanceLevel is an instance counter per block.

-    //     (In contrast to blockInstNo, which is an instance counter over the instances of all blocks)

-    //  parentInstLevel               // instance level of parent block

-    //  nextBlockInstNo               // pointer to next instance of this block or -1

-    //     Forward chain for instances of same block.

-    //  blockVarTab                   // block instance variables

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

+	// Indexed by BlockInstNo.

+	// Fields:

+	//  blockNo                       // block number

+	//  instanceLevel                 // instance level of this block

+	//     InstanceLevel is an instance counter per block.

+	//     (In contrast to blockInstNo, which is an instance counter over the instances of all blocks)

+	//  parentInstLevel               // instance level of parent block

+	//  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 $currentNestingLevel;             // Current block nesting level during parsing.

@@ -173,8 +173,8 @@ 
 */

 function readTemplateFromFile ($fileName) {

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

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

-      return false; }

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

+	  return false; }

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

    return true; }

 

@@ -200,8 +200,8 @@ 
 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; }

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

+	  return false; }

    return true; }

 

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

@@ -271,17 +271,17 @@ 
 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; }

+	  $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; }

 

 /**

@@ -295,24 +295,24 @@ 
    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; }}

-    return true; }

+	  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; }

 

 /**

 * Processes the $BeginBlock command.

@@ -322,11 +322,11 @@ 
 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; }

+	  $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->triggerError ("Extra parameter in \$BeginBlock command in template at offset $cmdTPosBegin.");

+	  return false; }

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

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

    $btr['tPosBegin'] = $cmdTPosBegin;

@@ -336,8 +336,8 @@ 
    $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; }

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

+	  return false; }

    return true; }

 

 /**

@@ -348,22 +348,22 @@ 
 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; }

+	  $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; }

+	  $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->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; }

+	  $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; }

+	  $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;

@@ -378,7 +378,7 @@ 
    $btr = array();

    $btr['blockName'] = $blockName;

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

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

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

    $btr['definitionIsOpen'] = true;

    $btr['instances'] = 0;

    $btr['firstBlockInstNo'] = -1;

@@ -395,13 +395,13 @@ 
 */

 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; }}

+	  $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; }

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

+	  return false; }

    return true; }

 

 /**

@@ -412,11 +412,11 @@ 
 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; }

+	  $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; }

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

+	  return false; }

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

 

 /**

@@ -426,8 +426,8 @@ 
 */

 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; }

+	  $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.)

@@ -442,19 +442,19 @@ 
 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); }

+	  $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; }

 

 /**

@@ -462,7 +462,7 @@ 
 */

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

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

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

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

    $varRefNo = $this->varRefTabCnt++;

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

    $vrtr = array();

@@ -490,27 +490,27 @@ 
    $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; }}

+	  $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; }}

 

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

 

@@ -524,12 +524,12 @@ 
 */

 function reset() {

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

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

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

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

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

-      $btr['instances'] = 0;

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

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

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

+	  $btr['instances'] = 0;

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

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

    $this->blockInstTab = array();

    $this->blockInstTabCnt = 0; }

 

@@ -551,9 +551,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;

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

-      return false; }

+	  if ($isOptional) return true;

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

+	  return false; }

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

    return true; }

 

@@ -605,11 +605,11 @@ 
 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; }

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

+	  return false; }

    while ($blockNo != -1) {

-      $this->addBlockByNo($blockNo);

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

+	  $this->addBlockByNo($blockNo);

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

    return true; }

 

 /**

@@ -620,25 +620,25 @@ 
    $this->registerBlockInstance ($blockInstNo);

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

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

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

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

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

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

-         // set forward pointer of chain

+	  $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['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']; }}

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

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

 

 /**

 * @access private

@@ -706,10 +706,10 @@ 
 function generateOutputPage() {

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

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

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

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

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

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

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

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

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

    $this->outputError = false;

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

    if ($this->outputError) return false;

@@ -724,14 +724,14 @@ 
 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']; }}

+	  $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

@@ -744,46 +744,46 @@ 
    $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) {

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

-            $kind = 1; }}

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

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

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

-            $subBlockNo += 1;

-            continue; }

-         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

-            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; }}}

+	  $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) {

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

+			$kind = 1; }}

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

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

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

+			$subBlockNo += 1;

+			continue; }

+		 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

+			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 ------------------------------------------------------------------------------------------

 

@@ -838,9 +838,9 @@ 
 */

 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; }

+	  $s = file_get_contents($fileName);

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

+	  return true; }

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

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

    $fileSize = filesize($fileName);

@@ -888,9 +888,9 @@ 
    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->parseQuotedString($s,$p,$w);

+	else

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

 

 /**

 * Combine two file system paths.

@@ -901,9 +901,9 @@ 
    $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;

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

+	else

+	  $s = $s . $path2;

    return $s; }

 

 /**

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"); }

 

 }

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

Indentation +233 added lines, -233 removed lines

@@ -17,254 +17,254 @@
 //   http://creativecommons.org/publicdomain/zero/1.0/
 
 class jimIcon {
-        // Get an image color from a string
-        function get_color($str, $img) {
-                $b = ord($str[0]);
-                $g = ord($str[1]);
-                $r = ord($str[2]);
-                if (strlen($str) > 3) {
-                        $a = 127 - (ord($str[3]) / 2);
-                        if ($a != 0 && $a != 127)
-                                $this->had_alpha = 1;
-                } else {
-                        $a = 0;
-                }
-                if ($a != 127)
-                        $this->all_transaprent = 0;
-                return imagecolorallocatealpha($img, $r, $g, $b, $a);
-        }
+		// Get an image color from a string
+		function get_color($str, $img) {
+				$b = ord($str[0]);
+				$g = ord($str[1]);
+				$r = ord($str[2]);
+				if (strlen($str) > 3) {
+						$a = 127 - (ord($str[3]) / 2);
+						if ($a != 0 && $a != 127)
+								$this->had_alpha = 1;
+				} else {
+						$a = 0;
+				}
+				if ($a != 127)
+						$this->all_transaprent = 0;
+				return imagecolorallocatealpha($img, $r, $g, $b, $a);
+		}
 
-        // Given a string with the contents of an .ICO,
-        // return a GD image of the icon, or false on error.
-        function fromiconstring($ico) {
-                $this->error = "(unknown error)";
-                $this->had_alpha = 0;
+		// Given a string with the contents of an .ICO,
+		// return a GD image of the icon, or false on error.
+		function fromiconstring($ico) {
+				$this->error = "(unknown error)";
+				$this->had_alpha = 0;
 
-                // Read header
-                if (strlen($ico) < 6) {
-                        $this->error = "too short";
-                        return false;
-                }
-                $h = unpack("vzero/vtype/vnum", $ico);
+				// Read header
+				if (strlen($ico) < 6) {
+						$this->error = "too short";
+						return false;
+				}
+				$h = unpack("vzero/vtype/vnum", $ico);
 
-                // Must be ICO format with at least one image
-                if ($h["zero"] != 0 || $h["type"] != 1 || $h["num"] == 0) {
-                        // See if we can just parse it with GD directly
-                        // if it's not ICO format; maybe it was a mislabeled
-                        // PNG or something.
-                        $i = @imagecreatefromstring($ico);
-                        if ($i) {
-                                imagesavealpha($i, true);
-                                return $i;
-                        }
-                        $this->error = "not ICO or other image";
-                        return false;
-                }
+				// Must be ICO format with at least one image
+				if ($h["zero"] != 0 || $h["type"] != 1 || $h["num"] == 0) {
+						// See if we can just parse it with GD directly
+						// if it's not ICO format; maybe it was a mislabeled
+						// PNG or something.
+						$i = @imagecreatefromstring($ico);
+						if ($i) {
+								imagesavealpha($i, true);
+								return $i;
+						}
+						$this->error = "not ICO or other image";
+						return false;
+				}
 
-                // Read directory entries to find the biggest image
-                $most_pixels = 0;
-                for ($i = 0; $i < $h["num"]; $i++) {
-                        $entry = substr($ico, 6 + 16 * $i, 16);
-                        if (!$entry || strlen($entry) < 16)
-                                continue;
-                        $e = unpack("Cwidth/" .
-                                    "Cheight/" .
-                                    "Ccolors/" .
-                                    "Czero/" .
-                                    "vplanes/" .
-                                    "vbpp/" .
-                                    "Vsize/" .
-                                    "Voffset/",
-                                    $entry);
-                        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;
-                        }
-                        $pixels = $e["width"] * $e["height"];
-                        if ($pixels > $most_pixels) {
-                                $most_pixels = $pixels;
-                                $most = $e;
-                        }
-                }
-                if ($most_pixels == 0) {
-                        $this->error = "no pixels";
-                        return false;
-                }
-                $e = $most;
+				// Read directory entries to find the biggest image
+				$most_pixels = 0;
+				for ($i = 0; $i < $h["num"]; $i++) {
+						$entry = substr($ico, 6 + 16 * $i, 16);
+						if (!$entry || strlen($entry) < 16)
+								continue;
+						$e = unpack("Cwidth/" .
+									"Cheight/" .
+									"Ccolors/" .
+									"Czero/" .
+									"vplanes/" .
+									"vbpp/" .
+									"Vsize/" .
+									"Voffset/",
+									$entry);
+						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;
+						}
+						$pixels = $e["width"] * $e["height"];
+						if ($pixels > $most_pixels) {
+								$most_pixels = $pixels;
+								$most = $e;
+						}
+				}
+				if ($most_pixels == 0) {
+						$this->error = "no pixels";
+						return false;
+				}
+				$e = $most;
 
-                // Extract image data
-                $data = substr($ico, $e["offset"], $e["size"]);
-                if (!$data || strlen($data) != $e["size"]) {
-                        $this->error = "bad image data";
-                        return false;
-                }
+				// Extract image data
+				$data = substr($ico, $e["offset"], $e["size"]);
+				if (!$data || strlen($data) != $e["size"]) {
+						$this->error = "bad image data";
+						return false;
+				}
 
-                // See if we can parse it (might be PNG format here)
-                $i = @imagecreatefromstring($data);
-                if ($i) {
-                        imagesavealpha($img, true);
-                        return $i;
-                }
+				// See if we can parse it (might be PNG format here)
+				$i = @imagecreatefromstring($data);
+				if ($i) {
+						imagesavealpha($img, true);
+						return $i;
+				}
 
-                // Must be a BMP.  Parse it ourselves.
-                $img = imagecreatetruecolor($e["width"], $e["height"]);
-                imagesavealpha($img, true);
-                $bg = imagecolorallocatealpha($img, 255, 0, 0, 127);
-                imagefill($img, 0, 0, $bg);
+				// Must be a BMP.  Parse it ourselves.
+				$img = imagecreatetruecolor($e["width"], $e["height"]);
+				imagesavealpha($img, true);
+				$bg = imagecolorallocatealpha($img, 255, 0, 0, 127);
+				imagefill($img, 0, 0, $bg);
 
-                // Skip over the BITMAPCOREHEADER or BITMAPINFOHEADER;
-                // we'll just assume the palette and pixel data follow
-                // in the most obvious format as described by the icon
-                // directory entry.
-                $bitmapinfo = unpack("Vsize", $data);
-                if ($bitmapinfo["size"] == 40) {
-                        $info = unpack("Vsize/" .
-                                       "Vwidth/" .
-                                       "Vheight/" .
-                                       "vplanes/" .
-                                       "vbpp/" .
-                                       "Vcompress/" .
-                                       "Vsize/" .
-                                       "Vxres/" .
-                                       "Vyres/" .
-                                       "Vpalcolors/" .
-                                       "Vimpcolors/", $data);
-                        if ($e["bpp"] == 0) {
-                                $e["bpp"] = $info["bpp"];
-                        }
-                }
-                $data = substr($data, $bitmapinfo["size"]);
+				// Skip over the BITMAPCOREHEADER or BITMAPINFOHEADER;
+				// we'll just assume the palette and pixel data follow
+				// in the most obvious format as described by the icon
+				// directory entry.
+				$bitmapinfo = unpack("Vsize", $data);
+				if ($bitmapinfo["size"] == 40) {
+						$info = unpack("Vsize/" .
+									   "Vwidth/" .
+									   "Vheight/" .
+									   "vplanes/" .
+									   "vbpp/" .
+									   "Vcompress/" .
+									   "Vsize/" .
+									   "Vxres/" .
+									   "Vyres/" .
+									   "Vpalcolors/" .
+									   "Vimpcolors/", $data);
+						if ($e["bpp"] == 0) {
+								$e["bpp"] = $info["bpp"];
+						}
+				}
+				$data = substr($data, $bitmapinfo["size"]);
 
-                $height = $e["height"];
-                $width = $e["width"];
-                $bpp = $e["bpp"];
+				$height = $e["height"];
+				$width = $e["width"];
+				$bpp = $e["bpp"];
 
-                // For indexed images, we only support 1, 4, or 8 BPP
-                switch ($bpp) {
-                case 1:
-                case 4:
-                case 8:
-                        $indexed = 1;
-                        break;
-                case 24:
-                case 32:
-                        $indexed = 0;
-                        break;
-                default:
-                        $this->error = "bad BPP $bpp";
-                        return false;
-                }
+				// For indexed images, we only support 1, 4, or 8 BPP
+				switch ($bpp) {
+				case 1:
+				case 4:
+				case 8:
+						$indexed = 1;
+						break;
+				case 24:
+				case 32:
+						$indexed = 0;
+						break;
+				default:
+						$this->error = "bad BPP $bpp";
+						return false;
+				}
 
-                $offset = 0;
-                if ($indexed) {
-                        $palette = array();
-                        $this->all_transparent = 1;
-                        for ($i = 0; $i < (1 << $bpp); $i++) {
-                                $entry = substr($data, $i * 4, 4);
-                                $palette[$i] = $this->get_color($entry, $img);
-                        }
-                        $offset = $i * 4;
+				$offset = 0;
+				if ($indexed) {
+						$palette = array();
+						$this->all_transparent = 1;
+						for ($i = 0; $i < (1 << $bpp); $i++) {
+								$entry = substr($data, $i * 4, 4);
+								$palette[$i] = $this->get_color($entry, $img);
+						}
+						$offset = $i * 4;
 
-                        // Hack for some icons: if everything was transparent,
-                        // discard alpha channel.
-                        if ($this->all_transparent) {
-                                for ($i = 0; $i < (1 << $bpp); $i++) {
-                                        $palette[$i] &= 0xffffff;
-                                }
-                        }
-                }
+						// Hack for some icons: if everything was transparent,
+						// discard alpha channel.
+						if ($this->all_transparent) {
+								for ($i = 0; $i < (1 << $bpp); $i++) {
+										$palette[$i] &= 0xffffff;
+								}
+						}
+				}
 
-                // Assume image data follows in bottom-up order.
-                // First the "XOR" image
-                if ((strlen($data) - $offset) < ($bpp * $height * $width / 8)) {
-                        $this->error = "short data";
-                        return false;
-                }
-                $XOR = array();
-                for ($y = $height - 1; $y >= 0; $y--) {
-                        $x = 0;
-                        while ($x < $width) {
-                                if (!$indexed) {
-                                        $bytes = $bpp / 8;
-                                        $entry = substr($data, $offset, $bytes);
-                                        $pixel = $this->get_color($entry, $img);
-                                        $XOR[$y][$x] = $pixel;
-                                        $x++;
-                                        $offset += $bytes;
-                                } elseif ($bpp == 1) {
-                                        $p = ord($data[$offset]);
-                                        for ($b = 0x80; $b > 0; $b >>= 1) {
-                                                if ($p & $b) {
-                                                        $pixel = $palette[1];
-                                                } else {
-                                                        $pixel = $palette[0];
-                                                }
-                                                $XOR[$y][$x] = $pixel;
-                                                $x++;
-                                        }
-                                        $offset++;
-                                } elseif ($bpp == 4) {
-                                        $p = ord($data[$offset]);
-                                        $pixel1 = $palette[$p >> 4];
-                                        $pixel2 = $palette[$p & 0x0f];
-                                        $XOR[$y][$x] = $pixel1;
-                                        $XOR[$y][$x+1] = $pixel2;
-                                        $x += 2;
-                                        $offset++;
-                                } elseif ($bpp == 8) {
-                                        $pixel = $palette[ord($data[$offset])];
-                                        $XOR[$y][$x] = $pixel;
-                                        $x += 1;
-                                        $offset++;
-                                } else {
-                                        $this->error = "bad BPP";
-                                        return false;
-                                }
-                        }
-                        // End of row padding
-                        while ($offset & 3)
-                                $offset++;
-                }
+				// Assume image data follows in bottom-up order.
+				// First the "XOR" image
+				if ((strlen($data) - $offset) < ($bpp * $height * $width / 8)) {
+						$this->error = "short data";
+						return false;
+				}
+				$XOR = array();
+				for ($y = $height - 1; $y >= 0; $y--) {
+						$x = 0;
+						while ($x < $width) {
+								if (!$indexed) {
+										$bytes = $bpp / 8;
+										$entry = substr($data, $offset, $bytes);
+										$pixel = $this->get_color($entry, $img);
+										$XOR[$y][$x] = $pixel;
+										$x++;
+										$offset += $bytes;
+								} elseif ($bpp == 1) {
+										$p = ord($data[$offset]);
+										for ($b = 0x80; $b > 0; $b >>= 1) {
+												if ($p & $b) {
+														$pixel = $palette[1];
+												} else {
+														$pixel = $palette[0];
+												}
+												$XOR[$y][$x] = $pixel;
+												$x++;
+										}
+										$offset++;
+								} elseif ($bpp == 4) {
+										$p = ord($data[$offset]);
+										$pixel1 = $palette[$p >> 4];
+										$pixel2 = $palette[$p & 0x0f];
+										$XOR[$y][$x] = $pixel1;
+										$XOR[$y][$x+1] = $pixel2;
+										$x += 2;
+										$offset++;
+								} elseif ($bpp == 8) {
+										$pixel = $palette[ord($data[$offset])];
+										$XOR[$y][$x] = $pixel;
+										$x += 1;
+										$offset++;
+								} else {
+										$this->error = "bad BPP";
+										return false;
+								}
+						}
+						// End of row padding
+						while ($offset & 3)
+								$offset++;
+				}
 
-                // Now the "AND" image, which is 1 bit per pixel.  Ignore
-                // if some of our image data already had alpha values,
-                // or if there isn't enough data left.
-                if ($this->had_alpha ||
-                    ((strlen($data) - $offset) < ($height * $width / 8))) {
-                        // Just return what we've got
-                        for ($y = 0; $y < $height; $y++) {
-                                for ($x = 0; $x < $width; $x++) {
-                                        imagesetpixel($img, $x, $y,
-                                                      $XOR[$y][$x]);
-                                }
-                        }
-                        return $img;
-                }
+				// Now the "AND" image, which is 1 bit per pixel.  Ignore
+				// if some of our image data already had alpha values,
+				// or if there isn't enough data left.
+				if ($this->had_alpha ||
+					((strlen($data) - $offset) < ($height * $width / 8))) {
+						// Just return what we've got
+						for ($y = 0; $y < $height; $y++) {
+								for ($x = 0; $x < $width; $x++) {
+										imagesetpixel($img, $x, $y,
+													  $XOR[$y][$x]);
+								}
+						}
+						return $img;
+				}
 
-                // Mask what we have with the "AND" image
-                for ($y = $height - 1; $y >= 0; $y--) {
-                        $x = 0;
-                        while ($x < $width) {
-                                for ($b = 0x80;
-                                     $b > 0 && $x < $width; $b >>= 1) {
-                                        if (!(ord($data[$offset]) & $b)) {
-                                                imagesetpixel($img, $x, $y,
-                                                              $XOR[$y][$x]);
-                                        }
-                                        $x++;
-                                }
-                                $offset++;
-                        }
+				// Mask what we have with the "AND" image
+				for ($y = $height - 1; $y >= 0; $y--) {
+						$x = 0;
+						while ($x < $width) {
+								for ($b = 0x80;
+									 $b > 0 && $x < $width; $b >>= 1) {
+										if (!(ord($data[$offset]) & $b)) {
+												imagesetpixel($img, $x, $y,
+															  $XOR[$y][$x]);
+										}
+										$x++;
+								}
+								$offset++;
+						}
 
-                        // End of row padding
-                        while ($offset & 3)
-                                $offset++;
-                }
-                return $img;
-        }
+						// End of row padding
+						while ($offset & 3)
+								$offset++;
+				}
+				return $img;
+		}
 }
 ?>
\ No newline at end of file

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;
         }

lib/floIcon.php

Indentation +9 added lines, -9 removed lines

@@ -4,17 +4,17 @@
 require_once "jimIcon.php";
 
 class floIconIcon {
-        function getImageResource() {
-                return $this->img;
-        }
+		function getImageResource() {
+				return $this->img;
+		}
 }
 
 class floIcon {
-        function readICO($file) {
-                $jim = new jimIcon();
-                $icon = new floIconIcon();
-                $icon->img = $jim->fromiconstring(file_get_contents($file));
-                $this->images = array($icon);
-        }
+		function readICO($file) {
+				$jim = new jimIcon();
+				$icon = new floIconIcon();
+				$icon->img = $jim->fromiconstring(file_get_contents($file));
+				$this->images = array($icon);
+		}
 }
 ?>

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