codysnider / tt-rss

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

 

 /**

lib/gettext/streams.php

Indentation +68 added lines, -68 removed lines

@@ -21,148 +21,148 @@
 */
 
 
-  // Simple class to wrap file streams, string streams, etc.
-  // seek is essential, and it should be byte stream
+    // Simple class to wrap file streams, string streams, etc.
+    // seek is essential, and it should be byte stream
 class StreamReader {
-  // should return a string [FIXME: perhaps return array of bytes?]
-  function read($bytes) {
+    // should return a string [FIXME: perhaps return array of bytes?]
+    function read($bytes) {
     return false;
-  }
+    }
 
-  // should return new position
-  function seekto($position) {
+    // should return new position
+    function seekto($position) {
     return false;
-  }
+    }
 
-  // returns current position
-  function currentpos() {
+    // returns current position
+    function currentpos() {
     return false;
-  }
+    }
 
-  // returns length of entire stream (limit for seekto()s)
-  function length() {
+    // returns length of entire stream (limit for seekto()s)
+    function length() {
     return false;
-  }
+    }
 };
 
 class StringReader {
-  var $_pos;
-  var $_str;
+    var $_pos;
+    var $_str;
 
-  function StringReader($str = '') {
+    function StringReader($str = '') {
     $this->_str = $str;
     $this->_pos = 0;
-  }
+    }
 
-  function read($bytes) {
+    function read($bytes) {
     $data = substr($this->_str, $this->_pos, $bytes);
     $this->_pos += $bytes;
     if (strlen($this->_str) < $this->_pos)
-      $this->_pos = strlen($this->_str);
+        $this->_pos = strlen($this->_str);
 
     return $data;
-  }
+    }
 
-  function seekto($pos) {
+    function seekto($pos) {
     $this->_pos = $pos;
     if (strlen($this->_str) < $this->_pos)
-      $this->_pos = strlen($this->_str);
+        $this->_pos = strlen($this->_str);
     return $this->_pos;
-  }
+    }
 
-  function currentpos() {
+    function currentpos() {
     return $this->_pos;
-  }
+    }
 
-  function length() {
+    function length() {
     return strlen($this->_str);
-  }
+    }
 
 };
 
 
 class FileReader {
-  var $_pos;
-  var $_fd;
-  var $_length;
+    var $_pos;
+    var $_fd;
+    var $_length;
 
-  function FileReader($filename) {
+    function FileReader($filename) {
     if (file_exists($filename)) {
 
-      $this->_length = filesize($filename);
-      $this->_pos = 0;
-      $this->_fd = fopen($filename, 'rb');
-      if (!$this->_fd) {
+        $this->_length = filesize($filename);
+        $this->_pos = 0;
+        $this->_fd = fopen($filename, 'rb');
+        if (!$this->_fd) {
         $this->error = 3; // Cannot read file, probably permissions
         return false;
-      }
+        }
     } else {
-      $this->error = 2; // File doesn't exist
-      return false;
+        $this->error = 2; // File doesn't exist
+        return false;
+    }
     }
-  }
 
-  function read($bytes) {
+    function read($bytes) {
     if ($bytes) {
-      fseek($this->_fd, $this->_pos);
+        fseek($this->_fd, $this->_pos);
 
-      // PHP 5.1.1 does not read more than 8192 bytes in one fread()
-      // the discussions at PHP Bugs suggest it's the intended behaviour
-      $data = '';
-      while ($bytes > 0) {
+        // PHP 5.1.1 does not read more than 8192 bytes in one fread()
+        // the discussions at PHP Bugs suggest it's the intended behaviour
+        $data = '';
+        while ($bytes > 0) {
         $chunk  = fread($this->_fd, $bytes);
         $data  .= $chunk;
         $bytes -= strlen($chunk);
-      }
-      $this->_pos = ftell($this->_fd);
+        }
+        $this->_pos = ftell($this->_fd);
 
-      return $data;
+        return $data;
     } else {
         return '';
     }
-  }
+    }
 
-  function seekto($pos) {
+    function seekto($pos) {
     fseek($this->_fd, $pos);
     $this->_pos = ftell($this->_fd);
     return $this->_pos;
-  }
+    }
 
-  function currentpos() {
+    function currentpos() {
     return $this->_pos;
-  }
+    }
 
-  function length() {
+    function length() {
     return $this->_length;
-  }
+    }
 
-  function close() {
+    function close() {
     fclose($this->_fd);
-  }
+    }
 
 };
 
 // Preloads entire file in memory first, then creates a StringReader
 // over it (it assumes knowledge of StringReader internals)
 class CachedFileReader extends StringReader {
-  function CachedFileReader($filename) {
+    function CachedFileReader($filename) {
     if (file_exists($filename)) {
 
-      $length = filesize($filename);
-      $fd = fopen($filename, 'rb');
+        $length = filesize($filename);
+        $fd = fopen($filename, 'rb');
 
-      if (!$fd) {
+        if (!$fd) {
         $this->error = 3; // Cannot read file, probably permissions
         return false;
-      }
-      $this->_str = fread($fd, $length);
-      fclose($fd);
+        }
+        $this->_str = fread($fd, $length);
+        fclose($fd);
 
     } else {
-      $this->error = 2; // File doesn't exist
-      return false;
+        $this->error = 2; // File doesn't exist
+        return false;
+    }
     }
-  }
 };
 
 

Braces +6 added lines, -4 removed lines

@@ -57,16 +57,18 @@
   function read($bytes) {
     $data = substr($this->_str, $this->_pos, $bytes);
     $this->_pos += $bytes;
-    if (strlen($this->_str) < $this->_pos)
-      $this->_pos = strlen($this->_str);
+    if (strlen($this->_str) < $this->_pos) {
+          $this->_pos = strlen($this->_str);
+    }
 
     return $data;
   }
 
   function seekto($pos) {
     $this->_pos = $pos;
-    if (strlen($this->_str) < $this->_pos)
-      $this->_pos = strlen($this->_str);
+    if (strlen($this->_str) < $this->_pos) {
+          $this->_pos = strlen($this->_str);
+    }
     return $this->_pos;
   }
 

lib/gettext/gettext.php

Indentation +244 added lines, -244 removed lines

@@ -34,75 +34,75 @@ 
  * that you don't want to keep in memory)
  */
 class gettext_reader {
-  //public:
-   var $error = 0; // public variable that holds error code (0 if no error)
-
-   //private:
-  var $BYTEORDER = 0; // 0: low endian, 1: big endian
-  var $STREAM = null;
-  var $short_circuit = false;
-  var $enable_cache = false;
-  var $originals = null; // offset of original table
-  var $translations = null; // offset of translation table
-  var $pluralheader = null; // cache header field for plural forms
-  var $total = 0; // total string count
-  var $table_originals = null; // table for original strings (offsets)
-  var $table_translations = null; // table for translated strings (offsets)
-  var $cache_translations = null; // original -> translation mapping
-
-
-  /* Methods */
-
-
-  /**
-   * Reads a 32bit Integer from the Stream
-   *
-   * @access private
-   * @return Integer from the Stream
-   */
-  function readint() {
-      if ($this->BYTEORDER == 0) {
+    //public:
+    var $error = 0; // public variable that holds error code (0 if no error)
+
+    //private:
+    var $BYTEORDER = 0; // 0: low endian, 1: big endian
+    var $STREAM = null;
+    var $short_circuit = false;
+    var $enable_cache = false;
+    var $originals = null; // offset of original table
+    var $translations = null; // offset of translation table
+    var $pluralheader = null; // cache header field for plural forms
+    var $total = 0; // total string count
+    var $table_originals = null; // table for original strings (offsets)
+    var $table_translations = null; // table for translated strings (offsets)
+    var $cache_translations = null; // original -> translation mapping
+
+
+    /* Methods */
+
+
+    /**
+     * Reads a 32bit Integer from the Stream
+     *
+     * @access private
+     * @return Integer from the Stream
+     */
+    function readint() {
+        if ($this->BYTEORDER == 0) {
         // low endian
         $input = unpack('V', $this->STREAM->read(4));
         return array_shift($input);
-      } else {
+        } else {
         // big endian
         $input = unpack('N', $this->STREAM->read(4));
         return array_shift($input);
-      }
+        }
     }
 
-  function read($bytes) {
+    function read($bytes) {
     return $this->STREAM->read($bytes);
-  }
-
-  /**
-   * Reads an array of Integers from the Stream
-   *
-   * @param int count How many elements should be read
-   * @return Array of Integers
-   */
-  function readintarray($count) {
+    }
+
+    /**
+     * Reads an array of Integers from the Stream
+     *
+     * @param int count How many elements should be read
+     * @return Array of Integers
+     */
+    function readintarray($count) {
     if ($this->BYTEORDER == 0) {
         // low endian
         return unpack('V'.$count, $this->STREAM->read(4 * $count));
-      } else {
+        } else {
         // big endian
         return unpack('N'.$count, $this->STREAM->read(4 * $count));
-      }
-  }
-
-  /**
-   * Constructor
-   *
-   * @param object Reader the StreamReader object
-   * @param boolean enable_cache Enable or disable caching of strings (default on)
-   */
-  function __construct($Reader, $enable_cache = true) {
+        }
+    }
+
+    /**
+     * Constructor
+     *
+     * @param object Reader the StreamReader object
+     * @param boolean enable_cache Enable or disable caching of strings (default on)
+     */
+    function __construct($Reader, $enable_cache = true) {
     // If there isn't a StreamReader, turn on short circuit mode.
     if (!$Reader || isset($Reader->error)) {
-      $this->short_circuit = true;
-      return;
+        $this->short_circuit = true;
+        return;
     }
 
     // Caching can be turned off
@@ -114,12 +114,12 @@ 
     $this->STREAM = $Reader;
     $magic = $this->read(4);
     if ($magic == $MAGIC1) {
-      $this->BYTEORDER = 1;
+        $this->BYTEORDER = 1;
     } elseif ($magic == $MAGIC2) {
-      $this->BYTEORDER = 0;
+        $this->BYTEORDER = 0;
     } else {
-      $this->error = 1; // not MO file
-      return false;
+        $this->error = 1; // not MO file
+        return false;
     }
 
     // FIXME: Do we care about revision? We should.
@@ -128,162 +128,162 @@ 
     $this->total = $this->readint();
     $this->originals = $this->readint();
     $this->translations = $this->readint();
-  }
-
-  /**
-   * Loads the translation tables from the MO file into the cache
-   * If caching is enabled, also loads all strings into a cache
-   * to speed up translation lookups
-   *
-   * @access private
-   */
-  function load_tables() {
+    }
+
+    /**
+     * Loads the translation tables from the MO file into the cache
+     * If caching is enabled, also loads all strings into a cache
+     * to speed up translation lookups
+     *
+     * @access private
+     */
+    function load_tables() {
     if (is_array($this->cache_translations) &&
       is_array($this->table_originals) &&
       is_array($this->table_translations)) {
-          return;
+            return;
     }
 
     /* get original and translations tables */
     if (!is_array($this->table_originals)) {
-      $this->STREAM->seekto($this->originals);
-      $this->table_originals = $this->readintarray($this->total * 2);
+        $this->STREAM->seekto($this->originals);
+        $this->table_originals = $this->readintarray($this->total * 2);
     }
     if (!is_array($this->table_translations)) {
-      $this->STREAM->seekto($this->translations);
-      $this->table_translations = $this->readintarray($this->total * 2);
+        $this->STREAM->seekto($this->translations);
+        $this->table_translations = $this->readintarray($this->total * 2);
     }
 
     if ($this->enable_cache) {
-      $this->cache_translations = array();
-      /* read all strings in the cache */
-      for ($i = 0; $i < $this->total; $i++) {
+        $this->cache_translations = array();
+        /* read all strings in the cache */
+        for ($i = 0; $i < $this->total; $i++) {
         $this->STREAM->seekto($this->table_originals[$i * 2 + 2]);
         $original = $this->STREAM->read($this->table_originals[$i * 2 + 1]);
         $this->STREAM->seekto($this->table_translations[$i * 2 + 2]);
         $translation = $this->STREAM->read($this->table_translations[$i * 2 + 1]);
         $this->cache_translations[$original] = $translation;
-      }
-    }
-  }
-
-  /**
-   * Returns a string from the "originals" table
-   *
-   * @access private
-   * @param int num Offset number of original string
-   * @return string Requested string if found, otherwise ''
-   */
-  function get_original_string($num) {
+        }
+    }
+    }
+
+    /**
+     * Returns a string from the "originals" table
+     *
+     * @access private
+     * @param int num Offset number of original string
+     * @return string Requested string if found, otherwise ''
+     */
+    function get_original_string($num) {
     $length = $this->table_originals[$num * 2 + 1];
     $offset = $this->table_originals[$num * 2 + 2];
     if (! $length) {
-          return '';
+            return '';
     }
     $this->STREAM->seekto($offset);
     $data = $this->STREAM->read($length);
     return (string)$data;
-  }
-
-  /**
-   * Returns a string from the "translations" table
-   *
-   * @access private
-   * @param int num Offset number of original string
-   * @return string Requested string if found, otherwise ''
-   */
-  function get_translation_string($num) {
+    }
+
+    /**
+     * Returns a string from the "translations" table
+     *
+     * @access private
+     * @param int num Offset number of original string
+     * @return string Requested string if found, otherwise ''
+     */
+    function get_translation_string($num) {
     $length = $this->table_translations[$num * 2 + 1];
     $offset = $this->table_translations[$num * 2 + 2];
     if (! $length) {
-          return '';
+            return '';
     }
     $this->STREAM->seekto($offset);
     $data = $this->STREAM->read($length);
     return (string)$data;
-  }
-
-  /**
-   * Binary search for string
-   *
-   * @access private
-   * @param string string
-   * @param int start (internally used in recursive function)
-   * @param int end (internally used in recursive function)
-   * @return int string number (offset in originals table)
-   */
-  function find_string($string, $start = -1, $end = -1) {
+    }
+
+    /**
+     * Binary search for string
+     *
+     * @access private
+     * @param string string
+     * @param int start (internally used in recursive function)
+     * @param int end (internally used in recursive function)
+     * @return int string number (offset in originals table)
+     */
+    function find_string($string, $start = -1, $end = -1) {
     if (($start == -1) or ($end == -1)) {
-      // find_string is called with only one parameter, set start end end
-      $start = 0;
-      $end = $this->total;
+        // find_string is called with only one parameter, set start end end
+        $start = 0;
+        $end = $this->total;
     }
     if (abs($start - $end) <= 1) {
-      // We're done, now we either found the string, or it doesn't exist
-      $txt = $this->get_original_string($start);
-      if ($string == $txt) {
-              return $start;
-      } else {
-              return -1;
-      }
+        // We're done, now we either found the string, or it doesn't exist
+        $txt = $this->get_original_string($start);
+        if ($string == $txt) {
+                return $start;
+        } else {
+                return -1;
+        }
     } else if ($start > $end) {
-      // start > end -> turn around and start over
-      return $this->find_string($string, $end, $start);
+        // start > end -> turn around and start over
+        return $this->find_string($string, $end, $start);
     } else {
-      // Divide table in two parts
-      $half = (int) (($start + $end) / 2);
-      $cmp = strcmp($string, $this->get_original_string($half));
-      if ($cmp == 0) {
-              // string is exactly in the middle => return it
+        // Divide table in two parts
+        $half = (int) (($start + $end) / 2);
+        $cmp = strcmp($string, $this->get_original_string($half));
+        if ($cmp == 0) {
+                // string is exactly in the middle => return it
         return $half;
-      } else if ($cmp < 0) {
-              // The string is in the upper half
+        } else if ($cmp < 0) {
+                // The string is in the upper half
         return $this->find_string($string, $start, $half);
-      } else {
-              // The string is in the lower half
+        } else {
+                // The string is in the lower half
         return $this->find_string($string, $half, $end);
-      }
-    }
-  }
-
-  /**
-   * Translates a string
-   *
-   * @access public
-   * @param string string to be translated
-   * @return string translated string (or original, if not found)
-   */
-  function translate($string) {
+        }
+    }
+    }
+
+    /**
+     * Translates a string
+     *
+     * @access public
+     * @param string string to be translated
+     * @return string translated string (or original, if not found)
+     */
+    function translate($string) {
     if ($this->short_circuit) {
-          return $string;
+            return $string;
     }
     $this->load_tables();
 
     if ($this->enable_cache) {
-      // Caching enabled, get translated string from cache
-      if (array_key_exists($string, $this->cache_translations)) {
-              return $this->cache_translations[$string];
-      } else {
-              return $string;
-      }
+        // Caching enabled, get translated string from cache
+        if (array_key_exists($string, $this->cache_translations)) {
+                return $this->cache_translations[$string];
+        } else {
+                return $string;
+        }
     } else {
-      // Caching not enabled, try to find string
-      $num = $this->find_string($string);
-      if ($num == -1) {
-              return $string;
-      } else {
-              return $this->get_translation_string($num);
-      }
-    }
-  }
-
-  /**
-   * Sanitize plural form expression for use in PHP eval call.
-   *
-   * @access private
-   * @return string sanitized plural form expression
-   */
-  function sanitize_plural_expression($expr) {
+        // Caching not enabled, try to find string
+        $num = $this->find_string($string);
+        if ($num == -1) {
+                return $string;
+        } else {
+                return $this->get_translation_string($num);
+        }
+    }
+    }
+
+    /**
+     * Sanitize plural form expression for use in PHP eval call.
+     *
+     * @access private
+     * @return string sanitized plural form expression
+     */
+    function sanitize_plural_expression($expr) {
     // Get rid of disallowed characters.
     $expr = preg_replace('@[^a-zA-Z0-9_:;\(\)\?\|\&=!<>+*/\%-]@', '', $expr);
 
@@ -292,75 +292,75 @@ 
     $res = '';
     $p = 0;
     for ($i = 0; $i < strlen($expr); $i++) {
-      $ch = $expr[$i];
-      switch ($ch) {
-      case '?':
+        $ch = $expr[$i];
+        switch ($ch) {
+        case '?':
         $res .= ' ? (';
         $p++;
         break;
-      case ':':
+        case ':':
         $res .= ') : (';
         break;
-      case ';':
+        case ';':
         $res .= str_repeat(')', $p).';';
         $p = 0;
         break;
-      default:
+        default:
         $res .= $ch;
-      }
+        }
     }
     return $res;
-  }
-
-  /**
-   * Parse full PO header and extract only plural forms line.
-   *
-   * @access private
-   * @return string verbatim plural form header field
-   */
-  function extract_plural_forms_header_from_po_header($header) {
+    }
+
+    /**
+     * Parse full PO header and extract only plural forms line.
+     *
+     * @access private
+     * @return string verbatim plural form header field
+     */
+    function extract_plural_forms_header_from_po_header($header) {
     if (preg_match("/(^|\n)plural-forms: ([^\n]*)\n/i", $header, $regs)) {
-          $expr = $regs[2];
+            $expr = $regs[2];
     } else {
-          $expr = "nplurals=2; plural=n == 1 ? 0 : 1;";
+            $expr = "nplurals=2; plural=n == 1 ? 0 : 1;";
     }
     return $expr;
-  }
-
-  /**
-   * Get possible plural forms from MO header
-   *
-   * @access private
-   * @return string plural form header
-   */
-  function get_plural_forms() {
+    }
+
+    /**
+     * Get possible plural forms from MO header
+     *
+     * @access private
+     * @return string plural form header
+     */
+    function get_plural_forms() {
     // lets assume message number 0 is header
     // this is true, right?
     $this->load_tables();
 
     // cache header field for plural forms
     if (!is_string($this->pluralheader)) {
-      if ($this->enable_cache) {
+        if ($this->enable_cache) {
         $header = $this->cache_translations[""];
-      } else {
+        } else {
         $header = $this->get_translation_string(0);
-      }
-      $expr = $this->extract_plural_forms_header_from_po_header($header);
-      $this->pluralheader = $this->sanitize_plural_expression($expr);
+        }
+        $expr = $this->extract_plural_forms_header_from_po_header($header);
+        $this->pluralheader = $this->sanitize_plural_expression($expr);
     }
     return $this->pluralheader;
-  }
-
-  /**
-   * Detects which plural form to take
-   *
-   * @access private
-   * @param n count
-   * @return int array index of the right plural form
-   */
-  function select_string($n) {
+    }
+
+    /**
+     * Detects which plural form to take
+     *
+     * @access private
+     * @param n count
+     * @return int array index of the right plural form
+     */
+    function select_string($n) {
     if (!is_int($n)) {
-      throw new InvalidArgumentException(
+        throw new InvalidArgumentException(
         "Select_string only accepts integers: ".$n);
     }
     $string = $this->get_plural_forms();
@@ -376,24 +376,24 @@ 
         $plural = $total - 1;
     }
     return $plural;
-  }
-
-  /**
-   * Plural version of gettext
-   *
-   * @access public
-   * @param string single
-   * @param string plural
-   * @param string number
-   * @return translated plural form
-   */
-  function ngettext($single, $plural, $number) {
+    }
+
+    /**
+     * Plural version of gettext
+     *
+     * @access public
+     * @param string single
+     * @param string plural
+     * @param string number
+     * @return translated plural form
+     */
+    function ngettext($single, $plural, $number) {
     if ($this->short_circuit) {
-      if ($number != 1) {
-              return $plural;
-      } else {
-              return $single;
-      }
+        if ($number != 1) {
+                return $plural;
+        } else {
+                return $single;
+        }
     }
 
     // find out the appropriate form
@@ -404,45 +404,45 @@ 
 
 
     if ($this->enable_cache) {
-      if (!array_key_exists($key, $this->cache_translations)) {
+        if (!array_key_exists($key, $this->cache_translations)) {
         return ($number != 1) ? $plural : $single;
-      } else {
+        } else {
         $result = $this->cache_translations[$key];
         $list = explode(chr(0), $result);
         return $list[$select];
-      }
+        }
     } else {
-      $num = $this->find_string($key);
-      if ($num == -1) {
+        $num = $this->find_string($key);
+        if ($num == -1) {
         return ($number != 1) ? $plural : $single;
-      } else {
+        } else {
         $result = $this->get_translation_string($num);
         $list = explode(chr(0), $result);
         return $list[$select];
-      }
+        }
+    }
     }
-  }
 
-  function pgettext($context, $msgid) {
+    function pgettext($context, $msgid) {
     $key = $context.chr(4).$msgid;
     $ret = $this->translate($key);
     if (strpos($ret, "\004") !== false) {
-      return $msgid;
+        return $msgid;
     } else {
-      return $ret;
+        return $ret;
+    }
     }
-  }
 
-  function npgettext($context, $singular, $plural, $number) {
+    function npgettext($context, $singular, $plural, $number) {
     $key = $context.chr(4).$singular;
     $ret = $this->ngettext($key, $plural, $number);
     if (strpos($ret, "\004") !== false) {
-      return $singular;
+        return $singular;
     } else {
-      return $ret;
+        return $ret;
     }
 
-  }
+    }
 }
 
 ?>

Spacing +4 added lines, -4 removed lines

@@ -177,12 +177,12 @@ 
   function get_original_string($num) {
     $length = $this->table_originals[$num * 2 + 1];
     $offset = $this->table_originals[$num * 2 + 2];
-    if (! $length) {
+    if (!$length) {
           return '';
     }
     $this->STREAM->seekto($offset);
     $data = $this->STREAM->read($length);
-    return (string)$data;
+    return (string) $data;
   }
 
   /**
@@ -195,12 +195,12 @@ 
   function get_translation_string($num) {
     $length = $this->table_translations[$num * 2 + 1];
     $offset = $this->table_translations[$num * 2 + 2];
-    if (! $length) {
+    if (!$length) {
           return '';
     }
     $this->STREAM->seekto($offset);
     $data = $this->STREAM->read($length);
-    return (string)$data;
+    return (string) $data;
   }
 
   /**

lib/gettext/gettext.inc

Indentation +93 added lines, -93 removed lines

@@ -35,7 +35,7 @@ 
 // LC_MESSAGES is not available if php-gettext is not loaded
 // while the other constants are already available from session extension.
 if (!defined('LC_MESSAGES')) {
-  define('LC_MESSAGES', 5);
+    define('LC_MESSAGES', 5);
 }
 
 require('streams.php');
@@ -53,9 +53,9 @@ 
 
 /* Class to hold a single domain included in $text_domains. */
 class domain {
-  var $l10n;
-  var $path;
-  var $codeset;
+    var $l10n;
+    var $path;
+    var $codeset;
 }
 
 // Utility functions
@@ -64,63 +64,63 @@ 
  * Return a list of locales to try for any POSIX-style locale specification.
  */
 function get_list_of_locales($locale) {
-  /* Figure out all possible locale names and start with the most
+    /* Figure out all possible locale names and start with the most
    * specific ones.  I.e. for sr_CS.UTF-8@latin, look through all of
    * sr_CS.UTF-8@latin, sr_CS@latin, sr@latin, sr_CS.UTF-8, sr_CS, sr.
    */
-  $locale_names = array();
-  $lang = null;
-  $country = null;
-  $charset = null;
-  $modifier = null;
-  if ($locale) {
+    $locale_names = array();
+    $lang = null;
+    $country = null;
+    $charset = null;
+    $modifier = null;
+    if ($locale) {
     if (preg_match("/^(?P<lang>[a-z]{2,3})"              // language code
-                   ."(?:_(?P<country>[A-Z]{2}))?"           // country code
-                   ."(?:\.(?P<charset>[-A-Za-z0-9_]+))?"    // charset
-                   ."(?:@(?P<modifier>[-A-Za-z0-9_]+))?$/", // @ modifier
-                   $locale, $matches)) {
-
-      if (isset($matches["lang"])) {
-          $lang = $matches["lang"];
-      }
-      if (isset($matches["country"])) {
-          $country = $matches["country"];
-      }
-      if (isset($matches["charset"])) {
-          $charset = $matches["charset"];
-      }
-      if (isset($matches["modifier"])) {
-          $modifier = $matches["modifier"];
-      }
-
-      if ($modifier) {
+                    ."(?:_(?P<country>[A-Z]{2}))?"           // country code
+                    ."(?:\.(?P<charset>[-A-Za-z0-9_]+))?"    // charset
+                    ."(?:@(?P<modifier>[-A-Za-z0-9_]+))?$/", // @ modifier
+                    $locale, $matches)) {
+
+        if (isset($matches["lang"])) {
+            $lang = $matches["lang"];
+        }
+        if (isset($matches["country"])) {
+            $country = $matches["country"];
+        }
+        if (isset($matches["charset"])) {
+            $charset = $matches["charset"];
+        }
+        if (isset($matches["modifier"])) {
+            $modifier = $matches["modifier"];
+        }
+
+        if ($modifier) {
         if ($country) {
-          if ($charset) {
-                      array_push($locale_names, "${lang}_$country.$charset@$modifier");
-          }
-          array_push($locale_names, "${lang}_$country@$modifier");
+            if ($charset) {
+                        array_push($locale_names, "${lang}_$country.$charset@$modifier");
+            }
+            array_push($locale_names, "${lang}_$country@$modifier");
         } elseif ($charset) {
                     array_push($locale_names, "${lang}.$charset@$modifier");
         }
         array_push($locale_names, "$lang@$modifier");
-      }
-      if ($country) {
+        }
+        if ($country) {
         if ($charset) {
-                  array_push($locale_names, "${lang}_$country.$charset");
+                    array_push($locale_names, "${lang}_$country.$charset");
         }
         array_push($locale_names, "${lang}_$country");
-      } elseif ($charset) {
+        } elseif ($charset) {
                 array_push($locale_names, "${lang}.$charset");
-      }
-      array_push($locale_names, $lang);
+        }
+        array_push($locale_names, $lang);
     }
 
     // If the locale name doesn't match POSIX style, just include it as-is.
     if (!in_array($locale, $locale_names)) {
-          array_push($locale_names, $locale);
+            array_push($locale_names, $locale);
     }
-  }
-  return $locale_names;
+    }
+    return $locale_names;
 }
 
 /**
@@ -141,19 +141,19 @@ 
         $locale_names = get_list_of_locales($locale);
         $input = null;
         foreach ($locale_names as $locale) {
-          $full_path = $bound_path.$locale."/".$subpath;
-          if (file_exists($full_path)) {
+            $full_path = $bound_path.$locale."/".$subpath;
+            if (file_exists($full_path)) {
             $input = new FileReader($full_path);
             break;
-          }
+            }
         }
 
         if (!array_key_exists($domain, $text_domains)) {
-          // Initialize an empty domain object.
-          $text_domains[$domain] = new domain();
+            // Initialize an empty domain object.
+            $text_domains[$domain] = new domain();
         }
         $text_domains[$domain]->l10n = new gettext_reader($input,
-                                                          $enable_cache);
+                                                            $enable_cache);
     }
     return $text_domains[$domain]->l10n;
 }
@@ -190,14 +190,14 @@ 
  * Convert the given string to the encoding set by bind_textdomain_codeset.
  */
 function _encode($text) {
-  $target_encoding = _get_codeset();
-  if (function_exists("mb_detect_encoding")) {
+    $target_encoding = _get_codeset();
+    if (function_exists("mb_detect_encoding")) {
     $source_encoding = mb_detect_encoding($text);
     if ($source_encoding != $target_encoding) {
-          $text = mb_convert_encoding($text, $target_encoding, $source_encoding);
+            $text = mb_convert_encoding($text, $target_encoding, $source_encoding);
+    }
     }
-  }
-  return $text;
+    return $text;
 }
 
 
@@ -207,13 +207,13 @@ 
  * Returns passed in $locale, or environment variable $LANG if $locale == ''.
  */
 function _get_default_locale($locale) {
-  if ($locale == '') {
-      // emulate variable support
+    if ($locale == '') {
+        // emulate variable support
     return getenv('LANG');
-  } else {
-      return $locale;
-  }
-  }
+    } else {
+        return $locale;
+    }
+    }
 
 /**
  * Sets a requested locale, if needed emulates it.
@@ -230,20 +230,20 @@ 
         }
     } else {
         if (function_exists('setlocale')) {
-          $ret = setlocale($category, $locale);
-          if (($locale == '' and !$ret) or // failed setting it by env
+            $ret = setlocale($category, $locale);
+            if (($locale == '' and !$ret) or // failed setting it by env
               ($locale != '' and $ret != $locale)) { // failed setting it
             // Failed setting it according to environment.
             $CURRENTLOCALE = _get_default_locale($locale);
             $EMULATEGETTEXT = 1;
-          } else {
+            } else {
             $CURRENTLOCALE = $ret;
             $EMULATEGETTEXT = 0;
-          }
+            }
         } else {
-          // No function setlocale(), emulate it all.
-          $CURRENTLOCALE = _get_default_locale($locale);
-          $EMULATEGETTEXT = 1;
+            // No function setlocale(), emulate it all.
+            $CURRENTLOCALE = _get_default_locale($locale);
+            $EMULATEGETTEXT = 1;
         }
         // Allow locale to be changed on the go for one translation domain.
         global $text_domains, $default_domain;
@@ -261,15 +261,15 @@ 
     global $text_domains;
     // ensure $path ends with a slash ('/' should work for both, but lets still play nice)
     if (substr(php_uname(), 0, 7) == "Windows") {
-      if ($path[strlen($path) - 1] != '\\' and $path[strlen($path) - 1] != '/')
+        if ($path[strlen($path) - 1] != '\\' and $path[strlen($path) - 1] != '/')
         $path .= '\\';
     } else {
-      if ($path[strlen($path) - 1] != '/')
+        if ($path[strlen($path) - 1] != '/')
         $path .= '/';
     }
     if (!array_key_exists($domain, $text_domains)) {
-      // Initialize an empty domain object.
-      $text_domains[$domain] = new domain();
+        // Initialize an empty domain object.
+        $text_domains[$domain] = new domain();
     }
     $text_domains[$domain]->path = $path;
 }
@@ -468,35 +468,35 @@ 
     }
 function T_dcngettext($domain, $singular, $plural, $number, $category) {
     if (_check_locale_and_function()) {
-          return dcngettext($domain, $singular, $plural, $number, $category);
+            return dcngettext($domain, $singular, $plural, $number, $category);
     } else {
         return _dcngettext($domain, $singular, $plural, $number, $category);
     }
     }
 
 function T_pgettext($context, $msgid) {
-  if (_check_locale_and_function('pgettext')) {
+    if (_check_locale_and_function('pgettext')) {
         return pgettext($context, $msgid);
-  } else {
+    } else {
         return _pgettext($context, $msgid);
-  }
-  }
+    }
+    }
 
 function T_dpgettext($domain, $context, $msgid) {
-  if (_check_locale_and_function('dpgettext')) {
+    if (_check_locale_and_function('dpgettext')) {
         return dpgettext($domain, $context, $msgid);
-  } else {
+    } else {
         return _dpgettext($domain, $context, $msgid);
-  }
-  }
+    }
+    }
 
 function T_dcpgettext($domain, $context, $msgid, $category) {
-  if (_check_locale_and_function('dcpgettext')) {
+    if (_check_locale_and_function('dcpgettext')) {
         return dcpgettext($domain, $context, $msgid, $category);
-  } else {
+    } else {
         return _dcpgettext($domain, $context, $msgid, $category);
-  }
-  }
+    }
+    }
 
 function T_npgettext($context, $singular, $plural, $number) {
     if (_check_locale_and_function('npgettext')) {
@@ -507,18 +507,18 @@ 
     }
 
 function T_dnpgettext($domain, $context, $singular, $plural, $number) {
-  if (_check_locale_and_function('dnpgettext')) {
+    if (_check_locale_and_function('dnpgettext')) {
         return dnpgettext($domain, $context, $singular, $plural, $number);
-  } else {
+    } else {
         return _dnpgettext($domain, $context, $singular, $plural, $number);
-  }
-  }
+    }
+    }
 
 function T_dcnpgettext($domain, $context, $singular, $plural,
-                       $number, $category) {
+                        $number, $category) {
     if (_check_locale_and_function('dcnpgettext')) {
             return dcnpgettext($domain, $context, $singular,
-                           $plural, $number, $category);
+                            $plural, $number, $category);
     } else {
             return _dcnpgettext($domain, $context, $singular,
                             $plural, $number, $category);
@@ -576,9 +576,9 @@ 
         return _dcpgettext($domain, $context, $msgid, $category);
     }
     function dcnpgettext($domain, $context, $singular, $plural,
-                         $number, $category) {
-      return _dcnpgettext($domain, $context, $singular, $plural,
-                          $number, $category);
+                            $number, $category) {
+        return _dcnpgettext($domain, $context, $singular, $plural,
+                            $number, $category);
     }
 }
 

Braces +9 added lines, -5 removed lines

@@ -182,7 +182,9 @@ 
  */
 function _get_codeset($domain = null) {
     global $text_domains, $default_domain, $LC_CATEGORIES;
-    if (!isset($domain)) $domain = $default_domain;
+    if (!isset($domain)) {
+        $domain = $default_domain;
+    }
     return (isset($text_domains[$domain]->codeset)) ? $text_domains[$domain]->codeset : ini_get('mbstring.internal_encoding');
 }
 
@@ -261,11 +263,13 @@ 
     global $text_domains;
     // ensure $path ends with a slash ('/' should work for both, but lets still play nice)
     if (substr(php_uname(), 0, 7) == "Windows") {
-      if ($path[strlen($path) - 1] != '\\' and $path[strlen($path) - 1] != '/')
-        $path .= '\\';
+      if ($path[strlen($path) - 1] != '\\' and $path[strlen($path) - 1] != '/') {
+              $path .= '\\';
+      }
     } else {
-      if ($path[strlen($path) - 1] != '/')
-        $path .= '/';
+      if ($path[strlen($path) - 1] != '/') {
+              $path .= '/';
+      }
     }
     if (!array_key_exists($domain, $text_domains)) {
       // Initialize an empty domain object.

lib/phpqrcode/qrimage.php

Spacing +2 added lines, -2 removed lines

@@ -35,11 +35,11 @@
                 Header("Content-type: image/png");

                 ImagePng($image);

             } else {

-                if($saveandprint===true){

+                if ($saveandprint === true) {

                     ImagePng($image, $filename);

                     header("Content-type: image/png");

                     ImagePng($image);

-                } else{

+                } else {

                     ImagePng($image, $filename);

                 }

             }

lib/phpqrcode/qrtools.php

Indentation +7 added lines, -7 removed lines

@@ -79,9 +79,9 @@ 
         //----------------------------------------------------------------------

         public static function buildCache()

         {

-			QRtools::markTime('before_build_cache');

+            QRtools::markTime('before_build_cache');

 			

-			$mask = new QRmask();

+            $mask = new QRmask();

             for ($a = 1; $a <= QRSPEC_VERSION_MAX; $a++) {

                 $frame = QRspec::newFrame($a);

                 if (QR_IMAGE) {

@@ -89,13 +89,13 @@ 
                     QRimage::png(self::binarize($frame), $fileName, 1, 0);

                 }

 				

-				$width = count($frame);

-				$bitMask = array_fill(0, $width, array_fill(0, $width, 0));

-				for ($maskNo = 0; $maskNo < 8; $maskNo++)

-					$mask->makeMaskNo($maskNo, $width, $frame, $bitMask, true);

+                $width = count($frame);

+                $bitMask = array_fill(0, $width, array_fill(0, $width, 0));

+                for ($maskNo = 0; $maskNo < 8; $maskNo++)

+                    $mask->makeMaskNo($maskNo, $width, $frame, $bitMask, true);

             }

 			

-			QRtools::markTime('after_build_cache');

+            QRtools::markTime('after_build_cache');

         }

 

         //----------------------------------------------------------------------

Braces +6 added lines, -4 removed lines

@@ -62,8 +62,9 @@ 
                 

             foreach ($qrTab as $line) {

                 $arrAdd = array();

-                foreach (str_split($line) as $char)

-                    $arrAdd[] = ($char == '1') ? 1 : 0;

+                foreach (str_split($line) as $char) {
+                                    $arrAdd[] = ($char == '1') ? 1 : 0;
+                }
                 $barcode_array['bcode'][] = $arrAdd;

             }

                     

@@ -91,8 +92,9 @@ 
 				

 				$width = count($frame);

 				$bitMask = array_fill(0, $width, array_fill(0, $width, 0));

-				for ($maskNo = 0; $maskNo < 8; $maskNo++)

-					$mask->makeMaskNo($maskNo, $width, $frame, $bitMask, true);

+				for ($maskNo = 0; $maskNo < 8; $maskNo++) {
+									$mask->makeMaskNo($maskNo, $width, $frame, $bitMask, true);
+				}
             }

 			

 			QRtools::markTime('after_build_cache');