codysnider / tt-rss

classes/handler/public.php

Switch Indentation +18 added lines, -18 removed lines

@@ -760,24 +760,24 @@
 				$feed_urls = false;
 
 				switch ($rc['code']) {
-					case 0:
-						print_warning(T_sprintf("Already subscribed to <b>%s</b>.", $feed_url));
-						break;
-					case 1:
-						print_notice(T_sprintf("Subscribed to <b>%s</b>.", $feed_url));
-						break;
-					case 2:
-						print_error(T_sprintf("Could not subscribe to <b>%s</b>.", $feed_url));
-						break;
-					case 3:
-						print_error(T_sprintf("No feeds found in <b>%s</b>.", $feed_url));
-						break;
-					case 4:
-						$feed_urls = $rc["feeds"];
-						break;
-					case 5:
-						print_error(T_sprintf("Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL.", $feed_url));
-						break;
+				case 0:
+					print_warning(T_sprintf("Already subscribed to <b>%s</b>.", $feed_url));
+					break;
+				case 1:
+					print_notice(T_sprintf("Subscribed to <b>%s</b>.", $feed_url));
+					break;
+				case 2:
+					print_error(T_sprintf("Could not subscribe to <b>%s</b>.", $feed_url));
+					break;
+				case 3:
+					print_error(T_sprintf("No feeds found in <b>%s</b>.", $feed_url));
+					break;
+				case 4:
+					$feed_urls = $rc["feeds"];
+					break;
+				case 5:
+					print_error(T_sprintf("Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL.", $feed_url));
+					break;
 				}
 
 				if ($feed_urls) {

Spacing +28 added lines, -29 removed lines

@@ -7,7 +7,7 @@ 
 
 		require_once "lib/MiniTemplator.class.php";
 
-		$note_style = 	"background-color : #fff7d5;
+		$note_style = "background-color : #fff7d5;
 			border-width : 1px; ".
 			"padding : 5px; border-style : dashed; border-color : #e7d796;".
 			"margin-bottom : 1em; color : #9a8c59;";
@@ -73,8 +73,8 @@ 
 		$feed_site_url = $qfh_ret[2];
 		/* $last_error = $qfh_ret[3]; */
 
-		$feed_self_url = get_self_url_prefix() .
-			"/public.php?op=rss&id=$feed&key=" .
+		$feed_self_url = get_self_url_prefix().
+			"/public.php?op=rss&id=$feed&key=".
 			Feeds::get_feed_access_key($feed, false, $owner_uid);
 
 		if (!$feed_site_url) $feed_site_url = get_self_url_prefix();
@@ -102,8 +102,7 @@ 
 				}
 
 				$tpl->setVariable('ARTICLE_ID',
-					htmlspecialchars($orig_guid ? $line['link'] :
-							$this->make_article_tag_uri($line['id'], $line['date_entered'])), true);
+					htmlspecialchars($orig_guid ? $line['link'] : $this->make_article_tag_uri($line['id'], $line['date_entered'])), true);
 				$tpl->setVariable('ARTICLE_LINK', htmlspecialchars($line['link']), true);
 				$tpl->setVariable('ARTICLE_TITLE', htmlspecialchars($line['title']), true);
 				$tpl->setVariable('ARTICLE_EXCERPT', $line["content_preview"], true);
@@ -112,7 +111,7 @@ 
 					$feed_site_url, false, $line["id"]);
 
 				if ($line['note']) {
-					$content = "<div style=\"$note_style\">Article note: " . $line['note'] . "</div>" .
+					$content = "<div style=\"$note_style\">Article note: ".$line['note']."</div>".
 						$content;
 					$tpl->setVariable('ARTICLE_NOTE', htmlspecialchars($line['note']), true);
 				}
@@ -201,7 +200,7 @@ 
 				$article = array();
 
 				$article['id'] = $line['link'];
-				$article['link']	= $line['link'];
+				$article['link'] = $line['link'];
 				$article['title'] = $line['title'];
 				$article['excerpt'] = $line["content_preview"];
 				$article['content'] = sanitize($line["content"], false, $owner_uid, $feed_site_url, false, $line["id"]);
@@ -277,13 +276,13 @@ 
 			WHERE ttrss_users.id = ttrss_settings_profiles.owner_uid AND login = ? ORDER BY title");
 			$sth->execute([$login]);
 
-			$rv = [ [ "value" => 0, "label" => __("Default profile") ] ];
+			$rv = [["value" => 0, "label" => __("Default profile")]];
 
 			while ($line = $sth->fetch()) {
 				$id = $line["id"];
 				$title = $line["title"];
 
-				array_push($rv, [ "label" => $title, "value" => $id ]);
+				array_push($rv, ["label" => $title, "value" => $id]);
 			}
 	    }
 
@@ -384,7 +383,7 @@ 
             list ($og_image, $og_stream) = Article::get_article_image($enclosures, $line['content'], $line["site_url"]);
 
             if ($og_image) {
-                $rv .= "<meta property='og:image' content=\"" . htmlspecialchars($og_image) . "\"/>";
+                $rv .= "<meta property='og:image' content=\"".htmlspecialchars($og_image)."\"/>";
             }
 
             $rv .= "<body class='flat ttrss_utility ttrss_zoom'>";
@@ -393,9 +392,9 @@ 
 			if ($line["link"]) {
 				$rv .= "<h1><a target='_blank' rel='noopener noreferrer'
 					title=\"".htmlspecialchars($line['title'])."\"
-					href=\"" .htmlspecialchars($line["link"]) . "\">" .	$line["title"] . "</a></h1>";
+					href=\"" .htmlspecialchars($line["link"])."\">".$line["title"]."</a></h1>";
 			} else {
-				$rv .= "<h1>" . $line["title"] . "</h1>";
+				$rv .= "<h1>".$line["title"]."</h1>";
 			}
 
 			$rv .= "<div class='content post'>";
@@ -448,8 +447,8 @@ 
 		$feed = clean($_REQUEST["id"]);
 		$key = clean($_REQUEST["key"]);
 		$is_cat = clean($_REQUEST["is_cat"]);
-		$limit = (int)clean($_REQUEST["limit"]);
-		$offset = (int)clean($_REQUEST["offset"]);
+		$limit = (int) clean($_REQUEST["limit"]);
+		$offset = (int) clean($_REQUEST["offset"]);
 
 		$search = clean($_REQUEST["q"]);
 		$view_mode = clean($_REQUEST["view-mode"]);
@@ -692,9 +691,9 @@ 
 			$return = clean($_REQUEST['return']);
 
 			if ($_REQUEST['return'] && mb_strpos($return, SELF_URL_PATH) === 0) {
-				header("Location: " . clean($_REQUEST['return']));
+				header("Location: ".clean($_REQUEST['return']));
 			} else {
-				header("Location: " . get_self_url_prefix());
+				header("Location: ".get_self_url_prefix());
 			}
 		}
 	}
@@ -786,7 +785,7 @@ 
 					print "<input type='hidden' name='op' value='subscribe'>";
 
 					print "<fieldset>";
-					print "<label style='display : inline'>" . __("Multiple feed URLs found:") . "</label>";
+					print "<label style='display : inline'>".__("Multiple feed URLs found:")."</label>";
 					print "<select name='feed_url' dojoType='dijit.form.Select'>";
 
 					foreach ($feed_urls as $url => $name) {
@@ -805,9 +804,9 @@ 
 					print "</form>";
 				}
 
-				$tp_uri = get_self_url_prefix() . "/prefs.php";
+				$tp_uri = get_self_url_prefix()."/prefs.php";
 
-				if ($rc['code'] <= 2){
+				if ($rc['code'] <= 2) {
 					$sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE
 					feed_url = ? AND owner_uid = ?");
 					$sth->execute([$feed_url, $_SESSION['uid']]);
@@ -895,7 +894,7 @@ 
 					list($timestamp, $resetpass_token) = explode(":", $resetpass_token_full);
 
 					if ($timestamp && $resetpass_token &&
-						$timestamp >= time() - 15*60*60 &&
+						$timestamp >= time() - 15 * 60 * 60 &&
 						$resetpass_token == $hash) {
 
 							$sth = $this->pdo->prepare("UPDATE ttrss_users SET resetpass_token = NULL
@@ -935,8 +934,8 @@ 
 				<input dojoType='dijit.form.TextBox' type='email' name='email' value='' required>
 				</fieldset>";
 
-			$_SESSION["pwdreset:testvalue1"] = rand(1,10);
-			$_SESSION["pwdreset:testvalue2"] = rand(1,10);
+			$_SESSION["pwdreset:testvalue1"] = rand(1, 10);
+			$_SESSION["pwdreset:testvalue2"] = rand(1, 10);
 
 			print "<fieldset>
 				<label>".T_sprintf("How much is %d + %d:", $_SESSION["pwdreset:testvalue1"], $_SESSION["pwdreset:testvalue2"])."</label>
@@ -981,8 +980,8 @@ 
 
 					if ($id) {
 						$resetpass_token = sha1(get_random_bytes(128));
-						$resetpass_link = get_self_url_prefix() . "/public.php?op=forgotpass&hash=" . $resetpass_token .
-							"&login=" . urlencode($login);
+						$resetpass_link = get_self_url_prefix()."/public.php?op=forgotpass&hash=".$resetpass_token.
+							"&login=".urlencode($login);
 
 						require_once "lib/MiniTemplator.class.php";
 
@@ -1009,7 +1008,7 @@ 
 
 						if (!$rc) print_error($mailer->error());
 
-						$resetpass_token_full = time() . ":" . $resetpass_token;
+						$resetpass_token_full = time().":".$resetpass_token;
 
 						$sth = $this->pdo->prepare("UPDATE ttrss_users
 							SET resetpass_token = ?
@@ -1099,12 +1098,12 @@ 
 				if ($op == "performupdate") {
 					if ($updater->isUpdateRequired()) {
 
-						print "<h2>" . T_sprintf("Performing updates to version %d", SCHEMA_VERSION) . "</h2>";
+						print "<h2>".T_sprintf("Performing updates to version %d", SCHEMA_VERSION)."</h2>";
 
 						for ($i = $updater->getSchemaVersion() + 1; $i <= SCHEMA_VERSION; $i++) {
 							print "<ul>";
 
-							print "<li class='text-info'>" . T_sprintf("Updating to version %d", $i) . "</li>";
+							print "<li class='text-info'>".T_sprintf("Updating to version %d", $i)."</li>";
 
 							print "<li>";
 							$result = $updater->performUpdateTo($i, true);
@@ -1123,7 +1122,7 @@ 
 
 								return;
 							} else {
-								print "<li class='text-success'>" . __("Completed.") . "</li>";
+								print "<li class='text-success'>".__("Completed.")."</li>";
 								print "</ul>";
 							}
 						}
@@ -1191,7 +1190,7 @@ 
 
 		$timestamp = date("Y-m-d", strtotime($timestamp));
 
-		return "tag:" . parse_url(get_self_url_prefix(), PHP_URL_HOST) . ",$timestamp:/$id";
+		return "tag:".parse_url(get_self_url_prefix(), PHP_URL_HOST).",$timestamp:/$id";
 	}
 
 	// this should be used very carefully because this endpoint is exposed to unauthenticated users

Indentation +716 added lines, -716 removed lines

@@ -1,329 +1,329 @@ 
 <?php
 class Handler_Public extends Handler {
 
-	private function generate_syndicated_feed($owner_uid, $feed, $is_cat,
-		$limit, $offset, $search,
-		$view_mode = false, $format = 'atom', $order = false, $orig_guid = false, $start_ts = false) {
+    private function generate_syndicated_feed($owner_uid, $feed, $is_cat,
+        $limit, $offset, $search,
+        $view_mode = false, $format = 'atom', $order = false, $orig_guid = false, $start_ts = false) {
 
-		require_once "lib/MiniTemplator.class.php";
+        require_once "lib/MiniTemplator.class.php";
 
-		$note_style = 	"background-color : #fff7d5;
+        $note_style = 	"background-color : #fff7d5;
 			border-width : 1px; ".
-			"padding : 5px; border-style : dashed; border-color : #e7d796;".
-			"margin-bottom : 1em; color : #9a8c59;";
-
-		if (!$limit) $limit = 60;
-
-		$date_sort_field = "date_entered DESC, updated DESC";
-
-		if ($feed == -2 && !$is_cat) {
-			$date_sort_field = "last_published DESC";
-		} else if ($feed == -1 && !$is_cat) {
-			$date_sort_field = "last_marked DESC";
-		}
-
-		switch ($order) {
-		case "title":
-			$date_sort_field = "ttrss_entries.title, date_entered, updated";
-			break;
-		case "date_reverse":
-			$date_sort_field = "date_entered, updated";
-			break;
-		case "feed_dates":
-			$date_sort_field = "updated DESC";
-			break;
-		}
-
-		$params = array(
-			"owner_uid" => $owner_uid,
-			"feed" => $feed,
-			"limit" => $limit,
-			"view_mode" => $view_mode,
-			"cat_view" => $is_cat,
-			"search" => $search,
-			"override_order" => $date_sort_field,
-			"include_children" => true,
-			"ignore_vfeed_group" => true,
-			"offset" => $offset,
-			"start_ts" => $start_ts
-		);
-
-		if (!$is_cat && is_numeric($feed) && $feed < PLUGIN_FEED_BASE_INDEX && $feed > LABEL_BASE_INDEX) {
-
-			$user_plugins = get_pref("_ENABLED_PLUGINS", $owner_uid);
-
-			$tmppluginhost = new PluginHost();
-			$tmppluginhost->load(PLUGINS, PluginHost::KIND_ALL);
-			$tmppluginhost->load($user_plugins, PluginHost::KIND_USER, $owner_uid);
-			$tmppluginhost->load_data();
-
-			$handler = $tmppluginhost->get_feed_handler(
-				PluginHost::feed_to_pfeed_id($feed));
-
-			if ($handler) {
-				$qfh_ret = $handler->get_headlines(PluginHost::feed_to_pfeed_id($feed), $params);
-			}
-
-		} else {
-			$qfh_ret = Feeds::queryFeedHeadlines($params);
-		}
-
-		$result = $qfh_ret[0];
-		$feed_title = htmlspecialchars($qfh_ret[1]);
-		$feed_site_url = $qfh_ret[2];
-		/* $last_error = $qfh_ret[3]; */
-
-		$feed_self_url = get_self_url_prefix() .
-			"/public.php?op=rss&id=$feed&key=" .
-			Feeds::get_feed_access_key($feed, false, $owner_uid);
-
-		if (!$feed_site_url) $feed_site_url = get_self_url_prefix();
-
-		if ($format == 'atom') {
-			$tpl = new MiniTemplator;
-
-			$tpl->readTemplateFromFile("templates/generated_feed.txt");
-
-			$tpl->setVariable('FEED_TITLE', $feed_title, true);
-			$tpl->setVariable('VERSION', get_version(), true);
-			$tpl->setVariable('FEED_URL', htmlspecialchars($feed_self_url), true);
-
-			$tpl->setVariable('SELF_URL', htmlspecialchars(get_self_url_prefix()), true);
-			while ($line = $result->fetch()) {
-
-				$line["content_preview"] = sanitize(truncate_string(strip_tags($line["content"]), 100, '...'));
-
-				foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
-					$line = $p->hook_query_headlines($line);
-				}
+            "padding : 5px; border-style : dashed; border-color : #e7d796;".
+            "margin-bottom : 1em; color : #9a8c59;";
+
+        if (!$limit) $limit = 60;
+
+        $date_sort_field = "date_entered DESC, updated DESC";
+
+        if ($feed == -2 && !$is_cat) {
+            $date_sort_field = "last_published DESC";
+        } else if ($feed == -1 && !$is_cat) {
+            $date_sort_field = "last_marked DESC";
+        }
+
+        switch ($order) {
+        case "title":
+            $date_sort_field = "ttrss_entries.title, date_entered, updated";
+            break;
+        case "date_reverse":
+            $date_sort_field = "date_entered, updated";
+            break;
+        case "feed_dates":
+            $date_sort_field = "updated DESC";
+            break;
+        }
+
+        $params = array(
+            "owner_uid" => $owner_uid,
+            "feed" => $feed,
+            "limit" => $limit,
+            "view_mode" => $view_mode,
+            "cat_view" => $is_cat,
+            "search" => $search,
+            "override_order" => $date_sort_field,
+            "include_children" => true,
+            "ignore_vfeed_group" => true,
+            "offset" => $offset,
+            "start_ts" => $start_ts
+        );
+
+        if (!$is_cat && is_numeric($feed) && $feed < PLUGIN_FEED_BASE_INDEX && $feed > LABEL_BASE_INDEX) {
+
+            $user_plugins = get_pref("_ENABLED_PLUGINS", $owner_uid);
+
+            $tmppluginhost = new PluginHost();
+            $tmppluginhost->load(PLUGINS, PluginHost::KIND_ALL);
+            $tmppluginhost->load($user_plugins, PluginHost::KIND_USER, $owner_uid);
+            $tmppluginhost->load_data();
+
+            $handler = $tmppluginhost->get_feed_handler(
+                PluginHost::feed_to_pfeed_id($feed));
+
+            if ($handler) {
+                $qfh_ret = $handler->get_headlines(PluginHost::feed_to_pfeed_id($feed), $params);
+            }
 
-				foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_EXPORT_FEED) as $p) {
-					$line = $p->hook_article_export_feed($line, $feed, $is_cat);
-				}
+        } else {
+            $qfh_ret = Feeds::queryFeedHeadlines($params);
+        }
 
-				$tpl->setVariable('ARTICLE_ID',
-					htmlspecialchars($orig_guid ? $line['link'] :
-							$this->make_article_tag_uri($line['id'], $line['date_entered'])), true);
-				$tpl->setVariable('ARTICLE_LINK', htmlspecialchars($line['link']), true);
-				$tpl->setVariable('ARTICLE_TITLE', htmlspecialchars($line['title']), true);
-				$tpl->setVariable('ARTICLE_EXCERPT', $line["content_preview"], true);
+        $result = $qfh_ret[0];
+        $feed_title = htmlspecialchars($qfh_ret[1]);
+        $feed_site_url = $qfh_ret[2];
+        /* $last_error = $qfh_ret[3]; */
 
-				$content = sanitize($line["content"], false, $owner_uid,
-					$feed_site_url, false, $line["id"]);
+        $feed_self_url = get_self_url_prefix() .
+            "/public.php?op=rss&id=$feed&key=" .
+            Feeds::get_feed_access_key($feed, false, $owner_uid);
 
-				if ($line['note']) {
-					$content = "<div style=\"$note_style\">Article note: " . $line['note'] . "</div>" .
-						$content;
-					$tpl->setVariable('ARTICLE_NOTE', htmlspecialchars($line['note']), true);
-				}
+        if (!$feed_site_url) $feed_site_url = get_self_url_prefix();
 
-				$tpl->setVariable('ARTICLE_CONTENT', $content, true);
+        if ($format == 'atom') {
+            $tpl = new MiniTemplator;
 
-				$tpl->setVariable('ARTICLE_UPDATED_ATOM',
-					date('c', strtotime($line["updated"])), true);
-				$tpl->setVariable('ARTICLE_UPDATED_RFC822',
-					date(DATE_RFC822, strtotime($line["updated"])), true);
+            $tpl->readTemplateFromFile("templates/generated_feed.txt");
 
-				$tpl->setVariable('ARTICLE_AUTHOR', htmlspecialchars($line['author']), true);
+            $tpl->setVariable('FEED_TITLE', $feed_title, true);
+            $tpl->setVariable('VERSION', get_version(), true);
+            $tpl->setVariable('FEED_URL', htmlspecialchars($feed_self_url), true);
 
-				$tpl->setVariable('ARTICLE_SOURCE_LINK', htmlspecialchars($line['site_url'] ? $line["site_url"] : get_self_url_prefix()), true);
-				$tpl->setVariable('ARTICLE_SOURCE_TITLE', htmlspecialchars($line['feed_title'] ? $line['feed_title'] : $feed_title), true);
+            $tpl->setVariable('SELF_URL', htmlspecialchars(get_self_url_prefix()), true);
+            while ($line = $result->fetch()) {
 
-				$tags = Article::get_article_tags($line["id"], $owner_uid);
+                $line["content_preview"] = sanitize(truncate_string(strip_tags($line["content"]), 100, '...'));
 
-				foreach ($tags as $tag) {
-					$tpl->setVariable('ARTICLE_CATEGORY', htmlspecialchars($tag), true);
-					$tpl->addBlock('category');
-				}
+                foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
+                    $line = $p->hook_query_headlines($line);
+                }
 
-				$enclosures = Article::get_article_enclosures($line["id"]);
+                foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_EXPORT_FEED) as $p) {
+                    $line = $p->hook_article_export_feed($line, $feed, $is_cat);
+                }
 
-				if (count($enclosures) > 0) {
-					foreach ($enclosures as $e) {
-						$type = htmlspecialchars($e['content_type']);
-						$url = htmlspecialchars($e['content_url']);
-						$length = $e['duration'] ? $e['duration'] : 1;
+                $tpl->setVariable('ARTICLE_ID',
+                    htmlspecialchars($orig_guid ? $line['link'] :
+                            $this->make_article_tag_uri($line['id'], $line['date_entered'])), true);
+                $tpl->setVariable('ARTICLE_LINK', htmlspecialchars($line['link']), true);
+                $tpl->setVariable('ARTICLE_TITLE', htmlspecialchars($line['title']), true);
+                $tpl->setVariable('ARTICLE_EXCERPT', $line["content_preview"], true);
 
-						$tpl->setVariable('ARTICLE_ENCLOSURE_URL', $url, true);
-						$tpl->setVariable('ARTICLE_ENCLOSURE_TYPE', $type, true);
-						$tpl->setVariable('ARTICLE_ENCLOSURE_LENGTH', $length, true);
+                $content = sanitize($line["content"], false, $owner_uid,
+                    $feed_site_url, false, $line["id"]);
 
-						$tpl->addBlock('enclosure');
-					}
-				} else {
-					$tpl->setVariable('ARTICLE_ENCLOSURE_URL', null, true);
-					$tpl->setVariable('ARTICLE_ENCLOSURE_TYPE', null, true);
-					$tpl->setVariable('ARTICLE_ENCLOSURE_LENGTH', null, true);
-				}
+                if ($line['note']) {
+                    $content = "<div style=\"$note_style\">Article note: " . $line['note'] . "</div>" .
+                        $content;
+                    $tpl->setVariable('ARTICLE_NOTE', htmlspecialchars($line['note']), true);
+                }
 
-				list ($og_image, $og_stream) = Article::get_article_image($enclosures, $line['content'], $feed_site_url);
+                $tpl->setVariable('ARTICLE_CONTENT', $content, true);
 
-				$tpl->setVariable('ARTICLE_OG_IMAGE', $og_image, true);
+                $tpl->setVariable('ARTICLE_UPDATED_ATOM',
+                    date('c', strtotime($line["updated"])), true);
+                $tpl->setVariable('ARTICLE_UPDATED_RFC822',
+                    date(DATE_RFC822, strtotime($line["updated"])), true);
 
-				$tpl->addBlock('entry');
-			}
+                $tpl->setVariable('ARTICLE_AUTHOR', htmlspecialchars($line['author']), true);
 
-			$tmp = "";
+                $tpl->setVariable('ARTICLE_SOURCE_LINK', htmlspecialchars($line['site_url'] ? $line["site_url"] : get_self_url_prefix()), true);
+                $tpl->setVariable('ARTICLE_SOURCE_TITLE', htmlspecialchars($line['feed_title'] ? $line['feed_title'] : $feed_title), true);
 
-			$tpl->addBlock('feed');
-			$tpl->generateOutputToString($tmp);
+                $tags = Article::get_article_tags($line["id"], $owner_uid);
 
-			if (@!clean($_REQUEST["noxml"])) {
-				header("Content-Type: text/xml; charset=utf-8");
-			} else {
-				header("Content-Type: text/plain; charset=utf-8");
-			}
+                foreach ($tags as $tag) {
+                    $tpl->setVariable('ARTICLE_CATEGORY', htmlspecialchars($tag), true);
+                    $tpl->addBlock('category');
+                }
 
-			print $tmp;
-		} else if ($format == 'json') {
+                $enclosures = Article::get_article_enclosures($line["id"]);
 
-			$feed = array();
+                if (count($enclosures) > 0) {
+                    foreach ($enclosures as $e) {
+                        $type = htmlspecialchars($e['content_type']);
+                        $url = htmlspecialchars($e['content_url']);
+                        $length = $e['duration'] ? $e['duration'] : 1;
 
-			$feed['title'] = $feed_title;
-			$feed['feed_url'] = $feed_self_url;
+                        $tpl->setVariable('ARTICLE_ENCLOSURE_URL', $url, true);
+                        $tpl->setVariable('ARTICLE_ENCLOSURE_TYPE', $type, true);
+                        $tpl->setVariable('ARTICLE_ENCLOSURE_LENGTH', $length, true);
 
-			$feed['self_url'] = get_self_url_prefix();
+                        $tpl->addBlock('enclosure');
+                    }
+                } else {
+                    $tpl->setVariable('ARTICLE_ENCLOSURE_URL', null, true);
+                    $tpl->setVariable('ARTICLE_ENCLOSURE_TYPE', null, true);
+                    $tpl->setVariable('ARTICLE_ENCLOSURE_LENGTH', null, true);
+                }
 
-			$feed['articles'] = array();
+                list ($og_image, $og_stream) = Article::get_article_image($enclosures, $line['content'], $feed_site_url);
 
-			while ($line = $result->fetch()) {
+                $tpl->setVariable('ARTICLE_OG_IMAGE', $og_image, true);
 
-				$line["content_preview"] = sanitize(truncate_string(strip_tags($line["content_preview"]), 100, '...'));
+                $tpl->addBlock('entry');
+            }
 
-				foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
-					$line = $p->hook_query_headlines($line, 100);
-				}
+            $tmp = "";
 
-				foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_EXPORT_FEED) as $p) {
-					$line = $p->hook_article_export_feed($line, $feed, $is_cat);
-				}
+            $tpl->addBlock('feed');
+            $tpl->generateOutputToString($tmp);
 
-				$article = array();
+            if (@!clean($_REQUEST["noxml"])) {
+                header("Content-Type: text/xml; charset=utf-8");
+            } else {
+                header("Content-Type: text/plain; charset=utf-8");
+            }
 
-				$article['id'] = $line['link'];
-				$article['link']	= $line['link'];
-				$article['title'] = $line['title'];
-				$article['excerpt'] = $line["content_preview"];
-				$article['content'] = sanitize($line["content"], false, $owner_uid, $feed_site_url, false, $line["id"]);
-				$article['updated'] = date('c', strtotime($line["updated"]));
+            print $tmp;
+        } else if ($format == 'json') {
 
-				if ($line['note']) $article['note'] = $line['note'];
-				if ($article['author']) $article['author'] = $line['author'];
+            $feed = array();
 
-				$tags = Article::get_article_tags($line["id"], $owner_uid);
+            $feed['title'] = $feed_title;
+            $feed['feed_url'] = $feed_self_url;
 
-				if (count($tags) > 0) {
-					$article['tags'] = array();
+            $feed['self_url'] = get_self_url_prefix();
 
-					foreach ($tags as $tag) {
-						array_push($article['tags'], $tag);
-					}
-				}
+            $feed['articles'] = array();
 
-				$enclosures = Article::get_article_enclosures($line["id"]);
+            while ($line = $result->fetch()) {
 
-				if (count($enclosures) > 0) {
-					$article['enclosures'] = array();
+                $line["content_preview"] = sanitize(truncate_string(strip_tags($line["content_preview"]), 100, '...'));
 
-					foreach ($enclosures as $e) {
-						$type = $e['content_type'];
-						$url = $e['content_url'];
-						$length = $e['duration'];
+                foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
+                    $line = $p->hook_query_headlines($line, 100);
+                }
 
-						array_push($article['enclosures'], array("url" => $url, "type" => $type, "length" => $length));
-					}
-				}
+                foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_EXPORT_FEED) as $p) {
+                    $line = $p->hook_article_export_feed($line, $feed, $is_cat);
+                }
+
+                $article = array();
+
+                $article['id'] = $line['link'];
+                $article['link']	= $line['link'];
+                $article['title'] = $line['title'];
+                $article['excerpt'] = $line["content_preview"];
+                $article['content'] = sanitize($line["content"], false, $owner_uid, $feed_site_url, false, $line["id"]);
+                $article['updated'] = date('c', strtotime($line["updated"]));
+
+                if ($line['note']) $article['note'] = $line['note'];
+                if ($article['author']) $article['author'] = $line['author'];
+
+                $tags = Article::get_article_tags($line["id"], $owner_uid);
+
+                if (count($tags) > 0) {
+                    $article['tags'] = array();
 
-				array_push($feed['articles'], $article);
-			}
+                    foreach ($tags as $tag) {
+                        array_push($article['tags'], $tag);
+                    }
+                }
+
+                $enclosures = Article::get_article_enclosures($line["id"]);
 
-			header("Content-Type: text/json; charset=utf-8");
-			print json_encode($feed);
+                if (count($enclosures) > 0) {
+                    $article['enclosures'] = array();
 
-		} else {
-			header("Content-Type: text/plain; charset=utf-8");
-			print json_encode(array("error" => array("message" => "Unknown format")));
-		}
-	}
+                    foreach ($enclosures as $e) {
+                        $type = $e['content_type'];
+                        $url = $e['content_url'];
+                        $length = $e['duration'];
 
-	public function getUnread() {
-		$login = clean($_REQUEST["login"]);
-		$fresh = clean($_REQUEST["fresh"]) == "1";
+                        array_push($article['enclosures'], array("url" => $url, "type" => $type, "length" => $length));
+                    }
+                }
+
+                array_push($feed['articles'], $article);
+            }
 
-		$sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE login = ?");
-		$sth->execute([$login]);
+            header("Content-Type: text/json; charset=utf-8");
+            print json_encode($feed);
 
-		if ($row = $sth->fetch()) {
-			$uid = $row["id"];
+        } else {
+            header("Content-Type: text/plain; charset=utf-8");
+            print json_encode(array("error" => array("message" => "Unknown format")));
+        }
+    }
 
-			print Feeds::getGlobalUnread($uid);
+    public function getUnread() {
+        $login = clean($_REQUEST["login"]);
+        $fresh = clean($_REQUEST["fresh"]) == "1";
 
-			if ($fresh) {
-				print ";";
-				print Feeds::getFeedArticles(-3, false, true, $uid);
-			}
+        $sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE login = ?");
+        $sth->execute([$login]);
+
+        if ($row = $sth->fetch()) {
+            $uid = $row["id"];
+
+            print Feeds::getGlobalUnread($uid);
+
+            if ($fresh) {
+                print ";";
+                print Feeds::getFeedArticles(-3, false, true, $uid);
+            }
 
-		} else {
-			print "-1;User not found";
-		}
-	}
+        } else {
+            print "-1;User not found";
+        }
+    }
 
-	public function getProfiles() {
-		$login = clean($_REQUEST["login"]);
-		$rv = [];
+    public function getProfiles() {
+        $login = clean($_REQUEST["login"]);
+        $rv = [];
 
-		if ($login) {
-			$sth = $this->pdo->prepare("SELECT ttrss_settings_profiles.* FROM ttrss_settings_profiles,ttrss_users
+        if ($login) {
+            $sth = $this->pdo->prepare("SELECT ttrss_settings_profiles.* FROM ttrss_settings_profiles,ttrss_users
 			WHERE ttrss_users.id = ttrss_settings_profiles.owner_uid AND login = ? ORDER BY title");
-			$sth->execute([$login]);
+            $sth->execute([$login]);
 
-			$rv = [ [ "value" => 0, "label" => __("Default profile") ] ];
+            $rv = [ [ "value" => 0, "label" => __("Default profile") ] ];
 
-			while ($line = $sth->fetch()) {
-				$id = $line["id"];
-				$title = $line["title"];
+            while ($line = $sth->fetch()) {
+                $id = $line["id"];
+                $title = $line["title"];
 
-				array_push($rv, [ "label" => $title, "value" => $id ]);
-			}
-	    }
+                array_push($rv, [ "label" => $title, "value" => $id ]);
+            }
+        }
 
-		print json_encode($rv);
-	}
+        print json_encode($rv);
+    }
 
-	public function logout() {
-		logout_user();
-		header("Location: index.php");
-	}
+    public function logout() {
+        logout_user();
+        header("Location: index.php");
+    }
 
-	public function share() {
-		$uuid = clean($_REQUEST["key"]);
+    public function share() {
+        $uuid = clean($_REQUEST["key"]);
 
-		if ($uuid) {
-			$sth = $this->pdo->prepare("SELECT ref_id, owner_uid
+        if ($uuid) {
+            $sth = $this->pdo->prepare("SELECT ref_id, owner_uid
 						FROM ttrss_user_entries WHERE uuid = ?");
-			$sth->execute([$uuid]);
+            $sth->execute([$uuid]);
 
-			if ($row = $sth->fetch()) {
-				header("Content-Type: text/html");
+            if ($row = $sth->fetch()) {
+                header("Content-Type: text/html");
 
-				$id = $row["ref_id"];
-				$owner_uid = $row["owner_uid"];
+                $id = $row["ref_id"];
+                $owner_uid = $row["owner_uid"];
 
-				print $this->format_article($id, $owner_uid);
+                print $this->format_article($id, $owner_uid);
 
-				return;
-			}
-		}
+                return;
+            }
+        }
 
-		header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found");
-		print "Article not found.";
-	}
+        header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found");
+        print "Article not found.";
+    }
 
-	private function format_article($id, $owner_uid) {
+    private function format_article($id, $owner_uid) {
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare("SELECT id,title,link,content,feed_id,comments,int_id,lang,
+        $sth = $pdo->prepare("SELECT id,title,link,content,feed_id,comments,int_id,lang,
 			".SUBSTRING_FOR_DATE."(updated,1,16) as updated,
 			(SELECT site_url FROM ttrss_feeds WHERE id = feed_id) as site_url,
 			(SELECT title FROM ttrss_feeds WHERE id = feed_id) as feed_title,
@@ -337,26 +337,26 @@ 
 			note
 			FROM ttrss_entries,ttrss_user_entries
 			WHERE	id = ? AND ref_id = id AND owner_uid = ?");
-		$sth->execute([$id, $owner_uid]);
+        $sth->execute([$id, $owner_uid]);
 
-		$rv = '';
+        $rv = '';
 
-		if ($line = $sth->fetch()) {
+        if ($line = $sth->fetch()) {
 
-			$line["tags"] = Article::get_article_tags($id, $owner_uid, $line["tag_cache"]);
-			unset($line["tag_cache"]);
+            $line["tags"] = Article::get_article_tags($id, $owner_uid, $line["tag_cache"]);
+            unset($line["tag_cache"]);
 
-			$line["content"] = sanitize($line["content"],
-				$line['hide_images'],
-				$owner_uid, $line["site_url"], false, $line["id"]);
+            $line["content"] = sanitize($line["content"],
+                $line['hide_images'],
+                $owner_uid, $line["site_url"], false, $line["id"]);
 
-			foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ARTICLE) as $p) {
-				$line = $p->hook_render_article($line);
-			}
+            foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ARTICLE) as $p) {
+                $line = $p->hook_render_article($line);
+            }
 
-			$line['content'] = DiskCache::rewriteUrls($line['content']);
+            $line['content'] = DiskCache::rewriteUrls($line['content']);
 
-			$enclosures = Article::get_article_enclosures($line["id"]);
+            $enclosures = Article::get_article_enclosures($line["id"]);
 
             header("Content-Type: text/html");
 
@@ -371,13 +371,13 @@ 
             $rv .= "<meta property='og:title' content=\"".htmlspecialchars(html_entity_decode($line["title"], ENT_NOQUOTES | ENT_HTML401))."\"/>\n";
             $rv .= "<meta property='og:description' content=\"".
                 htmlspecialchars(
-                	truncate_string(
-                		preg_replace("/[\r\n\t]/", "",
-							preg_replace("/ {1,}/", " ",
-								strip_tags(html_entity_decode($line["content"], ENT_NOQUOTES | ENT_HTML401))
-							)
-					), 500, "...")
-				)."\"/>\n";
+                    truncate_string(
+                        preg_replace("/[\r\n\t]/", "",
+                            preg_replace("/ {1,}/", " ",
+                                strip_tags(html_entity_decode($line["content"], ENT_NOQUOTES | ENT_HTML401))
+                            )
+                    ), 500, "...")
+                )."\"/>\n";
 
             $rv .= "</head>";
 
@@ -390,132 +390,132 @@ 
             $rv .= "<body class='flat ttrss_utility ttrss_zoom'>";
             $rv .= "<div class='container'>";
 
-			if ($line["link"]) {
-				$rv .= "<h1><a target='_blank' rel='noopener noreferrer'
+            if ($line["link"]) {
+                $rv .= "<h1><a target='_blank' rel='noopener noreferrer'
 					title=\"".htmlspecialchars($line['title'])."\"
 					href=\"" .htmlspecialchars($line["link"]) . "\">" .	$line["title"] . "</a></h1>";
-			} else {
-				$rv .= "<h1>" . $line["title"] . "</h1>";
-			}
+            } else {
+                $rv .= "<h1>" . $line["title"] . "</h1>";
+            }
 
-			$rv .= "<div class='content post'>";
+            $rv .= "<div class='content post'>";
 
-			/* header */
+            /* header */
 
-			$rv .= "<div class='header'>";
-			$rv .= "<div class='row'>"; # row
+            $rv .= "<div class='header'>";
+            $rv .= "<div class='row'>"; # row
 
-			//$entry_author = $line["author"] ? " - " . $line["author"] : "";
-			$parsed_updated = make_local_datetime($line["updated"], true,
-				$owner_uid, true);
+            //$entry_author = $line["author"] ? " - " . $line["author"] : "";
+            $parsed_updated = make_local_datetime($line["updated"], true,
+                $owner_uid, true);
 
-			$rv .= "<div>".$line['author']."</div>";
+            $rv .= "<div>".$line['author']."</div>";
             $rv .= "<div>$parsed_updated</div>";
 
-			$rv .= "</div>"; # row
+            $rv .= "</div>"; # row
 
-			$rv .= "</div>"; # header
+            $rv .= "</div>"; # header
 
-			/* content */
+            /* content */
 
-			$lang = $line['lang'] ? $line['lang'] : "en";
-			$rv .= "<div class='content' lang='$lang'>";
+            $lang = $line['lang'] ? $line['lang'] : "en";
+            $rv .= "<div class='content' lang='$lang'>";
 
-			/* content body */
+            /* content body */
 
-			$rv .= $line["content"];
+            $rv .= $line["content"];
 
             $rv .= Article::format_article_enclosures($id,
                 $line["always_display_enclosures"],
                 $line["content"],
                 $line["hide_images"]);
 
-			$rv .= "</div>"; # content
+            $rv .= "</div>"; # content
 
-			$rv .= "</div>"; # post
+            $rv .= "</div>"; # post
 
-		}
+        }
 
-		foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_FORMAT_ARTICLE) as $p) {
-			$rv = $p->hook_format_article($rv, $line, true);
-		}
+        foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_FORMAT_ARTICLE) as $p) {
+            $rv = $p->hook_format_article($rv, $line, true);
+        }
 
-		return $rv;
+        return $rv;
 
-	}
+    }
 
-	public function rss() {
-		$feed = clean($_REQUEST["id"]);
-		$key = clean($_REQUEST["key"]);
-		$is_cat = clean($_REQUEST["is_cat"]);
-		$limit = (int)clean($_REQUEST["limit"]);
-		$offset = (int)clean($_REQUEST["offset"]);
+    public function rss() {
+        $feed = clean($_REQUEST["id"]);
+        $key = clean($_REQUEST["key"]);
+        $is_cat = clean($_REQUEST["is_cat"]);
+        $limit = (int)clean($_REQUEST["limit"]);
+        $offset = (int)clean($_REQUEST["offset"]);
 
-		$search = clean($_REQUEST["q"]);
-		$view_mode = clean($_REQUEST["view-mode"]);
-		$order = clean($_REQUEST["order"]);
-		$start_ts = clean($_REQUEST["ts"]);
+        $search = clean($_REQUEST["q"]);
+        $view_mode = clean($_REQUEST["view-mode"]);
+        $order = clean($_REQUEST["order"]);
+        $start_ts = clean($_REQUEST["ts"]);
 
-		$format = clean($_REQUEST['format']);
-		$orig_guid = clean($_REQUEST["orig_guid"]);
+        $format = clean($_REQUEST['format']);
+        $orig_guid = clean($_REQUEST["orig_guid"]);
 
-		if (!$format) $format = 'atom';
+        if (!$format) $format = 'atom';
 
-		if (SINGLE_USER_MODE) {
-			authenticate_user("admin", null);
-		}
+        if (SINGLE_USER_MODE) {
+            authenticate_user("admin", null);
+        }
 
-		$owner_id = false;
+        $owner_id = false;
 
-		if ($key) {
-			$sth = $this->pdo->prepare("SELECT owner_uid FROM
+        if ($key) {
+            $sth = $this->pdo->prepare("SELECT owner_uid FROM
 				ttrss_access_keys WHERE access_key = ? AND feed_id = ?");
-			$sth->execute([$key, $feed]);
+            $sth->execute([$key, $feed]);
 
-			if ($row = $sth->fetch())
-				$owner_id = $row["owner_uid"];
-		}
+            if ($row = $sth->fetch())
+                $owner_id = $row["owner_uid"];
+        }
 
-		if ($owner_id) {
-			$this->generate_syndicated_feed($owner_id, $feed, $is_cat, $limit,
-				$offset, $search, $view_mode, $format, $order, $orig_guid, $start_ts);
-		} else {
-			header('HTTP/1.1 403 Forbidden');
-		}
-	}
+        if ($owner_id) {
+            $this->generate_syndicated_feed($owner_id, $feed, $is_cat, $limit,
+                $offset, $search, $view_mode, $format, $order, $orig_guid, $start_ts);
+        } else {
+            header('HTTP/1.1 403 Forbidden');
+        }
+    }
 
-	public function updateTask() {
-		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", false);
-	}
+    public function updateTask() {
+        PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", false);
+    }
 
-	public function housekeepingTask() {
-		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_HOUSE_KEEPING, "hook_house_keeping", false);
-	}
+    public function housekeepingTask() {
+        PluginHost::getInstance()->run_hooks(PluginHost::HOOK_HOUSE_KEEPING, "hook_house_keeping", false);
+    }
 
-	public function globalUpdateFeeds() {
-		RPC::updaterandomfeed_real();
+    public function globalUpdateFeeds() {
+        RPC::updaterandomfeed_real();
 
-		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", false);
-	}
+        PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", false);
+    }
 
-	public function sharepopup() {
-		if (SINGLE_USER_MODE) {
-			login_sequence();
-		}
+    public function sharepopup() {
+        if (SINGLE_USER_MODE) {
+            login_sequence();
+        }
 
-		header('Content-Type: text/html; charset=utf-8');
-		?>
+        header('Content-Type: text/html; charset=utf-8');
+        ?>
 		<!DOCTYPE html>
 		<html>
 		<head>
 			<title><?php echo __("Share with Tiny Tiny RSS") ?></title>
 			<?php
-			echo stylesheet_tag("css/default.css");
-			echo javascript_tag("lib/prototype.js");
-			echo javascript_tag("lib/dojo/dojo.js");
-			echo javascript_tag("lib/dojo/tt-rss-layer.js");
-			echo javascript_tag("lib/scriptaculous/scriptaculous.js?load=effects,controls")
-			?>
+            echo stylesheet_tag("css/default.css");
+            echo javascript_tag("lib/prototype.js");
+            echo javascript_tag("lib/dojo/dojo.js");
+            echo javascript_tag("lib/dojo/tt-rss-layer.js");
+            echo javascript_tag("lib/scriptaculous/scriptaculous.js?load=effects,controls")
+            ?>
 			<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 			<link rel="shortcut icon" type="image/png" href="images/favicon.png">
 			<link rel="icon" type="image/png" sizes="72x72" href="images/favicon-72px.png">
@@ -537,29 +537,29 @@ 
 
 		<?php
 
-		$action = clean($_REQUEST["action"]);
+        $action = clean($_REQUEST["action"]);
 
-		if ($_SESSION["uid"]) {
+        if ($_SESSION["uid"]) {
 
-			if ($action == 'share') {
+            if ($action == 'share') {
 
-				$title = strip_tags(clean($_REQUEST["title"]));
-				$url = strip_tags(clean($_REQUEST["url"]));
-				$content = strip_tags(clean($_REQUEST["content"]));
-				$labels = strip_tags(clean($_REQUEST["labels"]));
+                $title = strip_tags(clean($_REQUEST["title"]));
+                $url = strip_tags(clean($_REQUEST["url"]));
+                $content = strip_tags(clean($_REQUEST["content"]));
+                $labels = strip_tags(clean($_REQUEST["labels"]));
 
-				Article::create_published_article($title, $url, $content, $labels,
-					$_SESSION["uid"]);
+                Article::create_published_article($title, $url, $content, $labels,
+                    $_SESSION["uid"]);
 
-				print "<script type='text/javascript'>";
-				print "window.close();";
-				print "</script>";
+                print "<script type='text/javascript'>";
+                print "window.close();";
+                print "</script>";
 
-			} else {
-				$title = htmlspecialchars(clean($_REQUEST["title"]));
-				$url = htmlspecialchars(clean($_REQUEST["url"]));
+            } else {
+                $title = htmlspecialchars(clean($_REQUEST["title"]));
+                $url = htmlspecialchars(clean($_REQUEST["url"]));
 
-				?>
+                ?>
 				<form id='share_form' name='share_form'>
 
 					<input type="hidden" name="op" value="sharepopup">
@@ -599,12 +599,12 @@ 
 				</form>
 				<?php
 
-			}
+            }
 
-		} else {
+        } else {
 
-			$return = urlencode(make_self_url());
-			print_error("Not logged in"); ?>
+            $return = urlencode(make_self_url());
+            print_error("Not logged in"); ?>
 
 			<form action="public.php?return=<?php echo $return ?>" method="post">
 
@@ -636,90 +636,90 @@ 
 
 			</form>
 			<?php
-		}
+        }
 
-		print "</div></body></html>";
-	}
+        print "</div></body></html>";
+    }
 
-	public function login() {
-		if (!SINGLE_USER_MODE) {
+    public function login() {
+        if (!SINGLE_USER_MODE) {
 
-			$login = clean($_POST["login"]);
-			$password = clean($_POST["password"]);
-			$remember_me = clean($_POST["remember_me"]);
+            $login = clean($_POST["login"]);
+            $password = clean($_POST["password"]);
+            $remember_me = clean($_POST["remember_me"]);
 
-			if ($remember_me) {
-				session_set_cookie_params(SESSION_COOKIE_LIFETIME);
-			} else {
-				session_set_cookie_params(0);
-			}
+            if ($remember_me) {
+                session_set_cookie_params(SESSION_COOKIE_LIFETIME);
+            } else {
+                session_set_cookie_params(0);
+            }
 
-			if (authenticate_user($login, $password)) {
-				$_POST["password"] = "";
+            if (authenticate_user($login, $password)) {
+                $_POST["password"] = "";
 
-				if (get_schema_version() >= 120) {
-					$_SESSION["language"] = get_pref("USER_LANGUAGE", $_SESSION["uid"]);
-				}
+                if (get_schema_version() >= 120) {
+                    $_SESSION["language"] = get_pref("USER_LANGUAGE", $_SESSION["uid"]);
+                }
 
-				$_SESSION["ref_schema_version"] = get_schema_version(true);
-				$_SESSION["bw_limit"] = !!clean($_POST["bw_limit"]);
+                $_SESSION["ref_schema_version"] = get_schema_version(true);
+                $_SESSION["bw_limit"] = !!clean($_POST["bw_limit"]);
 
-				if (clean($_POST["profile"])) {
+                if (clean($_POST["profile"])) {
 
-					$profile = (int) clean($_POST["profile"]);
+                    $profile = (int) clean($_POST["profile"]);
 
-					$sth = $this->pdo->prepare("SELECT id FROM ttrss_settings_profiles
+                    $sth = $this->pdo->prepare("SELECT id FROM ttrss_settings_profiles
 						WHERE id = ? AND owner_uid = ?");
-					$sth->execute([$profile, $_SESSION['uid']]);
+                    $sth->execute([$profile, $_SESSION['uid']]);
 
-					if ($sth->fetch()) {
-						$_SESSION["profile"] = $profile;
- 					} else {
-					    $_SESSION["profile"] = null;
+                    if ($sth->fetch()) {
+                        $_SESSION["profile"] = $profile;
+                        } else {
+                        $_SESSION["profile"] = null;
                     }
-				}
-			} else {
+                }
+            } else {
 
-				// start an empty session to deliver login error message
-				@session_start();
+                // start an empty session to deliver login error message
+                @session_start();
 
-				if (!isset($_SESSION["login_error_msg"]))
-					$_SESSION["login_error_msg"] = __("Incorrect username or password");
+                if (!isset($_SESSION["login_error_msg"]))
+                    $_SESSION["login_error_msg"] = __("Incorrect username or password");
 
-				user_error("Failed login attempt for $login from {$_SERVER['REMOTE_ADDR']}", E_USER_WARNING);
-			}
+                user_error("Failed login attempt for $login from {$_SERVER['REMOTE_ADDR']}", E_USER_WARNING);
+            }
 
-			$return = clean($_REQUEST['return']);
+            $return = clean($_REQUEST['return']);
 
-			if ($_REQUEST['return'] && mb_strpos($return, SELF_URL_PATH) === 0) {
-				header("Location: " . clean($_REQUEST['return']));
-			} else {
-				header("Location: " . get_self_url_prefix());
-			}
-		}
-	}
+            if ($_REQUEST['return'] && mb_strpos($return, SELF_URL_PATH) === 0) {
+                header("Location: " . clean($_REQUEST['return']));
+            } else {
+                header("Location: " . get_self_url_prefix());
+            }
+        }
+    }
 
-	public function subscribe() {
-		if (SINGLE_USER_MODE) {
-			login_sequence();
-		}
+    public function subscribe() {
+        if (SINGLE_USER_MODE) {
+            login_sequence();
+        }
 
-		if ($_SESSION["uid"]) {
+        if ($_SESSION["uid"]) {
 
-			$feed_url = trim(clean($_REQUEST["feed_url"]));
+            $feed_url = trim(clean($_REQUEST["feed_url"]));
 
-			header('Content-Type: text/html; charset=utf-8');
-			?>
+            header('Content-Type: text/html; charset=utf-8');
+            ?>
 			<!DOCTYPE html>
 			<html>
 			<head>
 				<title>Tiny Tiny RSS</title>
 				<?php
-					echo stylesheet_tag("css/default.css");
-					echo javascript_tag("lib/prototype.js");
-					echo javascript_tag("lib/dojo/dojo.js");
-					echo javascript_tag("lib/dojo/tt-rss-layer.js");
-				?>
+                    echo stylesheet_tag("css/default.css");
+                    echo javascript_tag("lib/prototype.js");
+                    echo javascript_tag("lib/dojo/dojo.js");
+                    echo javascript_tag("lib/dojo/tt-rss-layer.js");
+                ?>
 				<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 				<link rel="shortcut icon" type="image/png" href="images/favicon.png">
 				<link rel="icon" type="image/png" sizes="72x72" href="images/favicon-72px.png">
@@ -738,8 +738,8 @@ 
 			<div class='content'>
 			<?php
 
-			if (!$feed_url) {
-				?>
+            if (!$feed_url) {
+                ?>
 				<form method="post">
 					<input type="hidden" name="op" value="subscribe">
 					<fieldset>
@@ -754,101 +754,101 @@ 
 					<a href="index.php"><?php echo __("Return to Tiny Tiny RSS") ?></a>
 				</form>
 				<?php
-			} else {
-
-				$rc = Feeds::subscribe_to_feed($feed_url);
-				$feed_urls = false;
-
-				switch ($rc['code']) {
-					case 0:
-						print_warning(T_sprintf("Already subscribed to <b>%s</b>.", $feed_url));
-						break;
-					case 1:
-						print_notice(T_sprintf("Subscribed to <b>%s</b>.", $feed_url));
-						break;
-					case 2:
-						print_error(T_sprintf("Could not subscribe to <b>%s</b>.", $feed_url));
-						break;
-					case 3:
-						print_error(T_sprintf("No feeds found in <b>%s</b>.", $feed_url));
-						break;
-					case 4:
-						$feed_urls = $rc["feeds"];
-						break;
-					case 5:
-						print_error(T_sprintf("Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL.", $feed_url));
-						break;
-				}
-
-				if ($feed_urls) {
-
-					print "<form action='public.php'>";
-					print "<input type='hidden' name='op' value='subscribe'>";
-
-					print "<fieldset>";
-					print "<label style='display : inline'>" . __("Multiple feed URLs found:") . "</label>";
-					print "<select name='feed_url' dojoType='dijit.form.Select'>";
-
-					foreach ($feed_urls as $url => $name) {
-						$url = htmlspecialchars($url);
-						$name = htmlspecialchars($name);
-
-						print "<option value=\"$url\">$name</option>";
-					}
+            } else {
+
+                $rc = Feeds::subscribe_to_feed($feed_url);
+                $feed_urls = false;
+
+                switch ($rc['code']) {
+                    case 0:
+                        print_warning(T_sprintf("Already subscribed to <b>%s</b>.", $feed_url));
+                        break;
+                    case 1:
+                        print_notice(T_sprintf("Subscribed to <b>%s</b>.", $feed_url));
+                        break;
+                    case 2:
+                        print_error(T_sprintf("Could not subscribe to <b>%s</b>.", $feed_url));
+                        break;
+                    case 3:
+                        print_error(T_sprintf("No feeds found in <b>%s</b>.", $feed_url));
+                        break;
+                    case 4:
+                        $feed_urls = $rc["feeds"];
+                        break;
+                    case 5:
+                        print_error(T_sprintf("Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL.", $feed_url));
+                        break;
+                }
+
+                if ($feed_urls) {
+
+                    print "<form action='public.php'>";
+                    print "<input type='hidden' name='op' value='subscribe'>";
+
+                    print "<fieldset>";
+                    print "<label style='display : inline'>" . __("Multiple feed URLs found:") . "</label>";
+                    print "<select name='feed_url' dojoType='dijit.form.Select'>";
+
+                    foreach ($feed_urls as $url => $name) {
+                        $url = htmlspecialchars($url);
+                        $name = htmlspecialchars($name);
+
+                        print "<option value=\"$url\">$name</option>";
+                    }
 
-					print "</select>";
-					print "</fieldset>";
+                    print "</select>";
+                    print "</fieldset>";
 
-					print "<button class='alt-primary' dojoType='dijit.form.Button' type='submit'>".__("Subscribe to selected feed")."</button>";
-					print "<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>";
+                    print "<button class='alt-primary' dojoType='dijit.form.Button' type='submit'>".__("Subscribe to selected feed")."</button>";
+                    print "<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>";
 
-					print "</form>";
-				}
+                    print "</form>";
+                }
 
-				$tp_uri = get_self_url_prefix() . "/prefs.php";
+                $tp_uri = get_self_url_prefix() . "/prefs.php";
 
-				if ($rc['code'] <= 2){
-					$sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE
+                if ($rc['code'] <= 2){
+                    $sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE
 					feed_url = ? AND owner_uid = ?");
-					$sth->execute([$feed_url, $_SESSION['uid']]);
-					$row = $sth->fetch();
+                    $sth->execute([$feed_url, $_SESSION['uid']]);
+                    $row = $sth->fetch();
 
-					$feed_id = $row["id"];
-				} else {
-					$feed_id = 0;
-				}
+                    $feed_id = $row["id"];
+                } else {
+                    $feed_id = 0;
+                }
 
-				if ($feed_id) {
-					print "<form method='GET' action=\"$tp_uri\">
+                if ($feed_id) {
+                    print "<form method='GET' action=\"$tp_uri\">
 					<input type='hidden' name='tab' value='feedConfig'>
 					<input type='hidden' name='method' value='editfeed'>
 					<input type='hidden' name='methodparam' value='$feed_id'>
 					<button dojoType='dijit.form.Button' class='alt-info' type='submit'>".__("Edit subscription options")."</button>
 					<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>
 					</form>";
-				}
-			}
+                }
+            }
 
-			print "</div></div></body></html>";
+            print "</div></div></body></html>";
 
-		} else {
-			render_login_form();
-		}
-	}
+        } else {
+            render_login_form();
+        }
+    }
 
-	public function index() {
-		header("Content-Type: text/plain");
-		print error_json(13);
-	}
+    public function index() {
+        header("Content-Type: text/plain");
+        print error_json(13);
+    }
 
-	public function forgotpass() {
-		startup_gettext();
-		session_start();
+    public function forgotpass() {
+        startup_gettext();
+        session_start();
 
-		@$hash = clean($_REQUEST["hash"]);
+        @$hash = clean($_REQUEST["hash"]);
 
-		header('Content-Type: text/html; charset=utf-8');
-		?>
+        header('Content-Type: text/html; charset=utf-8');
+        ?>
 		<!DOCTYPE html>
 		<html>
 		<head>
@@ -857,11 +857,11 @@ 
 			<link rel="icon" type="image/png" sizes="72x72" href="images/favicon-72px.png">
 			<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 			<?php
-				echo stylesheet_tag("css/default.css");
-				echo javascript_tag("lib/prototype.js");
-				echo javascript_tag("lib/dojo/dojo.js");
-				echo javascript_tag("lib/dojo/tt-rss-layer.js");
-			?>
+                echo stylesheet_tag("css/default.css");
+                echo javascript_tag("lib/prototype.js");
+                echo javascript_tag("lib/dojo/dojo.js");
+                echo javascript_tag("lib/dojo/tt-rss-layer.js");
+            ?>
 		</head>
 		<body class='flat ttrss_utility'>
 		<div class='container'>
@@ -876,52 +876,52 @@ 
 		</script>
 		<?php
 
-		print "<h1>".__("Password recovery")."</h1>";
-		print "<div class='content'>";
+        print "<h1>".__("Password recovery")."</h1>";
+        print "<div class='content'>";
 
-		@$method = clean($_POST['method']);
+        @$method = clean($_POST['method']);
 
-		if ($hash) {
-			$login = clean($_REQUEST["login"]);
+        if ($hash) {
+            $login = clean($_REQUEST["login"]);
 
-			if ($login) {
-				$sth = $this->pdo->prepare("SELECT id, resetpass_token FROM ttrss_users
+            if ($login) {
+                $sth = $this->pdo->prepare("SELECT id, resetpass_token FROM ttrss_users
 					WHERE login = ?");
-				$sth->execute([$login]);
+                $sth->execute([$login]);
 
-				if ($row = $sth->fetch()) {
-					$id = $row["id"];
-					$resetpass_token_full = $row["resetpass_token"];
-					list($timestamp, $resetpass_token) = explode(":", $resetpass_token_full);
+                if ($row = $sth->fetch()) {
+                    $id = $row["id"];
+                    $resetpass_token_full = $row["resetpass_token"];
+                    list($timestamp, $resetpass_token) = explode(":", $resetpass_token_full);
 
-					if ($timestamp && $resetpass_token &&
-						$timestamp >= time() - 15*60*60 &&
-						$resetpass_token == $hash) {
+                    if ($timestamp && $resetpass_token &&
+                        $timestamp >= time() - 15*60*60 &&
+                        $resetpass_token == $hash) {
 
-							$sth = $this->pdo->prepare("UPDATE ttrss_users SET resetpass_token = NULL
+                            $sth = $this->pdo->prepare("UPDATE ttrss_users SET resetpass_token = NULL
 								WHERE id = ?");
-							$sth->execute([$id]);
+                            $sth->execute([$id]);
 
-							Pref_Users::resetUserPassword($id, true);
+                            Pref_Users::resetUserPassword($id, true);
 
-							print "<p>"."Completed."."</p>";
+                            print "<p>"."Completed."."</p>";
 
-					} else {
-						print_error("Some of the information provided is missing or incorrect.");
-					}
-				} else {
-					print_error("Some of the information provided is missing or incorrect.");
-				}
-			} else {
-				print_error("Some of the information provided is missing or incorrect.");
-			}
+                    } else {
+                        print_error("Some of the information provided is missing or incorrect.");
+                    }
+                } else {
+                    print_error("Some of the information provided is missing or incorrect.");
+                }
+            } else {
+                print_error("Some of the information provided is missing or incorrect.");
+            }
 
-			print "<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>";
+            print "<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>";
 
-		} else if (!$method) {
-			print_notice(__("You will need to provide valid account name and email. Password reset link will be sent to your email address."));
+        } else if (!$method) {
+            print_notice(__("You will need to provide valid account name and email. Password reset link will be sent to your email address."));
 
-			print "<form method='POST' action='public.php'>
+            print "<form method='POST' action='public.php'>
 				<input type='hidden' name='method' value='do'>
 				<input type='hidden' name='op' value='forgotpass'>
 
@@ -935,10 +935,10 @@ 
 				<input dojoType='dijit.form.TextBox' type='email' name='email' value='' required>
 				</fieldset>";
 
-			$_SESSION["pwdreset:testvalue1"] = rand(1,10);
-			$_SESSION["pwdreset:testvalue2"] = rand(1,10);
+            $_SESSION["pwdreset:testvalue1"] = rand(1,10);
+            $_SESSION["pwdreset:testvalue2"] = rand(1,10);
 
-			print "<fieldset>
+            print "<fieldset>
 				<label>".T_sprintf("How much is %d + %d:", $_SESSION["pwdreset:testvalue1"], $_SESSION["pwdreset:testvalue2"])."</label>
 				<input dojoType='dijit.form.TextBox' type='text' name='test' value='' required>
 				</fieldset>
@@ -950,109 +950,109 @@ 
 				</fieldset>
 
 				</form>";
-		} else if ($method == 'do') {
+        } else if ($method == 'do') {
 
-			$login = clean($_POST["login"]);
-			$email = clean($_POST["email"]);
-			$test = clean($_POST["test"]);
+            $login = clean($_POST["login"]);
+            $email = clean($_POST["email"]);
+            $test = clean($_POST["test"]);
 
-			if ($test != ($_SESSION["pwdreset:testvalue1"] + $_SESSION["pwdreset:testvalue2"]) || !$email || !$login) {
-				print_error(__('Some of the required form parameters are missing or incorrect.'));
+            if ($test != ($_SESSION["pwdreset:testvalue1"] + $_SESSION["pwdreset:testvalue2"]) || !$email || !$login) {
+                print_error(__('Some of the required form parameters are missing or incorrect.'));
 
-				print "<form method='GET' action='public.php'>
+                print "<form method='GET' action='public.php'>
 					<input type='hidden' name='op' value='forgotpass'>
 					<button dojoType='dijit.form.Button' type='submit' class='alt-primary'>".__("Go back")."</button>
 					</form>";
 
-			} else {
+            } else {
 
-				// prevent submitting this form multiple times
-				$_SESSION["pwdreset:testvalue1"] = rand(1, 1000);
-				$_SESSION["pwdreset:testvalue2"] = rand(1, 1000);
+                // prevent submitting this form multiple times
+                $_SESSION["pwdreset:testvalue1"] = rand(1, 1000);
+                $_SESSION["pwdreset:testvalue2"] = rand(1, 1000);
 
-				$sth = $this->pdo->prepare("SELECT id FROM ttrss_users
+                $sth = $this->pdo->prepare("SELECT id FROM ttrss_users
 					WHERE login = ? AND email = ?");
-				$sth->execute([$login, $email]);
+                $sth->execute([$login, $email]);
 
-				if ($row = $sth->fetch()) {
-					print_notice("Password reset instructions are being sent to your email address.");
+                if ($row = $sth->fetch()) {
+                    print_notice("Password reset instructions are being sent to your email address.");
 
-					$id = $row["id"];
+                    $id = $row["id"];
 
-					if ($id) {
-						$resetpass_token = sha1(get_random_bytes(128));
-						$resetpass_link = get_self_url_prefix() . "/public.php?op=forgotpass&hash=" . $resetpass_token .
-							"&login=" . urlencode($login);
+                    if ($id) {
+                        $resetpass_token = sha1(get_random_bytes(128));
+                        $resetpass_link = get_self_url_prefix() . "/public.php?op=forgotpass&hash=" . $resetpass_token .
+                            "&login=" . urlencode($login);
 
-						require_once "lib/MiniTemplator.class.php";
+                        require_once "lib/MiniTemplator.class.php";
 
-						$tpl = new MiniTemplator;
+                        $tpl = new MiniTemplator;
 
-						$tpl->readTemplateFromFile("templates/resetpass_link_template.txt");
+                        $tpl->readTemplateFromFile("templates/resetpass_link_template.txt");
 
-						$tpl->setVariable('LOGIN', $login);
-						$tpl->setVariable('RESETPASS_LINK', $resetpass_link);
-						$tpl->setVariable('TTRSS_HOST', SELF_URL_PATH);
+                        $tpl->setVariable('LOGIN', $login);
+                        $tpl->setVariable('RESETPASS_LINK', $resetpass_link);
+                        $tpl->setVariable('TTRSS_HOST', SELF_URL_PATH);
 
-						$tpl->addBlock('message');
+                        $tpl->addBlock('message');
 
-						$message = "";
+                        $message = "";
 
-						$tpl->generateOutputToString($message);
+                        $tpl->generateOutputToString($message);
 
-						$mailer = new Mailer();
+                        $mailer = new Mailer();
 
-						$rc = $mailer->mail(["to_name" => $login,
-							"to_address" => $email,
-							"subject" => __("[tt-rss] Password reset request"),
-							"message" => $message]);
+                        $rc = $mailer->mail(["to_name" => $login,
+                            "to_address" => $email,
+                            "subject" => __("[tt-rss] Password reset request"),
+                            "message" => $message]);
 
-						if (!$rc) print_error($mailer->error());
+                        if (!$rc) print_error($mailer->error());
 
-						$resetpass_token_full = time() . ":" . $resetpass_token;
+                        $resetpass_token_full = time() . ":" . $resetpass_token;
 
-						$sth = $this->pdo->prepare("UPDATE ttrss_users
+                        $sth = $this->pdo->prepare("UPDATE ttrss_users
 							SET resetpass_token = ?
 							WHERE login = ? AND email = ?");
 
-						$sth->execute([$resetpass_token_full, $login, $email]);
+                        $sth->execute([$resetpass_token_full, $login, $email]);
 
-					} else {
-						print_error("User ID not found.");
-					}
+                    } else {
+                        print_error("User ID not found.");
+                    }
 
-					print "<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>";
+                    print "<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>";
 
-				} else {
-					print_error(__("Sorry, login and email combination not found."));
+                } else {
+                    print_error(__("Sorry, login and email combination not found."));
 
-					print "<form method='GET' action='public.php'>
+                    print "<form method='GET' action='public.php'>
 						<input type='hidden' name='op' value='forgotpass'>
 						<button dojoType='dijit.form.Button' type='submit'>".__("Go back")."</button>
 						</form>";
 
-				}
-			}
+                }
+            }
 
-		}
+        }
 
-		print "</div>";
-		print "</div>";
-		print "</body>";
-		print "</html>";
+        print "</div>";
+        print "</div>";
+        print "</body>";
+        print "</html>";
 
-	}
+    }
 
-	public function dbupdate() {
-		startup_gettext();
+    public function dbupdate() {
+        startup_gettext();
 
-		if (!SINGLE_USER_MODE && $_SESSION["access_level"] < 10) {
-			$_SESSION["login_error_msg"] = __("Your access level is insufficient to run this script.");
-			render_login_form();
-			exit;
-		}
+        if (!SINGLE_USER_MODE && $_SESSION["access_level"] < 10) {
+            $_SESSION["login_error_msg"] = __("Your access level is insufficient to run this script.");
+            render_login_form();
+            exit;
+        }
 
-		?>
+        ?>
 		<!DOCTYPE html>
 		<html>
 			<head>
@@ -1062,11 +1062,11 @@ 
 			<link rel="shortcut icon" type="image/png" href="images/favicon.png">
 			<link rel="icon" type="image/png" sizes="72x72" href="images/favicon-72px.png">
 			<?php
-				echo stylesheet_tag("css/default.css");
-				echo javascript_tag("lib/prototype.js");
-				echo javascript_tag("lib/dojo/dojo.js");
-				echo javascript_tag("lib/dojo/tt-rss-layer.js");
-			?>
+                echo stylesheet_tag("css/default.css");
+                echo javascript_tag("lib/prototype.js");
+                echo javascript_tag("lib/dojo/dojo.js");
+                echo javascript_tag("lib/dojo/tt-rss-layer.js");
+            ?>
 			<style type="text/css">
 				span.ok { color : #009000; font-weight : bold; }
 				span.err { color : #ff0000; font-weight : bold; }
@@ -1093,139 +1093,139 @@ 
 			<div class="content">
 
 			<?php
-				@$op = clean($_REQUEST["subop"]);
-				$updater = new DbUpdater(DB_TYPE, SCHEMA_VERSION);
+                @$op = clean($_REQUEST["subop"]);
+                $updater = new DbUpdater(DB_TYPE, SCHEMA_VERSION);
 
-				if ($op == "performupdate") {
-					if ($updater->isUpdateRequired()) {
+                if ($op == "performupdate") {
+                    if ($updater->isUpdateRequired()) {
 
-						print "<h2>" . T_sprintf("Performing updates to version %d", SCHEMA_VERSION) . "</h2>";
+                        print "<h2>" . T_sprintf("Performing updates to version %d", SCHEMA_VERSION) . "</h2>";
 
-						for ($i = $updater->getSchemaVersion() + 1; $i <= SCHEMA_VERSION; $i++) {
-							print "<ul>";
+                        for ($i = $updater->getSchemaVersion() + 1; $i <= SCHEMA_VERSION; $i++) {
+                            print "<ul>";
 
-							print "<li class='text-info'>" . T_sprintf("Updating to version %d", $i) . "</li>";
+                            print "<li class='text-info'>" . T_sprintf("Updating to version %d", $i) . "</li>";
 
-							print "<li>";
-							$result = $updater->performUpdateTo($i, true);
-							print "</li>";
+                            print "<li>";
+                            $result = $updater->performUpdateTo($i, true);
+                            print "</li>";
 
-							if (!$result) {
-								print "</ul>";
+                            if (!$result) {
+                                print "</ul>";
 
-								print_error("One of the updates failed. Either retry the process or perform updates manually.");
+                                print_error("One of the updates failed. Either retry the process or perform updates manually.");
 
-								print "<form method='POST'>
+                                print "<form method='POST'>
 									<input type='hidden' name='subop' value='performupdate'>
 									<button type='submit' dojoType='dijit.form.Button' class='alt-danger' onclick='return confirmOP()'>".__("Try again")."</button>
 									<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>
 								</form>";
 
-								return;
-							} else {
-								print "<li class='text-success'>" . __("Completed.") . "</li>";
-								print "</ul>";
-							}
-						}
+                                return;
+                            } else {
+                                print "<li class='text-success'>" . __("Completed.") . "</li>";
+                                print "</ul>";
+                            }
+                        }
 
-						print_notice("Your Tiny Tiny RSS database is now updated to the latest version.");
+                        print_notice("Your Tiny Tiny RSS database is now updated to the latest version.");
 
-						print "<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>";
+                        print "<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>";
 
-					} else {
-						print_notice("Tiny Tiny RSS database is up to date.");
+                    } else {
+                        print_notice("Tiny Tiny RSS database is up to date.");
 
-						print "<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>";
-					}
-				} else {
-					if ($updater->isUpdateRequired()) {
+                        print "<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>";
+                    }
+                } else {
+                    if ($updater->isUpdateRequired()) {
 
-						print "<h2>".T_sprintf("Tiny Tiny RSS database needs update to the latest version (%d to %d).",
-							$updater->getSchemaVersion(), SCHEMA_VERSION)."</h2>";
+                        print "<h2>".T_sprintf("Tiny Tiny RSS database needs update to the latest version (%d to %d).",
+                            $updater->getSchemaVersion(), SCHEMA_VERSION)."</h2>";
 
-						if (DB_TYPE == "mysql") {
-							print_error("<strong>READ THIS:</strong> Due to MySQL limitations, your database is not completely protected while updating. ".
-								"Errors may put it in an inconsistent state requiring manual rollback. <strong>BACKUP YOUR DATABASE BEFORE CONTINUING.</strong>");
-						} else {
-							print_warning("Please backup your database before proceeding.");
-						}
+                        if (DB_TYPE == "mysql") {
+                            print_error("<strong>READ THIS:</strong> Due to MySQL limitations, your database is not completely protected while updating. ".
+                                "Errors may put it in an inconsistent state requiring manual rollback. <strong>BACKUP YOUR DATABASE BEFORE CONTINUING.</strong>");
+                        } else {
+                            print_warning("Please backup your database before proceeding.");
+                        }
 
-						print "<form method='POST'>
+                        print "<form method='POST'>
 							<input type='hidden' name='subop' value='performupdate'>
 							<button type='submit' dojoType='dijit.form.Button' class='alt-danger' onclick='return confirmOP()'>".__("Perform updates")."</button>
 						</form>";
 
-					} else {
+                    } else {
 
-						print_notice("Tiny Tiny RSS database is up to date.");
+                        print_notice("Tiny Tiny RSS database is up to date.");
 
-						print "<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>";
-					}
-				}
-			?>
+                        print "<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>";
+                    }
+                }
+            ?>
 
 			</div>
 			</div>
 			</body>
 			</html>
 		<?php
-	}
-
-	public function cached_url() {
-		list ($cache_dir, $filename) = explode("/", $_GET["file"], 2);
-
-		// we do not allow files with extensions at the moment
-		$filename = str_replace(".", "", $filename);
-
-		$cache = new DiskCache($cache_dir);
-
-		if ($cache->exists($filename)) {
-			$cache->send($filename);
-		} else {
-			header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found");
-			echo "File not found.";
-		}
-	}
-
-	private function make_article_tag_uri($id, $timestamp) {
-
-		$timestamp = date("Y-m-d", strtotime($timestamp));
-
-		return "tag:" . parse_url(get_self_url_prefix(), PHP_URL_HOST) . ",$timestamp:/$id";
-	}
-
-	// this should be used very carefully because this endpoint is exposed to unauthenticated users
-	// plugin data is not loaded because there's no user context and owner_uid/session may or may not be available
-	// in general, don't do anything user-related in here and do not modify $_SESSION
-	public function pluginhandler() {
-		$host = new PluginHost();
-
-		$plugin_name = clean_filename($_REQUEST["plugin"]);
-		$method = clean($_REQUEST["pmethod"]);
-
-		$host->load($plugin_name, PluginHost::KIND_USER, 0);
-		$host->load_data();
-
-		$plugin = $host->get_plugin($plugin_name);
-
-		if ($plugin) {
-			if (method_exists($plugin, $method)) {
-				if ($plugin->is_public_method($method)) {
-					$plugin->$method();
-				} else {
-					user_error("PluginHandler[PUBLIC]: Requested private method '$method' of plugin '$plugin_name'.", E_USER_WARNING);
-					header("Content-Type: text/json");
-					print error_json(6);
-				}
-			} else {
-				user_error("PluginHandler[PUBLIC]: Requested unknown method '$method' of plugin '$plugin_name'.", E_USER_WARNING);
-				header("Content-Type: text/json");
-				print error_json(13);
-			}
-		} else {
-			user_error("PluginHandler[PUBLIC]: Requested method '$method' of unknown plugin '$plugin_name'.", E_USER_WARNING);
-			header("Content-Type: text/json");
-			print error_json(14);
-		}
-	}
+    }
+
+    public function cached_url() {
+        list ($cache_dir, $filename) = explode("/", $_GET["file"], 2);
+
+        // we do not allow files with extensions at the moment
+        $filename = str_replace(".", "", $filename);
+
+        $cache = new DiskCache($cache_dir);
+
+        if ($cache->exists($filename)) {
+            $cache->send($filename);
+        } else {
+            header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found");
+            echo "File not found.";
+        }
+    }
+
+    private function make_article_tag_uri($id, $timestamp) {
+
+        $timestamp = date("Y-m-d", strtotime($timestamp));
+
+        return "tag:" . parse_url(get_self_url_prefix(), PHP_URL_HOST) . ",$timestamp:/$id";
+    }
+
+    // this should be used very carefully because this endpoint is exposed to unauthenticated users
+    // plugin data is not loaded because there's no user context and owner_uid/session may or may not be available
+    // in general, don't do anything user-related in here and do not modify $_SESSION
+    public function pluginhandler() {
+        $host = new PluginHost();
+
+        $plugin_name = clean_filename($_REQUEST["plugin"]);
+        $method = clean($_REQUEST["pmethod"]);
+
+        $host->load($plugin_name, PluginHost::KIND_USER, 0);
+        $host->load_data();
+
+        $plugin = $host->get_plugin($plugin_name);
+
+        if ($plugin) {
+            if (method_exists($plugin, $method)) {
+                if ($plugin->is_public_method($method)) {
+                    $plugin->$method();
+                } else {
+                    user_error("PluginHandler[PUBLIC]: Requested private method '$method' of plugin '$plugin_name'.", E_USER_WARNING);
+                    header("Content-Type: text/json");
+                    print error_json(6);
+                }
+            } else {
+                user_error("PluginHandler[PUBLIC]: Requested unknown method '$method' of plugin '$plugin_name'.", E_USER_WARNING);
+                header("Content-Type: text/json");
+                print error_json(13);
+            }
+        } else {
+            user_error("PluginHandler[PUBLIC]: Requested method '$method' of unknown plugin '$plugin_name'.", E_USER_WARNING);
+            header("Content-Type: text/json");
+            print error_json(14);
+        }
+    }
 }

Braces +24 added lines, -10 removed lines

@@ -12,7 +12,9 @@ 
 			"padding : 5px; border-style : dashed; border-color : #e7d796;".
 			"margin-bottom : 1em; color : #9a8c59;";
 
-		if (!$limit) $limit = 60;
+		if (!$limit) {
+		    $limit = 60;
+		}
 
 		$date_sort_field = "date_entered DESC, updated DESC";
 
@@ -77,7 +79,9 @@ 
 			"/public.php?op=rss&id=$feed&key=" .
 			Feeds::get_feed_access_key($feed, false, $owner_uid);
 
-		if (!$feed_site_url) $feed_site_url = get_self_url_prefix();
+		if (!$feed_site_url) {
+		    $feed_site_url = get_self_url_prefix();
+		}
 
 		if ($format == 'atom') {
 			$tpl = new MiniTemplator;
@@ -207,8 +211,12 @@ 
 				$article['content'] = sanitize($line["content"], false, $owner_uid, $feed_site_url, false, $line["id"]);
 				$article['updated'] = date('c', strtotime($line["updated"]));
 
-				if ($line['note']) $article['note'] = $line['note'];
-				if ($article['author']) $article['author'] = $line['author'];
+				if ($line['note']) {
+				    $article['note'] = $line['note'];
+				}
+				if ($article['author']) {
+				    $article['author'] = $line['author'];
+				}
 
 				$tags = Article::get_article_tags($line["id"], $owner_uid);
 
@@ -459,7 +467,9 @@ 
 		$format = clean($_REQUEST['format']);
 		$orig_guid = clean($_REQUEST["orig_guid"]);
 
-		if (!$format) $format = 'atom';
+		if (!$format) {
+		    $format = 'atom';
+		}
 
 		if (SINGLE_USER_MODE) {
 			authenticate_user("admin", null);
@@ -472,8 +482,9 @@ 
 				ttrss_access_keys WHERE access_key = ? AND feed_id = ?");
 			$sth->execute([$key, $feed]);
 
-			if ($row = $sth->fetch())
-				$owner_id = $row["owner_uid"];
+			if ($row = $sth->fetch()) {
+							$owner_id = $row["owner_uid"];
+			}
 		}
 
 		if ($owner_id) {
@@ -683,8 +694,9 @@ 
 				// start an empty session to deliver login error message
 				@session_start();
 
-				if (!isset($_SESSION["login_error_msg"]))
-					$_SESSION["login_error_msg"] = __("Incorrect username or password");
+				if (!isset($_SESSION["login_error_msg"])) {
+									$_SESSION["login_error_msg"] = __("Incorrect username or password");
+				}
 
 				user_error("Failed login attempt for $login from {$_SERVER['REMOTE_ADDR']}", E_USER_WARNING);
 			}
@@ -1007,7 +1019,9 @@ 
 							"subject" => __("[tt-rss] Password reset request"),
 							"message" => $message]);
 
-						if (!$rc) print_error($mailer->error());
+						if (!$rc) {
+						    print_error($mailer->error());
+						}
 
 						$resetpass_token_full = time() . ":" . $resetpass_token;
 

classes/feedparser.php

Spacing +3 added lines, -3 removed lines

@@ -26,7 +26,7 @@ 
 		if ($error) {
 			foreach (libxml_get_errors() as $error) {
 				if ($error->level == LIBXML_ERR_FATAL) {
-					if(!isset($this->error)) //currently only the first error is reported
+					if (!isset($this->error)) //currently only the first error is reported
 						$this->error = $this->format_error($error);
 					$this->libxml_errors [] = $this->format_error($error);
 				}
@@ -69,7 +69,7 @@ 
 					$this->type = $this::FEED_ATOM;
 					break;
 				default:
-					if( !isset($this->error) ){
+					if (!isset($this->error)) {
 						$this->error = "Unknown/unsupported feed type";
 					}
 					return;
@@ -166,7 +166,7 @@ 
 			if ($this->link) $this->link = trim($this->link);
 
 		} else {
-			if( !isset($this->error) ){
+			if (!isset($this->error)) {
 				$this->error = "Unknown/unsupported feed type";
 			}
 			return;

Indentation +224 added lines, -224 removed lines

@@ -1,233 +1,233 @@
 <?php
 class FeedParser {
-	private $doc;
-	private $error;
-	private $libxml_errors = array();
-	private $items;
-	private $link;
-	private $title;
-	private $type;
-	private $xpath;
-
-	const FEED_RDF = 0;
-	const FEED_RSS = 1;
-	const FEED_ATOM = 2;
-
-	public function __construct($data) {
-		libxml_use_internal_errors(true);
-		libxml_clear_errors();
-		$this->doc = new DOMDocument();
-		$this->doc->loadXML($data);
-
-		mb_substitute_character("none");
-
-		$error = libxml_get_last_error();
-
-		if ($error) {
-			foreach (libxml_get_errors() as $error) {
-				if ($error->level == LIBXML_ERR_FATAL) {
-					if(!isset($this->error)) //currently only the first error is reported
-						$this->error = $this->format_error($error);
-					$this->libxml_errors [] = $this->format_error($error);
-				}
-			}
-		}
-		libxml_clear_errors();
-
-		$this->items = array();
-	}
-
-	public function init() {
-		$xpath = new DOMXPath($this->doc);
-		$xpath->registerNamespace('atom', 'http://www.w3.org/2005/Atom');
-		$xpath->registerNamespace('atom03', 'http://purl.org/atom/ns#');
-		$xpath->registerNamespace('media', 'http://search.yahoo.com/mrss/');
-		$xpath->registerNamespace('rdf', 'http://www.w3.org/1999/02/22-rdf-syntax-ns#');
-		$xpath->registerNamespace('slash', 'http://purl.org/rss/1.0/modules/slash/');
-		$xpath->registerNamespace('dc', 'http://purl.org/dc/elements/1.1/');
-		$xpath->registerNamespace('content', 'http://purl.org/rss/1.0/modules/content/');
-		$xpath->registerNamespace('thread', 'http://purl.org/syndication/thread/1.0');
-
-		$this->xpath = $xpath;
-
-		$root = $xpath->query("(//atom03:feed|//atom:feed|//channel|//rdf:rdf|//rdf:RDF)");
-
-		if ($root && $root->length > 0) {
-			$root = $root->item(0);
-
-			if ($root) {
-				switch (mb_strtolower($root->tagName)) {
-				case "rdf:rdf":
-					$this->type = $this::FEED_RDF;
-					break;
-				case "channel":
-					$this->type = $this::FEED_RSS;
-					break;
-				case "feed":
-				case "atom:feed":
-					$this->type = $this::FEED_ATOM;
-					break;
-				default:
-					if( !isset($this->error) ){
-						$this->error = "Unknown/unsupported feed type";
-					}
-					return;
-				}
-			}
-
-			switch ($this->type) {
-			case $this::FEED_ATOM:
-
-				$title = $xpath->query("//atom:feed/atom:title")->item(0);
-
-				if (!$title)
-					$title = $xpath->query("//atom03:feed/atom03:title")->item(0);
-
-
-				if ($title) {
-					$this->title = $title->nodeValue;
-				}
-
-				$link = $xpath->query("//atom:feed/atom:link[not(@rel)]")->item(0);
-
-				if (!$link)
-					$link = $xpath->query("//atom:feed/atom:link[@rel='alternate']")->item(0);
-
-				if (!$link)
-					$link = $xpath->query("//atom03:feed/atom03:link[not(@rel)]")->item(0);
-
-				if (!$link)
-					$link = $xpath->query("//atom03:feed/atom03:link[@rel='alternate']")->item(0);
-
-				if ($link && $link->hasAttributes()) {
-					$this->link = $link->getAttribute("href");
-				}
-
-				$articles = $xpath->query("//atom:entry");
-
-				if (!$articles || $articles->length == 0)
-					$articles = $xpath->query("//atom03:entry");
-
-				foreach ($articles as $article) {
-					array_push($this->items, new FeedItem_Atom($article, $this->doc, $this->xpath));
-				}
-
-				break;
-			case $this::FEED_RSS:
-				$title = $xpath->query("//channel/title")->item(0);
-
-				if ($title) {
-					$this->title = $title->nodeValue;
-				}
-
-				$link = $xpath->query("//channel/link")->item(0);
-
-				if ($link) {
-					if ($link->getAttribute("href"))
-						$this->link = $link->getAttribute("href");
-					else if ($link->nodeValue)
-						$this->link = $link->nodeValue;
-				}
-
-				$articles = $xpath->query("//channel/item");
-
-				foreach ($articles as $article) {
-					array_push($this->items, new FeedItem_RSS($article, $this->doc, $this->xpath));
-				}
-
-				break;
-			case $this::FEED_RDF:
-				$xpath->registerNamespace('rssfake', 'http://purl.org/rss/1.0/');
-
-				$title = $xpath->query("//rssfake:channel/rssfake:title")->item(0);
-
-				if ($title) {
-					$this->title = $title->nodeValue;
-				}
-
-				$link = $xpath->query("//rssfake:channel/rssfake:link")->item(0);
-
-				if ($link) {
-					$this->link = $link->nodeValue;
-				}
-
-				$articles = $xpath->query("//rssfake:item");
-
-				foreach ($articles as $article) {
-					array_push($this->items, new FeedItem_RSS($article, $this->doc, $this->xpath));
-				}
-
-				break;
-
-			}
-
-			if ($this->title) $this->title = trim($this->title);
-			if ($this->link) $this->link = trim($this->link);
+    private $doc;
+    private $error;
+    private $libxml_errors = array();
+    private $items;
+    private $link;
+    private $title;
+    private $type;
+    private $xpath;
+
+    const FEED_RDF = 0;
+    const FEED_RSS = 1;
+    const FEED_ATOM = 2;
+
+    public function __construct($data) {
+        libxml_use_internal_errors(true);
+        libxml_clear_errors();
+        $this->doc = new DOMDocument();
+        $this->doc->loadXML($data);
+
+        mb_substitute_character("none");
+
+        $error = libxml_get_last_error();
+
+        if ($error) {
+            foreach (libxml_get_errors() as $error) {
+                if ($error->level == LIBXML_ERR_FATAL) {
+                    if(!isset($this->error)) //currently only the first error is reported
+                        $this->error = $this->format_error($error);
+                    $this->libxml_errors [] = $this->format_error($error);
+                }
+            }
+        }
+        libxml_clear_errors();
+
+        $this->items = array();
+    }
+
+    public function init() {
+        $xpath = new DOMXPath($this->doc);
+        $xpath->registerNamespace('atom', 'http://www.w3.org/2005/Atom');
+        $xpath->registerNamespace('atom03', 'http://purl.org/atom/ns#');
+        $xpath->registerNamespace('media', 'http://search.yahoo.com/mrss/');
+        $xpath->registerNamespace('rdf', 'http://www.w3.org/1999/02/22-rdf-syntax-ns#');
+        $xpath->registerNamespace('slash', 'http://purl.org/rss/1.0/modules/slash/');
+        $xpath->registerNamespace('dc', 'http://purl.org/dc/elements/1.1/');
+        $xpath->registerNamespace('content', 'http://purl.org/rss/1.0/modules/content/');
+        $xpath->registerNamespace('thread', 'http://purl.org/syndication/thread/1.0');
+
+        $this->xpath = $xpath;
+
+        $root = $xpath->query("(//atom03:feed|//atom:feed|//channel|//rdf:rdf|//rdf:RDF)");
+
+        if ($root && $root->length > 0) {
+            $root = $root->item(0);
+
+            if ($root) {
+                switch (mb_strtolower($root->tagName)) {
+                case "rdf:rdf":
+                    $this->type = $this::FEED_RDF;
+                    break;
+                case "channel":
+                    $this->type = $this::FEED_RSS;
+                    break;
+                case "feed":
+                case "atom:feed":
+                    $this->type = $this::FEED_ATOM;
+                    break;
+                default:
+                    if( !isset($this->error) ){
+                        $this->error = "Unknown/unsupported feed type";
+                    }
+                    return;
+                }
+            }
+
+            switch ($this->type) {
+            case $this::FEED_ATOM:
+
+                $title = $xpath->query("//atom:feed/atom:title")->item(0);
+
+                if (!$title)
+                    $title = $xpath->query("//atom03:feed/atom03:title")->item(0);
+
+
+                if ($title) {
+                    $this->title = $title->nodeValue;
+                }
+
+                $link = $xpath->query("//atom:feed/atom:link[not(@rel)]")->item(0);
+
+                if (!$link)
+                    $link = $xpath->query("//atom:feed/atom:link[@rel='alternate']")->item(0);
+
+                if (!$link)
+                    $link = $xpath->query("//atom03:feed/atom03:link[not(@rel)]")->item(0);
+
+                if (!$link)
+                    $link = $xpath->query("//atom03:feed/atom03:link[@rel='alternate']")->item(0);
+
+                if ($link && $link->hasAttributes()) {
+                    $this->link = $link->getAttribute("href");
+                }
+
+                $articles = $xpath->query("//atom:entry");
+
+                if (!$articles || $articles->length == 0)
+                    $articles = $xpath->query("//atom03:entry");
+
+                foreach ($articles as $article) {
+                    array_push($this->items, new FeedItem_Atom($article, $this->doc, $this->xpath));
+                }
+
+                break;
+            case $this::FEED_RSS:
+                $title = $xpath->query("//channel/title")->item(0);
+
+                if ($title) {
+                    $this->title = $title->nodeValue;
+                }
+
+                $link = $xpath->query("//channel/link")->item(0);
+
+                if ($link) {
+                    if ($link->getAttribute("href"))
+                        $this->link = $link->getAttribute("href");
+                    else if ($link->nodeValue)
+                        $this->link = $link->nodeValue;
+                }
+
+                $articles = $xpath->query("//channel/item");
+
+                foreach ($articles as $article) {
+                    array_push($this->items, new FeedItem_RSS($article, $this->doc, $this->xpath));
+                }
+
+                break;
+            case $this::FEED_RDF:
+                $xpath->registerNamespace('rssfake', 'http://purl.org/rss/1.0/');
+
+                $title = $xpath->query("//rssfake:channel/rssfake:title")->item(0);
+
+                if ($title) {
+                    $this->title = $title->nodeValue;
+                }
+
+                $link = $xpath->query("//rssfake:channel/rssfake:link")->item(0);
+
+                if ($link) {
+                    $this->link = $link->nodeValue;
+                }
+
+                $articles = $xpath->query("//rssfake:item");
+
+                foreach ($articles as $article) {
+                    array_push($this->items, new FeedItem_RSS($article, $this->doc, $this->xpath));
+                }
+
+                break;
+
+            }
+
+            if ($this->title) $this->title = trim($this->title);
+            if ($this->link) $this->link = trim($this->link);
 
-		} else {
-			if( !isset($this->error) ){
-				$this->error = "Unknown/unsupported feed type";
-			}
-			return;
-		}
-	}
+        } else {
+            if( !isset($this->error) ){
+                $this->error = "Unknown/unsupported feed type";
+            }
+            return;
+        }
+    }
 
-	public function format_error($error) {
-		if ($error) {
-			return sprintf("LibXML error %s at line %d (column %d): %s",
-				$error->code, $error->line, $error->column,
-				$error->message);
-		} else {
-			return "";
-		}
-	}
+    public function format_error($error) {
+        if ($error) {
+            return sprintf("LibXML error %s at line %d (column %d): %s",
+                $error->code, $error->line, $error->column,
+                $error->message);
+        } else {
+            return "";
+        }
+    }
 
-	// libxml may have invalid unicode data in error messages
-	public function error() {
-		return UConverter::transcode($this->error, 'UTF-8', 'UTF-8');
-	}
+    // libxml may have invalid unicode data in error messages
+    public function error() {
+        return UConverter::transcode($this->error, 'UTF-8', 'UTF-8');
+    }
 
-	// WARNING: may return invalid unicode data
-	public function errors() {
-		return $this->libxml_errors;
-	}
+    // WARNING: may return invalid unicode data
+    public function errors() {
+        return $this->libxml_errors;
+    }
 
-	public function get_link() {
-		return clean($this->link);
-	}
+    public function get_link() {
+        return clean($this->link);
+    }
 
-	public function get_title() {
-		return clean($this->title);
-	}
-
-	public function get_items() {
-		return $this->items;
-	}
-
-	public function get_links($rel) {
-		$rv = array();
-
-		switch ($this->type) {
-		case $this::FEED_ATOM:
-			$links = $this->xpath->query("//atom:feed/atom:link");
-
-			foreach ($links as $link) {
-				if (!$rel || $link->hasAttribute('rel') && $link->getAttribute('rel') == $rel) {
-					array_push($rv, clean(trim($link->getAttribute('href'))));
-				}
-			}
-			break;
-		case $this::FEED_RSS:
-			$links = $this->xpath->query("//atom:link");
-
-			foreach ($links as $link) {
-				if (!$rel || $link->hasAttribute('rel') && $link->getAttribute('rel') == $rel) {
-					array_push($rv, clean(trim($link->getAttribute('href'))));
-				}
-			}
-			break;
-		}
-
-		return $rv;
-	}
+    public function get_title() {
+        return clean($this->title);
+    }
+
+    public function get_items() {
+        return $this->items;
+    }
+
+    public function get_links($rel) {
+        $rv = array();
+
+        switch ($this->type) {
+        case $this::FEED_ATOM:
+            $links = $this->xpath->query("//atom:feed/atom:link");
+
+            foreach ($links as $link) {
+                if (!$rel || $link->hasAttribute('rel') && $link->getAttribute('rel') == $rel) {
+                    array_push($rv, clean(trim($link->getAttribute('href'))));
+                }
+            }
+            break;
+        case $this::FEED_RSS:
+            $links = $this->xpath->query("//atom:link");
+
+            foreach ($links as $link) {
+                if (!$rel || $link->hasAttribute('rel') && $link->getAttribute('rel') == $rel) {
+                    array_push($rv, clean(trim($link->getAttribute('href'))));
+                }
+            }
+            break;
+        }
+
+        return $rv;
+    }
 }

Braces +29 added lines, -17 removed lines

@@ -26,8 +26,10 @@ 
 		if ($error) {
 			foreach (libxml_get_errors() as $error) {
 				if ($error->level == LIBXML_ERR_FATAL) {
-					if(!isset($this->error)) //currently only the first error is reported
+					if(!isset($this->error)) {
+					    //currently only the first error is reported
 						$this->error = $this->format_error($error);
+					}
 					$this->libxml_errors [] = $this->format_error($error);
 				}
 			}
@@ -80,8 +82,9 @@ 
 
 				$title = $xpath->query("//atom:feed/atom:title")->item(0);
 
-				if (!$title)
-					$title = $xpath->query("//atom03:feed/atom03:title")->item(0);
+				if (!$title) {
+									$title = $xpath->query("//atom03:feed/atom03:title")->item(0);
+				}
 
 
 				if ($title) {
@@ -90,14 +93,17 @@ 
 
 				$link = $xpath->query("//atom:feed/atom:link[not(@rel)]")->item(0);
 
-				if (!$link)
-					$link = $xpath->query("//atom:feed/atom:link[@rel='alternate']")->item(0);
+				if (!$link) {
+									$link = $xpath->query("//atom:feed/atom:link[@rel='alternate']")->item(0);
+				}
 
-				if (!$link)
-					$link = $xpath->query("//atom03:feed/atom03:link[not(@rel)]")->item(0);
+				if (!$link) {
+									$link = $xpath->query("//atom03:feed/atom03:link[not(@rel)]")->item(0);
+				}
 
-				if (!$link)
-					$link = $xpath->query("//atom03:feed/atom03:link[@rel='alternate']")->item(0);
+				if (!$link) {
+									$link = $xpath->query("//atom03:feed/atom03:link[@rel='alternate']")->item(0);
+				}
 
 				if ($link && $link->hasAttributes()) {
 					$this->link = $link->getAttribute("href");
@@ -105,8 +111,9 @@ 
 
 				$articles = $xpath->query("//atom:entry");
 
-				if (!$articles || $articles->length == 0)
-					$articles = $xpath->query("//atom03:entry");
+				if (!$articles || $articles->length == 0) {
+									$articles = $xpath->query("//atom03:entry");
+				}
 
 				foreach ($articles as $article) {
 					array_push($this->items, new FeedItem_Atom($article, $this->doc, $this->xpath));
@@ -123,10 +130,11 @@ 
 				$link = $xpath->query("//channel/link")->item(0);
 
 				if ($link) {
-					if ($link->getAttribute("href"))
-						$this->link = $link->getAttribute("href");
-					else if ($link->nodeValue)
-						$this->link = $link->nodeValue;
+					if ($link->getAttribute("href")) {
+											$this->link = $link->getAttribute("href");
+					} else if ($link->nodeValue) {
+											$this->link = $link->nodeValue;
+					}
 				}
 
 				$articles = $xpath->query("//channel/item");
@@ -161,8 +169,12 @@ 
 
 			}
 
-			if ($this->title) $this->title = trim($this->title);
-			if ($this->link) $this->link = trim($this->link);
+			if ($this->title) {
+			    $this->title = trim($this->title);
+			}
+			if ($this->link) {
+			    $this->link = trim($this->link);
+			}
 
 		} else {
 			if( !isset($this->error) ){

classes/counters.php

Braces +20 added lines, -14 removed lines

@@ -95,10 +95,11 @@ 
 
 			$count = getFeedUnread($i);
 
-			if ($i == 0 || $i == -1 || $i == -2)
-				$auxctr = Feeds::getFeedArticles($i, false);
-			else
-				$auxctr = 0;
+			if ($i == 0 || $i == -1 || $i == -2) {
+							$auxctr = Feeds::getFeedArticles($i, false);
+			} else {
+							$auxctr = 0;
+			}
 
 			$cv = array("id" => $i,
 				"counter" => (int) $count,
@@ -117,8 +118,9 @@ 
 				$cv = array("id" => PluginHost::pfeed_to_feed_id($feed['id']),
 					"counter" => $feed['sender']->get_unread($feed['id']));
 
-				if (method_exists($feed['sender'], 'get_total'))
-					$cv["auxcounter"] = $feed['sender']->get_total($feed['id']);
+				if (method_exists($feed['sender'], 'get_total')) {
+									$cv["auxcounter"] = $feed['sender']->get_total($feed['id']);
+				}
 
 				array_push($ret_arr, $cv);
 			}
@@ -150,8 +152,9 @@ 
 				"counter" => (int) $line["unread"],
 				"auxcounter" => (int) $line["total"]);
 
-			if ($descriptions)
-				$cv["description"] = $line["caption"];
+			if ($descriptions) {
+							$cv["description"] = $line["caption"];
+			}
 
 			array_push($ret_arr, $cv);
 		}
@@ -189,22 +192,25 @@ 
 				$has_img = false;
 			}
 
-			if (date('Y') - date('Y', strtotime($line['last_updated'])) > 2)
-				$last_updated = '';
+			if (date('Y') - date('Y', strtotime($line['last_updated'])) > 2) {
+							$last_updated = '';
+			}
 
 			$cv = array("id" => $id,
 				"updated" => $last_updated,
 				"counter" => (int) $count,
 				"has_img" => (int) $has_img);
 
-			if ($last_error)
-				$cv["error"] = $last_error;
+			if ($last_error) {
+							$cv["error"] = $last_error;
+			}
 
 //			if (get_pref('EXTENDED_FEEDLIST'))
 //				$cv["xmsg"] = getFeedArticles($id)." ".__("total");
 
-			if ($active_feed && $id == $active_feed)
-				$cv["title"] = truncate_string($line["title"], 30);
+			if ($active_feed && $id == $active_feed) {
+							$cv["title"] = truncate_string($line["title"], 30);
+			}
 
 			array_push($ret_arr, $cv);
 

Indentation +122 added lines, -122 removed lines

@@ -1,171 +1,171 @@ 
 <?php
 class Counters {
 
-	public static function getAllCounters() {
-		$data = Counters::getGlobalCounters();
+    public static function getAllCounters() {
+        $data = Counters::getGlobalCounters();
 
-		$data = array_merge($data, Counters::getVirtCounters());
-		$data = array_merge($data, Counters::getLabelCounters());
-		$data = array_merge($data, Counters::getFeedCounters());
-		$data = array_merge($data, Counters::getCategoryCounters());
+        $data = array_merge($data, Counters::getVirtCounters());
+        $data = array_merge($data, Counters::getLabelCounters());
+        $data = array_merge($data, Counters::getFeedCounters());
+        $data = array_merge($data, Counters::getCategoryCounters());
 
-		return $data;
-	}
+        return $data;
+    }
 
-	public static function getCategoryCounters() {
-		$ret_arr = array();
+    public static function getCategoryCounters() {
+        $ret_arr = array();
 
-		/* Labels category */
+        /* Labels category */
 
-		$cv = array("id" => -2, "kind" => "cat",
-			"counter" => Feeds::getCategoryUnread(-2));
+        $cv = array("id" => -2, "kind" => "cat",
+            "counter" => Feeds::getCategoryUnread(-2));
 
-		array_push($ret_arr, $cv);
+        array_push($ret_arr, $cv);
 
-		$pdo = DB::pdo();
+        $pdo = DB::pdo();
 
-		$sth = $pdo->prepare("SELECT ttrss_feed_categories.id AS cat_id, value AS unread,
+        $sth = $pdo->prepare("SELECT ttrss_feed_categories.id AS cat_id, value AS unread,
 			(SELECT COUNT(id) FROM ttrss_feed_categories AS c2
 				WHERE c2.parent_cat = ttrss_feed_categories.id) AS num_children
 			FROM ttrss_feed_categories, ttrss_cat_counters_cache
 			WHERE ttrss_cat_counters_cache.feed_id = ttrss_feed_categories.id AND
 			ttrss_cat_counters_cache.owner_uid = ttrss_feed_categories.owner_uid AND
 			ttrss_feed_categories.owner_uid = ?");
-		$sth->execute([$_SESSION['uid']]);
+        $sth->execute([$_SESSION['uid']]);
 
-		while ($line = $sth->fetch()) {
-			$line["cat_id"] = (int) $line["cat_id"];
+        while ($line = $sth->fetch()) {
+            $line["cat_id"] = (int) $line["cat_id"];
 
-			if ($line["num_children"] > 0) {
-				$child_counter = Feeds::getCategoryChildrenUnread($line["cat_id"], $_SESSION["uid"]);
-			} else {
-				$child_counter = 0;
-			}
+            if ($line["num_children"] > 0) {
+                $child_counter = Feeds::getCategoryChildrenUnread($line["cat_id"], $_SESSION["uid"]);
+            } else {
+                $child_counter = 0;
+            }
 
-			$cv = array("id" => $line["cat_id"], "kind" => "cat",
-				"counter" => $line["unread"] + $child_counter);
+            $cv = array("id" => $line["cat_id"], "kind" => "cat",
+                "counter" => $line["unread"] + $child_counter);
 
-			array_push($ret_arr, $cv);
-		}
+            array_push($ret_arr, $cv);
+        }
 
-		/* Special case: NULL category doesn't actually exist in the DB */
+        /* Special case: NULL category doesn't actually exist in the DB */
 
-		$cv = array("id" => 0, "kind" => "cat",
-			"counter" => (int) CCache::find(0, $_SESSION["uid"], true));
+        $cv = array("id" => 0, "kind" => "cat",
+            "counter" => (int) CCache::find(0, $_SESSION["uid"], true));
 
-		array_push($ret_arr, $cv);
+        array_push($ret_arr, $cv);
 
-		return $ret_arr;
-	}
+        return $ret_arr;
+    }
 
-	public static function getGlobalCounters($global_unread = -1) {
-		$ret_arr = array();
+    public static function getGlobalCounters($global_unread = -1) {
+        $ret_arr = array();
 
-		if ($global_unread == -1) {
-			$global_unread = Feeds::getGlobalUnread();
-		}
+        if ($global_unread == -1) {
+            $global_unread = Feeds::getGlobalUnread();
+        }
 
-		$cv = array("id" => "global-unread",
-			"counter" => (int) $global_unread);
+        $cv = array("id" => "global-unread",
+            "counter" => (int) $global_unread);
 
-		array_push($ret_arr, $cv);
+        array_push($ret_arr, $cv);
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare("SELECT COUNT(id) AS fn FROM
+        $sth = $pdo->prepare("SELECT COUNT(id) AS fn FROM
 			ttrss_feeds WHERE owner_uid = ?");
-		$sth->execute([$_SESSION['uid']]);
-		$row = $sth->fetch();
+        $sth->execute([$_SESSION['uid']]);
+        $row = $sth->fetch();
 
-		$subscribed_feeds = $row["fn"];
+        $subscribed_feeds = $row["fn"];
 
-		$cv = array("id" => "subscribed-feeds",
-			"counter" => (int) $subscribed_feeds);
+        $cv = array("id" => "subscribed-feeds",
+            "counter" => (int) $subscribed_feeds);
 
-		array_push($ret_arr, $cv);
+        array_push($ret_arr, $cv);
 
-		return $ret_arr;
-	}
+        return $ret_arr;
+    }
 
-	public static function getVirtCounters() {
+    public static function getVirtCounters() {
 
-		$ret_arr = array();
+        $ret_arr = array();
 
-		for ($i = 0; $i >= -4; $i--) {
+        for ($i = 0; $i >= -4; $i--) {
 
-			$count = getFeedUnread($i);
+            $count = getFeedUnread($i);
 
-			if ($i == 0 || $i == -1 || $i == -2)
-				$auxctr = Feeds::getFeedArticles($i, false);
-			else
-				$auxctr = 0;
+            if ($i == 0 || $i == -1 || $i == -2)
+                $auxctr = Feeds::getFeedArticles($i, false);
+            else
+                $auxctr = 0;
 
-			$cv = array("id" => $i,
-				"counter" => (int) $count,
-				"auxcounter" => (int) $auxctr);
+            $cv = array("id" => $i,
+                "counter" => (int) $count,
+                "auxcounter" => (int) $auxctr);
 
 //			if (get_pref('EXTENDED_FEEDLIST'))
 //				$cv["xmsg"] = getFeedArticles($i)." ".__("total");
 
-			array_push($ret_arr, $cv);
-		}
+            array_push($ret_arr, $cv);
+        }
 
-		$feeds = PluginHost::getInstance()->get_feeds(-1);
+        $feeds = PluginHost::getInstance()->get_feeds(-1);
 
-		if (is_array($feeds)) {
-			foreach ($feeds as $feed) {
-				$cv = array("id" => PluginHost::pfeed_to_feed_id($feed['id']),
-					"counter" => $feed['sender']->get_unread($feed['id']));
+        if (is_array($feeds)) {
+            foreach ($feeds as $feed) {
+                $cv = array("id" => PluginHost::pfeed_to_feed_id($feed['id']),
+                    "counter" => $feed['sender']->get_unread($feed['id']));
 
-				if (method_exists($feed['sender'], 'get_total'))
-					$cv["auxcounter"] = $feed['sender']->get_total($feed['id']);
+                if (method_exists($feed['sender'], 'get_total'))
+                    $cv["auxcounter"] = $feed['sender']->get_total($feed['id']);
 
-				array_push($ret_arr, $cv);
-			}
-		}
+                array_push($ret_arr, $cv);
+            }
+        }
 
-		return $ret_arr;
-	}
+        return $ret_arr;
+    }
 
-	public static function getLabelCounters($descriptions = false) {
+    public static function getLabelCounters($descriptions = false) {
 
-		$ret_arr = array();
+        $ret_arr = array();
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare("SELECT id,caption,SUM(CASE WHEN u1.unread = true THEN 1 ELSE 0 END) AS unread, COUNT(u1.unread) AS total
+        $sth = $pdo->prepare("SELECT id,caption,SUM(CASE WHEN u1.unread = true THEN 1 ELSE 0 END) AS unread, COUNT(u1.unread) AS total
 			FROM ttrss_labels2 LEFT JOIN ttrss_user_labels2 ON
 				(ttrss_labels2.id = label_id)
 				LEFT JOIN ttrss_user_entries AS u1 ON u1.ref_id = article_id
 				WHERE ttrss_labels2.owner_uid = :uid AND u1.owner_uid = :uid
 				GROUP BY ttrss_labels2.id,
 					ttrss_labels2.caption");
-		$sth->execute([":uid" => $_SESSION['uid']]);
+        $sth->execute([":uid" => $_SESSION['uid']]);
 
-		while ($line = $sth->fetch()) {
+        while ($line = $sth->fetch()) {
 
-			$id = Labels::label_to_feed_id($line["id"]);
+            $id = Labels::label_to_feed_id($line["id"]);
 
-			$cv = array("id" => $id,
-				"counter" => (int) $line["unread"],
-				"auxcounter" => (int) $line["total"]);
+            $cv = array("id" => $id,
+                "counter" => (int) $line["unread"],
+                "auxcounter" => (int) $line["total"]);
 
-			if ($descriptions)
-				$cv["description"] = $line["caption"];
+            if ($descriptions)
+                $cv["description"] = $line["caption"];
 
-			array_push($ret_arr, $cv);
-		}
+            array_push($ret_arr, $cv);
+        }
 
-		return $ret_arr;
-	}
+        return $ret_arr;
+    }
 
-	public static function getFeedCounters($active_feed = false) {
+    public static function getFeedCounters($active_feed = false) {
 
-		$ret_arr = array();
+        $ret_arr = array();
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare("SELECT ttrss_feeds.id,
+        $sth = $pdo->prepare("SELECT ttrss_feeds.id,
 				ttrss_feeds.title,
 				".SUBSTRING_FOR_DATE."(ttrss_feeds.last_updated,1,19) AS last_updated,
 				last_error, value AS count
@@ -173,44 +173,44 @@ 
 			WHERE ttrss_feeds.owner_uid = ?
 				AND ttrss_counters_cache.owner_uid = ttrss_feeds.owner_uid
 				AND ttrss_counters_cache.feed_id = ttrss_feeds.id");
-		$sth->execute([$_SESSION['uid']]);
+        $sth->execute([$_SESSION['uid']]);
 
-		while ($line = $sth->fetch()) {
+        while ($line = $sth->fetch()) {
 
-			$id = $line["id"];
-			$count = $line["count"];
-			$last_error = htmlspecialchars($line["last_error"]);
+            $id = $line["id"];
+            $count = $line["count"];
+            $last_error = htmlspecialchars($line["last_error"]);
 
-			$last_updated = make_local_datetime($line['last_updated'], false);
+            $last_updated = make_local_datetime($line['last_updated'], false);
 
-			if (Feeds::feedHasIcon($id)) {
-				$has_img = filemtime(Feeds::getIconFile($id));
-			} else {
-				$has_img = false;
-			}
+            if (Feeds::feedHasIcon($id)) {
+                $has_img = filemtime(Feeds::getIconFile($id));
+            } else {
+                $has_img = false;
+            }
 
-			if (date('Y') - date('Y', strtotime($line['last_updated'])) > 2)
-				$last_updated = '';
+            if (date('Y') - date('Y', strtotime($line['last_updated'])) > 2)
+                $last_updated = '';
 
-			$cv = array("id" => $id,
-				"updated" => $last_updated,
-				"counter" => (int) $count,
-				"has_img" => (int) $has_img);
+            $cv = array("id" => $id,
+                "updated" => $last_updated,
+                "counter" => (int) $count,
+                "has_img" => (int) $has_img);
 
-			if ($last_error)
-				$cv["error"] = $last_error;
+            if ($last_error)
+                $cv["error"] = $last_error;
 
 //			if (get_pref('EXTENDED_FEEDLIST'))
 //				$cv["xmsg"] = getFeedArticles($id)." ".__("total");
 
-			if ($active_feed && $id == $active_feed)
-				$cv["title"] = truncate_string($line["title"], 30);
+            if ($active_feed && $id == $active_feed)
+                $cv["title"] = truncate_string($line["title"], 30);
 
-			array_push($ret_arr, $cv);
+            array_push($ret_arr, $cv);
 
-		}
+        }
 
-		return $ret_arr;
-	}
+        return $ret_arr;
+    }
 
 }

classes/dbupdater.php

Spacing +2 added lines, -2 removed lines

@@ -52,9 +52,9 @@
 							$this->pdo->query($line); // PDO returns errors as exceptions now
 						} catch (PDOException $e) {
 							if ($html_output) {
-								print "<div class='text-error'>Error: " . $e->getMessage() . "</div>";
+								print "<div class='text-error'>Error: ".$e->getMessage()."</div>";
 							} else {
-								Debug::log("Error: " . $e->getMessage());
+								Debug::log("Error: ".$e->getMessage());
 							}
 
 							$this->pdo->rollBack();

Braces +5 added lines, -4 removed lines

@@ -43,10 +43,11 @@
 				foreach ($lines as $line) {
 					if (strpos($line, "--") !== 0 && $line) {
 
-						if ($html_output)
-							print "<pre>$line</pre>";
-						else
-							Debug::log("> $line");
+						if ($html_output) {
+													print "<pre>$line</pre>";
+						} else {
+													Debug::log("> $line");
+						}
 
 						try {
 							$this->pdo->query($line); // PDO returns errors as exceptions now

Indentation +78 added lines, -78 removed lines

@@ -2,83 +2,83 @@
 
 class DbUpdater {
 
-	private $pdo;
-	private $db_type;
-	private $need_version;
-
-	public function __construct($db_type, $need_version) {
-		$this->pdo = Db::pdo();
-		$this->db_type = $db_type;
-		$this->need_version = (int) $need_version;
-	}
-
-	public function getSchemaVersion() {
-		$row = $this->pdo->query("SELECT schema_version FROM ttrss_version")->fetch();
-		return (int) $row['schema_version'];
-	}
-
-	public function isUpdateRequired() {
-		return $this->getSchemaVersion() < $this->need_version;
-	}
-
-	public function getSchemaLines($version) {
-		$filename = "schema/versions/".$this->db_type."/$version.sql";
-
-		if (file_exists($filename)) {
-			return explode(";", preg_replace("/[\r\n]/", "", file_get_contents($filename)));
-		} else {
-			user_error("DB Updater: schema file for version $version is not found.");
-			return false;
-		}
-	}
-
-	public function performUpdateTo($version, $html_output = true) {
-		if ($this->getSchemaVersion() == $version - 1) {
-
-			$lines = $this->getSchemaLines($version);
-
-			if (is_array($lines)) {
-
-				$this->pdo->beginTransaction();
-
-				foreach ($lines as $line) {
-					if (strpos($line, "--") !== 0 && $line) {
-
-						if ($html_output)
-							print "<pre>$line</pre>";
-						else
-							Debug::log("> $line");
-
-						try {
-							$this->pdo->query($line); // PDO returns errors as exceptions now
-						} catch (PDOException $e) {
-							if ($html_output) {
-								print "<div class='text-error'>Error: " . $e->getMessage() . "</div>";
-							} else {
-								Debug::log("Error: " . $e->getMessage());
-							}
-
-							$this->pdo->rollBack();
-							return false;
-						}
-					}
-				}
-
-				$db_version = $this->getSchemaVersion();
-
-				if ($db_version == $version) {
-					$this->pdo->commit();
-					return true;
-				} else {
-					$this->pdo->rollBack();
-					return false;
-				}
-			} else {
-				return false;
-			}
-		} else {
-			return false;
-		}
-	}
+    private $pdo;
+    private $db_type;
+    private $need_version;
+
+    public function __construct($db_type, $need_version) {
+        $this->pdo = Db::pdo();
+        $this->db_type = $db_type;
+        $this->need_version = (int) $need_version;
+    }
+
+    public function getSchemaVersion() {
+        $row = $this->pdo->query("SELECT schema_version FROM ttrss_version")->fetch();
+        return (int) $row['schema_version'];
+    }
+
+    public function isUpdateRequired() {
+        return $this->getSchemaVersion() < $this->need_version;
+    }
+
+    public function getSchemaLines($version) {
+        $filename = "schema/versions/".$this->db_type."/$version.sql";
+
+        if (file_exists($filename)) {
+            return explode(";", preg_replace("/[\r\n]/", "", file_get_contents($filename)));
+        } else {
+            user_error("DB Updater: schema file for version $version is not found.");
+            return false;
+        }
+    }
+
+    public function performUpdateTo($version, $html_output = true) {
+        if ($this->getSchemaVersion() == $version - 1) {
+
+            $lines = $this->getSchemaLines($version);
+
+            if (is_array($lines)) {
+
+                $this->pdo->beginTransaction();
+
+                foreach ($lines as $line) {
+                    if (strpos($line, "--") !== 0 && $line) {
+
+                        if ($html_output)
+                            print "<pre>$line</pre>";
+                        else
+                            Debug::log("> $line");
+
+                        try {
+                            $this->pdo->query($line); // PDO returns errors as exceptions now
+                        } catch (PDOException $e) {
+                            if ($html_output) {
+                                print "<div class='text-error'>Error: " . $e->getMessage() . "</div>";
+                            } else {
+                                Debug::log("Error: " . $e->getMessage());
+                            }
+
+                            $this->pdo->rollBack();
+                            return false;
+                        }
+                    }
+                }
+
+                $db_version = $this->getSchemaVersion();
+
+                if ($db_version == $version) {
+                    $this->pdo->commit();
+                    return true;
+                } else {
+                    $this->pdo->rollBack();
+                    return false;
+                }
+            } else {
+                return false;
+            }
+        } else {
+            return false;
+        }
+    }
 
 }

install/index.php

Spacing +8 added lines, -8 removed lines

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

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 	function javascript_tag($filename) {
 		$query = "";
 
-		if (!(strpos($filename, "?") === FALSE)) {
+		if (!(strpos($filename, "?") === false)) {
 			$query = substr($filename, strpos($filename, "?")+1);
 			$filename = substr($filename, 0, strpos($filename, "?"));
 		}

Indentation +261 added lines, -261 removed lines

@@ -1,26 +1,26 @@ 
 <?php
-	function stylesheet_tag($filename, $id = false) {
-		$timestamp = filemtime($filename);
+    function stylesheet_tag($filename, $id = false) {
+        $timestamp = filemtime($filename);
 
-		$id_part = $id ? "id=\"$id\"" : "";
+        $id_part = $id ? "id=\"$id\"" : "";
 
-		return "<link rel=\"stylesheet\" $id_part type=\"text/css\" href=\"$filename?$timestamp\"/>\n";
-	}
+        return "<link rel=\"stylesheet\" $id_part type=\"text/css\" href=\"$filename?$timestamp\"/>\n";
+    }
 
-	function javascript_tag($filename) {
-		$query = "";
+    function javascript_tag($filename) {
+        $query = "";
 
-		if (!(strpos($filename, "?") === FALSE)) {
-			$query = substr($filename, strpos($filename, "?")+1);
-			$filename = substr($filename, 0, strpos($filename, "?"));
-		}
+        if (!(strpos($filename, "?") === FALSE)) {
+            $query = substr($filename, strpos($filename, "?")+1);
+            $filename = substr($filename, 0, strpos($filename, "?"));
+        }
 
-		$timestamp = filemtime($filename);
+        $timestamp = filemtime($filename);
 
-		if ($query) $timestamp .= "&$query";
+        if ($query) $timestamp .= "&$query";
 
-		return "<script type=\"text/javascript\" charset=\"utf-8\" src=\"$filename?$timestamp\"></script>\n";
-	}
+        return "<script type=\"text/javascript\" charset=\"utf-8\" src=\"$filename?$timestamp\"></script>\n";
+    }
 ?>
 <!DOCTYPE html>
 <html>
@@ -31,11 +31,11 @@ 
 		textarea { font-size : 12px; }
 	</style>
 	<?php
-		echo stylesheet_tag("../css/default.css");
-		echo javascript_tag("../lib/prototype.js");
-		echo javascript_tag("../lib/dojo/dojo.js");
-		echo javascript_tag("../lib/dojo/tt-rss-layer.js");
-	?>
+        echo stylesheet_tag("../css/default.css");
+        echo javascript_tag("../lib/prototype.js");
+        echo javascript_tag("../lib/dojo/dojo.js");
+        echo javascript_tag("../lib/dojo/tt-rss-layer.js");
+    ?>
 </head>
 <body class="flat ttrss_utility installer">
 
@@ -50,149 +50,149 @@ 
 
 <?php
 
-	// could be needed because of existing config.php
-	function define_default($param, $value) {
-		//
-	}
+    // could be needed because of existing config.php
+    function define_default($param, $value) {
+        //
+    }
 
-	function make_password($length = 12) {
-		$password = "";
-		$possible = "0123456789abcdfghjkmnpqrstvwxyzABCDFGHJKMNPQRSTVWXYZ*%+^";
+    function make_password($length = 12) {
+        $password = "";
+        $possible = "0123456789abcdfghjkmnpqrstvwxyzABCDFGHJKMNPQRSTVWXYZ*%+^";
 
-		$i = 0;
+        $i = 0;
 
-		while ($i < $length) {
+        while ($i < $length) {
 
-			try {
-				$idx = function_exists("random_int") ? random_int(0, strlen($possible) - 1) : mt_rand(0, strlen($possible) - 1);
-			} catch (Exception $e) {
-				$idx = mt_rand(0, strlen($possible) - 1);
-			}
+            try {
+                $idx = function_exists("random_int") ? random_int(0, strlen($possible) - 1) : mt_rand(0, strlen($possible) - 1);
+            } catch (Exception $e) {
+                $idx = mt_rand(0, strlen($possible) - 1);
+            }
 
-			$char = substr($possible, $idx, 1);
+            $char = substr($possible, $idx, 1);
 
-			if (!strstr($password, $char)) {
-				$password .= $char;
-				$i++;
-			}
-		}
+            if (!strstr($password, $char)) {
+                $password .= $char;
+                $i++;
+            }
+        }
 
-		return $password;
-	}
+        return $password;
+    }
 
 
-	function sanity_check($db_type) {
-		$errors = array();
+    function sanity_check($db_type) {
+        $errors = array();
 
-		if (version_compare(PHP_VERSION, '5.6.0', '<')) {
-			array_push($errors, "PHP version 5.6.0 or newer required. You're using " . PHP_VERSION . ".");
-		}
+        if (version_compare(PHP_VERSION, '5.6.0', '<')) {
+            array_push($errors, "PHP version 5.6.0 or newer required. You're using " . PHP_VERSION . ".");
+        }
 
-		if (!function_exists("curl_init") && !ini_get("allow_url_fopen")) {
-			array_push($errors, "PHP configuration option allow_url_fopen is disabled, and CURL functions are not present. Either enable allow_url_fopen or install PHP extension for CURL.");
-		}
+        if (!function_exists("curl_init") && !ini_get("allow_url_fopen")) {
+            array_push($errors, "PHP configuration option allow_url_fopen is disabled, and CURL functions are not present. Either enable allow_url_fopen or install PHP extension for CURL.");
+        }
 
-		if (!function_exists("json_encode")) {
-			array_push($errors, "PHP support for JSON is required, but was not found.");
-		}
+        if (!function_exists("json_encode")) {
+            array_push($errors, "PHP support for JSON is required, but was not found.");
+        }
 
-		if (!class_exists("PDO")) {
-			array_push($errors, "PHP support for PDO is required but was not found.");
-		}
+        if (!class_exists("PDO")) {
+            array_push($errors, "PHP support for PDO is required but was not found.");
+        }
 
-		if (!function_exists("mb_strlen")) {
-			array_push($errors, "PHP support for mbstring functions is required but was not found.");
-		}
+        if (!function_exists("mb_strlen")) {
+            array_push($errors, "PHP support for mbstring functions is required but was not found.");
+        }
 
-		if (!function_exists("hash")) {
-			array_push($errors, "PHP support for hash() function is required but was not found.");
-		}
+        if (!function_exists("hash")) {
+            array_push($errors, "PHP support for hash() function is required but was not found.");
+        }
 
-		if (!function_exists("iconv")) {
-			array_push($errors, "PHP support for iconv is required to handle multiple charsets.");
-		}
+        if (!function_exists("iconv")) {
+            array_push($errors, "PHP support for iconv is required to handle multiple charsets.");
+        }
 
-		if (ini_get("safe_mode")) {
-			array_push($errors, "PHP safe mode setting is obsolete and not supported by tt-rss.");
-		}
+        if (ini_get("safe_mode")) {
+            array_push($errors, "PHP safe mode setting is obsolete and not supported by tt-rss.");
+        }
 
-		if (!class_exists("DOMDocument")) {
-			array_push($errors, "PHP support for DOMDocument is required, but was not found.");
-		}
+        if (!class_exists("DOMDocument")) {
+            array_push($errors, "PHP support for DOMDocument is required, but was not found.");
+        }
 
-		return $errors;
-	}
+        return $errors;
+    }
 
-	function print_error($msg) {
-		print "<div class='alert alert-error'>$msg</div>";
-	}
+    function print_error($msg) {
+        print "<div class='alert alert-error'>$msg</div>";
+    }
 
-	function print_notice($msg) {
-		print "<div class=\"alert alert-info\">$msg</div>";
-	}
+    function print_notice($msg) {
+        print "<div class=\"alert alert-info\">$msg</div>";
+    }
 
-	function pdo_connect($host, $user, $pass, $db, $type, $port = false) {
+    function pdo_connect($host, $user, $pass, $db, $type, $port = false) {
 
-		$db_port = $port ? ';port=' . $port : '';
-		$db_host = $host ? ';host=' . $host : '';
+        $db_port = $port ? ';port=' . $port : '';
+        $db_host = $host ? ';host=' . $host : '';
 
-		try {
-			$pdo = new PDO($type . ':dbname=' . $db . $db_host . $db_port,
-				$user,
-				$pass);
+        try {
+            $pdo = new PDO($type . ':dbname=' . $db . $db_host . $db_port,
+                $user,
+                $pass);
 
-			return $pdo;
-		} catch (Exception $e) {
-		    print "<div class='alert alert-danger'>" . $e->getMessage() . "</div>";
-		    return null;
+            return $pdo;
+        } catch (Exception $e) {
+            print "<div class='alert alert-danger'>" . $e->getMessage() . "</div>";
+            return null;
         }
-	}
-
-	function make_config($DB_TYPE, $DB_HOST, $DB_USER, $DB_NAME, $DB_PASS,
-			$DB_PORT, $SELF_URL_PATH) {
-
-		$data = explode("\n", file_get_contents("../config.php-dist"));
-
-		$rv = "";
-
-		$finished = false;
-
-		foreach ($data as $line) {
-			if (preg_match("/define\('DB_TYPE'/", $line)) {
-				$rv .= "\tdefine('DB_TYPE', '$DB_TYPE');\n";
-			} else if (preg_match("/define\('DB_HOST'/", $line)) {
-				$rv .= "\tdefine('DB_HOST', '$DB_HOST');\n";
-			} else if (preg_match("/define\('DB_USER'/", $line)) {
-				$rv .= "\tdefine('DB_USER', '$DB_USER');\n";
-			} else if (preg_match("/define\('DB_NAME'/", $line)) {
-				$rv .= "\tdefine('DB_NAME', '$DB_NAME');\n";
-			} else if (preg_match("/define\('DB_PASS'/", $line)) {
-				$rv .= "\tdefine('DB_PASS', '$DB_PASS');\n";
-			} else if (preg_match("/define\('DB_PORT'/", $line)) {
-				$rv .= "\tdefine('DB_PORT', '$DB_PORT');\n";
-			} else if (preg_match("/define\('SELF_URL_PATH'/", $line)) {
-				$rv .= "\tdefine('SELF_URL_PATH', '$SELF_URL_PATH');\n";
-			} else if (!$finished) {
-				$rv .= "$line\n";
-			}
-
-			if (preg_match("/\?\>/", $line)) {
-				$finished = true;
-			}
-		}
-
-		return $rv;
-	}
-
-	function is_server_https() {
-		return (!empty($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] != 'off')) || (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https');
-	}
-
-	function make_self_url_path() {
-		$url_path = (is_server_https() ? 'https://' :  'http://') . $_SERVER["HTTP_HOST"] . parse_url($_SERVER["REQUEST_URI"], PHP_URL_PATH);
-
-		return $url_path;
-	}
+    }
+
+    function make_config($DB_TYPE, $DB_HOST, $DB_USER, $DB_NAME, $DB_PASS,
+            $DB_PORT, $SELF_URL_PATH) {
+
+        $data = explode("\n", file_get_contents("../config.php-dist"));
+
+        $rv = "";
+
+        $finished = false;
+
+        foreach ($data as $line) {
+            if (preg_match("/define\('DB_TYPE'/", $line)) {
+                $rv .= "\tdefine('DB_TYPE', '$DB_TYPE');\n";
+            } else if (preg_match("/define\('DB_HOST'/", $line)) {
+                $rv .= "\tdefine('DB_HOST', '$DB_HOST');\n";
+            } else if (preg_match("/define\('DB_USER'/", $line)) {
+                $rv .= "\tdefine('DB_USER', '$DB_USER');\n";
+            } else if (preg_match("/define\('DB_NAME'/", $line)) {
+                $rv .= "\tdefine('DB_NAME', '$DB_NAME');\n";
+            } else if (preg_match("/define\('DB_PASS'/", $line)) {
+                $rv .= "\tdefine('DB_PASS', '$DB_PASS');\n";
+            } else if (preg_match("/define\('DB_PORT'/", $line)) {
+                $rv .= "\tdefine('DB_PORT', '$DB_PORT');\n";
+            } else if (preg_match("/define\('SELF_URL_PATH'/", $line)) {
+                $rv .= "\tdefine('SELF_URL_PATH', '$SELF_URL_PATH');\n";
+            } else if (!$finished) {
+                $rv .= "$line\n";
+            }
+
+            if (preg_match("/\?\>/", $line)) {
+                $finished = true;
+            }
+        }
+
+        return $rv;
+    }
+
+    function is_server_https() {
+        return (!empty($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] != 'off')) || (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https');
+    }
+
+    function make_self_url_path() {
+        $url_path = (is_server_https() ? 'https://' :  'http://') . $_SERVER["HTTP_HOST"] . parse_url($_SERVER["REQUEST_URI"], PHP_URL_PATH);
+
+        return $url_path;
+    }
 
 ?>
 
@@ -202,32 +202,32 @@ 
 
 <?php
 
-	if (file_exists("../config.php")) {
-		require "../config.php";
+    if (file_exists("../config.php")) {
+        require "../config.php";
 
-		if (!defined('_INSTALLER_IGNORE_CONFIG_CHECK')) {
-			print_error("Error: config.php already exists in tt-rss directory; aborting.");
+        if (!defined('_INSTALLER_IGNORE_CONFIG_CHECK')) {
+            print_error("Error: config.php already exists in tt-rss directory; aborting.");
 
-			print "<form method='GET' action='../index.php'>
+            print "<form method='GET' action='../index.php'>
 				<button type='submit' dojoType='dijit.form.Button' class='alt-primary'>Return to Tiny Tiny RSS</button>
 				</form>";
-			exit;
-		}
-	}
-
-	@$op = $_REQUEST['op'];
-
-	@$DB_HOST = strip_tags($_POST['DB_HOST']);
-	@$DB_TYPE = strip_tags($_POST['DB_TYPE']);
-	@$DB_USER = strip_tags($_POST['DB_USER']);
-	@$DB_NAME = strip_tags($_POST['DB_NAME']);
-	@$DB_PASS = strip_tags($_POST['DB_PASS']);
-	@$DB_PORT = strip_tags($_POST['DB_PORT']);
-	@$SELF_URL_PATH = strip_tags($_POST['SELF_URL_PATH']);
-
-	if (!$SELF_URL_PATH) {
-		$SELF_URL_PATH = preg_replace("/\/install\/$/", "/", make_self_url_path());
-	}
+            exit;
+        }
+    }
+
+    @$op = $_REQUEST['op'];
+
+    @$DB_HOST = strip_tags($_POST['DB_HOST']);
+    @$DB_TYPE = strip_tags($_POST['DB_TYPE']);
+    @$DB_USER = strip_tags($_POST['DB_USER']);
+    @$DB_NAME = strip_tags($_POST['DB_NAME']);
+    @$DB_PASS = strip_tags($_POST['DB_PASS']);
+    @$DB_PORT = strip_tags($_POST['DB_PORT']);
+    @$SELF_URL_PATH = strip_tags($_POST['SELF_URL_PATH']);
+
+    if (!$SELF_URL_PATH) {
+        $SELF_URL_PATH = preg_replace("/\/install\/$/", "/", make_self_url_path());
+    }
 ?>
 
 <form action="" method="post">
@@ -236,9 +236,9 @@ 
 	<h2>Database settings</h2>
 
 	<?php
-		$issel_pgsql = $DB_TYPE == "pgsql" ? "selected='selected'" : "";
-		$issel_mysql = $DB_TYPE == "mysql" ? "selected='selected'" : "";
-	?>
+        $issel_pgsql = $DB_TYPE == "pgsql" ? "selected='selected'" : "";
+        $issel_mysql = $DB_TYPE == "mysql" ? "selected='selected'" : "";
+    ?>
 
 	<fieldset>
 		<label>Database type:</label>
@@ -292,87 +292,87 @@ 
 	<h2>Checking configuration</h2>
 
 	<?php
-		$errors = sanity_check($DB_TYPE);
+        $errors = sanity_check($DB_TYPE);
 
-		if (count($errors) > 0) {
-			print "<p>Some configuration tests failed. Please correct them before continuing.</p>";
+        if (count($errors) > 0) {
+            print "<p>Some configuration tests failed. Please correct them before continuing.</p>";
 
-			print "<ul>";
+            print "<ul>";
 
-			foreach ($errors as $error) {
-				print "<li style='color : red'>$error</li>";
-			}
+            foreach ($errors as $error) {
+                print "<li style='color : red'>$error</li>";
+            }
 
-			print "</ul>";
+            print "</ul>";
 
-			exit;
-		}
+            exit;
+        }
 
-		$notices = array();
+        $notices = array();
 
-		if (!function_exists("curl_init")) {
-			array_push($notices, "It is highly recommended to enable support for CURL in PHP.");
-		}
+        if (!function_exists("curl_init")) {
+            array_push($notices, "It is highly recommended to enable support for CURL in PHP.");
+        }
 
-		if (function_exists("curl_init") && ini_get("open_basedir")) {
-			array_push($notices, "CURL and open_basedir combination breaks support for HTTP redirects. See the FAQ for more information.");
-		}
+        if (function_exists("curl_init") && ini_get("open_basedir")) {
+            array_push($notices, "CURL and open_basedir combination breaks support for HTTP redirects. See the FAQ for more information.");
+        }
 
-		if (!function_exists("idn_to_ascii")) {
-			array_push($notices, "PHP support for Internationalization Functions is required to handle Internationalized Domain Names.");
-		}
+        if (!function_exists("idn_to_ascii")) {
+            array_push($notices, "PHP support for Internationalization Functions is required to handle Internationalized Domain Names.");
+        }
 
         if ($DB_TYPE == "mysql" && !function_exists("mysqli_connect")) {
             array_push($notices, "PHP extension for MySQL (mysqli) is missing. This may prevent legacy plugins from working.");
         }
 
         if ($DB_TYPE == "pgsql" && !function_exists("pg_connect")) {
-			array_push($notices, "PHP extension for PostgreSQL is missing. This may prevent legacy plugins from working.");
+            array_push($notices, "PHP extension for PostgreSQL is missing. This may prevent legacy plugins from working.");
         }
 
-		if (count($notices) > 0) {
-			print_notice("Configuration check succeeded with minor problems:");
+        if (count($notices) > 0) {
+            print_notice("Configuration check succeeded with minor problems:");
 
-			print "<ul>";
+            print "<ul>";
 
-			foreach ($notices as $notice) {
-				print "<li>$notice</li>";
-			}
+            foreach ($notices as $notice) {
+                print "<li>$notice</li>";
+            }
 
-			print "</ul>";
-		} else {
-			print_notice("Configuration check succeeded.");
-		}
+            print "</ul>";
+        } else {
+            print_notice("Configuration check succeeded.");
+        }
 
-	?>
+    ?>
 
 	<h2>Checking database</h2>
 
 	<?php
-		$pdo = pdo_connect($DB_HOST, $DB_USER, $DB_PASS, $DB_NAME, $DB_TYPE, $DB_PORT);
+        $pdo = pdo_connect($DB_HOST, $DB_USER, $DB_PASS, $DB_NAME, $DB_TYPE, $DB_PORT);
 
-		if (!$pdo) {
-			print_error("Unable to connect to database using specified parameters (driver: $DB_TYPE).");
-			exit;
-		}
+        if (!$pdo) {
+            print_error("Unable to connect to database using specified parameters (driver: $DB_TYPE).");
+            exit;
+        }
 
-		print_notice("Database test succeeded.");
-	?>
+        print_notice("Database test succeeded.");
+    ?>
 
 	<h2>Initialize database</h2>
 
 	<p>Before you can start using tt-rss, database needs to be initialized. Click on the button below to do that now.</p>
 
 	<?php
-		$res = $pdo->query("SELECT true FROM ttrss_feeds");
+        $res = $pdo->query("SELECT true FROM ttrss_feeds");
 
-		if ($res && $res->fetch()) {
-			print_error("Some tt-rss data already exists in this database. If you continue with database initialization your current data <b>WILL BE LOST</b>.");
-			$need_confirm = true;
-		} else {
-			$need_confirm = false;
-		}
-	?>
+        if ($res && $res->fetch()) {
+            print_error("Some tt-rss data already exists in this database. If you continue with database initialization your current data <b>WILL BE LOST</b>.");
+            $need_confirm = true;
+        } else {
+            $need_confirm = false;
+        }
+    ?>
 
 	<table><tr><td>
 	<form method="post">
@@ -415,44 +415,44 @@ 
 
 	<?php
 
-		} else if ($op == 'installschema' || $op == 'skipschema') {
+        } else if ($op == 'installschema' || $op == 'skipschema') {
 
-			$pdo = pdo_connect($DB_HOST, $DB_USER, $DB_PASS, $DB_NAME, $DB_TYPE, $DB_PORT);
+            $pdo = pdo_connect($DB_HOST, $DB_USER, $DB_PASS, $DB_NAME, $DB_TYPE, $DB_PORT);
 
-			if (!$pdo) {
-				print_error("Unable to connect to database using specified parameters.");
-				exit;
-			}
+            if (!$pdo) {
+                print_error("Unable to connect to database using specified parameters.");
+                exit;
+            }
 
-			if ($op == 'installschema') {
+            if ($op == 'installschema') {
 
-				print "<h2>Initializing database...</h2>";
+                print "<h2>Initializing database...</h2>";
 
-				$lines = explode(";", preg_replace("/[\r\n]/", "",
+                $lines = explode(";", preg_replace("/[\r\n]/", "",
                     file_get_contents("../schema/ttrss_schema_".basename($DB_TYPE).".sql")));
 
-				foreach ($lines as $line) {
-					if (strpos($line, "--") !== 0 && $line) {
-						$res = $pdo->query($line);
+                foreach ($lines as $line) {
+                    if (strpos($line, "--") !== 0 && $line) {
+                        $res = $pdo->query($line);
 
-						if (!$res) {
-							print_notice("Query: $line");
-							print_error("Error: " . implode(", ", $pdo->errorInfo()));
+                        if (!$res) {
+                            print_notice("Query: $line");
+                            print_error("Error: " . implode(", ", $pdo->errorInfo()));
                         }
-					}
-				}
+                    }
+                }
 
-				print_notice("Database initialization completed.");
+                print_notice("Database initialization completed.");
 
-			} else {
-				print_notice("Database initialization skipped.");
-			}
+            } else {
+                print_notice("Database initialization skipped.");
+            }
 
-			print "<h2>Generated configuration file</h2>";
+            print "<h2>Generated configuration file</h2>";
 
-			print "<p>Copy following text and save as <code>config.php</code> in tt-rss main directory. It is suggested to read through the file to the end in case you need any options changed fom default values.</p>";
+            print "<p>Copy following text and save as <code>config.php</code> in tt-rss main directory. It is suggested to read through the file to the end in case you need any options changed fom default values.</p>";
 
-			print "<p>After copying the file, you will be able to login with default username and password combination: <code>admin</code> and <code>password</code>. Don't forget to change the password immediately!</p>"; ?>
+            print "<p>After copying the file, you will be able to login with default username and password combination: <code>admin</code> and <code>password</code>. Don't forget to change the password immediately!</p>"; ?>
 
 			<form action="" method="post">
 				<input type="hidden" name="op" value="saveconfig">
@@ -464,9 +464,9 @@ 
 				<input type="hidden" name="DB_TYPE" value="<?php echo $DB_TYPE ?>"/>
 				<input type="hidden" name="SELF_URL_PATH" value="<?php echo $SELF_URL_PATH ?>"/>
 			<?php print "<textarea rows='20' style='width : 100%'>";
-			echo make_config($DB_TYPE, $DB_HOST, $DB_USER, $DB_NAME, $DB_PASS,
-				$DB_PORT, $SELF_URL_PATH);
-			print "</textarea>"; ?>
+            echo make_config($DB_TYPE, $DB_HOST, $DB_USER, $DB_NAME, $DB_PASS,
+                $DB_PORT, $SELF_URL_PATH);
+            print "</textarea>"; ?>
 
 			<hr/>
 
@@ -476,40 +476,40 @@ 
 				<p><button type="submit" dojoType='dijit.form.Button' class='alt-primary'>Save configuration</button></p>
 				</form>
 			<?php } else {
-				print_error("Unfortunately, parent directory is not writable, so we're unable to save config.php automatically.");
-			}
+                print_error("Unfortunately, parent directory is not writable, so we're unable to save config.php automatically.");
+            }
 
-		   print_notice("You can generate the file again by changing the form above.");
+            print_notice("You can generate the file again by changing the form above.");
 
-		} else if ($op == "saveconfig") {
+        } else if ($op == "saveconfig") {
 
-			print "<h2>Saving configuration file to parent directory...</h2>";
+            print "<h2>Saving configuration file to parent directory...</h2>";
 
-			if (!file_exists("../config.php")) {
+            if (!file_exists("../config.php")) {
 
-				$fp = fopen("../config.php", "w");
+                $fp = fopen("../config.php", "w");
 
-				if ($fp) {
-					$written = fwrite($fp, make_config($DB_TYPE, $DB_HOST,
-						$DB_USER, $DB_NAME, $DB_PASS,
-						$DB_PORT, $SELF_URL_PATH));
+                if ($fp) {
+                    $written = fwrite($fp, make_config($DB_TYPE, $DB_HOST,
+                        $DB_USER, $DB_NAME, $DB_PASS,
+                        $DB_PORT, $SELF_URL_PATH));
 
-					if ($written > 0) {
-						print_notice("Successfully saved config.php. You can try <a href=\"..\">loading tt-rss now</a>.");
+                    if ($written > 0) {
+                        print_notice("Successfully saved config.php. You can try <a href=\"..\">loading tt-rss now</a>.");
 
-					} else {
-						print_notice("Unable to write into config.php in tt-rss directory.");
-					}
+                    } else {
+                        print_notice("Unable to write into config.php in tt-rss directory.");
+                    }
 
-					fclose($fp);
-				} else {
-					print_error("Unable to open config.php in tt-rss directory for writing.");
-				}
-			} else {
-				print_error("config.php already present in tt-rss directory, refusing to overwrite.");
-			}
-		}
-	?>
+                    fclose($fp);
+                } else {
+                    print_error("Unable to open config.php in tt-rss directory for writing.");
+                }
+            } else {
+                print_error("config.php already present in tt-rss directory, refusing to overwrite.");
+            }
+        }
+    ?>
 
 </div>
 

Braces +3 added lines, -1 removed lines

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

opml.php

Spacing +3 added lines, -3 removed lines

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

Indentation +24 added lines, -24 removed lines

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

Braces +3 added lines, -1 removed lines

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

lib/MiniTemplator.class.php

Switch Indentation +47 added lines, -47 removed lines

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

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

    switch (strtoupper($cmd)) {

-      case '$BEGINBLOCK':

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

-            return false;

-         break;

-      case '$ENDBLOCK':

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

-            return false;

-         break;

-      case '$INCLUDE':

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

-            return false;

-         $resumeFromStart = true;

-         break;

-      default:

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

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

-            return false; }}

+   case '$BEGINBLOCK':

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

+         return false;

+      break;

+   case '$ENDBLOCK':

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

+         return false;

+      break;

+   case '$INCLUDE':

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

+         return false;

+      $resumeFromStart = true;

+      break;

+   default:

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

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

+         return false; }}

     return true; }

 

 /**

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

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

       switch ($kind) {

-         case 0:         // end of block

-            return;

-         case 1:         // variable

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

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

-               $this->programLogicError (4);

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

-            $this->writeString ($variableValue);

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

-            $varRefNo += 1;

-            break;

-         case 2:         // sub block

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

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

-               $this->programLogicError (3);

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

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

-            $subBlockNo += 1;

-            break; }}}

+      case 0:         // end of block

+         return;

+      case 1:         // variable

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

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

+            $this->programLogicError (4);

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

+         $this->writeString ($variableValue);

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

+         $varRefNo += 1;

+         break;

+      case 2:         // sub block

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

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

+            $this->programLogicError (3);

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

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

+         $subBlockNo += 1;

+         break; }}}

 

 /**

 * @access private

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

    if ($this->outputError) return;

    switch ($this->outputMode) {

-      case 0:            // output to PHP output stream

-         if (!print($s))

-            $this->outputError = true;

-         break;

-      case 1:            // output to file

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

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

-         break;

-      case 2:            // output to string

-         $this->outputString .= $s;

-         break; }}

+   case 0:            // output to PHP output stream

+      if (!print($s))

+         $this->outputError = true;

+      break;

+   case 1:            // output to file

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

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

+      break;

+   case 2:            // output to string

+      $this->outputString .= $s;

+      break; }}

 

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

 

Spacing +165 added lines, -165 removed lines

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

 */

 

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

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

-var $template;                        // Template file data

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

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

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

+var $template; // Template file data

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

     // Fields:

     //  varName                       // variable name

     //  varValue                      // variable value

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

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

-var $varRefTab;                       // variable references table

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

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

+var $varRefTab; // variable references table

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

     // Fields:

     //  varNo                         // variable no

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

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

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

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

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

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

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

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

     // Fields:

     //  blockName                     // block name

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

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

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

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

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

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

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

 var $openBlocksTab;

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

     // Indexed by the block nesting level.

-var $blockInstTab;                    // block instances table

+var $blockInstTab; // block instances table

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

     // Indexed by BlockInstNo.

     // Fields:

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

     //     Forward chain for instances of same block.

     //  blockVarTab                   // block instance variables

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

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

 

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

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

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

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

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

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

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

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

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

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

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

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

 

 /**#@-*/

 

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

 * @access public

 */

-function readTemplateFromFile ($fileName) {

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

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

+function readTemplateFromFile($fileName) {

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

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

       return false; }

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

    return true; }

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

 * @access public

 */

-function setTemplateString ($templateString) {

+function setTemplateString($templateString) {

    $this->templateValid = false;

    $this->template = $templateString;

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

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

 * @access private

 */

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

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

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

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

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

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

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

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

       return false; }

    return true; }

 

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

    $blockNo = 0;

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

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

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

    $bte['tPosBegin'] = 0;

    $bte['tPosContentsBegin'] = 0;

    $bte['nestingLevel'] = 0;

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

 */

 function endMainBlock() {

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

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

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

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

    $bte['definitionIsOpen'] = false;

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

    $p = 0;

    while (true) {

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

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

       if ($p0 === false) break;

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

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

       if ($p === false) {

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

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

          return false; }

       $p += 3;

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

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

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

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

          return false;

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

    return true; }

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

 * @access private

 */

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

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

    $resumeFromStart = false;

    $p = 0;

    $cmd = '';

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

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

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

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

    switch (strtoupper($cmd)) {

       case '$BEGINBLOCK':

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

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

             return false;

          break;

       case '$ENDBLOCK':

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

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

             return false;

          break;

       case '$INCLUDE':

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

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

             return false;

          $resumeFromStart = true;

          break;

       default:

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

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

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

             return false; }}

     return true; }

 

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

 * @access private

 */

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

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

    $p = 0;

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

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

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

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

       return false; }

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

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

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

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

       return false; }

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

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

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

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

    $btr['tPosBegin'] = $cmdTPosBegin;

    $btr['tPosContentsBegin'] = $cmdTPosEnd;

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

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

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

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

    $this->currentNestingLevel += 1;

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

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

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

       return false; }

    return true; }

 

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

 * @access private

 */

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

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

    $p = 0;

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

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

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

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

       return false; }

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

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

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

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

       return false; }

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

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

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

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

       return false; }

    $this->currentNestingLevel -= 1;

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

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

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

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

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

       return false; }

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

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

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

       return false; }

    $btr['tPosContentsEnd'] = $cmdTPosBegin;

    $btr['tPosEnd'] = $cmdTPosEnd;

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

 function registerBlock($blockName, &$blockNo) {

    $blockNo = $this->blockTabCnt++;

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

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

    $btr = array();

    $btr['blockName'] = $blockName;

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

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

       $btr['nextWithSameName'] = -1;

    $btr['definitionIsOpen'] = true;

    $btr['instances'] = 0;

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

 */

 function checkBlockDefinitionsComplete() {

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

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

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

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

       if ($btr['definitionIsOpen']) {

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

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

          return false; }}

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

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

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

       return false; }

    return true; }

 

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

 * @access private

 */

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

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

    $p = 0;

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

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

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

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

       return false; }

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

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

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

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

       return false; }

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

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

 

 /**

 * Processes the $Include command.

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

 * @access private

 */

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

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

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

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

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

       return false; }

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

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

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

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

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

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

    return true; }

 

 /**

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

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

       if ($p === false) {

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

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

          return false; }

       $p += 1;

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

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

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

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

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

          return false; }

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

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

    return true; }

 

 /**

 * @access private

 */

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

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

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

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

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

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

    $varRefNo = $this->varRefTabCnt++;

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

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

    $vrtr = array();

    $vrtr['tPosBegin'] = $tPosBegin;

    $vrtr['tPosEnd'] = $tPosEnd;

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

 * @access private

 */

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

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

    $varNo = $this->varTabCnt++;

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

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

    $vtr = array();

    $vtr['varName'] = $varName;

    $vtr['varValue'] = '';

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

    $nextBlockNo = 1;

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

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

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

       $varRefTPos = $vrtr['tPosBegin'];

       $varNo = $vrtr['varNo'];

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

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

             $nextBlockNo += 1;

             continue; }}

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

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

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

          $this->programLogicError(1);

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

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

 */

 function reset() {

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

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

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

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

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

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

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

       $btr['instances'] = 0;

       $btr['firstBlockInstNo'] = -1;

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

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

 * @access public

 */

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

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

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

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

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

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

       if ($isOptional) return true;

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

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

       return false; }

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

    return true; }

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

 * @access public

 */

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

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

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

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

 

 /**

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

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

 * @access public

 */

-function variableExists ($variableName) {

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

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

+function variableExists($variableName) {

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

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

 

 /**

 * Adds an instance of a template block.

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

 */

 function addBlock($blockName) {

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

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

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

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

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

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

       return false; }

    while ($blockNo != -1) {

       $this->addBlockByNo($blockNo);

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

 * @access private

 */

-function addBlockByNo ($blockNo) {

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

-   $this->registerBlockInstance ($blockInstNo);

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

+function addBlockByNo($blockNo) {

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

+   $this->registerBlockInstance($blockInstNo);

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

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

       $btr['firstBlockInstNo'] = $blockInstNo;

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

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

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

    // copy instance variables for this block

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

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

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

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

 

 /**

 * @access private

 */

-function registerBlockInstance (&$blockInstNo) {

+function registerBlockInstance(&$blockInstNo) {

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

 

 /**

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

 * @access public

 */

-function blockExists ($blockName) {

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

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

+function blockExists($blockName) {

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

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

 

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

 

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

 * @access public

 */

-function generateOutput () {

+function generateOutput() {

    $this->outputMode = 0;

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

    return true; }

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

 * @access public

 */

-function generateOutputToFile ($fileName) {

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

+function generateOutputToFile($fileName) {

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

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

    $this->outputMode = 1;

    $this->outputFileHandle = $fh;

    $ok = $this->generateOutputPage();

-   fclose ($fh);

+   fclose($fh);

    return $ok; }

 

 /**

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

 * @access public

 */

-function generateOutputToString (&$outputString) {

+function generateOutputToString(&$outputString) {

    $outputString = "Error";

    $this->outputMode = 2;

    $this->outputString = "";

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

 */

 function generateOutputPage() {

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

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

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

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

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

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

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

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

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

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

    $this->outputError = false;

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

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

    if ($this->outputError) return false;

    return true; }

 

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

 * @access private

 */

-function writeBlockInstances ($blockNo, $parentInstLevel) {

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

+function writeBlockInstances($blockNo, $parentInstLevel) {

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

    while (!$this->outputError) {

       $blockInstNo = $btr['currBlockInstNo'];

       if ($blockInstNo == -1) break;

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

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

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

-         $this->programLogicError (2);

+         $this->programLogicError(2);

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

-      $this->writeBlockInstance ($blockInstNo);

+      $this->writeBlockInstance($blockInstNo);

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

 

 /**

 * @access private

 */

 function writeBlockInstance($blockInstNo) {

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

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

    $blockNo = $bitr['blockNo'];

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

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

    $tPos = $btr['tPosContentsBegin'];

    $subBlockNo = $blockNo + 1;

    $varRefNo = $btr['firstVarRefNo'];

    while (!$this->outputError) {

       $tPos2 = $btr['tPosContentsEnd'];

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

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

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

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

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

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

             $varRefNo += 1;

             continue; }

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

             $kind = 1; }}

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

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

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

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

             $subBlockNo += 1;

             continue; }

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

             $kind = 2; }}

       if ($tPos2 > $tPos)

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

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

       switch ($kind) {

          case 0:         // end of block

             return;

          case 1:         // variable

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

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

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

-               $this->programLogicError (4);

+               $this->programLogicError(4);

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

-            $this->writeString ($variableValue);

+            $this->writeString($variableValue);

             $tPos = $vrtr['tPosEnd'];

             $varRefNo += 1;

             break;

          case 2:         // sub block

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

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

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

-               $this->programLogicError (3);

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

+               $this->programLogicError(3);

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

             $tPos = $subBtr['tPosEnd'];

             $subBlockNo += 1;

             break; }}}

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

 * @access private

 */

-function writeString ($s) {

+function writeString($s) {

    if ($this->outputError) return;

    switch ($this->outputMode) {

       case 0:            // output to PHP output stream

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

 * @access private

 */

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

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

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

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

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

    $varNo = $x;

    return true; }

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

 * @access private

 */

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

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

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

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

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

    $blockNo = $x;

    return true; }

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

 * @access private

 */

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

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

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

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

       $s = file_get_contents($fileName);

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

       return true; }

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

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

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

    $fileSize = filesize($fileName);

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

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

-   fclose ($fh);

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

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

+   fclose($fh);

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

    return true; }

 

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

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

 */

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

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

    $sLen = strlen($s);

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

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

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

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

 */

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

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

    $sLen = strlen($s);

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

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

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

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

    $p++; $p0 = $p;

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

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

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

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

 */

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

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

    $sLen = strlen($s);

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

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

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

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

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

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

     else

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

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

 

 /**

 * Combine two file system paths.

 * @access private

 */

-function combineFileSystemPath ($path1, $path2) {

+function combineFileSystemPath($path1, $path2) {

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

    $s = $path1;

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

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

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

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

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

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

     else

-      $s = $s . $path2;

+      $s = $s.$path2;

    return $s; }

 

 /**

 * @access private

 */

-function triggerError ($msg) {

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

+function triggerError($msg) {

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

 

 /**

 * @access private

 */

-function programLogicError ($errorId) {

+function programLogicError($errorId) {

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

 

 }

Indentation +383 added lines, -383 removed lines

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

 */

 function __construct() {

-   $this->templateValid = false; }

+    $this->templateValid = false; }

 

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

 

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

 */

 function readTemplateFromFile ($fileName) {

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

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

-      return false; }

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

-   return true; }

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

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

+        return false; }

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

+    return true; }

 

 /**

 * Assigns a new template string.

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

 */

 function setTemplateString ($templateString) {

-   $this->templateValid = false;

-   $this->template = $templateString;

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

-   $this->reset();

-   $this->templateValid = true;

-   return true; }

+    $this->templateValid = false;

+    $this->template = $templateString;

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

+    $this->reset();

+    $this->templateValid = true;

+    return true; }

 

 /**

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

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

 */

 function loadSubtemplate ($subtemplateName, &$s) {

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

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

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

-      return false; }

-   return true; }

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

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

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

+        return false; }

+    return true; }

 

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

 

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

 */

 function parseTemplate() {

-   $this->initParsing();

-   $this->beginMainBlock();

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

-   $this->endMainBlock();

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

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

-   $this->associateVariablesWithBlocks();

-   return true; }

+    $this->initParsing();

+    $this->beginMainBlock();

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

+    $this->endMainBlock();

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

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

+    $this->associateVariablesWithBlocks();

+    return true; }

 

 /**

 * @access private

 */

 function initParsing() {

-   $this->varTab = array();

-   $this->varTabCnt = 0;

-   $this->varNameToNoMap = array();

-   $this->varRefTab = array();

-   $this->varRefTabCnt = 0;

-   $this->blockTab = array();

-   $this->blockTabCnt = 0;

-   $this->blockNameToNoMap = array();

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

+    $this->varTab = array();

+    $this->varTabCnt = 0;

+    $this->varNameToNoMap = array();

+    $this->varRefTab = array();

+    $this->varRefTabCnt = 0;

+    $this->blockTab = array();

+    $this->blockTabCnt = 0;

+    $this->blockNameToNoMap = array();

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

 

 /**

 * Registers the main block.

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

 */

 function beginMainBlock() {

-   $blockNo = 0;

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

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

-   $bte['tPosBegin'] = 0;

-   $bte['tPosContentsBegin'] = 0;

-   $bte['nestingLevel'] = 0;

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

-   $bte['definitionIsOpen'] = true;

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

-   $this->currentNestingLevel = 1; }

+    $blockNo = 0;

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

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

+    $bte['tPosBegin'] = 0;

+    $bte['tPosContentsBegin'] = 0;

+    $bte['nestingLevel'] = 0;

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

+    $bte['definitionIsOpen'] = true;

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

+    $this->currentNestingLevel = 1; }

 

 /**

 * Completes the main block registration.

 * @access private

 */

 function endMainBlock() {

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

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

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

-   $bte['definitionIsOpen'] = false;

-   $this->currentNestingLevel -= 1; }

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

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

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

+    $bte['definitionIsOpen'] = false;

+    $this->currentNestingLevel -= 1; }

 

 /**

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

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

 */

 function parseTemplateCommands() {

-   $p = 0;

-   while (true) {

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

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

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

-      if ($p === false) {

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

-         return false; }

-      $p += 3;

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

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

-         return false;

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

-   return true; }

+    $p = 0;

+    while (true) {

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

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

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

+        if ($p === false) {

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

+            return false; }

+        $p += 3;

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

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

+            return false;

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

+    return true; }

 

 /**

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

 * @access private

 */

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

-   $resumeFromStart = false;

-   $p = 0;

-   $cmd = '';

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

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

-   switch (strtoupper($cmd)) {

-      case '$BEGINBLOCK':

+    $resumeFromStart = false;

+    $p = 0;

+    $cmd = '';

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

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

+    switch (strtoupper($cmd)) {

+        case '$BEGINBLOCK':

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

             return false;

-         break;

-      case '$ENDBLOCK':

+            break;

+        case '$ENDBLOCK':

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

             return false;

-         break;

-      case '$INCLUDE':

+            break;

+        case '$INCLUDE':

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

             return false;

-         $resumeFromStart = true;

-         break;

-      default:

+            $resumeFromStart = true;

+            break;

+        default:

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

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

             return false; }}

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

 */

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

-   $p = 0;

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

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

-      return false; }

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

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

-      return false; }

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

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

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

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

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

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

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

-   $this->currentNestingLevel += 1;

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

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

-      return false; }

-   return true; }

+    $p = 0;

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

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

+        return false; }

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

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

+        return false; }

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

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

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

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

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

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

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

+    $this->currentNestingLevel += 1;

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

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

+        return false; }

+    return true; }

 

 /**

 * Processes the $EndBlock command.

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

 */

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

-   $p = 0;

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

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

-      return false; }

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

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

-      return false; }

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

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

-      return false; }

-   $this->currentNestingLevel -= 1;

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

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

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

-      return false; }

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

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

-      return false; }

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

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

-   $btr['definitionIsOpen'] = false;

-   return true; }

+    $p = 0;

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

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

+        return false; }

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

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

+        return false; }

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

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

+        return false; }

+    $this->currentNestingLevel -= 1;

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

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

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

+        return false; }

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

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

+        return false; }

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

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

+    $btr['definitionIsOpen'] = false;

+    return true; }

 

 /**

 * @access private

 */

 function registerBlock($blockName, &$blockNo) {

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

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

-   $btr = array();

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

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

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

-   $btr['definitionIsOpen'] = true;

-   $btr['instances'] = 0;

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

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

-   $btr['blockVarCnt'] = 0;

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

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

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

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

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

+    $btr = array();

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

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

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

+    $btr['definitionIsOpen'] = true;

+    $btr['instances'] = 0;

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

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

+    $btr['blockVarCnt'] = 0;

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

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

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

 

 /**

 * Checks that all block definitions are closed.

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

 */

 function checkBlockDefinitionsComplete() {

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

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

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

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

-         return false; }}

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

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

-      return false; }

-   return true; }

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

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

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

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

+            return false; }}

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

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

+        return false; }

+    return true; }

 

 /**

 * Processes the $Include command.

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

 */

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

-   $p = 0;

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

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

-      return false; }

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

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

-      return false; }

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

+    $p = 0;

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

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

+        return false; }

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

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

+        return false; }

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

 

 /**

 * Processes the $Include command.

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

 */

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

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

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

-      return false; }

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

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

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

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

-   return true; }

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

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

+        return false; }

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

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

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

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

+    return true; }

 

 /**

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

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

 */

 function parseTemplateVariables() {

-   $p = 0;

-   while (true) {

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

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

-      $p0 = $p;

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

-      if ($p === false) {

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

-         return false; }

-      $p += 1;

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

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

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

-         return false; }

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

-   return true; }

+    $p = 0;

+    while (true) {

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

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

+        $p0 = $p;

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

+        if ($p === false) {

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

+            return false; }

+        $p += 1;

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

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

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

+            return false; }

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

+    return true; }

 

 /**

 * @access private

 */

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

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

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

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

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

-   $vrtr = array();

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

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

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

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

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

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

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

+    $vrtr = array();

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

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

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

 

 /**

 * @access private

 */

 function registerVariable ($varName, &$varNo) {

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

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

-   $vtr = array();

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

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

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

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

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

+    $vtr = array();

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

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

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

 

 /**

 * Associates variable references with blocks.

 * @access private

 */

 function associateVariablesWithBlocks() {

-   $varRefNo = 0;

-   $activeBlockNo = 0;

-   $nextBlockNo = 1;

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

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

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

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

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

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

-         continue; }

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

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

+    $varRefNo = 0;

+    $activeBlockNo = 0;

+    $nextBlockNo = 1;

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

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

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

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

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

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

+            continue; }

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

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

             $activeBlockNo = $nextBlockNo;

             $nextBlockNo += 1;

             continue; }}

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

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

-         $this->programLogicError(1);

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

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

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

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

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

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

-      $varRefNo += 1; }}

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

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

+            $this->programLogicError(1);

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

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

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

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

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

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

+        $varRefNo += 1; }}

 

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

 

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

 */

 function reset() {

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

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

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

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

-      $btr['instances'] = 0;

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

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

-   $this->blockInstTab = array();

-   $this->blockInstTabCnt = 0; }

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

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

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

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

+        $btr['instances'] = 0;

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

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

+    $this->blockInstTab = array();

+    $this->blockInstTabCnt = 0; }

 

 /**

 * Sets a template variable.

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

 */

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

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

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

-      if ($isOptional) return true;

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

-      return false; }

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

-   return true; }

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

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

+        if ($isOptional) return true;

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

+        return false; }

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

+    return true; }

 

 /**

 * Sets a template variable to an escaped string.

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

 */

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

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

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

 

 /**

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

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

 */

 function variableExists ($variableName) {

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

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

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

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

 

 /**

 * Adds an instance of a template block.

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

 */

 function addBlock($blockName) {

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

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

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

-      return false; }

-   while ($blockNo != -1) {

-      $this->addBlockByNo($blockNo);

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

-   return true; }

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

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

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

+        return false; }

+    while ($blockNo != -1) {

+        $this->addBlockByNo($blockNo);

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

+    return true; }

 

 /**

 * @access private

 */

 function addBlockByNo ($blockNo) {

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

-   $this->registerBlockInstance ($blockInstNo);

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

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

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

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

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

-         // set forward pointer of chain

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

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

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

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

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

-   if ($parentBlockNo == -1)

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

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

+    $this->registerBlockInstance ($blockInstNo);

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

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

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

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

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

+            // set forward pointer of chain

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

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

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

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

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

+    if ($parentBlockNo == -1)

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

     else

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

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

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

-   // copy instance variables for this block

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

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

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

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

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

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

+    // copy instance variables for this block

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

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

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

 

 /**

 * @access private

 */

 function registerBlockInstance (&$blockInstNo) {

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

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

 

 /**

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

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

 */

 function blockExists ($blockName) {

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

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

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

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

 

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

 

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

 */

 function generateOutput () {

-   $this->outputMode = 0;

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

-   return true; }

+    $this->outputMode = 0;

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

+    return true; }

 

 /**

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

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

 */

 function generateOutputToFile ($fileName) {

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

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

-   $this->outputMode = 1;

-   $this->outputFileHandle = $fh;

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

-   fclose ($fh);

-   return $ok; }

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

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

+    $this->outputMode = 1;

+    $this->outputFileHandle = $fh;

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

+    fclose ($fh);

+    return $ok; }

 

 /**

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

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

 */

 function generateOutputToString (&$outputString) {

-   $outputString = "Error";

-   $this->outputMode = 2;

-   $this->outputString = "";

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

-   $outputString = $this->outputString;

-   return true; }

+    $outputString = "Error";

+    $this->outputMode = 2;

+    $this->outputString = "";

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

+    $outputString = $this->outputString;

+    return true; }

 

 /**

 * @access private

 * @return boolean  true on success, false on error.

 */

 function generateOutputPage() {

-   if (!$this->templateValid) {$this->triggerError ("Template not valid."); return false; }

-   if ($this->blockTab[0]['instances'] == 0)

-      $this->addBlockByNo (0);        // add main block

-   for ($blockNo=0; $blockNo < $this->blockTabCnt; $blockNo++) {

-       $btr =& $this->blockTab[$blockNo];

-       $btr['currBlockInstNo'] = $btr['firstBlockInstNo']; }

-   $this->outputError = false;

-   $this->writeBlockInstances (0, -1);

-   if ($this->outputError) return false;

-   return true; }

+    if (!$this->templateValid) {$this->triggerError ("Template not valid."); return false; }

+    if ($this->blockTab[0]['instances'] == 0)

+        $this->addBlockByNo (0);        // add main block

+    for ($blockNo=0; $blockNo < $this->blockTabCnt; $blockNo++) {

+        $btr =& $this->blockTab[$blockNo];

+        $btr['currBlockInstNo'] = $btr['firstBlockInstNo']; }

+    $this->outputError = false;

+    $this->writeBlockInstances (0, -1);

+    if ($this->outputError) return false;

+    return true; }

 

 /**

 * Writes all instances of a block that are contained within a specific

@@ -722,64 +722,64 @@ 
 * @access private

 */

 function writeBlockInstances ($blockNo, $parentInstLevel) {

-   $btr =& $this->blockTab[$blockNo];

-   while (!$this->outputError) {

-      $blockInstNo = $btr['currBlockInstNo'];

-      if ($blockInstNo == -1) break;

-      $bitr =& $this->blockInstTab[$blockInstNo];

-      if ($bitr['parentInstLevel'] < $parentInstLevel)

-         $this->programLogicError (2);

-      if ($bitr['parentInstLevel'] > $parentInstLevel) break;

-      $this->writeBlockInstance ($blockInstNo);

-      $btr['currBlockInstNo'] = $bitr['nextBlockInstNo']; }}

+    $btr =& $this->blockTab[$blockNo];

+    while (!$this->outputError) {

+        $blockInstNo = $btr['currBlockInstNo'];

+        if ($blockInstNo == -1) break;

+        $bitr =& $this->blockInstTab[$blockInstNo];

+        if ($bitr['parentInstLevel'] < $parentInstLevel)

+            $this->programLogicError (2);

+        if ($bitr['parentInstLevel'] > $parentInstLevel) break;

+        $this->writeBlockInstance ($blockInstNo);

+        $btr['currBlockInstNo'] = $bitr['nextBlockInstNo']; }}

 

 /**

 * @access private

 */

 function writeBlockInstance($blockInstNo) {

-   $bitr =& $this->blockInstTab[$blockInstNo];

-   $blockNo = $bitr['blockNo'];

-   $btr =& $this->blockTab[$blockNo];

-   $tPos = $btr['tPosContentsBegin'];

-   $subBlockNo = $blockNo + 1;

-   $varRefNo = $btr['firstVarRefNo'];

-   while (!$this->outputError) {

-      $tPos2 = $btr['tPosContentsEnd'];

-      $kind = 0;                                // assume end-of-block

-      if ($varRefNo != -1 && $varRefNo < $this->varRefTabCnt) {  // check for variable reference

-         $vrtr =& $this->varRefTab[$varRefNo];

-         if ($vrtr['tPosBegin'] < $tPos) {

+    $bitr =& $this->blockInstTab[$blockInstNo];

+    $blockNo = $bitr['blockNo'];

+    $btr =& $this->blockTab[$blockNo];

+    $tPos = $btr['tPosContentsBegin'];

+    $subBlockNo = $blockNo + 1;

+    $varRefNo = $btr['firstVarRefNo'];

+    while (!$this->outputError) {

+        $tPos2 = $btr['tPosContentsEnd'];

+        $kind = 0;                                // assume end-of-block

+        if ($varRefNo != -1 && $varRefNo < $this->varRefTabCnt) {  // check for variable reference

+            $vrtr =& $this->varRefTab[$varRefNo];

+            if ($vrtr['tPosBegin'] < $tPos) {

             $varRefNo += 1;

             continue; }

-         if ($vrtr['tPosBegin'] < $tPos2) {

+            if ($vrtr['tPosBegin'] < $tPos2) {

             $tPos2 = $vrtr['tPosBegin'];

             $kind = 1; }}

-      if ($subBlockNo < $this->blockTabCnt) {   // check for subblock

-         $subBtr =& $this->blockTab[$subBlockNo];

-         if ($subBtr['tPosBegin'] < $tPos) {

+        if ($subBlockNo < $this->blockTabCnt) {   // check for subblock

+            $subBtr =& $this->blockTab[$subBlockNo];

+            if ($subBtr['tPosBegin'] < $tPos) {

             $subBlockNo += 1;

             continue; }

-         if ($subBtr['tPosBegin'] < $tPos2) {

+            if ($subBtr['tPosBegin'] < $tPos2) {

             $tPos2 = $subBtr['tPosBegin'];

             $kind = 2; }}

-      if ($tPos2 > $tPos)

-         $this->writeString (substr($this->template,$tPos,$tPos2-$tPos));

-      switch ($kind) {

-         case 0:         // end of block

+        if ($tPos2 > $tPos)

+            $this->writeString (substr($this->template,$tPos,$tPos2-$tPos));

+        switch ($kind) {

+            case 0:         // end of block

             return;

-         case 1:         // variable

+            case 1:         // variable

             $vrtr =& $this->varRefTab[$varRefNo];

             if ($vrtr['blockNo'] != $blockNo)

-               $this->programLogicError (4);

+                $this->programLogicError (4);

             $variableValue = $bitr['blockVarTab'][$vrtr['blockVarNo']];

             $this->writeString ($variableValue);

             $tPos = $vrtr['tPosEnd'];

             $varRefNo += 1;

             break;

-         case 2:         // sub block

+            case 2:         // sub block

             $subBtr =& $this->blockTab[$subBlockNo];

             if ($subBtr['parentBlockNo'] != $blockNo)

-               $this->programLogicError (3);

+                $this->programLogicError (3);

             $this->writeBlockInstances ($subBlockNo, $bitr['instanceLevel']);  // recursive call

             $tPos = $subBtr['tPosEnd'];

             $subBlockNo += 1;

@@ -789,19 +789,19 @@ 
 * @access private

 */

 function writeString ($s) {

-   if ($this->outputError) return;

-   switch ($this->outputMode) {

-      case 0:            // output to PHP output stream

+    if ($this->outputError) return;

+    switch ($this->outputMode) {

+        case 0:            // output to PHP output stream

          if (!print($s))

             $this->outputError = true;

-         break;

-      case 1:            // output to file

+            break;

+        case 1:            // output to file

          $rc = fwrite($this->outputFileHandle, $s);

-         if ($rc === false) $this->outputError = true;

-         break;

-      case 2:            // output to string

+            if ($rc === false) $this->outputError = true;

+            break;

+        case 2:            // output to string

          $this->outputString .= $s;

-         break; }}

+            break; }}

 

 //--- name lookup routines ------------------------------------------------------------------------------------------

 

@@ -811,10 +811,10 @@ 
 * @access private

 */

 function lookupVariableName ($varName, &$varNo) {

-   $x =& $this->varNameToNoMap[strtoupper($varName)];

-   if (!isset($x)) return false;

-   $varNo = $x;

-   return true; }

+    $x =& $this->varNameToNoMap[strtoupper($varName)];

+    if (!isset($x)) return false;

+    $varNo = $x;

+    return true; }

 

 /**

 * Maps block name to block number.

@@ -824,10 +824,10 @@ 
 * @access private

 */

 function lookupBlockName ($blockName, &$blockNo) {

-   $x =& $this->blockNameToNoMap[strtoupper($blockName)];

-   if (!isset($x)) return false;

-   $blockNo = $x;

-   return true; }

+    $x =& $this->blockNameToNoMap[strtoupper($blockName)];

+    if (!isset($x)) return false;

+    $blockNo = $x;

+    return true; }

 

 //--- general utility routines -----------------------------------------------------------------------------------------

 

@@ -837,86 +837,86 @@ 
 * @access private

 */

 function readFileIntoString ($fileName, &$s) {

-   if (function_exists('version_compare') && version_compare(phpversion(),"4.3.0",">=")) {

-      $s = file_get_contents($fileName);

-      if ($s === false) return false;

-      return true; }

-   $fh = fopen($fileName,"rb");

-   if ($fh === false) return false;

-   $fileSize = filesize($fileName);

-   if ($fileSize === false) {fclose ($fh); return false; }

-   $s = fread($fh,$fileSize);

-   fclose ($fh);

-   if (strlen($s) != $fileSize) return false;

-   return true; }

+    if (function_exists('version_compare') && version_compare(phpversion(),"4.3.0",">=")) {

+        $s = file_get_contents($fileName);

+        if ($s === false) return false;

+        return true; }

+    $fh = fopen($fileName,"rb");

+    if ($fh === false) return false;

+    $fileSize = filesize($fileName);

+    if ($fileSize === false) {fclose ($fh); return false; }

+    $s = fread($fh,$fileSize);

+    fclose ($fh);

+    if (strlen($s) != $fileSize) return false;

+    return true; }

 

 /**

 * @access private

 * @return boolean  true on success, false when the end of the string is reached.

 */

 function parseWord ($s, &$p, &$w) {

-   $sLen = strlen($s);

-   while ($p < $sLen && ord($s{$p}) <= 32) $p++;

-   if ($p >= $sLen) return false;

-   $p0 = $p;

-   while ($p < $sLen && ord($s{$p}) > 32) $p++;

-   $w = substr($s, $p0, $p - $p0);

-   return true; }

+    $sLen = strlen($s);

+    while ($p < $sLen && ord($s{$p}) <= 32) $p++;

+    if ($p >= $sLen) return false;

+    $p0 = $p;

+    while ($p < $sLen && ord($s{$p}) > 32) $p++;

+    $w = substr($s, $p0, $p - $p0);

+    return true; }

 

 /**

 * @access private

 * @return boolean  true on success, false on error.

 */

 function parseQuotedString ($s, &$p, &$w) {

-   $sLen = strlen($s);

-   while ($p < $sLen && ord($s{$p}) <= 32) $p++;

-   if ($p >= $sLen) return false;

-   if (substr($s,$p,1) != '"') return false;

-   $p++; $p0 = $p;

-   while ($p < $sLen && $s{$p} != '"') $p++;

-   if ($p >= $sLen) return false;

-   $w = substr($s, $p0, $p - $p0);

-   $p++;

-   return true; }

+    $sLen = strlen($s);

+    while ($p < $sLen && ord($s{$p}) <= 32) $p++;

+    if ($p >= $sLen) return false;

+    if (substr($s,$p,1) != '"') return false;

+    $p++; $p0 = $p;

+    while ($p < $sLen && $s{$p} != '"') $p++;

+    if ($p >= $sLen) return false;

+    $w = substr($s, $p0, $p - $p0);

+    $p++;

+    return true; }

 

 /**

 * @access private

 * @return boolean  true on success, false on error.

 */

 function parseWordOrQuotedString ($s, &$p, &$w) {

-   $sLen = strlen($s);

-   while ($p < $sLen && ord($s{$p}) <= 32) $p++;

-   if ($p >= $sLen) return false;

-   if (substr($s,$p,1) == '"')

-      return $this->parseQuotedString($s,$p,$w);

+    $sLen = strlen($s);

+    while ($p < $sLen && ord($s{$p}) <= 32) $p++;

+    if ($p >= $sLen) return false;

+    if (substr($s,$p,1) == '"')

+        return $this->parseQuotedString($s,$p,$w);

     else

-      return $this->parseWord($s,$p,$w); }

+        return $this->parseWord($s,$p,$w); }

 

 /**

 * Combine two file system paths.

 * @access private

 */

 function combineFileSystemPath ($path1, $path2) {

-   if ($path1 == '' || $path2 == '') return $path2;

-   $s = $path1;

-   if (substr($s,-1) != '\\' && substr($s,-1) != '/') $s = $s . "/";

-   if (substr($path2,0,1) == '\\' || substr($path2,0,1) == '/')

-      $s = $s . substr($path2,1);

+    if ($path1 == '' || $path2 == '') return $path2;

+    $s = $path1;

+    if (substr($s,-1) != '\\' && substr($s,-1) != '/') $s = $s . "/";

+    if (substr($path2,0,1) == '\\' || substr($path2,0,1) == '/')

+        $s = $s . substr($path2,1);

     else

-      $s = $s . $path2;

-   return $s; }

+        $s = $s . $path2;

+    return $s; }

 

 /**

 * @access private

 */

 function triggerError ($msg) {

-   trigger_error ("MiniTemplator error: $msg", E_USER_ERROR); }

+    trigger_error ("MiniTemplator error: $msg", E_USER_ERROR); }

 

 /**

 * @access private

 */

 function programLogicError ($errorId) {

-   die ("MiniTemplator: Program logic error $errorId.\n"); }

+    die ("MiniTemplator: Program logic error $errorId.\n"); }

 

 }

 ?>

Braces +177 added lines, -82 removed lines

@@ -175,7 +175,9 @@ 
    if (!$this->readFileIntoString($fileName,$s)) {

       $this->triggerError ("Error while reading template file " . $fileName . ".");

       return false; }

-   if (!$this->setTemplateString($s)) return false;

+   if (!$this->setTemplateString($s)) {
+       return false;
+   }
    return true; }

 

 /**

@@ -187,7 +189,9 @@ 
 function setTemplateString ($templateString) {

    $this->templateValid = false;

    $this->template = $templateString;

-   if (!$this->parseTemplate()) return false;

+   if (!$this->parseTemplate()) {
+       return false;
+   }
    $this->reset();

    $this->templateValid = true;

    return true; }

@@ -214,10 +218,16 @@ 
 function parseTemplate() {

    $this->initParsing();

    $this->beginMainBlock();

-   if (!$this->parseTemplateCommands()) return false;

+   if (!$this->parseTemplateCommands()) {
+       return false;
+   }
    $this->endMainBlock();

-   if (!$this->checkBlockDefinitionsComplete()) return false;

-   if (!$this->parseTemplateVariables()) return false;

+   if (!$this->checkBlockDefinitionsComplete()) {
+       return false;
+   }
+   if (!$this->parseTemplateVariables()) {
+       return false;
+   }
    $this->associateVariablesWithBlocks();

    return true; }

 

@@ -272,16 +282,22 @@ 
    $p = 0;

    while (true) {

       $p0 = strpos($this->template,'<!--',$p);

-      if ($p0 === false) break;

+      if ($p0 === false) {
+          break;
+      }
       $p = strpos($this->template,'-->',$p0);

       if ($p === false) {

          $this->triggerError ("Invalid HTML comment in template at offset $p0.");

          return false; }

       $p += 3;

       $cmdL = substr($this->template,$p0+4,$p-$p0-7);

-      if (!$this->processTemplateCommand($cmdL,$p0,$p,$resumeFromStart))

-         return false;

-      if ($resumeFromStart) $p = $p0; }

+      if (!$this->processTemplateCommand($cmdL,$p0,$p,$resumeFromStart)) {
+               return false;
+      }
+      if ($resumeFromStart) {
+          $p = $p0;
+      }
+      }

    return true; }

 

 /**

@@ -292,20 +308,25 @@ 
    $resumeFromStart = false;

    $p = 0;

    $cmd = '';

-   if (!$this->parseWord($cmdL,$p,$cmd)) return true;

+   if (!$this->parseWord($cmdL,$p,$cmd)) {
+       return true;
+   }
    $parms = substr($cmdL,$p);

    switch (strtoupper($cmd)) {

       case '$BEGINBLOCK':

-         if (!$this->processBeginBlockCmd($parms,$cmdTPosBegin,$cmdTPosEnd))

-            return false;

+         if (!$this->processBeginBlockCmd($parms,$cmdTPosBegin,$cmdTPosEnd)) {
+                     return false;
+         }
          break;

       case '$ENDBLOCK':

-         if (!$this->processEndBlockCmd($parms,$cmdTPosBegin,$cmdTPosEnd))

-            return false;

+         if (!$this->processEndBlockCmd($parms,$cmdTPosBegin,$cmdTPosEnd)) {
+                     return false;
+         }
          break;

       case '$INCLUDE':

-         if (!$this->processincludeCmd($parms,$cmdTPosBegin,$cmdTPosEnd))

-            return false;

+         if (!$this->processincludeCmd($parms,$cmdTPosBegin,$cmdTPosEnd)) {
+                     return false;
+         }
          $resumeFromStart = true;

          break;

       default:

@@ -377,8 +398,9 @@ 
    $btr =& $this->blockTab[$blockNo];

    $btr = array();

    $btr['blockName'] = $blockName;

-   if (!$this->lookupBlockName($blockName,$btr['nextWithSameName']))

-      $btr['nextWithSameName'] = -1;

+   if (!$this->lookupBlockName($blockName,$btr['nextWithSameName'])) {
+         $btr['nextWithSameName'] = -1;
+   }
    $btr['definitionIsOpen'] = true;

    $btr['instances'] = 0;

    $btr['firstBlockInstNo'] = -1;

@@ -428,7 +450,9 @@ 
    if (strlen($this->template) > $this->maxInclTemplateSize) {

       $this->triggerError ("Subtemplate include aborted because the internal template string is longer than $this->maxInclTemplateSize characters.");

       return false; }

-   if (!$this->loadSubtemplate($subtemplateName,$subtemplate)) return false;

+   if (!$this->loadSubtemplate($subtemplateName,$subtemplate)) {
+       return false;
+   }
    // (Copying the template to insert a subtemplate is a bit slow. In a future implementation of MiniTemplator,

    // a table could be used that contains references to the string fragments.)

    $this->template = substr($this->template,0,$tPos1) . $subtemplate . substr($this->template,$tPos2);

@@ -443,7 +467,9 @@ 
    $p = 0;

    while (true) {

       $p = strpos($this->template, '${', $p);

-      if ($p === false) break;

+      if ($p === false) {
+          break;
+      }
       $p0 = $p;

       $p = strpos($this->template, '}', $p);

       if ($p === false) {

@@ -461,8 +487,9 @@ 
 * @access private

 */

 function registerVariableReference ($varName, $tPosBegin, $tPosEnd) {

-   if (!$this->lookupVariableName($varName,$varNo))

-      $this->registerVariable($varName,$varNo);

+   if (!$this->lookupVariableName($varName,$varNo)) {
+         $this->registerVariable($varName,$varNo);
+   }
    $varRefNo = $this->varRefTabCnt++;

    $vrtr =& $this->varRefTab[$varRefNo];

    $vrtr = array();

@@ -502,12 +529,14 @@ 
             $nextBlockNo += 1;

             continue; }}

       $btr =& $this->blockTab[$activeBlockNo];

-      if ($varRefTPos < $btr['tPosBegin'])

-         $this->programLogicError(1);

+      if ($varRefTPos < $btr['tPosBegin']) {
+               $this->programLogicError(1);
+      }
       $blockVarNo = $btr['blockVarCnt']++;

       $btr['blockVarNoToVarNoMap'][$blockVarNo] = $varNo;

-      if ($btr['firstVarRefNo'] == -1)

-         $btr['firstVarRefNo'] = $varRefNo;

+      if ($btr['firstVarRefNo'] == -1) {
+               $btr['firstVarRefNo'] = $varRefNo;
+      }
       $vrtr['blockNo'] = $activeBlockNo;

       $vrtr['blockVarNo'] = $blockVarNo;

       $varRefNo += 1; }}

@@ -523,8 +552,9 @@ 
 * @access public

 */

 function reset() {

-   for ($varNo=0; $varNo<$this->varTabCnt; $varNo++)

-      $this->varTab[$varNo]['varValue'] = '';

+   for ($varNo=0; $varNo<$this->varTabCnt; $varNo++) {
+         $this->varTab[$varNo]['varValue'] = '';
+   }
    for ($blockNo=0; $blockNo<$this->blockTabCnt; $blockNo++) {

       $btr =& $this->blockTab[$blockNo];

       $btr['instances'] = 0;

@@ -551,7 +581,9 @@ 
 function setVariable ($variableName, $variableValue, $isOptional=false) {

    if (!$this->templateValid) {$this->triggerError ("Template not valid."); return false; }

    if (!$this->lookupVariableName($variableName,$varNo)) {

-      if ($isOptional) return true;

+      if ($isOptional) {
+          return true;
+      }
       $this->triggerError ("Variable \"$variableName\" not defined in template.");

       return false; }

    $this->varTab[$varNo]['varValue'] = $variableValue;

@@ -619,20 +651,23 @@ 
    $btr =& $this->blockTab[$blockNo];

    $this->registerBlockInstance ($blockInstNo);

    $bitr =& $this->blockInstTab[$blockInstNo];

-   if ($btr['firstBlockInstNo'] == -1)

-      $btr['firstBlockInstNo'] = $blockInstNo;

-   if ($btr['lastBlockInstNo'] != -1)

-      $this->blockInstTab[$btr['lastBlockInstNo']]['nextBlockInstNo'] = $blockInstNo;

+   if ($btr['firstBlockInstNo'] == -1) {
+         $btr['firstBlockInstNo'] = $blockInstNo;
+   }
+   if ($btr['lastBlockInstNo'] != -1) {
+         $this->blockInstTab[$btr['lastBlockInstNo']]['nextBlockInstNo'] = $blockInstNo;
+   }
          // set forward pointer of chain

    $btr['lastBlockInstNo'] = $blockInstNo;

    $parentBlockNo = $btr['parentBlockNo'];

    $blockVarCnt = $btr['blockVarCnt'];

    $bitr['blockNo'] = $blockNo;

    $bitr['instanceLevel'] = $btr['instances']++;

-   if ($parentBlockNo == -1)

-      $bitr['parentInstLevel'] = -1;

-    else

-      $bitr['parentInstLevel'] = $this->blockTab[$parentBlockNo]['instances'];

+   if ($parentBlockNo == -1) {
+         $bitr['parentInstLevel'] = -1;
+   } else {
+          $bitr['parentInstLevel'] = $this->blockTab[$parentBlockNo]['instances'];
+    }
    $bitr['nextBlockInstNo'] = -1;

    $bitr['blockVarTab'] = array();

    // copy instance variables for this block

@@ -666,7 +701,9 @@ 
 */

 function generateOutput () {

    $this->outputMode = 0;

-   if (!$this->generateOutputPage()) return false;

+   if (!$this->generateOutputPage()) {
+       return false;
+   }
    return true; }

 

 /**

@@ -677,7 +714,9 @@ 
 */

 function generateOutputToFile ($fileName) {

    $fh = fopen($fileName,"wb");

-   if ($fh === false) return false;

+   if ($fh === false) {
+       return false;
+   }
    $this->outputMode = 1;

    $this->outputFileHandle = $fh;

    $ok = $this->generateOutputPage();

@@ -695,7 +734,9 @@ 
    $outputString = "Error";

    $this->outputMode = 2;

    $this->outputString = "";

-   if (!$this->generateOutputPage()) return false;

+   if (!$this->generateOutputPage()) {
+       return false;
+   }
    $outputString = $this->outputString;

    return true; }

 

@@ -705,14 +746,18 @@ 
 */

 function generateOutputPage() {

    if (!$this->templateValid) {$this->triggerError ("Template not valid."); return false; }

-   if ($this->blockTab[0]['instances'] == 0)

-      $this->addBlockByNo (0);        // add main block

+   if ($this->blockTab[0]['instances'] == 0) {
+         $this->addBlockByNo (0);
+   }
+   // add main block

    for ($blockNo=0; $blockNo < $this->blockTabCnt; $blockNo++) {

        $btr =& $this->blockTab[$blockNo];

        $btr['currBlockInstNo'] = $btr['firstBlockInstNo']; }

    $this->outputError = false;

    $this->writeBlockInstances (0, -1);

-   if ($this->outputError) return false;

+   if ($this->outputError) {
+       return false;
+   }
    return true; }

 

 /**

@@ -725,11 +770,16 @@ 
    $btr =& $this->blockTab[$blockNo];

    while (!$this->outputError) {

       $blockInstNo = $btr['currBlockInstNo'];

-      if ($blockInstNo == -1) break;

+      if ($blockInstNo == -1) {
+          break;
+      }
       $bitr =& $this->blockInstTab[$blockInstNo];

-      if ($bitr['parentInstLevel'] < $parentInstLevel)

-         $this->programLogicError (2);

-      if ($bitr['parentInstLevel'] > $parentInstLevel) break;

+      if ($bitr['parentInstLevel'] < $parentInstLevel) {
+               $this->programLogicError (2);
+      }
+      if ($bitr['parentInstLevel'] > $parentInstLevel) {
+          break;
+      }
       $this->writeBlockInstance ($blockInstNo);

       $btr['currBlockInstNo'] = $bitr['nextBlockInstNo']; }}

 

@@ -762,15 +812,17 @@ 
          if ($subBtr['tPosBegin'] < $tPos2) {

             $tPos2 = $subBtr['tPosBegin'];

             $kind = 2; }}

-      if ($tPos2 > $tPos)

-         $this->writeString (substr($this->template,$tPos,$tPos2-$tPos));

+      if ($tPos2 > $tPos) {
+               $this->writeString (substr($this->template,$tPos,$tPos2-$tPos));
+      }
       switch ($kind) {

          case 0:         // end of block

             return;

          case 1:         // variable

             $vrtr =& $this->varRefTab[$varRefNo];

-            if ($vrtr['blockNo'] != $blockNo)

-               $this->programLogicError (4);

+            if ($vrtr['blockNo'] != $blockNo) {
+                           $this->programLogicError (4);
+            }
             $variableValue = $bitr['blockVarTab'][$vrtr['blockVarNo']];

             $this->writeString ($variableValue);

             $tPos = $vrtr['tPosEnd'];

@@ -778,8 +830,9 @@ 
             break;

          case 2:         // sub block

             $subBtr =& $this->blockTab[$subBlockNo];

-            if ($subBtr['parentBlockNo'] != $blockNo)

-               $this->programLogicError (3);

+            if ($subBtr['parentBlockNo'] != $blockNo) {
+                           $this->programLogicError (3);
+            }
             $this->writeBlockInstances ($subBlockNo, $bitr['instanceLevel']);  // recursive call

             $tPos = $subBtr['tPosEnd'];

             $subBlockNo += 1;

@@ -789,15 +842,20 @@ 
 * @access private

 */

 function writeString ($s) {

-   if ($this->outputError) return;

+   if ($this->outputError) {
+       return;
+   }
    switch ($this->outputMode) {

       case 0:            // output to PHP output stream

-         if (!print($s))

-            $this->outputError = true;

+         if (!print($s)) {
+                     $this->outputError = true;
+         }
          break;

       case 1:            // output to file

          $rc = fwrite($this->outputFileHandle, $s);

-         if ($rc === false) $this->outputError = true;

+         if ($rc === false) {
+             $this->outputError = true;
+         }
          break;

       case 2:            // output to string

          $this->outputString .= $s;

@@ -812,7 +870,9 @@ 
 */

 function lookupVariableName ($varName, &$varNo) {

    $x =& $this->varNameToNoMap[strtoupper($varName)];

-   if (!isset($x)) return false;

+   if (!isset($x)) {
+       return false;
+   }
    $varNo = $x;

    return true; }

 

@@ -825,7 +885,9 @@ 
 */

 function lookupBlockName ($blockName, &$blockNo) {

    $x =& $this->blockNameToNoMap[strtoupper($blockName)];

-   if (!isset($x)) return false;

+   if (!isset($x)) {
+       return false;
+   }
    $blockNo = $x;

    return true; }

 

@@ -839,15 +901,21 @@ 
 function readFileIntoString ($fileName, &$s) {

    if (function_exists('version_compare') && version_compare(phpversion(),"4.3.0",">=")) {

       $s = file_get_contents($fileName);

-      if ($s === false) return false;

+      if ($s === false) {
+          return false;
+      }
       return true; }

    $fh = fopen($fileName,"rb");

-   if ($fh === false) return false;

+   if ($fh === false) {
+       return false;
+   }
    $fileSize = filesize($fileName);

    if ($fileSize === false) {fclose ($fh); return false; }

    $s = fread($fh,$fileSize);

    fclose ($fh);

-   if (strlen($s) != $fileSize) return false;

+   if (strlen($s) != $fileSize) {
+       return false;
+   }
    return true; }

 

 /**

@@ -856,10 +924,16 @@ 
 */

 function parseWord ($s, &$p, &$w) {

    $sLen = strlen($s);

-   while ($p < $sLen && ord($s{$p}) <= 32) $p++;

-   if ($p >= $sLen) return false;

+   while ($p < $sLen && ord($s{$p}) <= 32) {
+       $p++;
+   }
+   if ($p >= $sLen) {
+       return false;
+   }
    $p0 = $p;

-   while ($p < $sLen && ord($s{$p}) > 32) $p++;

+   while ($p < $sLen && ord($s{$p}) > 32) {
+       $p++;
+   }
    $w = substr($s, $p0, $p - $p0);

    return true; }

 

@@ -869,12 +943,22 @@ 
 */

 function parseQuotedString ($s, &$p, &$w) {

    $sLen = strlen($s);

-   while ($p < $sLen && ord($s{$p}) <= 32) $p++;

-   if ($p >= $sLen) return false;

-   if (substr($s,$p,1) != '"') return false;

+   while ($p < $sLen && ord($s{$p}) <= 32) {
+       $p++;
+   }
+   if ($p >= $sLen) {
+       return false;
+   }
+   if (substr($s,$p,1) != '"') {
+       return false;
+   }
    $p++; $p0 = $p;

-   while ($p < $sLen && $s{$p} != '"') $p++;

-   if ($p >= $sLen) return false;

+   while ($p < $sLen && $s{$p} != '"') {
+       $p++;
+   }
+   if ($p >= $sLen) {
+       return false;
+   }
    $w = substr($s, $p0, $p - $p0);

    $p++;

    return true; }

@@ -885,25 +969,36 @@ 
 */

 function parseWordOrQuotedString ($s, &$p, &$w) {

    $sLen = strlen($s);

-   while ($p < $sLen && ord($s{$p}) <= 32) $p++;

-   if ($p >= $sLen) return false;

-   if (substr($s,$p,1) == '"')

-      return $this->parseQuotedString($s,$p,$w);

-    else

-      return $this->parseWord($s,$p,$w); }

+   while ($p < $sLen && ord($s{$p}) <= 32) {
+       $p++;
+   }
+   if ($p >= $sLen) {
+       return false;
+   }
+   if (substr($s,$p,1) == '"') {
+         return $this->parseQuotedString($s,$p,$w);
+   } else {
+          return $this->parseWord($s,$p,$w);
+    }
+    }

 

 /**

 * Combine two file system paths.

 * @access private

 */

 function combineFileSystemPath ($path1, $path2) {

-   if ($path1 == '' || $path2 == '') return $path2;

+   if ($path1 == '' || $path2 == '') {
+       return $path2;
+   }
    $s = $path1;

-   if (substr($s,-1) != '\\' && substr($s,-1) != '/') $s = $s . "/";

-   if (substr($path2,0,1) == '\\' || substr($path2,0,1) == '/')

-      $s = $s . substr($path2,1);

-    else

-      $s = $s . $path2;

+   if (substr($s,-1) != '\\' && substr($s,-1) != '/') {
+       $s = $s . "/";
+   }
+   if (substr($path2,0,1) == '\\' || substr($path2,0,1) == '/') {
+         $s = $s . substr($path2,1);
+   } else {
+          $s = $s . $path2;
+    }
    return $s; }

 

 /**

lib/jimIcon.php

Spacing +18 added lines, -18 removed lines

@@ -67,13 +67,13 @@ 
                         $entry = substr($ico, 6 + 16 * $i, 16);
                         if (!$entry || strlen($entry) < 16)
                                 continue;
-                        $e = unpack("Cwidth/" .
-                                    "Cheight/" .
-                                    "Ccolors/" .
-                                    "Czero/" .
-                                    "vplanes/" .
-                                    "vbpp/" .
-                                    "Vsize/" .
+                        $e = unpack("Cwidth/".
+                                    "Cheight/".
+                                    "Ccolors/".
+                                    "Czero/".
+                                    "vplanes/".
+                                    "vbpp/".
+                                    "Vsize/".
                                     "Voffset/",
                                     $entry);
                         if ($e["width"] == 0)
@@ -122,16 +122,16 @@ 
                 // directory entry.
                 $bitmapinfo = unpack("Vsize", $data);
                 if ($bitmapinfo["size"] == 40) {
-                        $info = unpack("Vsize/" .
-                                       "Vwidth/" .
-                                       "Vheight/" .
-                                       "vplanes/" .
-                                       "vbpp/" .
-                                       "Vcompress/" .
-                                       "Vsize/" .
-                                       "Vxres/" .
-                                       "Vyres/" .
-                                       "Vpalcolors/" .
+                        $info = unpack("Vsize/".
+                                       "Vwidth/".
+                                       "Vheight/".
+                                       "vplanes/".
+                                       "vbpp/".
+                                       "Vcompress/".
+                                       "Vsize/".
+                                       "Vxres/".
+                                       "Vyres/".
+                                       "Vpalcolors/".
                                        "Vimpcolors/", $data);
                         if ($e["bpp"] == 0) {
                                 $e["bpp"] = $info["bpp"];
@@ -212,7 +212,7 @@ 
                                         $pixel1 = $palette[$p >> 4];
                                         $pixel2 = $palette[$p & 0x0f];
                                         $XOR[$y][$x] = $pixel1;
-                                        $XOR[$y][$x+1] = $pixel2;
+                                        $XOR[$y][$x + 1] = $pixel2;
                                         $x += 2;
                                         $offset++;
                                 } elseif ($bpp == 8) {

Braces +21 added lines, -14 removed lines

@@ -24,13 +24,15 @@ 
                 $r = ord($str[2]);
                 if (strlen($str) > 3) {
                         $a = 127 - (ord($str[3]) / 2);
-                        if ($a != 0 && $a != 127)
-                                $this->had_alpha = 1;
+                        if ($a != 0 && $a != 127) {
+                                                        $this->had_alpha = 1;
+                        }
                 } else {
                         $a = 0;
                 }
-                if ($a != 127)
-                        $this->all_transaprent = 0;
+                if ($a != 127) {
+                                        $this->all_transaprent = 0;
+                }
                 return imagecolorallocatealpha($img, $r, $g, $b, $a);
         }
 
@@ -65,8 +67,9 @@ 
                 $most_pixels = 0;
                 for ($i = 0; $i < $h["num"]; $i++) {
                         $entry = substr($ico, 6 + 16 * $i, 16);
-                        if (!$entry || strlen($entry) < 16)
-                                continue;
+                        if (!$entry || strlen($entry) < 16) {
+                                                        continue;
+                        }
                         $e = unpack("Cwidth/" .
                                     "Cheight/" .
                                     "Ccolors/" .
@@ -76,10 +79,12 @@ 
                                     "Vsize/" .
                                     "Voffset/",
                                     $entry);
-                        if ($e["width"] == 0)
-                                $e["width"] = 256;
-                        if ($e["height"] == 0)
-                                $e["height"] = 256;
+                        if ($e["width"] == 0) {
+                                                        $e["width"] = 256;
+                        }
+                        if ($e["height"] == 0) {
+                                                        $e["height"] = 256;
+                        }
                         if ($e["zero"] != 0) {
                                 $this->error = "nonzero reserved field";
                                 return false;
@@ -226,8 +231,9 @@ 
                                 }
                         }
                         // End of row padding
-                        while ($offset & 3)
-                                $offset++;
+                        while ($offset & 3) {
+                                                        $offset++;
+                        }
                 }
 
                 // Now the "AND" image, which is 1 bit per pixel.  Ignore
@@ -261,8 +267,9 @@ 
                         }
 
                         // End of row padding
-                        while ($offset & 3)
-                                $offset++;
+                        while ($offset & 3) {
+                                                        $offset++;
+                        }
                 }
                 return $img;
         }

Indentation +13 added lines, -13 removed lines

@@ -123,16 +123,16 @@ 
                 $bitmapinfo = unpack("Vsize", $data);
                 if ($bitmapinfo["size"] == 40) {
                         $info = unpack("Vsize/" .
-                                       "Vwidth/" .
-                                       "Vheight/" .
-                                       "vplanes/" .
-                                       "vbpp/" .
-                                       "Vcompress/" .
-                                       "Vsize/" .
-                                       "Vxres/" .
-                                       "Vyres/" .
-                                       "Vpalcolors/" .
-                                       "Vimpcolors/", $data);
+                                        "Vwidth/" .
+                                        "Vheight/" .
+                                        "vplanes/" .
+                                        "vbpp/" .
+                                        "Vcompress/" .
+                                        "Vsize/" .
+                                        "Vxres/" .
+                                        "Vyres/" .
+                                        "Vpalcolors/" .
+                                        "Vimpcolors/", $data);
                         if ($e["bpp"] == 0) {
                                 $e["bpp"] = $info["bpp"];
                         }
@@ -239,7 +239,7 @@ 
                         for ($y = 0; $y < $height; $y++) {
                                 for ($x = 0; $x < $width; $x++) {
                                         imagesetpixel($img, $x, $y,
-                                                      $XOR[$y][$x]);
+                                                        $XOR[$y][$x]);
                                 }
                         }
                         return $img;
@@ -250,10 +250,10 @@ 
                         $x = 0;
                         while ($x < $width) {
                                 for ($b = 0x80;
-                                     $b > 0 && $x < $width; $b >>= 1) {
+                                        $b > 0 && $x < $width; $b >>= 1) {
                                         if (!(ord($data[$offset]) & $b)) {
                                                 imagesetpixel($img, $x, $y,
-                                                              $XOR[$y][$x]);
+                                                                $XOR[$y][$x]);
                                         }
                                         $x++;
                                 }

lib/phpqrcode/qrconst.php

Spacing +2 added lines, -2 removed lines

@@ -45,10 +45,10 @@
 	// Supported output formats

 	

 	define('QR_FORMAT_TEXT', 0);

-	define('QR_FORMAT_PNG',  1);

+	define('QR_FORMAT_PNG', 1);

 	

 	class qrstr {

 		public static function set(&$srctab, $x, $y, $repl, $replLen = false) {

-			$srctab[$y] = substr_replace($srctab[$y], ($replLen !== false)?substr($repl,0,$replLen):$repl, $x, ($replLen !== false)?$replLen:strlen($repl));

+			$srctab[$y] = substr_replace($srctab[$y], ($replLen !== false) ?substr($repl, 0, $replLen) : $repl, $x, ($replLen !== false) ? $replLen : strlen($repl));

 		}

 	}	
\ No newline at end of file

Indentation +20 added lines, -20 removed lines

@@ -26,29 +26,29 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

  */

  

-	// Encoding modes

+    // Encoding modes

 	 

-	define('QR_MODE_NUL', -1);

-	define('QR_MODE_NUM', 0);

-	define('QR_MODE_AN', 1);

-	define('QR_MODE_8', 2);

-	define('QR_MODE_KANJI', 3);

-	define('QR_MODE_STRUCTURE', 4);

+    define('QR_MODE_NUL', -1);

+    define('QR_MODE_NUM', 0);

+    define('QR_MODE_AN', 1);

+    define('QR_MODE_8', 2);

+    define('QR_MODE_KANJI', 3);

+    define('QR_MODE_STRUCTURE', 4);

 

-	// Levels of error correction.

+    // Levels of error correction.

 

-	define('QR_ECLEVEL_L', 0);

-	define('QR_ECLEVEL_M', 1);

-	define('QR_ECLEVEL_Q', 2);

-	define('QR_ECLEVEL_H', 3);

+    define('QR_ECLEVEL_L', 0);

+    define('QR_ECLEVEL_M', 1);

+    define('QR_ECLEVEL_Q', 2);

+    define('QR_ECLEVEL_H', 3);

 	

-	// Supported output formats

+    // Supported output formats

 	

-	define('QR_FORMAT_TEXT', 0);

-	define('QR_FORMAT_PNG',  1);

+    define('QR_FORMAT_TEXT', 0);

+    define('QR_FORMAT_PNG',  1);

 	

-	class qrstr {

-		public static function set(&$srctab, $x, $y, $repl, $replLen = false) {

-			$srctab[$y] = substr_replace($srctab[$y], ($replLen !== false)?substr($repl,0,$replLen):$repl, $x, ($replLen !== false)?$replLen:strlen($repl));

-		}

-	}	
\ No newline at end of file
+    class qrstr {

+        public static function set(&$srctab, $x, $y, $repl, $replLen = false) {

+            $srctab[$y] = substr_replace($srctab[$y], ($replLen !== false)?substr($repl,0,$replLen):$repl, $x, ($replLen !== false)?$replLen:strlen($repl));

+        }

+    }	
\ No newline at end of file