codysnider / tt-rss

include/sanity_check.php

Indentation +145 added lines, -145 removed lines

@@ -1,190 +1,190 @@ 
 <?php
 
-	function make_self_url() {
-		$proto = is_server_https() ? 'https' : 'http';
+    function make_self_url() {
+        $proto = is_server_https() ? 'https' : 'http';
 
-		return $proto.'://'.$_SERVER["HTTP_HOST"].$_SERVER["REQUEST_URI"];
-	}
+        return $proto.'://'.$_SERVER["HTTP_HOST"].$_SERVER["REQUEST_URI"];
+    }
 
-	function make_self_url_path() {
-		$proto = is_server_https() ? 'https' : 'http';
-		$url_path = $proto.'://'.$_SERVER["HTTP_HOST"].parse_url($_SERVER["REQUEST_URI"], PHP_URL_PATH);
+    function make_self_url_path() {
+        $proto = is_server_https() ? 'https' : 'http';
+        $url_path = $proto.'://'.$_SERVER["HTTP_HOST"].parse_url($_SERVER["REQUEST_URI"], PHP_URL_PATH);
 
-		return $url_path;
-	}
+        return $url_path;
+    }
 
-	function check_mysql_tables() {
-		$pdo = Db::pdo();
+    function check_mysql_tables() {
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare("SELECT engine, table_name FROM information_schema.tables WHERE
+        $sth = $pdo->prepare("SELECT engine, table_name FROM information_schema.tables WHERE
 				table_schema = ? AND table_name LIKE 'ttrss_%' AND engine != 'InnoDB'");
-		$sth->execute([DB_NAME]);
+        $sth->execute([DB_NAME]);
 
-		$bad_tables = [];
+        $bad_tables = [];
 
-		while ($line = $sth->fetch()) {
-			array_push($bad_tables, $line);
-		}
+        while ($line = $sth->fetch()) {
+            array_push($bad_tables, $line);
+        }
 
-		return $bad_tables;
-	}
+        return $bad_tables;
+    }
 
-	function initial_sanity_check() {
+    function initial_sanity_check() {
 
-		$errors = array();
+        $errors = array();
 
-		if (!file_exists("config.php")) {
-			array_push($errors, "Configuration file not found. Looks like you forgot to copy config.php-dist to config.php and edit it.");
-		} else {
+        if (!file_exists("config.php")) {
+            array_push($errors, "Configuration file not found. Looks like you forgot to copy config.php-dist to config.php and edit it.");
+        } else {
 
-			require_once "sanity_config.php";
+            require_once "sanity_config.php";
 
-			if (file_exists("install") && !file_exists("config.php")) {
-				array_push($errors, "Please copy config.php-dist to config.php or run the installer in install/");
-			}
+            if (file_exists("install") && !file_exists("config.php")) {
+                array_push($errors, "Please copy config.php-dist to config.php or run the installer in install/");
+            }
 
-			if (strpos(PLUGINS, "auth_") === false) {
-				array_push($errors, "Please enable at least one authentication module via PLUGINS constant in config.php");
-			}
+            if (strpos(PLUGINS, "auth_") === false) {
+                array_push($errors, "Please enable at least one authentication module via PLUGINS constant in config.php");
+            }
 
-			if (function_exists('posix_getuid') && posix_getuid() == 0) {
-				array_push($errors, "Please don't run this script as root.");
-			}
+            if (function_exists('posix_getuid') && posix_getuid() == 0) {
+                array_push($errors, "Please don't run this script as root.");
+            }
 
-			if (version_compare(PHP_VERSION, '5.6.0', '<')) {
-				array_push($errors, "PHP version 5.6.0 or newer required. You're using ".PHP_VERSION.".");
-			}
+            if (version_compare(PHP_VERSION, '5.6.0', '<')) {
+                array_push($errors, "PHP version 5.6.0 or newer required. You're using ".PHP_VERSION.".");
+            }
 
-			if (!class_exists("UConverter")) {
-				array_push($errors, "PHP UConverter class is missing, it's provided by the Internationalization (intl) module.");
-			}
+            if (!class_exists("UConverter")) {
+                array_push($errors, "PHP UConverter class is missing, it's provided by the Internationalization (intl) module.");
+            }
 
-			if (CONFIG_VERSION != EXPECTED_CONFIG_VERSION) {
-				array_push($errors, "Configuration file (config.php) has incorrect version. Update it with new options from config.php-dist and set CONFIG_VERSION to the correct value.");
-			}
+            if (CONFIG_VERSION != EXPECTED_CONFIG_VERSION) {
+                array_push($errors, "Configuration file (config.php) has incorrect version. Update it with new options from config.php-dist and set CONFIG_VERSION to the correct value.");
+            }
 
-			if (!is_writable(CACHE_DIR."/images")) {
-				array_push($errors, "Image cache is not writable (chmod -R 777 ".CACHE_DIR."/images)");
-			}
+            if (!is_writable(CACHE_DIR."/images")) {
+                array_push($errors, "Image cache is not writable (chmod -R 777 ".CACHE_DIR."/images)");
+            }
 
-			if (!is_writable(CACHE_DIR."/upload")) {
-				array_push($errors, "Upload cache is not writable (chmod -R 777 ".CACHE_DIR."/upload)");
-			}
+            if (!is_writable(CACHE_DIR."/upload")) {
+                array_push($errors, "Upload cache is not writable (chmod -R 777 ".CACHE_DIR."/upload)");
+            }
 
-			if (!is_writable(CACHE_DIR."/export")) {
-				array_push($errors, "Data export cache is not writable (chmod -R 777 ".CACHE_DIR."/export)");
-			}
+            if (!is_writable(CACHE_DIR."/export")) {
+                array_push($errors, "Data export cache is not writable (chmod -R 777 ".CACHE_DIR."/export)");
+            }
 
-			if (GENERATED_CONFIG_CHECK != EXPECTED_CONFIG_VERSION) {
-				array_push($errors,
-					"Configuration option checker sanity_config.php is outdated, please recreate it using ./utils/regen_config_checks.sh");
-			}
+            if (GENERATED_CONFIG_CHECK != EXPECTED_CONFIG_VERSION) {
+                array_push($errors,
+                    "Configuration option checker sanity_config.php is outdated, please recreate it using ./utils/regen_config_checks.sh");
+            }
 
-			foreach ($required_defines as $d) {
-				if (!defined($d)) {
-					array_push($errors,
-						"Required configuration file parameter $d is not defined in config.php. You might need to copy it from config.php-dist.");
-				}
-			}
+            foreach ($required_defines as $d) {
+                if (!defined($d)) {
+                    array_push($errors,
+                        "Required configuration file parameter $d is not defined in config.php. You might need to copy it from config.php-dist.");
+                }
+            }
 
-			if (SINGLE_USER_MODE && class_exists("PDO")) {
-			    $pdo = DB::pdo();
+            if (SINGLE_USER_MODE && class_exists("PDO")) {
+                $pdo = DB::pdo();
 
-				$res = $pdo->query("SELECT id FROM ttrss_users WHERE id = 1");
+                $res = $pdo->query("SELECT id FROM ttrss_users WHERE id = 1");
 
-				if (!$res->fetch()) {
-					array_push($errors, "SINGLE_USER_MODE is enabled in config.php but default admin account is not found.");
-				}
-			}
+                if (!$res->fetch()) {
+                    array_push($errors, "SINGLE_USER_MODE is enabled in config.php but default admin account is not found.");
+                }
+            }
 
-			$ref_self_url_path = make_self_url_path();
-			$ref_self_url_path = preg_replace("/\w+\.php$/", "", $ref_self_url_path);
+            $ref_self_url_path = make_self_url_path();
+            $ref_self_url_path = preg_replace("/\w+\.php$/", "", $ref_self_url_path);
 
-			if (SELF_URL_PATH == "http://example.org/tt-rss/") {
-				array_push($errors,
-						"Please set SELF_URL_PATH to the correct value for your server (possible value: <b>$ref_self_url_path</b>)");
-			}
+            if (SELF_URL_PATH == "http://example.org/tt-rss/") {
+                array_push($errors,
+                        "Please set SELF_URL_PATH to the correct value for your server (possible value: <b>$ref_self_url_path</b>)");
+            }
 
-			if (isset($_SERVER["HTTP_HOST"]) &&
-				(!defined('_SKIP_SELF_URL_PATH_CHECKS') || !_SKIP_SELF_URL_PATH_CHECKS) &&
-				SELF_URL_PATH != $ref_self_url_path && SELF_URL_PATH != mb_substr($ref_self_url_path, 0, mb_strlen($ref_self_url_path) - 1)) {
-				array_push($errors,
-					"Please set SELF_URL_PATH to the correct value detected for your server: <b>$ref_self_url_path</b>");
-			}
+            if (isset($_SERVER["HTTP_HOST"]) &&
+                (!defined('_SKIP_SELF_URL_PATH_CHECKS') || !_SKIP_SELF_URL_PATH_CHECKS) &&
+                SELF_URL_PATH != $ref_self_url_path && SELF_URL_PATH != mb_substr($ref_self_url_path, 0, mb_strlen($ref_self_url_path) - 1)) {
+                array_push($errors,
+                    "Please set SELF_URL_PATH to the correct value detected for your server: <b>$ref_self_url_path</b>");
+            }
 
-			if (!is_writable(ICONS_DIR)) {
-				array_push($errors, "ICONS_DIR defined in config.php is not writable (chmod -R 777 ".ICONS_DIR.").\n");
-			}
+            if (!is_writable(ICONS_DIR)) {
+                array_push($errors, "ICONS_DIR defined in config.php is not writable (chmod -R 777 ".ICONS_DIR.").\n");
+            }
 
-			if (!is_writable(LOCK_DIRECTORY)) {
-				array_push($errors, "LOCK_DIRECTORY defined in config.php is not writable (chmod -R 777 ".LOCK_DIRECTORY.").\n");
-			}
+            if (!is_writable(LOCK_DIRECTORY)) {
+                array_push($errors, "LOCK_DIRECTORY defined in config.php is not writable (chmod -R 777 ".LOCK_DIRECTORY.").\n");
+            }
 
-			if (!function_exists("curl_init") && !ini_get("allow_url_fopen")) {
-				array_push($errors, "PHP configuration option allow_url_fopen is disabled, and CURL functions are not present. Either enable allow_url_fopen or install PHP extension for CURL.");
-			}
+            if (!function_exists("curl_init") && !ini_get("allow_url_fopen")) {
+                array_push($errors, "PHP configuration option allow_url_fopen is disabled, and CURL functions are not present. Either enable allow_url_fopen or install PHP extension for CURL.");
+            }
 
-			if (!function_exists("json_encode")) {
-				array_push($errors, "PHP support for JSON is required, but was not found.");
-			}
+            if (!function_exists("json_encode")) {
+                array_push($errors, "PHP support for JSON is required, but was not found.");
+            }
 
-			if (DB_TYPE == "mysql" && !function_exists("mysqli_connect")) {
-				array_push($errors, "PHP support for MySQL is required for configured DB_TYPE in config.php.");
-			}
+            if (DB_TYPE == "mysql" && !function_exists("mysqli_connect")) {
+                array_push($errors, "PHP support for MySQL is required for configured DB_TYPE in config.php.");
+            }
 
-			if (DB_TYPE == "pgsql" && !function_exists("pg_connect")) {
-				array_push($errors, "PHP support for PostgreSQL is required for configured DB_TYPE in config.php");
-			}
+            if (DB_TYPE == "pgsql" && !function_exists("pg_connect")) {
+                array_push($errors, "PHP support for PostgreSQL is required for configured DB_TYPE in config.php");
+            }
 
-			if (!class_exists("PDO")) {
-				array_push($errors, "PHP support for PDO is required but was not found.");
-			}
+            if (!class_exists("PDO")) {
+                array_push($errors, "PHP support for PDO is required but was not found.");
+            }
 
-			if (!function_exists("mb_strlen")) {
-				array_push($errors, "PHP support for mbstring functions is required but was not found.");
-			}
+            if (!function_exists("mb_strlen")) {
+                array_push($errors, "PHP support for mbstring functions is required but was not found.");
+            }
 
-			if (!function_exists("hash")) {
-				array_push($errors, "PHP support for hash() function is required but was not found.");
-			}
+            if (!function_exists("hash")) {
+                array_push($errors, "PHP support for hash() function is required but was not found.");
+            }
 
-			if (ini_get("safe_mode")) {
-				array_push($errors, "PHP safe mode setting is obsolete and not supported by tt-rss.");
-			}
+            if (ini_get("safe_mode")) {
+                array_push($errors, "PHP safe mode setting is obsolete and not supported by tt-rss.");
+            }
 
-			if (!function_exists("mime_content_type")) {
-				array_push($errors, "PHP function mime_content_type() is missing, try enabling fileinfo module.");
-			}
+            if (!function_exists("mime_content_type")) {
+                array_push($errors, "PHP function mime_content_type() is missing, try enabling fileinfo module.");
+            }
 
-			if (!class_exists("DOMDocument")) {
-				array_push($errors, "PHP support for DOMDocument is required, but was not found.");
-			}
+            if (!class_exists("DOMDocument")) {
+                array_push($errors, "PHP support for DOMDocument is required, but was not found.");
+            }
 
-			if (DB_TYPE == "mysql") {
-				$bad_tables = check_mysql_tables();
+            if (DB_TYPE == "mysql") {
+                $bad_tables = check_mysql_tables();
 
-				if (count($bad_tables) > 0) {
-					$bad_tables_fmt = [];
+                if (count($bad_tables) > 0) {
+                    $bad_tables_fmt = [];
 
-					foreach ($bad_tables as $bt) {
-						array_push($bad_tables_fmt, sprintf("%s (%s)", $bt['table_name'], $bt['engine']));
-					}
+                    foreach ($bad_tables as $bt) {
+                        array_push($bad_tables_fmt, sprintf("%s (%s)", $bt['table_name'], $bt['engine']));
+                    }
 
-					$msg = "<p>The following tables use an unsupported MySQL engine: <b>".
-						implode(", ", $bad_tables_fmt)."</b>.</p>";
+                    $msg = "<p>The following tables use an unsupported MySQL engine: <b>".
+                        implode(", ", $bad_tables_fmt)."</b>.</p>";
 
-					$msg .= "<p>The only supported engine on MySQL is InnoDB. MyISAM lacks functionality to run
+                    $msg .= "<p>The only supported engine on MySQL is InnoDB. MyISAM lacks functionality to run
 						tt-rss.
 						Please backup your data (via OPML) and re-import the schema before continuing.</p>
 						<p><b>WARNING: importing the schema would mean LOSS OF ALL YOUR DATA.</b></p>";
 
 
-					array_push($errors, $msg);
-				}
-			}
-		}
+                    array_push($errors, $msg);
+                }
+            }
+        }
 
-		if (count($errors) > 0 && $_SERVER['REQUEST_URI']) { ?>
+        if (count($errors) > 0 && $_SERVER['REQUEST_URI']) { ?>
 			<!DOCTYPE html>
 			<html>
 			<head>
@@ -211,22 +211,22 @@ 
 		</html>
 
 		<?php
-			die;
-		} else if (count($errors) > 0) {
-			echo "Tiny Tiny RSS was unable to start properly. This usually means a misconfiguration or an incomplete upgrade.\n";
-			echo "Please fix errors indicated by the following messages:\n\n";
+            die;
+        } else if (count($errors) > 0) {
+            echo "Tiny Tiny RSS was unable to start properly. This usually means a misconfiguration or an incomplete upgrade.\n";
+            echo "Please fix errors indicated by the following messages:\n\n";
 
-			foreach ($errors as $error) {
-				echo " * $error\n";
-			}
+            foreach ($errors as $error) {
+                echo " * $error\n";
+            }
 
-			echo "\nYou might want to check tt-rss wiki or the forums for more information.\n";
-			echo "Please search the forums before creating new topic for your question.\n";
+            echo "\nYou might want to check tt-rss wiki or the forums for more information.\n";
+            echo "Please search the forums before creating new topic for your question.\n";
 
-			exit(-1);
-		}
-	}
+            exit(-1);
+        }
+    }
 
-	initial_sanity_check();
+    initial_sanity_check();
 
 ?>

include/functions.php

Indentation +8 added lines, -8 removed lines

@@ -390,8 +390,8 @@ 
 
         // TODO: should this support POST requests or not? idk
 
-         $context_options = array(
-              'http' => array(
+            $context_options = array(
+                'http' => array(
                     'header' => array(
                         'Connection: close'
                     ),
@@ -399,7 +399,7 @@ 
                     'ignore_errors' => true,
                     'timeout' => $timeout ? $timeout : FILE_FETCH_TIMEOUT,
                     'protocol_version'=> 1.1)
-              );
+                );
 
         if (!$post_query && $last_modified) {
                     array_push($context_options['http']['header'], "If-Modified-Since: $last_modified");
@@ -681,7 +681,7 @@ 
 function logout_user() {
     @session_destroy();
     if (isset($_COOKIE[session_name()])) {
-       setcookie(session_name(), '', time() - 42000, '/');
+        setcookie(session_name(), '', time() - 42000, '/');
     }
     session_commit();
 }
@@ -725,7 +725,7 @@ 
             if (AUTH_AUTO_LOGIN && authenticate_user(null, null)) {
                 $_SESSION["ref_schema_version"] = get_schema_version(true);
             } else {
-                 authenticate_user(null, null, true);
+                    authenticate_user(null, null, true);
             }
 
             if (!$_SESSION["uid"]) {
@@ -1012,9 +1012,9 @@ 
     $params = array();
 
     foreach (array("ON_CATCHUP_SHOW_NEXT_FEED", "HIDE_READ_FEEDS",
-                 "ENABLE_FEED_CATS", "FEEDS_SORT_BY_UNREAD", "CONFIRM_FEED_CATCHUP",
-                 "CDM_AUTO_CATCHUP", "FRESH_ARTICLE_MAX_AGE",
-                 "HIDE_READ_SHOWS_SPECIAL", "COMBINED_DISPLAY_MODE") as $param) {
+                    "ENABLE_FEED_CATS", "FEEDS_SORT_BY_UNREAD", "CONFIRM_FEED_CATCHUP",
+                    "CDM_AUTO_CATCHUP", "FRESH_ARTICLE_MAX_AGE",
+                    "HIDE_READ_SHOWS_SPECIAL", "COMBINED_DISPLAY_MODE") as $param) {
 
         $params[strtolower($param)] = (int) get_pref($param);
     }

Spacing +5 added lines, -6 removed lines

@@ -231,14 +231,14 @@ 
     $url = str_replace(' ', '%20', $url);
 
     if (strpos($url, "//") === 0) {
-            $url = 'http:' . $url;
+            $url = 'http:'.$url;
     }
 
     $url_host = parse_url($url, PHP_URL_HOST);
     $fetch_domain_hits[$url_host] += 1;
 
     if ($fetch_domain_hits[$url_host] > MAX_FETCH_REQUESTS_PER_HOST) {
-        user_error("Exceeded fetch request quota for $url_host: " . $fetch_domain_hits[$url_host], E_USER_WARNING);
+        user_error("Exceeded fetch request quota for $url_host: ".$fetch_domain_hits[$url_host], E_USER_WARNING);
         #return false;
     }
 
@@ -255,7 +255,7 @@ 
         }
 
         if ($http_accept) {
-                    array_push($curl_http_headers, "Accept: " . $http_accept);
+                    array_push($curl_http_headers, "Accept: ".$http_accept);
         }
 
         if (count($curl_http_headers) > 0) {
@@ -270,11 +270,10 @@ 
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($ch, CURLOPT_HEADER, true);
         curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
-        curl_setopt($ch, CURLOPT_USERAGENT, $useragent ? $useragent :
-            SELF_USER_AGENT);
+        curl_setopt($ch, CURLOPT_USERAGENT, $useragent ? $useragent : SELF_USER_AGENT);
         curl_setopt($ch, CURLOPT_ENCODING, "");
 
-        if  ($http_referrer) {
+        if ($http_referrer) {
                     curl_setopt($ch, CURLOPT_REFERER, $http_referrer);
         }
 

include/errorhandler.php

Indentation +59 added lines, -59 removed lines

@@ -1,80 +1,80 @@
 <?php
 function format_backtrace($trace) {
-	$rv = "";
-	$idx = 1;
-
-	if (is_array($trace)) {
-		foreach ($trace as $e) {
-			if (isset($e["file"]) && isset($e["line"])) {
-				$fmt_args = [];
-
-				if (is_array($e["args"])) {
-					foreach ($e["args"] as $a) {
-						if (!is_object($a)) {
-							array_push($fmt_args, $a);
-						} else {
-							array_push($fmt_args, "[".get_class($a)."]");
-						}
-					}
-				}
-
-				$filename = str_replace(dirname(__DIR__)."/", "", $e["file"]);
-
-				$rv .= sprintf("%d. %s(%s): %s(%s)\n",
-					$idx, $filename, $e["line"], $e["function"], implode(", ", $fmt_args));
-
-				$idx++;
-			}
-		}
-	}
-
-	return $rv;
+    $rv = "";
+    $idx = 1;
+
+    if (is_array($trace)) {
+        foreach ($trace as $e) {
+            if (isset($e["file"]) && isset($e["line"])) {
+                $fmt_args = [];
+
+                if (is_array($e["args"])) {
+                    foreach ($e["args"] as $a) {
+                        if (!is_object($a)) {
+                            array_push($fmt_args, $a);
+                        } else {
+                            array_push($fmt_args, "[".get_class($a)."]");
+                        }
+                    }
+                }
+
+                $filename = str_replace(dirname(__DIR__)."/", "", $e["file"]);
+
+                $rv .= sprintf("%d. %s(%s): %s(%s)\n",
+                    $idx, $filename, $e["line"], $e["function"], implode(", ", $fmt_args));
+
+                $idx++;
+            }
+        }
+    }
+
+    return $rv;
 }
 
 function ttrss_error_handler($errno, $errstr, $file, $line, $context) {
-	if (error_reporting() == 0 || !$errno) {
-	    return false;
-	}
+    if (error_reporting() == 0 || !$errno) {
+        return false;
+    }
 
-	$file = substr(str_replace(dirname(dirname(__FILE__)), "", $file), 1);
+    $file = substr(str_replace(dirname(dirname(__FILE__)), "", $file), 1);
 
-	$context = format_backtrace(debug_backtrace());
-	$errstr = truncate_middle($errstr, 16384, " (...) ");
+    $context = format_backtrace(debug_backtrace());
+    $errstr = truncate_middle($errstr, 16384, " (...) ");
 
-	if (class_exists("Logger")) {
-			return Logger::get()->log_error($errno, $errstr, $file, $line, $context);
-	}
-	}
+    if (class_exists("Logger")) {
+            return Logger::get()->log_error($errno, $errstr, $file, $line, $context);
+    }
+    }
 
 function ttrss_fatal_handler() {
-	global $last_query;
+    global $last_query;
 
-	$error = error_get_last();
+    $error = error_get_last();
 
-	if ($error !== null) {
-		$errno = $error["type"];
-		$file = $error["file"];
-		$line = $error["line"];
-		$errstr = $error["message"];
+    if ($error !== null) {
+        $errno = $error["type"];
+        $file = $error["file"];
+        $line = $error["line"];
+        $errstr = $error["message"];
 
-		if (!$errno) {
-		    return false;
-		}
+        if (!$errno) {
+            return false;
+        }
 
-		$context = format_backtrace(debug_backtrace());
+        $context = format_backtrace(debug_backtrace());
 
-		$file = substr(str_replace(dirname(dirname(__FILE__)), "", $file), 1);
+        $file = substr(str_replace(dirname(dirname(__FILE__)), "", $file), 1);
 
-		if ($last_query) {
-		    $errstr .= " [Last query: $last_query]";
-		}
+        if ($last_query) {
+            $errstr .= " [Last query: $last_query]";
+        }
 
-		if (class_exists("Logger")) {
-					return Logger::get()->log_error($errno, $errstr, $file, $line, $context);
-		}
-	}
+        if (class_exists("Logger")) {
+                    return Logger::get()->log_error($errno, $errstr, $file, $line, $context);
+        }
+    }
 
-	return false;
+    return false;
 }
 
 register_shutdown_function('ttrss_fatal_handler');

include/db.php

Indentation +9 added lines, -9 removed lines

@@ -1,38 +1,38 @@
 <?php
 
 function db_escape_string($s, $strip_tags = true) {
-	return Db::get()->escape_string($s, $strip_tags);
+    return Db::get()->escape_string($s, $strip_tags);
 }
 
 function db_query($query, $die_on_error = true) {
-	return Db::get()->query($query, $die_on_error);
+    return Db::get()->query($query, $die_on_error);
 }
 
 function db_fetch_assoc($result) {
-	return Db::get()->fetch_assoc($result);
+    return Db::get()->fetch_assoc($result);
 }
 
 
 function db_num_rows($result) {
-	return Db::get()->num_rows($result);
+    return Db::get()->num_rows($result);
 }
 
 function db_fetch_result($result, $row, $param) {
-	return Db::get()->fetch_result($result, $row, $param);
+    return Db::get()->fetch_result($result, $row, $param);
 }
 
 function db_affected_rows($result) {
-	return Db::get()->affected_rows($result);
+    return Db::get()->affected_rows($result);
 }
 
 function db_last_error() {
-	return Db::get()->last_error();
+    return Db::get()->last_error();
 }
 
 function db_last_query_error() {
-	return Db::get()->last_query_error();
+    return Db::get()->last_query_error();
 }
 
 function db_quote($str) {
-	return Db::get()->quote($str);
+    return Db::get()->quote($str);
 }

include/autoload.php

Indentation +20 added lines, -20 removed lines

@@ -1,28 +1,28 @@
 <?php
-	require_once "functions.php";
+    require_once "functions.php";
 
-	spl_autoload_register(function($class) {
-		$namespace = '';
-		$class_name = $class;
+    spl_autoload_register(function($class) {
+        $namespace = '';
+        $class_name = $class;
 
-		if (strpos($class, '\\') !== false) {
-					list ($namespace, $class_name) = explode('\\', $class, 2);
-		}
+        if (strpos($class, '\\') !== false) {
+                    list ($namespace, $class_name) = explode('\\', $class, 2);
+        }
 
-		$root_dir = dirname(__DIR__); // we're in tt-rss/include
+        $root_dir = dirname(__DIR__); // we're in tt-rss/include
 
-		// 1. third party libraries with namespaces are loaded from vendor/
-		// 2. internal tt-rss classes are loaded from classes/ and use special naming logic instead of namespaces
-		// 3. plugin classes are loaded by PluginHandler from plugins.local/ and plugins/ (TODO: use generic autoloader?)
+        // 1. third party libraries with namespaces are loaded from vendor/
+        // 2. internal tt-rss classes are loaded from classes/ and use special naming logic instead of namespaces
+        // 3. plugin classes are loaded by PluginHandler from plugins.local/ and plugins/ (TODO: use generic autoloader?)
 
-		if ($namespace && $class_name) {
-			$class_file = "$root_dir/vendor/$namespace/".str_replace('\\', '/', $class_name).".php";
-		} else {
-			$class_file = "$root_dir/classes/".str_replace("_", "/", strtolower($class)).".php";
-		}
+        if ($namespace && $class_name) {
+            $class_file = "$root_dir/vendor/$namespace/".str_replace('\\', '/', $class_name).".php";
+        } else {
+            $class_file = "$root_dir/classes/".str_replace("_", "/", strtolower($class)).".php";
+        }
 
-		if (file_exists($class_file)) {
-					include $class_file;
-		}
+        if (file_exists($class_file)) {
+                    include $class_file;
+        }
 
-	});
+    });

register.php

Indentation +150 added lines, -150 removed lines

@@ -1,97 +1,97 @@ 
 <?php
-	// This file uses two additional include files:
-	//
-	// 1) templates/register_notice.txt - displayed above the registration form
-	// 2) register_expire_do.php - contains user expiration queries when necessary
+    // This file uses two additional include files:
+    //
+    // 1) templates/register_notice.txt - displayed above the registration form
+    // 2) register_expire_do.php - contains user expiration queries when necessary
 
-	set_include_path(dirname(__FILE__)."/include".PATH_SEPARATOR.
-		get_include_path());
+    set_include_path(dirname(__FILE__)."/include".PATH_SEPARATOR.
+        get_include_path());
 
-	require_once "autoload.php";
-	require_once "functions.php";
-	require_once "sessions.php";
-	require_once "sanity_check.php";
-	require_once "config.php";
-	require_once "db.php";
+    require_once "autoload.php";
+    require_once "functions.php";
+    require_once "sessions.php";
+    require_once "sanity_check.php";
+    require_once "config.php";
+    require_once "db.php";
 
-	startup_gettext();
+    startup_gettext();
 
-	$action = $_REQUEST["action"];
+    $action = $_REQUEST["action"];
 
-	if (!init_plugins()) {
-	    return;
-	}
+    if (!init_plugins()) {
+        return;
+    }
 
-	if ($_REQUEST["format"] == "feed") {
-		header("Content-Type: text/xml");
+    if ($_REQUEST["format"] == "feed") {
+        header("Content-Type: text/xml");
 
-		print '<?xml version="1.0" encoding="utf-8"?>';
-		print "<feed xmlns=\"http://www.w3.org/2005/Atom\">
+        print '<?xml version="1.0" encoding="utf-8"?>';
+        print "<feed xmlns=\"http://www.w3.org/2005/Atom\">
 			<id>".htmlspecialchars(SELF_URL_PATH."/register.php")."</id>
 			<title>Tiny Tiny RSS registration slots</title>
 			<link rel=\"self\" href=\"".htmlspecialchars(SELF_URL_PATH."/register.php?format=feed")."\"/>
 			<link rel=\"alternate\" href=\"".htmlspecialchars(SELF_URL_PATH)."\"/>";
 
-		if (ENABLE_REGISTRATION) {
-			$result = db_query("SELECT COUNT(*) AS cu FROM ttrss_users");
-			$num_users = db_fetch_result($result, 0, "cu");
-
-			$num_users = REG_MAX_USERS - $num_users;
-			if ($num_users < 0) {
-			    $num_users = 0;
-			}
-			$reg_suffix = "enabled";
-		} else {
-			$num_users = 0;
-			$reg_suffix = "disabled";
-		}
-
-		print "<entry>
+        if (ENABLE_REGISTRATION) {
+            $result = db_query("SELECT COUNT(*) AS cu FROM ttrss_users");
+            $num_users = db_fetch_result($result, 0, "cu");
+
+            $num_users = REG_MAX_USERS - $num_users;
+            if ($num_users < 0) {
+                $num_users = 0;
+            }
+            $reg_suffix = "enabled";
+        } else {
+            $num_users = 0;
+            $reg_suffix = "disabled";
+        }
+
+        print "<entry>
 			<id>".htmlspecialchars(SELF_URL_PATH)."/register.php?$num_users"."</id>
 			<link rel=\"alternate\" href=\"".htmlspecialchars(SELF_URL_PATH."/register.php")."\"/>";
 
-		print "<title>$num_users slots are currently available, registration $reg_suffix</title>";
-		print "<summary>$num_users slots are currently available, registration $reg_suffix</summary>";
+        print "<title>$num_users slots are currently available, registration $reg_suffix</title>";
+        print "<summary>$num_users slots are currently available, registration $reg_suffix</summary>";
 
-		print "</entry>";
+        print "</entry>";
 
-		print "</feed>";
+        print "</feed>";
 
-		return;
-	}
+        return;
+    }
 
-	/* Remove users which didn't login after receiving their registration information */
+    /* Remove users which didn't login after receiving their registration information */
 
-	if (DB_TYPE == "pgsql") {
-		db_query("DELETE FROM ttrss_users WHERE last_login IS NULL
+    if (DB_TYPE == "pgsql") {
+        db_query("DELETE FROM ttrss_users WHERE last_login IS NULL
 				AND created < NOW() - INTERVAL '1 day' AND access_level = 0");
-	} else {
-		db_query("DELETE FROM ttrss_users WHERE last_login IS NULL
+    } else {
+        db_query("DELETE FROM ttrss_users WHERE last_login IS NULL
 				AND created < DATE_SUB(NOW(), INTERVAL 1 DAY) AND access_level = 0");
-	}
+    }
 
-	if (file_exists("register_expire_do.php")) {
-		require_once "register_expire_do.php";
-	}
+    if (file_exists("register_expire_do.php")) {
+        require_once "register_expire_do.php";
+    }
 
-	if ($action == "check") {
-		header("Content-Type: application/xml");
+    if ($action == "check") {
+        header("Content-Type: application/xml");
 
-		$login = trim(db_escape_string($_REQUEST['login']));
+        $login = trim(db_escape_string($_REQUEST['login']));
 
-		$result = db_query("SELECT id FROM ttrss_users WHERE
+        $result = db_query("SELECT id FROM ttrss_users WHERE
 			LOWER(login) = LOWER('$login')");
 
-		$is_registered = db_num_rows($result) > 0;
+        $is_registered = db_num_rows($result) > 0;
 
-		print "<result>";
+        print "<result>";
 
-		printf("%d", $is_registered);
+        printf("%d", $is_registered);
 
-		print "</result>";
+        print "</result>";
 
-		return;
-	}
+        return;
+    }
 ?>
 <!DOCTYPE html>
 <html>
@@ -189,20 +189,20 @@ 
 <div class="content">
 
 <?php
-		if (!ENABLE_REGISTRATION) {
-			print_error(__("New user registrations are administratively disabled."));
+        if (!ENABLE_REGISTRATION) {
+            print_error(__("New user registrations are administratively disabled."));
 
-			print "<p><form method=\"GET\" action=\"backend.php\">
+            print "<p><form method=\"GET\" action=\"backend.php\">
 				<input type=\"hidden\" name=\"op\" value=\"logout\">
 				<input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
 				</form>";
-			return;
-		}
+            return;
+        }
 ?>
 
 <?php if (REG_MAX_USERS > 0) {
-		$result = db_query("SELECT COUNT(*) AS cu FROM ttrss_users");
-		$num_users = db_fetch_result($result, 0, "cu");
+        $result = db_query("SELECT COUNT(*) AS cu FROM ttrss_users");
+        $num_users = db_fetch_result($result, 0, "cu");
 } ?>
 
 <?php if (!REG_MAX_USERS || $num_users < REG_MAX_USERS) { ?>
@@ -210,8 +210,8 @@ 
 	<!-- If you have any rules or ToS you'd like to display, enter them here -->
 
 	<?php	if (file_exists("templates/register_notice.txt")) {
-			require_once "templates/register_notice.txt";
-	} ?>
+            require_once "templates/register_notice.txt";
+    } ?>
 
 	<?php if (!$action) { ?>
 
@@ -245,114 +245,114 @@ 
 	<?php } else if ($action == "do_register") { ?>
 
 	<?php
-		$login = mb_strtolower(trim(db_escape_string($_REQUEST["login"])));
-		$email = trim(db_escape_string($_REQUEST["email"]));
-		$test = trim(db_escape_string($_REQUEST["turing_test"]));
+        $login = mb_strtolower(trim(db_escape_string($_REQUEST["login"])));
+        $email = trim(db_escape_string($_REQUEST["email"]));
+        $test = trim(db_escape_string($_REQUEST["turing_test"]));
 
-		if (!$login || !$email || !$test) {
-			print_error(__("Your registration information is incomplete."));
-			print "<p><form method=\"GET\" action=\"index.php\">
+        if (!$login || !$email || !$test) {
+            print_error(__("Your registration information is incomplete."));
+            print "<p><form method=\"GET\" action=\"index.php\">
 				<input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
 				</form>";
-			return;
-		}
+            return;
+        }
 
-		if ($test == "four" || $test == "4") {
+        if ($test == "four" || $test == "4") {
 
-			$result = db_query("SELECT id FROM ttrss_users WHERE
+            $result = db_query("SELECT id FROM ttrss_users WHERE
 				login = '$login'");
 
-			$is_registered = db_num_rows($result) > 0;
+            $is_registered = db_num_rows($result) > 0;
 
-			if ($is_registered) {
-				print_error(__('Sorry, this username is already taken.'));
-				print "<p><form method=\"GET\" action=\"index.php\">
+            if ($is_registered) {
+                print_error(__('Sorry, this username is already taken.'));
+                print "<p><form method=\"GET\" action=\"index.php\">
 				<input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
 				</form>";
-			} else {
+            } else {
 
-				$password = make_password();
+                $password = make_password();
 
-				$salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
-				$pwd_hash = encrypt_password($password, $salt, true);
+                $salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
+                $pwd_hash = encrypt_password($password, $salt, true);
 
-				db_query("INSERT INTO ttrss_users
+                db_query("INSERT INTO ttrss_users
 					(login,pwd_hash,access_level,last_login, email, created, salt)
 					VALUES ('$login', '$pwd_hash', 0, null, '$email', NOW(), '$salt')");
 
-				$result = db_query("SELECT id FROM ttrss_users WHERE
+                $result = db_query("SELECT id FROM ttrss_users WHERE
 					login = '$login' AND pwd_hash = '$pwd_hash'");
 
-				if (db_num_rows($result) != 1) {
-					print_error(__('Registration failed.'));
-					print "<p><form method=\"GET\" action=\"index.php\">
+                if (db_num_rows($result) != 1) {
+                    print_error(__('Registration failed.'));
+                    print "<p><form method=\"GET\" action=\"index.php\">
 					<input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
 					</form>";
-				} else {
-
-					$new_uid = db_fetch_result($result, 0, "id");
-
-					initialize_user($new_uid);
-
-					$reg_text = "Hi!\n".
-						"\n".
-						"You are receiving this message, because you (or somebody else) have opened\n".
-						"an account at Tiny Tiny RSS.\n".
-						"\n".
-						"Your login information is as follows:\n".
-						"\n".
-						"Login: $login\n".
-						"Password: $password\n".
-						"\n".
-						"Don't forget to login at least once to your new account, otherwise\n".
-						"it will be deleted in 24 hours.\n".
-						"\n".
-						"If that wasn't you, just ignore this message. Thanks.";
-
-					$mailer = new Mailer();
-					$rc = $mailer->mail(["to_address" => $email,
-						"subject" => "Registration information for Tiny Tiny RSS",
-						"message" => $reg_text]);
-
-					if (!$rc) {
-					    print_error($mailer->error());
-					}
-
-					$reg_text = "Hi!\n".
-						"\n".
-						"New user had registered at your Tiny Tiny RSS installation.\n".
-						"\n".
-						"Login: $login\n".
-						"Email: $email\n";
-
-					$mailer = new Mailer();
-					$rc = $mailer->mail(["to_address" => REG_NOTIFY_ADDRESS,
-						"subject" => "Registration notice for Tiny Tiny RSS",
-						"message" => $reg_text]);
-
-					if (!$rc) {
-					    print_error($mailer->error());
-					}
-
-					print_notice(__("Account created successfully."));
-
-					print "<p><form method=\"GET\" action=\"index.php\">
+                } else {
+
+                    $new_uid = db_fetch_result($result, 0, "id");
+
+                    initialize_user($new_uid);
+
+                    $reg_text = "Hi!\n".
+                        "\n".
+                        "You are receiving this message, because you (or somebody else) have opened\n".
+                        "an account at Tiny Tiny RSS.\n".
+                        "\n".
+                        "Your login information is as follows:\n".
+                        "\n".
+                        "Login: $login\n".
+                        "Password: $password\n".
+                        "\n".
+                        "Don't forget to login at least once to your new account, otherwise\n".
+                        "it will be deleted in 24 hours.\n".
+                        "\n".
+                        "If that wasn't you, just ignore this message. Thanks.";
+
+                    $mailer = new Mailer();
+                    $rc = $mailer->mail(["to_address" => $email,
+                        "subject" => "Registration information for Tiny Tiny RSS",
+                        "message" => $reg_text]);
+
+                    if (!$rc) {
+                        print_error($mailer->error());
+                    }
+
+                    $reg_text = "Hi!\n".
+                        "\n".
+                        "New user had registered at your Tiny Tiny RSS installation.\n".
+                        "\n".
+                        "Login: $login\n".
+                        "Email: $email\n";
+
+                    $mailer = new Mailer();
+                    $rc = $mailer->mail(["to_address" => REG_NOTIFY_ADDRESS,
+                        "subject" => "Registration notice for Tiny Tiny RSS",
+                        "message" => $reg_text]);
+
+                    if (!$rc) {
+                        print_error($mailer->error());
+                    }
+
+                    print_notice(__("Account created successfully."));
+
+                    print "<p><form method=\"GET\" action=\"index.php\">
 					<input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
 					</form>";
 
-				}
+                }
 
-			}
+            }
 
-			} else {
-				print_error('Plese check the form again, you have failed the robot test.');
-				print "<p><form method=\"GET\" action=\"index.php\">
+            } else {
+                print_error('Plese check the form again, you have failed the robot test.');
+                print "<p><form method=\"GET\" action=\"index.php\">
 				<input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
 				</form>";
 
-			}
-		}
-	?>
+            }
+        }
+    ?>
 
 <?php } else { ?>
 

lib/accept-to-gettext.php

Indentation +52 added lines, -52 removed lines

@@ -72,41 +72,41 @@ 
 function find_match($curlscore, $curcscore, $curgtlang, $langval, $charval,
                     $gtlang)
 {
-  if ($curlscore < $langval) {
+    if ($curlscore < $langval) {
     $curlscore = $langval;
     $curcscore = $charval;
     $curgtlang = $gtlang;
-  } else if ($curlscore == $langval) {
+    } else if ($curlscore == $langval) {
     if ($curcscore < $charval) {
-      $curcscore = $charval;
-      $curgtlang = $gtlang;
+        $curcscore = $charval;
+        $curgtlang = $gtlang;
     }
-  }
-  return array($curlscore, $curcscore, $curgtlang);
+    }
+    return array($curlscore, $curcscore, $curgtlang);
 }
 
 function al2gt($gettextlangs, $mime) {
-  /* default to "everything is acceptable", as RFC2616 specifies */
-  $acceptLang = (($_SERVER["HTTP_ACCEPT_LANGUAGE"] == '') ? '*' : $_SERVER["HTTP_ACCEPT_LANGUAGE"]);
-  $acceptChar = (($_SERVER["HTTP_ACCEPT_CHARSET"] == '') ? '*' : $_SERVER["HTTP_ACCEPT_CHARSET"]);
-  $alparts = @preg_split("/,/", $acceptLang);
-  $acparts = @preg_split("/,/", $acceptChar);
+    /* default to "everything is acceptable", as RFC2616 specifies */
+    $acceptLang = (($_SERVER["HTTP_ACCEPT_LANGUAGE"] == '') ? '*' : $_SERVER["HTTP_ACCEPT_LANGUAGE"]);
+    $acceptChar = (($_SERVER["HTTP_ACCEPT_CHARSET"] == '') ? '*' : $_SERVER["HTTP_ACCEPT_CHARSET"]);
+    $alparts = @preg_split("/,/", $acceptLang);
+    $acparts = @preg_split("/,/", $acceptChar);
   
-  /* Parse the contents of the Accept-Language header.*/
-  foreach ($alparts as $part) {
+    /* Parse the contents of the Accept-Language header.*/
+    foreach ($alparts as $part) {
     $part = trim($part);
     if (preg_match("/;/", $part)) {
-      $lang = @preg_split("/;/", $part);
-      $score = @preg_split("/=/", $lang[1]);
-      $alscores[$lang[0]] = $score[1];
+        $lang = @preg_split("/;/", $part);
+        $score = @preg_split("/=/", $lang[1]);
+        $alscores[$lang[0]] = $score[1];
     } else {
-      $alscores[$part] = 1;
+        $alscores[$part] = 1;
+    }
     }
-  }
 
-  /* Do the same for the Accept-Charset header. */
+    /* Do the same for the Accept-Charset header. */
 
-  /* RFC2616: ``If no "*" is present in an Accept-Charset field, then
+    /* RFC2616: ``If no "*" is present in an Accept-Charset field, then
    * all character sets not explicitly mentioned get a quality value of
    * 0, except for ISO-8859-1, which gets a quality value of 1 if not
    * explicitly mentioned.''
@@ -114,31 +114,31 @@ 
    * Making it 2 for the time being, so that we
    * can distinguish between "not specified" and "specified as 1" later
    * on. */
-  $acscores["ISO-8859-1"] = 2;
+    $acscores["ISO-8859-1"] = 2;
 
-  foreach ($acparts as $part) {
+    foreach ($acparts as $part) {
     $part = trim($part);
     if (preg_match("/;/", $part)) {
-      $cs = @preg_split("/;/", $part);
-      $score = @preg_split("/=/", $cs[1]);
-      $acscores[strtoupper($cs[0])] = $score[1];
+        $cs = @preg_split("/;/", $part);
+        $score = @preg_split("/=/", $cs[1]);
+        $acscores[strtoupper($cs[0])] = $score[1];
     } else {
-      $acscores[strtoupper($part)] = 1;
+        $acscores[strtoupper($part)] = 1;
+    }
     }
-  }
-  if ($acscores["ISO-8859-1"] == 2) {
+    if ($acscores["ISO-8859-1"] == 2) {
     $acscores["ISO-8859-1"] = (isset($acscores["*"]) ? $acscores["*"] : 1);
-  }
+    }
 
-  /* 
+    /* 
    * Loop through the available languages/encodings, and pick the one
    * with the highest score, excluding the ones with a charset the user
    * did not include.
    */
-  $curlscore = 0;
-  $curcscore = 0;
-  $curgtlang = null;
-  foreach ($gettextlangs as $gtlang) {
+    $curlscore = 0;
+    $curcscore = 0;
+    $curgtlang = null;
+    foreach ($gettextlangs as $gtlang) {
 
     $tmp1 = preg_replace("/\_/", "-", $gtlang);
     $tmp2 = @preg_split("/\./", $tmp1);
@@ -147,38 +147,38 @@ 
     $noct = @preg_split("/-/", $allang);
 
     $testvals = array(
-         array(@$alscores[$allang], @$acscores[$gtcs]),
-     array(@$alscores[$noct[0]], @$acscores[$gtcs]),
-     array(@$alscores[$allang], @$acscores["*"]),
-     array(@$alscores[$noct[0]], @$acscores["*"]),
-     array(@$alscores["*"], @$acscores[$gtcs]),
-     array(@$alscores["*"], @$acscores["*"]));
+            array(@$alscores[$allang], @$acscores[$gtcs]),
+        array(@$alscores[$noct[0]], @$acscores[$gtcs]),
+        array(@$alscores[$allang], @$acscores["*"]),
+        array(@$alscores[$noct[0]], @$acscores["*"]),
+        array(@$alscores["*"], @$acscores[$gtcs]),
+        array(@$alscores["*"], @$acscores["*"]));
 
     $found = false;
     foreach ($testvals as $tval) {
-      if (!$found && isset($tval[0]) && isset($tval[1])) {
+        if (!$found && isset($tval[0]) && isset($tval[1])) {
         $arr = find_match($curlscore, $curcscore, $curgtlang, $tval[0],
-              $tval[1], $gtlang);
+                $tval[1], $gtlang);
         $curlscore = $arr[0];
         $curcscore = $arr[1];
         $curgtlang = $arr[2];
     $found = true;
-      }
+        }
+    }
     }
-  }
 
-  /* We must re-parse the gettext-string now, since we may have found it
+    /* We must re-parse the gettext-string now, since we may have found it
    * through a "*" qualifier.*/
   
-  $gtparts = @preg_split("/\./", $curgtlang);
-  $tmp = strtolower($gtparts[0]);
-  $lang = preg_replace("/\_/", "-", $tmp);
-  $charset = $gtparts[1];
+    $gtparts = @preg_split("/\./", $curgtlang);
+    $tmp = strtolower($gtparts[0]);
+    $lang = preg_replace("/\_/", "-", $tmp);
+    $charset = $gtparts[1];
 
-  header("Content-Language: $lang");
-  header("Content-Type: $mime; charset=$charset");
+    header("Content-Language: $lang");
+    header("Content-Type: $mime; charset=$charset");
 
-  return $curgtlang;
+    return $curgtlang;
 }
 
 ?>

lib/jimIcon.php

Indentation +13 added lines, -13 removed lines

@@ -127,16 +127,16 @@ 
                 $bitmapinfo = unpack("Vsize", $data);
                 if ($bitmapinfo["size"] == 40) {
                         $info = unpack("Vsize/".
-                                       "Vwidth/".
-                                       "Vheight/".
-                                       "vplanes/".
-                                       "vbpp/".
-                                       "Vcompress/".
-                                       "Vsize/".
-                                       "Vxres/".
-                                       "Vyres/".
-                                       "Vpalcolors/".
-                                       "Vimpcolors/", $data);
+                                        "Vwidth/".
+                                        "Vheight/".
+                                        "vplanes/".
+                                        "vbpp/".
+                                        "Vcompress/".
+                                        "Vsize/".
+                                        "Vxres/".
+                                        "Vyres/".
+                                        "Vpalcolors/".
+                                        "Vimpcolors/", $data);
                         if ($e["bpp"] == 0) {
                                 $e["bpp"] = $info["bpp"];
                         }
@@ -244,7 +244,7 @@ 
                         for ($y = 0; $y < $height; $y++) {
                                 for ($x = 0; $x < $width; $x++) {
                                         imagesetpixel($img, $x, $y,
-                                                      $XOR[$y][$x]);
+                                                        $XOR[$y][$x]);
                                 }
                         }
                         return $img;
@@ -255,10 +255,10 @@ 
                         $x = 0;
                         while ($x < $width) {
                                 for ($b = 0x80;
-                                     $b > 0 && $x < $width; $b >>= 1) {
+                                        $b > 0 && $x < $width; $b >>= 1) {
                                         if (!(ord($data[$offset]) & $b)) {
                                                 imagesetpixel($img, $x, $y,
-                                                              $XOR[$y][$x]);
+                                                                $XOR[$y][$x]);
                                         }
                                         $x++;
                                 }

Braces +3 added lines, -2 removed lines

@@ -67,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/".

lib/MiniTemplator.class.php

Indentation +405 added lines, -405 removed lines

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

 */

 function __construct() {

-   $this->templateValid = false; }

+    $this->templateValid = false; }

 

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

 

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

 */

 function readTemplateFromFile($fileName) {

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

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

-      return false; }

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

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

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

+        return false; }

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

 

 /**

 * Assigns a new template string.

@@ -187,14 +187,14 @@ 
 * @access public

 */

 function setTemplateString($templateString) {

-   $this->templateValid = false;

-   $this->template = $templateString;

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

-   $this->templateValid = true;

-   return true; }

+    $this->templateValid = false;

+    $this->template = $templateString;

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

+    $this->templateValid = true;

+    return true; }

 

 /**

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

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

 */

 function loadSubtemplate($subtemplateName, &$s) {

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

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

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

-      return false; }

-   return true; }

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

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

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

+        return false; }

+    return true; }

 

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

 

@@ -216,34 +216,34 @@ 
 * @access private

 */

 function parseTemplate() {

-   $this->initParsing();

-   $this->beginMainBlock();

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

-   if (!$this->checkBlockDefinitionsComplete()) {
-       return false;
-   }
-   if (!$this->parseTemplateVariables()) {
-       return false;
-   }
-   $this->associateVariablesWithBlocks();

-   return true; }

+    $this->initParsing();

+    $this->beginMainBlock();

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

+    if (!$this->checkBlockDefinitionsComplete()) {
+        return false;
+    }
+    if (!$this->parseTemplateVariables()) {
+        return false;
+    }
+    $this->associateVariablesWithBlocks();

+    return true; }

 

 /**

 * @access private

 */

 function initParsing() {

-   $this->varTab = array();

-   $this->varTabCnt = 0;

-   $this->varNameToNoMap = array();

-   $this->varRefTab = array();

-   $this->varRefTabCnt = 0;

-   $this->blockTab = array();

-   $this->blockTabCnt = 0;

-   $this->blockNameToNoMap = array();

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

+    $this->varTab = array();

+    $this->varTabCnt = 0;

+    $this->varNameToNoMap = array();

+    $this->varRefTab = array();

+    $this->varRefTabCnt = 0;

+    $this->blockTab = array();

+    $this->blockTabCnt = 0;

+    $this->blockNameToNoMap = array();

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

 

 /**

 * Registers the main block.

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

 */

 function beginMainBlock() {

-   $blockNo = 0;

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

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

-   $bte['tPosBegin'] = 0;

-   $bte['tPosContentsBegin'] = 0;

-   $bte['nestingLevel'] = 0;

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

-   $bte['definitionIsOpen'] = true;

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

-   $this->currentNestingLevel = 1; }

+    $blockNo = 0;

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

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

+    $bte['tPosBegin'] = 0;

+    $bte['tPosContentsBegin'] = 0;

+    $bte['nestingLevel'] = 0;

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

+    $bte['definitionIsOpen'] = true;

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

+    $this->currentNestingLevel = 1; }

 

 /**

 * Completes the main block registration.

 * @access private

 */

 function endMainBlock() {

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

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

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

-   $bte['definitionIsOpen'] = false;

-   $this->currentNestingLevel -= 1; }

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

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

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

+    $bte['definitionIsOpen'] = false;

+    $this->currentNestingLevel -= 1; }

 

 /**

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

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

 */

 function parseTemplateCommands() {

-   $p = 0;

-   while (true) {

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

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

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

-      if ($p === false) {

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

-         return false; }

-      $p += 3;

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

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

-         return false;

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

-   return true; }

+    $p = 0;

+    while (true) {

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

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

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

+        if ($p === false) {

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

+            return false; }

+        $p += 3;

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

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

+            return false;

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

+    return true; }

 

 /**

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

 * @access private

 */

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

-   $resumeFromStart = false;

-   $p = 0;

-   $cmd = '';

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

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

-   switch (strtoupper($cmd)) {

-      case '$BEGINBLOCK':

+    $resumeFromStart = false;

+    $p = 0;

+    $cmd = '';

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

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

+    switch (strtoupper($cmd)) {

+        case '$BEGINBLOCK':

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

             return false;

-         break;

-      case '$ENDBLOCK':

+            break;

+        case '$ENDBLOCK':

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

             return false;

-         break;

-      case '$INCLUDE':

+            break;

+        case '$INCLUDE':

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

             return false;

-         $resumeFromStart = true;

-         break;

-      default:

+            $resumeFromStart = true;

+            break;

+        default:

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

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

             return false; }}

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

 */

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

-   $p = 0;

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

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

-      return false; }

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

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

-      return false; }

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

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

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

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

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

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

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

-   $this->currentNestingLevel += 1;

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

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

-      return false; }

-   return true; }

+    $p = 0;

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

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

+        return false; }

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

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

+        return false; }

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

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

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

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

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

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

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

+    $this->currentNestingLevel += 1;

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

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

+        return false; }

+    return true; }

 

 /**

 * Processes the $EndBlock command.

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

 */

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

-   $p = 0;

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

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

-      return false; }

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

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

-      return false; }

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

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

-      return false; }

-   $this->currentNestingLevel -= 1;

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

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

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

-      return false; }

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

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

-      return false; }

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

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

-   $btr['definitionIsOpen'] = false;

-   return true; }

+    $p = 0;

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

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

+        return false; }

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

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

+        return false; }

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

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

+        return false; }

+    $this->currentNestingLevel -= 1;

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

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

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

+        return false; }

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

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

+        return false; }

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

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

+    $btr['definitionIsOpen'] = false;

+    return true; }

 

 /**

 * @access private

 */

 function registerBlock($blockName, &$blockNo) {

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

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

-   $btr = array();

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

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

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

-   $btr['definitionIsOpen'] = true;

-   $btr['instances'] = 0;

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

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

-   $btr['blockVarCnt'] = 0;

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

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

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

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

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

+    $btr = array();

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

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

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

+    $btr['definitionIsOpen'] = true;

+    $btr['instances'] = 0;

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

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

+    $btr['blockVarCnt'] = 0;

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

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

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

 

 /**

 * Checks that all block definitions are closed.

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

 */

 function checkBlockDefinitionsComplete() {

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

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

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

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

-         return false; }}

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

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

-      return false; }

-   return true; }

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

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

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

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

+            return false; }}

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

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

+        return false; }

+    return true; }

 

 /**

 * Processes the $Include command.

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

 */

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

-   $p = 0;

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

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

-      return false; }

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

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

-      return false; }

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

+    $p = 0;

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

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

+        return false; }

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

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

+        return false; }

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

 

 /**

 * Processes the $Include command.

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

 */

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

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

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

-      return false; }

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

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

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

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

-   return true; }

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

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

+        return false; }

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

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

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

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

+    return true; }

 

 /**

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

@@ -450,79 +450,79 @@ 
 * @access private

 */

 function parseTemplateVariables() {

-   $p = 0;

-   while (true) {

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

-      if ($p === false) {
-          break;
-      }
-      $p0 = $p;

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

-      if ($p === false) {

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

-         return false; }

-      $p += 1;

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

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

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

-         return false; }

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

-   return true; }

+    $p = 0;

+    while (true) {

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

+        if ($p === false) {
+            break;
+        }
+        $p0 = $p;

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

+        if ($p === false) {

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

+            return false; }

+        $p += 1;

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

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

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

+            return false; }

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

+    return true; }

 

 /**

 * @access private

 */

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

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

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

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

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

-   $vrtr = array();

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

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

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

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

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

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

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

+    $vrtr = array();

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

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

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

 

 /**

 * @access private

 */

 function registerVariable($varName, &$varNo) {

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

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

-   $vtr = array();

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

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

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

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

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

+    $vtr = array();

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

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

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

 

 /**

 * Associates variable references with blocks.

 * @access private

 */

 function associateVariablesWithBlocks() {

-   $varRefNo = 0;

-   $activeBlockNo = 0;

-   $nextBlockNo = 1;

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

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

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

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

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

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

-         continue; }

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

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

+    $varRefNo = 0;

+    $activeBlockNo = 0;

+    $nextBlockNo = 1;

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

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

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

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

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

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

+            continue; }

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

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

             $activeBlockNo = $nextBlockNo;

             $nextBlockNo += 1;

             continue; }}

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

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

-         $this->programLogicError(1);

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

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

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

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

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

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

-      $varRefNo += 1; }}

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

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

+            $this->programLogicError(1);

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

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

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

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

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

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

+        $varRefNo += 1; }}

 

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

 

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

 */

 function reset() {

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

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

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

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

-      $btr['instances'] = 0;

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

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

-   $this->blockInstTab = array();

-   $this->blockInstTabCnt = 0; }

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

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

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

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

+        $btr['instances'] = 0;

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

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

+    $this->blockInstTab = array();

+    $this->blockInstTabCnt = 0; }

 

 /**

 * Sets a template variable.

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

 */

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

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

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

-      if ($isOptional) return true;

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

-      return false; }

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

-   return true; }

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

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

+        if ($isOptional) return true;

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

+        return false; }

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

+    return true; }

 

 /**

 * Sets a template variable to an escaped string.

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

 */

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

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

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

 

 /**

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

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

 */

 function variableExists($variableName) {

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

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

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

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

 

 /**

 * Adds an instance of a template block.

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

 */

 function addBlock($blockName) {

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

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

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

-      return false; }

-   while ($blockNo != -1) {

-      $this->addBlockByNo($blockNo);

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

-   return true; }

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

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

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

+        return false; }

+    while ($blockNo != -1) {

+        $this->addBlockByNo($blockNo);

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

+    return true; }

 

 /**

 * @access private

 */

 function addBlockByNo($blockNo) {

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

-   $this->registerBlockInstance($blockInstNo);

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

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

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

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

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

-         // set forward pointer of chain

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

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

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

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

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

-   if ($parentBlockNo == -1)

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

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

+    $this->registerBlockInstance($blockInstNo);

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

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

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

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

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

+            // set forward pointer of chain

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

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

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

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

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

+    if ($parentBlockNo == -1)

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

     else

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

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

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

-   // copy instance variables for this block

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

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

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

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

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

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

+    // copy instance variables for this block

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

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

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

 

 /**

 * @access private

 */

 function registerBlockInstance(&$blockInstNo) {

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

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

 

 /**

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

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

 */

 function blockExists($blockName) {

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

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

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

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

 

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

 

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

 */

 function generateOutput() {

-   $this->outputMode = 0;

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

+    $this->outputMode = 0;

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

 

 /**

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

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

 */

 function generateOutputToFile($fileName) {

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

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

-   $this->outputMode = 1;

-   $this->outputFileHandle = $fh;

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

-   fclose($fh);

-   return $ok; }

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

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

+    $this->outputMode = 1;

+    $this->outputFileHandle = $fh;

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

+    fclose($fh);

+    return $ok; }

 

 /**

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

@@ -706,30 +706,30 @@ 
 * @access public

 */

 function generateOutputToString(&$outputString) {

-   $outputString = "Error";

-   $this->outputMode = 2;

-   $this->outputString = "";

-   if (!$this->generateOutputPage()) {
-       return false;
-   }
-   $outputString = $this->outputString;

-   return true; }

+    $outputString = "Error";

+    $this->outputMode = 2;

+    $this->outputString = "";

+    if (!$this->generateOutputPage()) {
+        return false;
+    }
+    $outputString = $this->outputString;

+    return true; }

 

 /**

 * @access private

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

 */

 function generateOutputPage() {

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

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

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

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

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

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

-   $this->outputError = false;

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

-   if ($this->outputError) return false;

-   return true; }

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

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

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

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

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

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

+    $this->outputError = false;

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

+    if ($this->outputError) return false;

+    return true; }

 

 /**

 * Writes all instances of a block that are contained within a specific

@@ -738,64 +738,64 @@ 
 * @access private

 */

 function writeBlockInstances($blockNo, $parentInstLevel) {

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

-   while (!$this->outputError) {

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

-      if ($blockInstNo == -1) break;

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

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

-         $this->programLogicError(2);

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

-      $this->writeBlockInstance($blockInstNo);

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

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

+    while (!$this->outputError) {

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

+        if ($blockInstNo == -1) break;

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

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

+            $this->programLogicError(2);

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

+        $this->writeBlockInstance($blockInstNo);

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

 

 /**

 * @access private

 */

 function writeBlockInstance($blockInstNo) {

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

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

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

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

-   $subBlockNo = $blockNo + 1;

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

-   while (!$this->outputError) {

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

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

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

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

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

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

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

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

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

+    $subBlockNo = $blockNo + 1;

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

+    while (!$this->outputError) {

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

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

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

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

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

             $varRefNo += 1;

             continue; }

-         if ($vrtr['tPosBegin'] < $tPos2) {

+            if ($vrtr['tPosBegin'] < $tPos2) {

             $tPos2 = $vrtr['tPosBegin'];

             $kind = 1; }}

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

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

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

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

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

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

             $subBlockNo += 1;

             continue; }

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

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

             $tPos2 = $subBtr['tPosBegin'];

             $kind = 2; }}

-      if ($tPos2 > $tPos)

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

-      switch ($kind) {

-         case 0:         // end of block

+        if ($tPos2 > $tPos)

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

+        switch ($kind) {

+            case 0:         // end of block

             return;

-         case 1:         // variable

+            case 1:         // variable

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

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

-               $this->programLogicError(4);

+                $this->programLogicError(4);

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

             $this->writeString($variableValue);

             $tPos = $vrtr['tPosEnd'];

             $varRefNo += 1;

             break;

-         case 2:         // sub block

+            case 2:         // sub block

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

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

-               $this->programLogicError(3);

+                $this->programLogicError(3);

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

             $tPos = $subBtr['tPosEnd'];

             $subBlockNo += 1;

@@ -805,19 +805,19 @@ 
 * @access private

 */

 function writeString($s) {

-   if ($this->outputError) return;

-   switch ($this->outputMode) {

-      case 0:            // output to PHP output stream

+    if ($this->outputError) return;

+    switch ($this->outputMode) {

+        case 0:            // output to PHP output stream

          if (!print($s))

             $this->outputError = true;

-         break;

-      case 1:            // output to file

+            break;

+        case 1:            // output to file

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

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

-         break;

-      case 2:            // output to string

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

+            break;

+        case 2:            // output to string

          $this->outputString .= $s;

-         break; }}

+            break; }}

 

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

 

@@ -827,10 +827,10 @@ 
 * @access private

 */

 function lookupVariableName($varName, &$varNo) {

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

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

-   $varNo = $x;

-   return true; }

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

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

+    $varNo = $x;

+    return true; }

 

 /**

 * Maps block name to block number.

@@ -840,10 +840,10 @@ 
 * @access private

 */

 function lookupBlockName($blockName, &$blockNo) {

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

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

-   $blockNo = $x;

-   return true; }

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

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

+    $blockNo = $x;

+    return true; }

 

 //--- general utility routines -----------------------------------------------------------------------------------------

 

@@ -853,92 +853,92 @@ 
 * @access private

 */

 function readFileIntoString($fileName, &$s) {

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

-      $s = file_get_contents($fileName);

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

-      return true; }

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

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

-   $fileSize = filesize($fileName);

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

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

-   fclose($fh);

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

-   return true; }

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

+        $s = file_get_contents($fileName);

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

+        return true; }

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

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

+    $fileSize = filesize($fileName);

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

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

+    fclose($fh);

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

+    return true; }

 

 /**

 * @access private

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

 */

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

-   $sLen = strlen($s);

-   while ($p < $sLen && ord($s{$p}) <= 32) {
-       $p++;
-   }
-   if ($p >= $sLen) {
-       return false;
-   }
-   $p0 = $p;

-   while ($p < $sLen && ord($s{$p}) > 32) {
-       $p++;
-   }
-   $w = substr($s, $p0, $p - $p0);

-   return true; }

+    $sLen = strlen($s);

+    while ($p < $sLen && ord($s{$p}) <= 32) {
+        $p++;
+    }
+    if ($p >= $sLen) {
+        return false;
+    }
+    $p0 = $p;

+    while ($p < $sLen && ord($s{$p}) > 32) {
+        $p++;
+    }
+    $w = substr($s, $p0, $p - $p0);

+    return true; }

 

 /**

 * @access private

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

 */

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

-   $sLen = strlen($s);

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

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

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

-   $p++; $p0 = $p;

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

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

-   $w = substr($s, $p0, $p - $p0);

-   $p++;

-   return true; }

+    $sLen = strlen($s);

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

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

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

+    $p++; $p0 = $p;

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

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

+    $w = substr($s, $p0, $p - $p0);

+    $p++;

+    return true; }

 

 /**

 * @access private

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

 */

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

-   $sLen = strlen($s);

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

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

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

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

+    $sLen = strlen($s);

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

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

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

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

     else

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

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

 

 /**

 * Combine two file system paths.

 * @access private

 */

 function combineFileSystemPath($path1, $path2) {

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

-   $s = $path1;

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

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

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

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

+    $s = $path1;

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

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

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

     else

-      $s = $s.$path2;

-   return $s; }

+        $s = $s.$path2;

+    return $s; }

 

 /**

 * @access private

 */

 function triggerError($msg) {

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

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

 

 /**

 * @access private

 */

 function programLogicError($errorId) {

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

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

 

 }

 ?>

Switch Indentation +47 added lines, -47 removed lines

@@ -305,23 +305,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; }

 

 /**

@@ -781,25 +781,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

@@ -807,17 +807,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 ------------------------------------------------------------------------------------------

 

Braces +144 added lines, -71 removed lines

@@ -282,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; }

 

 /**

@@ -302,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:

@@ -387,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;

@@ -438,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);

@@ -473,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();

@@ -514,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; }}

@@ -535,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;

@@ -563,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;

@@ -631,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

@@ -691,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();

@@ -721,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; }

 

 /**

@@ -741,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']; }}

 

@@ -778,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'];

@@ -794,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;

@@ -805,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;

@@ -828,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; }

 

@@ -841,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; }

 

@@ -855,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; }

 

 /**

@@ -891,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; }

@@ -907,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; }

 

 /**