codysnider / tt-rss

classes/pref/feeds.php

Switch Indentation +60 added lines, -60 removed lines

@@ -1066,70 +1066,70 @@
 				$qpart = "";
 
 				switch ($k) {
-					case "title":
-						$qpart = "title = " . $this->pdo->quote($feed_title);
-						break;
-
-					case "feed_url":
-						$qpart = "feed_url = " . $this->pdo->quote($feed_url);
-						break;
-
-					case "update_interval":
-						$qpart = "update_interval = " . $this->pdo->quote($upd_intl);
-						break;
-
-					case "purge_interval":
-						$qpart = "purge_interval =" . $this->pdo->quote($purge_intl);
-						break;
-
-					case "auth_login":
-						$qpart = "auth_login = " . $this->pdo->quote($auth_login);
-						break;
-
-					case "auth_pass":
-						$qpart = "auth_pass =" . $this->pdo->quote($auth_pass). ", auth_pass_encrypted = false";
-						break;
-
-					case "private":
-						$qpart = "private = " . $this->pdo->quote($private);
-						break;
-
-					case "include_in_digest":
-						$qpart = "include_in_digest = " . $this->pdo->quote($include_in_digest);
-						break;
-
-					case "always_display_enclosures":
-						$qpart = "always_display_enclosures = " . $this->pdo->quote($always_display_enclosures);
-						break;
-
-					case "mark_unread_on_update":
-						$qpart = "mark_unread_on_update = " . $this->pdo->quote($mark_unread_on_update);
-						break;
-
-					case "cache_images":
-						$qpart = "cache_images = " . $this->pdo->quote($cache_images);
-						break;
-
-					case "hide_images":
-						$qpart = "hide_images = " . $this->pdo->quote($hide_images);
-						break;
-
-					case "cat_id":
-						if (get_pref('ENABLE_FEED_CATS')) {
-							if ($cat_id) {
-								$qpart = "cat_id = " . $this->pdo->quote($cat_id);
-							} else {
-								$qpart = 'cat_id = NULL';
-							}
+				case "title":
+					$qpart = "title = " . $this->pdo->quote($feed_title);
+					break;
+
+				case "feed_url":
+					$qpart = "feed_url = " . $this->pdo->quote($feed_url);
+					break;
+
+				case "update_interval":
+					$qpart = "update_interval = " . $this->pdo->quote($upd_intl);
+					break;
+
+				case "purge_interval":
+					$qpart = "purge_interval =" . $this->pdo->quote($purge_intl);
+					break;
+
+				case "auth_login":
+					$qpart = "auth_login = " . $this->pdo->quote($auth_login);
+					break;
+
+				case "auth_pass":
+					$qpart = "auth_pass =" . $this->pdo->quote($auth_pass). ", auth_pass_encrypted = false";
+					break;
+
+				case "private":
+					$qpart = "private = " . $this->pdo->quote($private);
+					break;
+
+				case "include_in_digest":
+					$qpart = "include_in_digest = " . $this->pdo->quote($include_in_digest);
+					break;
+
+				case "always_display_enclosures":
+					$qpart = "always_display_enclosures = " . $this->pdo->quote($always_display_enclosures);
+					break;
+
+				case "mark_unread_on_update":
+					$qpart = "mark_unread_on_update = " . $this->pdo->quote($mark_unread_on_update);
+					break;
+
+				case "cache_images":
+					$qpart = "cache_images = " . $this->pdo->quote($cache_images);
+					break;
+
+				case "hide_images":
+					$qpart = "hide_images = " . $this->pdo->quote($hide_images);
+					break;
+
+				case "cat_id":
+					if (get_pref('ENABLE_FEED_CATS')) {
+						if ($cat_id) {
+							$qpart = "cat_id = " . $this->pdo->quote($cat_id);
 						} else {
-							$qpart = "";
+							$qpart = 'cat_id = NULL';
 						}
+					} else {
+						$qpart = "";
+					}
 
-						break;
+					break;
 
-					case "feed_language":
-						$qpart = "feed_language = " . $this->pdo->quote($feed_language);
-						break;
+				case "feed_language":
+					$qpart = "feed_language = " . $this->pdo->quote($feed_language);
+					break;
 
 				}
 

Spacing +81 added lines, -81 removed lines

@@ -60,8 +60,8 @@ 
 		while ($line = $sth->fetch()) {
 
 			$cat = array();
-			$cat['id'] = 'CAT:' . $line['id'];
-			$cat['bare_id'] = (int)$line['id'];
+			$cat['id'] = 'CAT:'.$line['id'];
+			$cat['bare_id'] = (int) $line['id'];
 			$cat['name'] = $line['title'];
 			$cat['items'] = array();
 			$cat['checkbox'] = false;
@@ -93,8 +93,8 @@ 
 
 		while ($feed_line = $fsth->fetch()) {
 			$feed = array();
-			$feed['id'] = 'FEED:' . $feed_line['id'];
-			$feed['bare_id'] = (int)$feed_line['id'];
+			$feed['id'] = 'FEED:'.$feed_line['id'];
+			$feed['bare_id'] = (int) $feed_line['id'];
 			$feed['auxcounter'] = -1;
 			$feed['name'] = $feed_line['title'];
 			$feed['checkbox'] = false;
@@ -103,7 +103,7 @@ 
 			$feed['icon'] = Feeds::getFeedIcon($feed_line['id']);
 			$feed['param'] = make_local_datetime(
 				$feed_line['last_updated'], true);
-			$feed['updates_disabled'] = (int)($feed_line['update_interval'] < 0);
+			$feed['updates_disabled'] = (int) ($feed_line['update_interval'] < 0);
 
 			array_push($items, $feed);
 		}
@@ -151,8 +151,8 @@ 
 					$feed_id = PluginHost::pfeed_to_feed_id($feed['id']);
 
 					$item = array();
-					$item['id'] = 'FEED:' . $feed_id;
-					$item['bare_id'] = (int)$feed_id;
+					$item['id'] = 'FEED:'.$feed_id;
+					$item['bare_id'] = (int) $feed_id;
 					$item['auxcounter'] = -1;
 					$item['name'] = $feed['title'];
 					$item['checkbox'] = false;
@@ -216,8 +216,8 @@ 
 
 			while ($line = $sth->fetch()) {
 				$cat = array();
-				$cat['id'] = 'CAT:' . $line['id'];
-				$cat['bare_id'] = (int)$line['id'];
+				$cat['id'] = 'CAT:'.$line['id'];
+				$cat['bare_id'] = (int) $line['id'];
 				$cat['auxcounter'] = -1;
 				$cat['name'] = $line['title'];
 				$cat['items'] = array();
@@ -261,8 +261,8 @@ 
 
 			while ($feed_line = $fsth->fetch()) {
 				$feed = array();
-				$feed['id'] = 'FEED:' . $feed_line['id'];
-				$feed['bare_id'] = (int)$feed_line['id'];
+				$feed['id'] = 'FEED:'.$feed_line['id'];
+				$feed['bare_id'] = (int) $feed_line['id'];
 				$feed['auxcounter'] = -1;
 				$feed['name'] = $feed_line['title'];
 				$feed['checkbox'] = false;
@@ -272,7 +272,7 @@ 
 					$feed_line['last_updated'], true);
 				$feed['unread'] = -1;
 				$feed['type'] = 'feed';
-				$feed['updates_disabled'] = (int)($feed_line['update_interval'] < 0);
+				$feed['updates_disabled'] = (int) ($feed_line['update_interval'] < 0);
 
 				array_push($cat['items'], $feed);
 			}
@@ -296,8 +296,8 @@ 
 
 			while ($feed_line = $fsth->fetch()) {
 				$feed = array();
-				$feed['id'] = 'FEED:' . $feed_line['id'];
-				$feed['bare_id'] = (int)$feed_line['id'];
+				$feed['id'] = 'FEED:'.$feed_line['id'];
+				$feed['bare_id'] = (int) $feed_line['id'];
 				$feed['auxcounter'] = -1;
 				$feed['name'] = $feed_line['title'];
 				$feed['checkbox'] = false;
@@ -307,7 +307,7 @@ 
 					$feed_line['last_updated'], true);
 				$feed['unread'] = -1;
 				$feed['type'] = 'feed';
-				$feed['updates_disabled'] = (int)($feed_line['update_interval'] < 0);
+				$feed['updates_disabled'] = (int) ($feed_line['update_interval'] < 0);
 
 				array_push($root['items'], $feed);
 			}
@@ -348,11 +348,11 @@ 
 
 		Debug::log("$prefix C: $item_id P: $parent_id");
 
-		$bare_item_id = substr($item_id, strpos($item_id, ':')+1);
+		$bare_item_id = substr($item_id, strpos($item_id, ':') + 1);
 
 		if ($item_id != 'root') {
 			if ($parent_id && $parent_id != 'root') {
-				$parent_bare_id = substr($parent_id, strpos($parent_id, ':')+1);
+				$parent_bare_id = substr($parent_id, strpos($parent_id, ':') + 1);
 				$parent_qpart = $parent_bare_id;
 			} else {
 				$parent_qpart = null;
@@ -371,7 +371,7 @@ 
 		if ($cat && is_array($cat)) {
 			foreach ($cat as $item) {
 				$id = $item['_reference'];
-				$bare_id = substr($id, strpos($id, ':')+1);
+				$bare_id = substr($id, strpos($id, ':') + 1);
 
 				Debug::log("$prefix [$order_id] $id/$bare_id");
 
@@ -389,7 +389,7 @@ 
 
 					} else if (strpos($id, "CAT:") === 0) {
 						$this->process_category_order($data_map, $item['_reference'], $item_id,
-							$nest_level+1);
+							$nest_level + 1);
 
 						$sth = $this->pdo->prepare("UPDATE ttrss_feed_categories
 								SET order_id = ? WHERE id = ? AND
@@ -446,7 +446,7 @@ 
 		$sth->execute([$feed_id, $_SESSION['uid']]);
 
 		if ($sth->fetch()) {
-			@unlink(ICONS_DIR . "/$feed_id.ico");
+			@unlink(ICONS_DIR."/$feed_id.ico");
 
 			$sth = $this->pdo->prepare("UPDATE ttrss_feeds SET favicon_avg_color = NULL where id = ?");
 			$sth->execute([$feed_id]);
@@ -457,7 +457,7 @@ 
 		header("Content-type: text/html");
 
 		if (is_uploaded_file($_FILES['icon_file']['tmp_name'])) {
-			$tmp_file = tempnam(CACHE_DIR . '/upload', 'icon');
+			$tmp_file = tempnam(CACHE_DIR.'/upload', 'icon');
 
 			$result = move_uploaded_file($_FILES['icon_file']['tmp_name'],
 				$tmp_file);
@@ -480,8 +480,8 @@ 
 				$sth->execute([$feed_id, $_SESSION['uid']]);
 
 				if ($sth->fetch()) {
-					@unlink(ICONS_DIR . "/$feed_id.ico");
-					if (rename($icon_file, ICONS_DIR . "/$feed_id.ico")) {
+					@unlink(ICONS_DIR."/$feed_id.ico");
+					if (rename($icon_file, ICONS_DIR."/$feed_id.ico")) {
 
 						$sth = $this->pdo->prepare("UPDATE ttrss_feeds SET favicon_avg_color = '' WHERE id = ?");
 						$sth->execute([$feed_id]);
@@ -540,7 +540,7 @@ 
 
 			print "<fieldset>";
 
-			print "<label>" . __('URL:') . "</label> ";
+			print "<label>".__('URL:')."</label> ";
 			print "<input dojoType='dijit.form.ValidationTextBox' required='1'
 				placeHolder=\"".__("Feed URL")."\"
 				regExp='^(http|https)://.*' style='width : 300px'
@@ -563,7 +563,7 @@ 
 
 				print "<fieldset>";
 
-				print "<label>" . __('Place in category:') . "</label> ";
+				print "<label>".__('Place in category:')."</label> ";
 
 				print_feed_cat_select("cat_id", $cat_id,
 					'dojoType="fox.form.Select"');
@@ -577,7 +577,7 @@ 
 
 			print "<fieldset>";
 
-			print "<label>" . __('Site URL:') . "</label> ";
+			print "<label>".__('Site URL:')."</label> ";
 			print "<input dojoType='dijit.form.ValidationTextBox' required='1'
 				placeHolder=\"".__("Site URL")."\"
 				regExp='^(http|https)://.*' style='width : 300px'
@@ -595,7 +595,7 @@ 
 
 				print "<fieldset>";
 
-				print "<label>" . __('Language:') . "</label> ";
+				print "<label>".__('Language:')."</label> ";
 				print_select("feed_language", $feed_language, $this::get_ts_languages(),
 					'dojoType="fox.form.Select"');
 
@@ -626,10 +626,10 @@ 
 
 			print "<fieldset>";
 
-			print "<label>" . __('Article purging:') . "</label> ";
+			print "<label>".__('Article purging:')."</label> ";
 
 			print_select_hash("purge_interval", $purge_interval, $purge_intervals,
-				'dojoType="fox.form.Select" ' .
+				'dojoType="fox.form.Select" '.
 				((FORCE_ARTICLE_PURGE == 0) ? "" : 'disabled="1"'));
 
 			print "</fieldset>";
@@ -736,7 +736,7 @@ 
 			print "<fieldset class='narrow'>";
 
 			print "<label class='checkbox'><input dojoType='dijit.form.CheckBox' type='checkbox' id='cache_images'
-				name='cache_images' $checked> ". __('Cache media')."</label>";
+				name='cache_images' $checked> ".__('Cache media')."</label>";
 
 			print "</fieldset>";
 
@@ -818,7 +818,7 @@ 
 
 			print "<fieldset>";
 
-			print "<label>" . __('Place in category:') . "</label> ";
+			print "<label>".__('Place in category:')."</label> ";
 
 			print_feed_cat_select("cat_id", false,
 				'disabled="1" dojoType="fox.form.Select"');
@@ -833,7 +833,7 @@ 
 		if (DB_TYPE == "pgsql") {
 			print "<fieldset>";
 
-			print "<label>" . __('Language:') . "</label> ";
+			print "<label>".__('Language:')."</label> ";
 			print_select("feed_language", "", $this::get_ts_languages(),
 				'disabled="1" dojoType="fox.form.Select"');
 
@@ -866,7 +866,7 @@ 
 
 			print "<fieldset>";
 
-			print "<label>" . __('Article purging:') . "</label> ";
+			print "<label>".__('Article purging:')."</label> ";
 
 			print_select_hash("purge_interval", "", $purge_intervals,
 				'disabled="1" dojoType="fox.form.Select"');
@@ -1026,12 +1026,12 @@ 
 					":purge_intl" => $purge_intl,
 					":auth_login" => $auth_login,
 					":auth_pass" => $auth_pass,
-					":private" => (int)$private,
-					":cache_images" => (int)$cache_images,
-					":hide_images" => (int)$hide_images,
-					":include_in_digest" => (int)$include_in_digest,
-					":always_display_enclosures" => (int)$always_display_enclosures,
-					":mark_unread_on_update" => (int)$mark_unread_on_update,
+					":private" => (int) $private,
+					":cache_images" => (int) $cache_images,
+					":hide_images" => (int) $hide_images,
+					":include_in_digest" => (int) $include_in_digest,
+					":always_display_enclosures" => (int) $always_display_enclosures,
+					":mark_unread_on_update" => (int) $mark_unread_on_update,
 					":feed_language" => $feed_language,
 					":id" => $feed_id,
 					":uid" => $_SESSION['uid']]);
@@ -1062,57 +1062,57 @@ 
 
 				switch ($k) {
 					case "title":
-						$qpart = "title = " . $this->pdo->quote($feed_title);
+						$qpart = "title = ".$this->pdo->quote($feed_title);
 						break;
 
 					case "feed_url":
-						$qpart = "feed_url = " . $this->pdo->quote($feed_url);
+						$qpart = "feed_url = ".$this->pdo->quote($feed_url);
 						break;
 
 					case "update_interval":
-						$qpart = "update_interval = " . $this->pdo->quote($upd_intl);
+						$qpart = "update_interval = ".$this->pdo->quote($upd_intl);
 						break;
 
 					case "purge_interval":
-						$qpart = "purge_interval =" . $this->pdo->quote($purge_intl);
+						$qpart = "purge_interval =".$this->pdo->quote($purge_intl);
 						break;
 
 					case "auth_login":
-						$qpart = "auth_login = " . $this->pdo->quote($auth_login);
+						$qpart = "auth_login = ".$this->pdo->quote($auth_login);
 						break;
 
 					case "auth_pass":
-						$qpart = "auth_pass =" . $this->pdo->quote($auth_pass). ", auth_pass_encrypted = false";
+						$qpart = "auth_pass =".$this->pdo->quote($auth_pass).", auth_pass_encrypted = false";
 						break;
 
 					case "private":
-						$qpart = "private = " . $this->pdo->quote($private);
+						$qpart = "private = ".$this->pdo->quote($private);
 						break;
 
 					case "include_in_digest":
-						$qpart = "include_in_digest = " . $this->pdo->quote($include_in_digest);
+						$qpart = "include_in_digest = ".$this->pdo->quote($include_in_digest);
 						break;
 
 					case "always_display_enclosures":
-						$qpart = "always_display_enclosures = " . $this->pdo->quote($always_display_enclosures);
+						$qpart = "always_display_enclosures = ".$this->pdo->quote($always_display_enclosures);
 						break;
 
 					case "mark_unread_on_update":
-						$qpart = "mark_unread_on_update = " . $this->pdo->quote($mark_unread_on_update);
+						$qpart = "mark_unread_on_update = ".$this->pdo->quote($mark_unread_on_update);
 						break;
 
 					case "cache_images":
-						$qpart = "cache_images = " . $this->pdo->quote($cache_images);
+						$qpart = "cache_images = ".$this->pdo->quote($cache_images);
 						break;
 
 					case "hide_images":
-						$qpart = "hide_images = " . $this->pdo->quote($hide_images);
+						$qpart = "hide_images = ".$this->pdo->quote($hide_images);
 						break;
 
 					case "cat_id":
 						if (get_pref('ENABLE_FEED_CATS')) {
 							if ($cat_id) {
-								$qpart = "cat_id = " . $this->pdo->quote($cat_id);
+								$qpart = "cat_id = ".$this->pdo->quote($cat_id);
 							} else {
 								$qpart = 'cat_id = NULL';
 							}
@@ -1123,7 +1123,7 @@ 
 						break;
 
 					case "feed_language":
-						$qpart = "feed_language = " . $this->pdo->quote($feed_language);
+						$qpart = "feed_language = ".$this->pdo->quote($feed_language);
 						break;
 
 				}
@@ -1184,14 +1184,14 @@ 
 
 			$error_button = "<button dojoType=\"dijit.form.Button\"
 			  		onclick=\"CommonDialogs.showFeedsWithErrors()\" id=\"errorButton\">" .
-				__("Feeds with errors") . "</button>";
+				__("Feeds with errors")."</button>";
 		}
 
 		$inactive_button = "<button dojoType=\"dijit.form.Button\"
 				id=\"pref_feeds_inactive_btn\"
 				style=\"display : none\"
 				onclick=\"dijit.byId('feedTree').showInactiveFeeds()\">" .
-				__("Inactive feeds") . "</button>";
+				__("Inactive feeds")."</button>";
 
 		$feed_search = clean($_REQUEST["search"]);
 
@@ -1213,7 +1213,7 @@ 
 			</div>";
 
 		print "<div dojoType=\"fox.form.DropDownButton\">".
-				"<span>" . __('Select')."</span>";
+				"<span>".__('Select')."</span>";
 		print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
 		print "<div onclick=\"dijit.byId('feedTree').model.setAllChecked(true)\"
 			dojoType=\"dijit.MenuItem\">".__('All')."</div>";
@@ -1222,7 +1222,7 @@ 
 		print "</div></div>";
 
 		print "<div dojoType=\"fox.form.DropDownButton\">".
-				"<span>" . __('Feeds')."</span>";
+				"<span>".__('Feeds')."</span>";
 		print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
 		print "<div onclick=\"CommonDialogs.quickAddFeed()\"
 			dojoType=\"dijit.MenuItem\">".__('Subscribe to feed')."</div>";
@@ -1238,7 +1238,7 @@ 
 
 		if (get_pref('ENABLE_FEED_CATS')) {
 			print "<div dojoType=\"fox.form.DropDownButton\">".
-					"<span>" . __('Categories')."</span>";
+					"<span>".__('Categories')."</span>";
 			print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
 			print "<div onclick=\"dijit.byId('feedTree').createCategory()\"
 				dojoType=\"dijit.MenuItem\">".__('Add category')."</div>";
@@ -1305,7 +1305,7 @@ 
 		print "<div dojoType='dijit.layout.AccordionPane'
 			title='<i class=\"material-icons\">import_export</i> ".__('OPML')."'>";
 
-		print "<h3>" . __("Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings.") . "</h3>";
+		print "<h3>".__("Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings.")."</h3>";
 
 		print_notice("Only main settings profile can be migrated using OPML.");
 
@@ -1322,7 +1322,7 @@ 
 			<input type='hidden' name='op' value='dlg'>
 			<input type='hidden' name='method' value='importOpml'>
 			<button dojoType='dijit.form.Button' class='alt-primary' onclick=\"return Helpers.OPML.import();\" type=\"submit\">" .
-			__('Import OPML') . "</button>";
+			__('Import OPML')."</button>";
 
 		print "</form>";
 
@@ -1330,22 +1330,22 @@ 
 
 		print "<button dojoType='dijit.form.Button'
 			onclick='Helpers.OPML.export()' >" .
-			__('Export OPML') . "</button>";
+			__('Export OPML')."</button>";
 
 		print " <label class='checkbox'>";
 		print_checkbox("include_settings", true, "1", "");
-		print " " . __("Include settings");
+		print " ".__("Include settings");
 		print "</label>";
 
 		print "</form>";
 
 		print "<p/>";
 
-		print "<h2>" . __("Published OPML") . "</h2>";
+		print "<h2>".__("Published OPML")."</h2>";
 
-		print "<p>" . __('Your OPML can be published publicly and can be subscribed by anyone who knows the URL below.') .
-			" " .
-			__("Published OPML does not include your Tiny Tiny RSS settings, feeds that require authentication or feeds hidden from Popular feeds.") . "</p>";
+		print "<p>".__('Your OPML can be published publicly and can be subscribed by anyone who knows the URL below.').
+			" ".
+			__("Published OPML does not include your Tiny Tiny RSS settings, feeds that require authentication or feeds hidden from Popular feeds.")."</p>";
 
 		print "<button dojoType='dijit.form.Button' class='alt-primary' onclick=\"return App.displayDlg('".__("Public OPML URL")."','pubOPMLUrl')\">".
 			__('Display published OPML URL')."</button> ";
@@ -1358,10 +1358,10 @@ 
 		print "<div dojoType=\"dijit.layout.AccordionPane\"
 			title=\"<i class='material-icons'>share</i> ".__('Published & shared articles / Generated feeds')."\">";
 
-		print "<h3>" . __('Published articles can be subscribed by anyone who knows the following URL:') . "</h3>";
+		print "<h3>".__('Published articles can be subscribed by anyone who knows the following URL:')."</h3>";
 
-		$rss_url = '-2::' . htmlspecialchars(get_self_url_prefix() .
-				"/public.php?op=rss&id=-2&view-mode=all_articles");;
+		$rss_url = '-2::'.htmlspecialchars(get_self_url_prefix().
+				"/public.php?op=rss&id=-2&view-mode=all_articles"); ;
 
 		print "<button dojoType='dijit.form.Button' class='alt-primary' onclick=\"return App.displayDlg('".__("Show as feed")."','generatedFeed', '$rss_url')\">".
 			__('Display URL')."</button> ";
@@ -1390,7 +1390,7 @@ 
 			$cat_unread = Feeds::getCategoryUnread($cat_id);
 		}
 
-		$obj['id'] = 'CAT:' . $cat_id;
+		$obj['id'] = 'CAT:'.$cat_id;
 		$obj['items'] = array();
 		$obj['name'] = Feeds::getCategoryTitle($cat_id);
 		$obj['type'] = 'category';
@@ -1410,7 +1410,7 @@ 
 		if ($unread === false)
 			$unread = getFeedUnread($feed_id, false);
 
-		$obj['id'] = 'FEED:' . $feed_id;
+		$obj['id'] = 'FEED:'.$feed_id;
 		$obj['name'] = $title;
 		$obj['unread'] = (int) $unread;
 		$obj['type'] = 'feed';
@@ -1446,7 +1446,7 @@ 
 
 		print "<div dojoType='fox.Toolbar'>";
 		print "<div dojoType='fox.form.DropDownButton'>".
-				"<span>" . __('Select')."</span>";
+				"<span>".__('Select')."</span>";
 		print "<div dojoType='dijit.Menu' style='display: none'>";
 		print "<div onclick=\"Tables.select('inactive-feeds-list', true)\"
 			dojoType='dijit.MenuItem'>".__('All')."</div>";
@@ -1503,7 +1503,7 @@ 
 
 		print "<div dojoType=\"fox.Toolbar\">";
 		print "<div dojoType=\"fox.form.DropDownButton\">".
-				"<span>" . __('Select')."</span>";
+				"<span>".__('Select')."</span>";
 		print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
 		print "<div onclick=\"Tables.select('error-feeds-list', true)\"
 			dojoType=\"dijit.MenuItem\">".__('All')."</div>";
@@ -1567,7 +1567,7 @@ 
 
 	public static function remove_feed($id, $owner_uid) {
 		foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_UNSUBSCRIBE_FEED) as $p) {
-			if (! $p->hook_unsubscribe_feed($id, $owner_uid)) {
+			if (!$p->hook_unsubscribe_feed($id, $owner_uid)) {
                 user_error("Feed $id (owner: $owner_uid) not removed due to plugin error (HOOK_UNSUBSCRIBE_FEED).", E_USER_WARNING);
                 return;
 			}
@@ -1599,7 +1599,7 @@ 
 					$res = $pdo->query("SELECT MAX(id) AS id FROM ttrss_archived_feeds");
 					$row = $res->fetch();
 
-					$new_feed_id = (int)$row['id'] + 1;
+					$new_feed_id = (int) $row['id'] + 1;
 
 					$sth = $pdo->prepare("INSERT INTO ttrss_archived_feeds
 						(id, owner_uid, title, feed_url, site_url, created)
@@ -1631,8 +1631,8 @@ 
 
 			$pdo->commit();
 
-			if (file_exists(ICONS_DIR . "/$id.ico")) {
-				unlink(ICONS_DIR . "/$id.ico");
+			if (file_exists(ICONS_DIR."/$id.ico")) {
+				unlink(ICONS_DIR."/$id.ico");
 			}
 
 			CCache::remove($id, $owner_uid);
@@ -1656,7 +1656,7 @@ 
 
 		if (get_pref('ENABLE_FEED_CATS')) {
 			print "<fieldset>";
-			print "<label>" . __('Place in category:') . "</label> ";
+			print "<label>".__('Place in category:')."</label> ";
 			print_feed_cat_select("cat", false, 'dojoType="fox.form.Select"');
 			print "</fieldset>";
 		}
@@ -1665,7 +1665,7 @@ 
 
 		print "<div id='feedDlg_loginContainer' style='display : none'>";
 
-		print "<header>" . __("Authentication") . "</header>";
+		print "<header>".__("Authentication")."</header>";
 		print "<section>";
 
 		print "<input dojoType='dijit.form.TextBox' name='login' placeHolder=\"".__("Login")."\">
@@ -1784,12 +1784,12 @@ 
 		$sth->execute([$_SESSION['uid']]);
 
 		if ($row = $sth->fetch()) {
-			print (int)$row["num_inactive"];
+			print (int) $row["num_inactive"];
 		}
 	}
 
 	public static function subscribe_to_feed_url() {
-		$url_path = get_self_url_prefix() .
+		$url_path = get_self_url_prefix().
 			"/public.php?op=subscribe&feed_url=%s";
 		return $url_path;
 	}

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

@@ -1568,7 +1568,7 @@
 	public static function remove_feed($id, $owner_uid) {
 		foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_UNSUBSCRIBE_FEED) as $p) {
 			if (! $p->hook_unsubscribe_feed($id, $owner_uid)) {
-                user_error("Feed $id (owner: $owner_uid) not removed due to plugin error (HOOK_UNSUBSCRIBE_FEED).", E_USER_WARNING);
+                user_error("feed $id (owner: $owner_uid) not removed due to plugin error (HOOK_UNSUBSCRIBE_FEED).", E_USER_WARNING);
                 return;
 			}
 		}

Indentation +1153 added lines, -1153 removed lines

@@ -1,87 +1,87 @@ 
 <?php
 class Pref_Feeds extends Handler_Protected {
-	public function csrf_ignore($method) {
-		$csrf_ignored = array("index", "getfeedtree", "add", "editcats", "editfeed",
-			"savefeedorder", "uploadicon", "feedswitherrors", "inactivefeeds",
-			"batchsubscribe");
+    public function csrf_ignore($method) {
+        $csrf_ignored = array("index", "getfeedtree", "add", "editcats", "editfeed",
+            "savefeedorder", "uploadicon", "feedswitherrors", "inactivefeeds",
+            "batchsubscribe");
 
-		return array_search($method, $csrf_ignored) !== false;
-	}
+        return array_search($method, $csrf_ignored) !== false;
+    }
 
-	public static function get_ts_languages() {
-		$rv = [];
+    public static function get_ts_languages() {
+        $rv = [];
 
-		if (DB_TYPE == "pgsql") {
-			$dbh = Db::pdo();
+        if (DB_TYPE == "pgsql") {
+            $dbh = Db::pdo();
 
-			$res = $dbh->query("SELECT cfgname FROM pg_ts_config");
+            $res = $dbh->query("SELECT cfgname FROM pg_ts_config");
 
-			while ($row = $res->fetch()) {
-				array_push($rv, ucfirst($row['cfgname']));
-			}
-		}
+            while ($row = $res->fetch()) {
+                array_push($rv, ucfirst($row['cfgname']));
+            }
+        }
 
-		return $rv;
-	}
+        return $rv;
+    }
 
-	public function batch_edit_cbox($elem, $label = false) {
-		print "<input type=\"checkbox\" title=\"".__("Check to enable field")."\"
+    public function batch_edit_cbox($elem, $label = false) {
+        print "<input type=\"checkbox\" title=\"".__("Check to enable field")."\"
 			onchange=\"dijit.byId('feedEditDlg').toggleField(this, '$elem', '$label')\">";
-	}
+    }
 
-	public function renamecat() {
-		$title = clean($_REQUEST['title']);
-		$id = clean($_REQUEST['id']);
+    public function renamecat() {
+        $title = clean($_REQUEST['title']);
+        $id = clean($_REQUEST['id']);
 
-		if ($title) {
-			$sth = $this->pdo->prepare("UPDATE ttrss_feed_categories SET
+        if ($title) {
+            $sth = $this->pdo->prepare("UPDATE ttrss_feed_categories SET
 				title = ? WHERE id = ? AND owner_uid = ?");
-			$sth->execute([$title, $id, $_SESSION['uid']]);
-		}
-	}
+            $sth->execute([$title, $id, $_SESSION['uid']]);
+        }
+    }
 
-	private function get_category_items($cat_id) {
+    private function get_category_items($cat_id) {
 
-		if (clean($_REQUEST['mode']) != 2)
-			$search = $_SESSION["prefs_feed_search"];
-		else
-			$search = "";
+        if (clean($_REQUEST['mode']) != 2)
+            $search = $_SESSION["prefs_feed_search"];
+        else
+            $search = "";
 
-		// first one is set by API
-		$show_empty_cats = clean($_REQUEST['force_show_empty']) ||
-			(clean($_REQUEST['mode']) != 2 && !$search);
+        // first one is set by API
+        $show_empty_cats = clean($_REQUEST['force_show_empty']) ||
+            (clean($_REQUEST['mode']) != 2 && !$search);
 
-		$items = array();
+        $items = array();
 
-		$sth = $this->pdo->prepare("SELECT id, title FROM ttrss_feed_categories
+        $sth = $this->pdo->prepare("SELECT id, title FROM ttrss_feed_categories
 				WHERE owner_uid = ? AND parent_cat = ? ORDER BY order_id, title");
-		$sth->execute([$_SESSION['uid'], $cat_id]);
+        $sth->execute([$_SESSION['uid'], $cat_id]);
 
-		while ($line = $sth->fetch()) {
+        while ($line = $sth->fetch()) {
 
-			$cat = array();
-			$cat['id'] = 'CAT:' . $line['id'];
-			$cat['bare_id'] = (int)$line['id'];
-			$cat['name'] = $line['title'];
-			$cat['items'] = array();
-			$cat['checkbox'] = false;
-			$cat['type'] = 'category';
-			$cat['unread'] = -1;
-			$cat['child_unread'] = -1;
-			$cat['auxcounter'] = -1;
-			$cat['parent_id'] = $cat_id;
+            $cat = array();
+            $cat['id'] = 'CAT:' . $line['id'];
+            $cat['bare_id'] = (int)$line['id'];
+            $cat['name'] = $line['title'];
+            $cat['items'] = array();
+            $cat['checkbox'] = false;
+            $cat['type'] = 'category';
+            $cat['unread'] = -1;
+            $cat['child_unread'] = -1;
+            $cat['auxcounter'] = -1;
+            $cat['parent_id'] = $cat_id;
 
-			$cat['items'] = $this->get_category_items($line['id']);
+            $cat['items'] = $this->get_category_items($line['id']);
 
-			$num_children = $this->calculate_children_count($cat);
-			$cat['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', (int) $num_children), $num_children);
+            $num_children = $this->calculate_children_count($cat);
+            $cat['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', (int) $num_children), $num_children);
 
-			if ($num_children > 0 || $show_empty_cats)
-				array_push($items, $cat);
+            if ($num_children > 0 || $show_empty_cats)
+                array_push($items, $cat);
 
-		}
+        }
 
-		$fsth = $this->pdo->prepare("SELECT id, title, last_error,
+        $fsth = $this->pdo->prepare("SELECT id, title, last_error,
 			".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated, update_interval
 			FROM ttrss_feeds
 			WHERE cat_id = :cat AND
@@ -89,679 +89,679 @@ 
 			(:search = '' OR (LOWER(title) LIKE :search OR LOWER(feed_url) LIKE :search))
 			ORDER BY order_id, title");
 
-		$fsth->execute([":cat" => $cat_id, ":uid" => $_SESSION['uid'], ":search" => $search ? "%$search%" : ""]);
-
-		while ($feed_line = $fsth->fetch()) {
-			$feed = array();
-			$feed['id'] = 'FEED:' . $feed_line['id'];
-			$feed['bare_id'] = (int)$feed_line['id'];
-			$feed['auxcounter'] = -1;
-			$feed['name'] = $feed_line['title'];
-			$feed['checkbox'] = false;
-			$feed['unread'] = -1;
-			$feed['error'] = $feed_line['last_error'];
-			$feed['icon'] = Feeds::getFeedIcon($feed_line['id']);
-			$feed['param'] = make_local_datetime(
-				$feed_line['last_updated'], true);
-			$feed['updates_disabled'] = (int)($feed_line['update_interval'] < 0);
-
-			array_push($items, $feed);
-		}
-
-		return $items;
-	}
-
-	public function getfeedtree() {
-		print json_encode($this->makefeedtree());
-	}
-
-	public function makefeedtree() {
-
-		if (clean($_REQUEST['mode']) != 2)
-			$search = $_SESSION["prefs_feed_search"];
-		else
-			$search = "";
-
-		$root = array();
-		$root['id'] = 'root';
-		$root['name'] = __('Feeds');
-		$root['items'] = array();
-		$root['type'] = 'category';
-
-		$enable_cats = get_pref('ENABLE_FEED_CATS');
-
-		if (clean($_REQUEST['mode']) == 2) {
-
-			if ($enable_cats) {
-				$cat = $this->feedlist_init_cat(-1);
-			} else {
-				$cat['items'] = array();
-			}
-
-			foreach (array(-4, -3, -1, -2, 0, -6) as $i) {
-				array_push($cat['items'], $this->feedlist_init_feed($i));
-			}
-
-			/* Plugin feeds for -1 */
-
-			$feeds = PluginHost::getInstance()->get_feeds(-1);
-
-			if ($feeds) {
-				foreach ($feeds as $feed) {
-					$feed_id = PluginHost::pfeed_to_feed_id($feed['id']);
-
-					$item = array();
-					$item['id'] = 'FEED:' . $feed_id;
-					$item['bare_id'] = (int)$feed_id;
-					$item['auxcounter'] = -1;
-					$item['name'] = $feed['title'];
-					$item['checkbox'] = false;
-					$item['error'] = '';
-					$item['icon'] = $feed['icon'];
-
-					$item['param'] = '';
-					$item['unread'] = -1;
-					$item['type'] = 'feed';
-
-					array_push($cat['items'], $item);
-				}
-			}
-
-			if ($enable_cats) {
-				array_push($root['items'], $cat);
-			} else {
-				$root['items'] = array_merge($root['items'], $cat['items']);
-			}
-
-			$sth = $this->pdo->prepare("SELECT * FROM
+        $fsth->execute([":cat" => $cat_id, ":uid" => $_SESSION['uid'], ":search" => $search ? "%$search%" : ""]);
+
+        while ($feed_line = $fsth->fetch()) {
+            $feed = array();
+            $feed['id'] = 'FEED:' . $feed_line['id'];
+            $feed['bare_id'] = (int)$feed_line['id'];
+            $feed['auxcounter'] = -1;
+            $feed['name'] = $feed_line['title'];
+            $feed['checkbox'] = false;
+            $feed['unread'] = -1;
+            $feed['error'] = $feed_line['last_error'];
+            $feed['icon'] = Feeds::getFeedIcon($feed_line['id']);
+            $feed['param'] = make_local_datetime(
+                $feed_line['last_updated'], true);
+            $feed['updates_disabled'] = (int)($feed_line['update_interval'] < 0);
+
+            array_push($items, $feed);
+        }
+
+        return $items;
+    }
+
+    public function getfeedtree() {
+        print json_encode($this->makefeedtree());
+    }
+
+    public function makefeedtree() {
+
+        if (clean($_REQUEST['mode']) != 2)
+            $search = $_SESSION["prefs_feed_search"];
+        else
+            $search = "";
+
+        $root = array();
+        $root['id'] = 'root';
+        $root['name'] = __('Feeds');
+        $root['items'] = array();
+        $root['type'] = 'category';
+
+        $enable_cats = get_pref('ENABLE_FEED_CATS');
+
+        if (clean($_REQUEST['mode']) == 2) {
+
+            if ($enable_cats) {
+                $cat = $this->feedlist_init_cat(-1);
+            } else {
+                $cat['items'] = array();
+            }
+
+            foreach (array(-4, -3, -1, -2, 0, -6) as $i) {
+                array_push($cat['items'], $this->feedlist_init_feed($i));
+            }
+
+            /* Plugin feeds for -1 */
+
+            $feeds = PluginHost::getInstance()->get_feeds(-1);
+
+            if ($feeds) {
+                foreach ($feeds as $feed) {
+                    $feed_id = PluginHost::pfeed_to_feed_id($feed['id']);
+
+                    $item = array();
+                    $item['id'] = 'FEED:' . $feed_id;
+                    $item['bare_id'] = (int)$feed_id;
+                    $item['auxcounter'] = -1;
+                    $item['name'] = $feed['title'];
+                    $item['checkbox'] = false;
+                    $item['error'] = '';
+                    $item['icon'] = $feed['icon'];
+
+                    $item['param'] = '';
+                    $item['unread'] = -1;
+                    $item['type'] = 'feed';
+
+                    array_push($cat['items'], $item);
+                }
+            }
+
+            if ($enable_cats) {
+                array_push($root['items'], $cat);
+            } else {
+                $root['items'] = array_merge($root['items'], $cat['items']);
+            }
+
+            $sth = $this->pdo->prepare("SELECT * FROM
 				ttrss_labels2 WHERE owner_uid = ? ORDER by caption");
-			$sth->execute([$_SESSION['uid']]);
+            $sth->execute([$_SESSION['uid']]);
 
-			if (get_pref('ENABLE_FEED_CATS')) {
-				$cat = $this->feedlist_init_cat(-2);
-			} else {
-				$cat['items'] = array();
-			}
+            if (get_pref('ENABLE_FEED_CATS')) {
+                $cat = $this->feedlist_init_cat(-2);
+            } else {
+                $cat['items'] = array();
+            }
 
-			$num_labels = 0;
-			while ($line = $sth->fetch()) {
-				++$num_labels;
+            $num_labels = 0;
+            while ($line = $sth->fetch()) {
+                ++$num_labels;
 
-				$label_id = Labels::label_to_feed_id($line['id']);
+                $label_id = Labels::label_to_feed_id($line['id']);
 
-				$feed = $this->feedlist_init_feed($label_id, false, 0);
+                $feed = $this->feedlist_init_feed($label_id, false, 0);
 
-				$feed['fg_color'] = $line['fg_color'];
-				$feed['bg_color'] = $line['bg_color'];
+                $feed['fg_color'] = $line['fg_color'];
+                $feed['bg_color'] = $line['bg_color'];
 
-				array_push($cat['items'], $feed);
-			}
+                array_push($cat['items'], $feed);
+            }
 
-			if ($num_labels) {
-				if ($enable_cats) {
-					array_push($root['items'], $cat);
-				} else {
-					$root['items'] = array_merge($root['items'], $cat['items']);
-				}
-			}
-		}
+            if ($num_labels) {
+                if ($enable_cats) {
+                    array_push($root['items'], $cat);
+                } else {
+                    $root['items'] = array_merge($root['items'], $cat['items']);
+                }
+            }
+        }
 
-		if ($enable_cats) {
-			$show_empty_cats = clean($_REQUEST['force_show_empty']) ||
-				(clean($_REQUEST['mode']) != 2 && !$search);
+        if ($enable_cats) {
+            $show_empty_cats = clean($_REQUEST['force_show_empty']) ||
+                (clean($_REQUEST['mode']) != 2 && !$search);
 
-			$sth = $this->pdo->prepare("SELECT id, title FROM ttrss_feed_categories
+            $sth = $this->pdo->prepare("SELECT id, title FROM ttrss_feed_categories
 				WHERE owner_uid = ? AND parent_cat IS NULL ORDER BY order_id, title");
-			$sth->execute([$_SESSION['uid']]);
-
-			while ($line = $sth->fetch()) {
-				$cat = array();
-				$cat['id'] = 'CAT:' . $line['id'];
-				$cat['bare_id'] = (int)$line['id'];
-				$cat['auxcounter'] = -1;
-				$cat['name'] = $line['title'];
-				$cat['items'] = array();
-				$cat['checkbox'] = false;
-				$cat['type'] = 'category';
-				$cat['unread'] = -1;
-				$cat['child_unread'] = -1;
-
-				$cat['items'] = $this->get_category_items($line['id']);
-
-				$num_children = $this->calculate_children_count($cat);
-				$cat['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', (int) $num_children), $num_children);
-
-				if ($num_children > 0 || $show_empty_cats)
-					array_push($root['items'], $cat);
-
-				$root['param'] += count($cat['items']);
-			}
-
-			/* Uncategorized is a special case */
-
-			$cat = array();
-			$cat['id'] = 'CAT:0';
-			$cat['bare_id'] = 0;
-			$cat['auxcounter'] = -1;
-			$cat['name'] = __("Uncategorized");
-			$cat['items'] = array();
-			$cat['type'] = 'category';
-			$cat['checkbox'] = false;
-			$cat['unread'] = -1;
-			$cat['child_unread'] = -1;
-
-			$fsth = $this->pdo->prepare("SELECT id, title,last_error,
+            $sth->execute([$_SESSION['uid']]);
+
+            while ($line = $sth->fetch()) {
+                $cat = array();
+                $cat['id'] = 'CAT:' . $line['id'];
+                $cat['bare_id'] = (int)$line['id'];
+                $cat['auxcounter'] = -1;
+                $cat['name'] = $line['title'];
+                $cat['items'] = array();
+                $cat['checkbox'] = false;
+                $cat['type'] = 'category';
+                $cat['unread'] = -1;
+                $cat['child_unread'] = -1;
+
+                $cat['items'] = $this->get_category_items($line['id']);
+
+                $num_children = $this->calculate_children_count($cat);
+                $cat['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', (int) $num_children), $num_children);
+
+                if ($num_children > 0 || $show_empty_cats)
+                    array_push($root['items'], $cat);
+
+                $root['param'] += count($cat['items']);
+            }
+
+            /* Uncategorized is a special case */
+
+            $cat = array();
+            $cat['id'] = 'CAT:0';
+            $cat['bare_id'] = 0;
+            $cat['auxcounter'] = -1;
+            $cat['name'] = __("Uncategorized");
+            $cat['items'] = array();
+            $cat['type'] = 'category';
+            $cat['checkbox'] = false;
+            $cat['unread'] = -1;
+            $cat['child_unread'] = -1;
+
+            $fsth = $this->pdo->prepare("SELECT id, title,last_error,
 				".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated, update_interval
 				FROM ttrss_feeds
 				WHERE cat_id IS NULL AND
 				owner_uid = :uid AND
 				(:search = '' OR (LOWER(title) LIKE :search OR LOWER(feed_url) LIKE :search))
 				ORDER BY order_id, title");
-			$fsth->execute([":uid" => $_SESSION['uid'], ":search" => $search ? "%$search%" : ""]);
-
-			while ($feed_line = $fsth->fetch()) {
-				$feed = array();
-				$feed['id'] = 'FEED:' . $feed_line['id'];
-				$feed['bare_id'] = (int)$feed_line['id'];
-				$feed['auxcounter'] = -1;
-				$feed['name'] = $feed_line['title'];
-				$feed['checkbox'] = false;
-				$feed['error'] = $feed_line['last_error'];
-				$feed['icon'] = Feeds::getFeedIcon($feed_line['id']);
-				$feed['param'] = make_local_datetime(
-					$feed_line['last_updated'], true);
-				$feed['unread'] = -1;
-				$feed['type'] = 'feed';
-				$feed['updates_disabled'] = (int)($feed_line['update_interval'] < 0);
-
-				array_push($cat['items'], $feed);
-			}
-
-			$cat['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', count($cat['items'])), count($cat['items']));
-
-			if (count($cat['items']) > 0 || $show_empty_cats)
-				array_push($root['items'], $cat);
-
-			$num_children = $this->calculate_children_count($root);
-			$root['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', (int) $num_children), $num_children);
-
-		} else {
-			$fsth = $this->pdo->prepare("SELECT id, title, last_error,
+            $fsth->execute([":uid" => $_SESSION['uid'], ":search" => $search ? "%$search%" : ""]);
+
+            while ($feed_line = $fsth->fetch()) {
+                $feed = array();
+                $feed['id'] = 'FEED:' . $feed_line['id'];
+                $feed['bare_id'] = (int)$feed_line['id'];
+                $feed['auxcounter'] = -1;
+                $feed['name'] = $feed_line['title'];
+                $feed['checkbox'] = false;
+                $feed['error'] = $feed_line['last_error'];
+                $feed['icon'] = Feeds::getFeedIcon($feed_line['id']);
+                $feed['param'] = make_local_datetime(
+                    $feed_line['last_updated'], true);
+                $feed['unread'] = -1;
+                $feed['type'] = 'feed';
+                $feed['updates_disabled'] = (int)($feed_line['update_interval'] < 0);
+
+                array_push($cat['items'], $feed);
+            }
+
+            $cat['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', count($cat['items'])), count($cat['items']));
+
+            if (count($cat['items']) > 0 || $show_empty_cats)
+                array_push($root['items'], $cat);
+
+            $num_children = $this->calculate_children_count($root);
+            $root['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', (int) $num_children), $num_children);
+
+        } else {
+            $fsth = $this->pdo->prepare("SELECT id, title, last_error,
 				".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated, update_interval
 				FROM ttrss_feeds
 				WHERE owner_uid = :uid AND
 				(:search = '' OR (LOWER(title) LIKE :search OR LOWER(feed_url) LIKE :search))
 				ORDER BY order_id, title");
-			$fsth->execute([":uid" => $_SESSION['uid'], ":search" => $search ? "%$search%" : ""]);
-
-			while ($feed_line = $fsth->fetch()) {
-				$feed = array();
-				$feed['id'] = 'FEED:' . $feed_line['id'];
-				$feed['bare_id'] = (int)$feed_line['id'];
-				$feed['auxcounter'] = -1;
-				$feed['name'] = $feed_line['title'];
-				$feed['checkbox'] = false;
-				$feed['error'] = $feed_line['last_error'];
-				$feed['icon'] = Feeds::getFeedIcon($feed_line['id']);
-				$feed['param'] = make_local_datetime(
-					$feed_line['last_updated'], true);
-				$feed['unread'] = -1;
-				$feed['type'] = 'feed';
-				$feed['updates_disabled'] = (int)($feed_line['update_interval'] < 0);
-
-				array_push($root['items'], $feed);
-			}
-
-			$root['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', count($root['items'])), count($root['items']));
-		}
-
-		$fl = array();
-		$fl['identifier'] = 'id';
-		$fl['label'] = 'name';
-
-		if (clean($_REQUEST['mode']) != 2) {
-			$fl['items'] = array($root);
-		} else {
-			$fl['items'] = $root['items'];
-		}
-
-		return $fl;
-	}
-
-	public function catsortreset() {
-		$sth = $this->pdo->prepare("UPDATE ttrss_feed_categories
+            $fsth->execute([":uid" => $_SESSION['uid'], ":search" => $search ? "%$search%" : ""]);
+
+            while ($feed_line = $fsth->fetch()) {
+                $feed = array();
+                $feed['id'] = 'FEED:' . $feed_line['id'];
+                $feed['bare_id'] = (int)$feed_line['id'];
+                $feed['auxcounter'] = -1;
+                $feed['name'] = $feed_line['title'];
+                $feed['checkbox'] = false;
+                $feed['error'] = $feed_line['last_error'];
+                $feed['icon'] = Feeds::getFeedIcon($feed_line['id']);
+                $feed['param'] = make_local_datetime(
+                    $feed_line['last_updated'], true);
+                $feed['unread'] = -1;
+                $feed['type'] = 'feed';
+                $feed['updates_disabled'] = (int)($feed_line['update_interval'] < 0);
+
+                array_push($root['items'], $feed);
+            }
+
+            $root['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', count($root['items'])), count($root['items']));
+        }
+
+        $fl = array();
+        $fl['identifier'] = 'id';
+        $fl['label'] = 'name';
+
+        if (clean($_REQUEST['mode']) != 2) {
+            $fl['items'] = array($root);
+        } else {
+            $fl['items'] = $root['items'];
+        }
+
+        return $fl;
+    }
+
+    public function catsortreset() {
+        $sth = $this->pdo->prepare("UPDATE ttrss_feed_categories
 				SET order_id = 0 WHERE owner_uid = ?");
-		$sth->execute([$_SESSION['uid']]);
-	}
+        $sth->execute([$_SESSION['uid']]);
+    }
 
-	public function feedsortreset() {
-		$sth = $this->pdo->prepare("UPDATE ttrss_feeds
+    public function feedsortreset() {
+        $sth = $this->pdo->prepare("UPDATE ttrss_feeds
 				SET order_id = 0 WHERE owner_uid = ?");
-		$sth->execute([$_SESSION['uid']]);
-	}
+        $sth->execute([$_SESSION['uid']]);
+    }
 
-	private function process_category_order(&$data_map, $item_id, $parent_id = false, $nest_level = 0) {
+    private function process_category_order(&$data_map, $item_id, $parent_id = false, $nest_level = 0) {
 
-		$prefix = "";
-		for ($i = 0; $i < $nest_level; $i++)
-			$prefix .= "   ";
+        $prefix = "";
+        for ($i = 0; $i < $nest_level; $i++)
+            $prefix .= "   ";
 
-		Debug::log("$prefix C: $item_id P: $parent_id");
+        Debug::log("$prefix C: $item_id P: $parent_id");
 
-		$bare_item_id = substr($item_id, strpos($item_id, ':')+1);
+        $bare_item_id = substr($item_id, strpos($item_id, ':')+1);
 
-		if ($item_id != 'root') {
-			if ($parent_id && $parent_id != 'root') {
-				$parent_bare_id = substr($parent_id, strpos($parent_id, ':')+1);
-				$parent_qpart = $parent_bare_id;
-			} else {
-				$parent_qpart = null;
-			}
+        if ($item_id != 'root') {
+            if ($parent_id && $parent_id != 'root') {
+                $parent_bare_id = substr($parent_id, strpos($parent_id, ':')+1);
+                $parent_qpart = $parent_bare_id;
+            } else {
+                $parent_qpart = null;
+            }
 
-			$sth = $this->pdo->prepare("UPDATE ttrss_feed_categories
+            $sth = $this->pdo->prepare("UPDATE ttrss_feed_categories
 				SET parent_cat = ? WHERE id = ? AND
 				owner_uid = ?");
-			$sth->execute([$parent_qpart, $bare_item_id, $_SESSION['uid']]);
-		}
+            $sth->execute([$parent_qpart, $bare_item_id, $_SESSION['uid']]);
+        }
 
-		$order_id = 1;
+        $order_id = 1;
 
-		$cat = $data_map[$item_id];
+        $cat = $data_map[$item_id];
 
-		if ($cat && is_array($cat)) {
-			foreach ($cat as $item) {
-				$id = $item['_reference'];
-				$bare_id = substr($id, strpos($id, ':')+1);
+        if ($cat && is_array($cat)) {
+            foreach ($cat as $item) {
+                $id = $item['_reference'];
+                $bare_id = substr($id, strpos($id, ':')+1);
 
-				Debug::log("$prefix [$order_id] $id/$bare_id");
+                Debug::log("$prefix [$order_id] $id/$bare_id");
 
-				if ($item['_reference']) {
+                if ($item['_reference']) {
 
-					if (strpos($id, "FEED") === 0) {
+                    if (strpos($id, "FEED") === 0) {
 
-						$cat_id = ($item_id != "root") ? $bare_item_id : null;
+                        $cat_id = ($item_id != "root") ? $bare_item_id : null;
 
-						$sth = $this->pdo->prepare("UPDATE ttrss_feeds
+                        $sth = $this->pdo->prepare("UPDATE ttrss_feeds
 							SET order_id = ?, cat_id = ?
 							WHERE id = ? AND owner_uid = ?");
 
-						$sth->execute([$order_id, $cat_id ? $cat_id : null, $bare_id, $_SESSION['uid']]);
+                        $sth->execute([$order_id, $cat_id ? $cat_id : null, $bare_id, $_SESSION['uid']]);
 
-					} else if (strpos($id, "CAT:") === 0) {
-						$this->process_category_order($data_map, $item['_reference'], $item_id,
-							$nest_level+1);
+                    } else if (strpos($id, "CAT:") === 0) {
+                        $this->process_category_order($data_map, $item['_reference'], $item_id,
+                            $nest_level+1);
 
-						$sth = $this->pdo->prepare("UPDATE ttrss_feed_categories
+                        $sth = $this->pdo->prepare("UPDATE ttrss_feed_categories
 								SET order_id = ? WHERE id = ? AND
 								owner_uid = ?");
-						$sth->execute([$order_id, $bare_id, $_SESSION['uid']]);
-					}
-				}
+                        $sth->execute([$order_id, $bare_id, $_SESSION['uid']]);
+                    }
+                }
 
-				++$order_id;
-			}
-		}
-	}
+                ++$order_id;
+            }
+        }
+    }
 
-	public function savefeedorder() {
-		$data = json_decode($_POST['payload'], true);
+    public function savefeedorder() {
+        $data = json_decode($_POST['payload'], true);
 
-		#file_put_contents("/tmp/saveorder.json", clean($_POST['payload']));
-		#$data = json_decode(file_get_contents("/tmp/saveorder.json"), true);
+        #file_put_contents("/tmp/saveorder.json", clean($_POST['payload']));
+        #$data = json_decode(file_get_contents("/tmp/saveorder.json"), true);
 
-		if (!is_array($data['items']))
-			$data['items'] = json_decode($data['items'], true);
+        if (!is_array($data['items']))
+            $data['items'] = json_decode($data['items'], true);
 
 #		print_r($data['items']);
 
-		if (is_array($data) && is_array($data['items'])) {
+        if (is_array($data) && is_array($data['items'])) {
 #			$cat_order_id = 0;
 
-			$data_map = array();
-			$root_item = false;
+            $data_map = array();
+            $root_item = false;
 
-			foreach ($data['items'] as $item) {
+            foreach ($data['items'] as $item) {
 
 #				if ($item['id'] != 'root') {
-					if (is_array($item['items'])) {
-						if (isset($item['items']['_reference'])) {
-							$data_map[$item['id']] = array($item['items']);
-						} else {
-							$data_map[$item['id']] = $item['items'];
-						}
-					}
-				if ($item['id'] == 'root') {
-					$root_item = $item['id'];
-				}
-			}
-
-			$this->process_category_order($data_map, $root_item);
-		}
-	}
-
-	public function removeicon() {
-		$feed_id = clean($_REQUEST["feed_id"]);
-
-		$sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE id = ? AND owner_uid = ?");
-		$sth->execute([$feed_id, $_SESSION['uid']]);
-
-		if ($sth->fetch()) {
-			@unlink(ICONS_DIR . "/$feed_id.ico");
-
-			$sth = $this->pdo->prepare("UPDATE ttrss_feeds SET favicon_avg_color = NULL where id = ?");
-			$sth->execute([$feed_id]);
-		}
-	}
-
-	public function uploadicon() {
-		header("Content-type: text/html");
-
-		if (is_uploaded_file($_FILES['icon_file']['tmp_name'])) {
-			$tmp_file = tempnam(CACHE_DIR . '/upload', 'icon');
-
-			$result = move_uploaded_file($_FILES['icon_file']['tmp_name'],
-				$tmp_file);
-
-			if (!$result) {
-				return;
-			}
-		} else {
-			return;
-		}
+                    if (is_array($item['items'])) {
+                        if (isset($item['items']['_reference'])) {
+                            $data_map[$item['id']] = array($item['items']);
+                        } else {
+                            $data_map[$item['id']] = $item['items'];
+                        }
+                    }
+                if ($item['id'] == 'root') {
+                    $root_item = $item['id'];
+                }
+            }
+
+            $this->process_category_order($data_map, $root_item);
+        }
+    }
+
+    public function removeicon() {
+        $feed_id = clean($_REQUEST["feed_id"]);
+
+        $sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE id = ? AND owner_uid = ?");
+        $sth->execute([$feed_id, $_SESSION['uid']]);
+
+        if ($sth->fetch()) {
+            @unlink(ICONS_DIR . "/$feed_id.ico");
+
+            $sth = $this->pdo->prepare("UPDATE ttrss_feeds SET favicon_avg_color = NULL where id = ?");
+            $sth->execute([$feed_id]);
+        }
+    }
+
+    public function uploadicon() {
+        header("Content-type: text/html");
+
+        if (is_uploaded_file($_FILES['icon_file']['tmp_name'])) {
+            $tmp_file = tempnam(CACHE_DIR . '/upload', 'icon');
+
+            $result = move_uploaded_file($_FILES['icon_file']['tmp_name'],
+                $tmp_file);
+
+            if (!$result) {
+                return;
+            }
+        } else {
+            return;
+        }
 
-		$icon_file = $tmp_file;
-		$feed_id = clean($_REQUEST["feed_id"]);
-		$rc = 2; // failed
+        $icon_file = $tmp_file;
+        $feed_id = clean($_REQUEST["feed_id"]);
+        $rc = 2; // failed
 
-		if (is_file($icon_file) && $feed_id) {
-			if (filesize($icon_file) < 65535) {
+        if (is_file($icon_file) && $feed_id) {
+            if (filesize($icon_file) < 65535) {
 
-				$sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE id = ? AND owner_uid = ?");
-				$sth->execute([$feed_id, $_SESSION['uid']]);
+                $sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE id = ? AND owner_uid = ?");
+                $sth->execute([$feed_id, $_SESSION['uid']]);
 
-				if ($sth->fetch()) {
-					@unlink(ICONS_DIR . "/$feed_id.ico");
-					if (rename($icon_file, ICONS_DIR . "/$feed_id.ico")) {
+                if ($sth->fetch()) {
+                    @unlink(ICONS_DIR . "/$feed_id.ico");
+                    if (rename($icon_file, ICONS_DIR . "/$feed_id.ico")) {
 
-						$sth = $this->pdo->prepare("UPDATE ttrss_feeds SET favicon_avg_color = '' WHERE id = ?");
-						$sth->execute([$feed_id]);
+                        $sth = $this->pdo->prepare("UPDATE ttrss_feeds SET favicon_avg_color = '' WHERE id = ?");
+                        $sth->execute([$feed_id]);
 
-						$rc = 0;
-					}
-				}
-			} else {
-				$rc = 1;
-			}
-		}
+                        $rc = 0;
+                    }
+                }
+            } else {
+                $rc = 1;
+            }
+        }
 
-		if (is_file($icon_file)) @unlink($icon_file);
+        if (is_file($icon_file)) @unlink($icon_file);
 
-		print $rc;
-		return;
-	}
+        print $rc;
+        return;
+    }
 
-	public function editfeed() {
-		global $purge_intervals;
-		global $update_intervals;
+    public function editfeed() {
+        global $purge_intervals;
+        global $update_intervals;
 
 
-		$feed_id = clean($_REQUEST["id"]);
+        $feed_id = clean($_REQUEST["id"]);
 
-		$sth = $this->pdo->prepare("SELECT * FROM ttrss_feeds WHERE id = ? AND
+        $sth = $this->pdo->prepare("SELECT * FROM ttrss_feeds WHERE id = ? AND
 				owner_uid = ?");
-		$sth->execute([$feed_id, $_SESSION['uid']]);
+        $sth->execute([$feed_id, $_SESSION['uid']]);
 
-		if ($row = $sth->fetch()) {
-			print '<div dojoType="dijit.layout.TabContainer" style="height : 450px">
+        if ($row = $sth->fetch()) {
+            print '<div dojoType="dijit.layout.TabContainer" style="height : 450px">
         		<div dojoType="dijit.layout.ContentPane" title="'.__('General').'">';
 
-			$title = htmlspecialchars($row["title"]);
+            $title = htmlspecialchars($row["title"]);
 
-			print_hidden("id", "$feed_id");
-			print_hidden("op", "pref-feeds");
-			print_hidden("method", "editSave");
+            print_hidden("id", "$feed_id");
+            print_hidden("op", "pref-feeds");
+            print_hidden("method", "editSave");
 
-			print "<header>".__("Feed")."</header>";
-			print "<section>";
+            print "<header>".__("Feed")."</header>";
+            print "<section>";
 
-			/* Title */
+            /* Title */
 
-			print "<fieldset>";
+            print "<fieldset>";
 
-			print "<input dojoType='dijit.form.ValidationTextBox' required='1'
+            print "<input dojoType='dijit.form.ValidationTextBox' required='1'
 				placeHolder=\"".__("Feed Title")."\"
 				style='font-size : 16px; width: 500px' name='title' value=\"$title\">";
 
-			print "</fieldset>";
+            print "</fieldset>";
 
-			/* Feed URL */
+            /* Feed URL */
 
-			$feed_url = htmlspecialchars($row["feed_url"]);
+            $feed_url = htmlspecialchars($row["feed_url"]);
 
-			print "<fieldset>";
+            print "<fieldset>";
 
-			print "<label>" . __('URL:') . "</label> ";
-			print "<input dojoType='dijit.form.ValidationTextBox' required='1'
+            print "<label>" . __('URL:') . "</label> ";
+            print "<input dojoType='dijit.form.ValidationTextBox' required='1'
 				placeHolder=\"".__("Feed URL")."\"
 				regExp='^(http|https)://.*' style='width : 300px'
 				name='feed_url' value=\"$feed_url\">";
 
-			$last_error = $row["last_error"];
+            $last_error = $row["last_error"];
 
-			if ($last_error) {
-				print "&nbsp;<i class=\"material-icons\"
+            if ($last_error) {
+                print "&nbsp;<i class=\"material-icons\"
 					title=\"".htmlspecialchars($last_error)."\">error</i>";
-			}
+            }
 
-			print "</fieldset>";
+            print "</fieldset>";
 
-			/* Category */
+            /* Category */
 
-			if (get_pref('ENABLE_FEED_CATS')) {
+            if (get_pref('ENABLE_FEED_CATS')) {
 
-				$cat_id = $row["cat_id"];
+                $cat_id = $row["cat_id"];
 
-				print "<fieldset>";
+                print "<fieldset>";
 
-				print "<label>" . __('Place in category:') . "</label> ";
+                print "<label>" . __('Place in category:') . "</label> ";
 
-				print_feed_cat_select("cat_id", $cat_id,
-					'dojoType="fox.form.Select"');
+                print_feed_cat_select("cat_id", $cat_id,
+                    'dojoType="fox.form.Select"');
 
-				print "</fieldset>";
-			}
+                print "</fieldset>";
+            }
 
-			/* Site URL  */
+            /* Site URL  */
 
-			$site_url = htmlspecialchars($row["site_url"]);
+            $site_url = htmlspecialchars($row["site_url"]);
 
-			print "<fieldset>";
+            print "<fieldset>";
 
-			print "<label>" . __('Site URL:') . "</label> ";
-			print "<input dojoType='dijit.form.ValidationTextBox' required='1'
+            print "<label>" . __('Site URL:') . "</label> ";
+            print "<input dojoType='dijit.form.ValidationTextBox' required='1'
 				placeHolder=\"".__("Site URL")."\"
 				regExp='^(http|https)://.*' style='width : 300px'
 				name='site_url' value=\"$site_url\">";
 
-			print "</fieldset>";
+            print "</fieldset>";
 
-			/* FTS Stemming Language */
+            /* FTS Stemming Language */
 
-			if (DB_TYPE == "pgsql") {
-				$feed_language = $row["feed_language"];
+            if (DB_TYPE == "pgsql") {
+                $feed_language = $row["feed_language"];
 
-				if (!$feed_language)
-					$feed_language = get_pref('DEFAULT_SEARCH_LANGUAGE');
+                if (!$feed_language)
+                    $feed_language = get_pref('DEFAULT_SEARCH_LANGUAGE');
 
-				print "<fieldset>";
+                print "<fieldset>";
 
-				print "<label>" . __('Language:') . "</label> ";
-				print_select("feed_language", $feed_language, $this::get_ts_languages(),
-					'dojoType="fox.form.Select"');
+                print "<label>" . __('Language:') . "</label> ";
+                print_select("feed_language", $feed_language, $this::get_ts_languages(),
+                    'dojoType="fox.form.Select"');
 
-				print "</fieldset>";
-			}
+                print "</fieldset>";
+            }
 
-			print "</section>";
+            print "</section>";
 
-			print "<header>".__("Update")."</header>";
-			print "<section>";
+            print "<header>".__("Update")."</header>";
+            print "<section>";
 
-			/* Update Interval */
+            /* Update Interval */
 
-			$update_interval = $row["update_interval"];
+            $update_interval = $row["update_interval"];
 
-			print "<fieldset>";
+            print "<fieldset>";
 
-			print "<label>".__("Interval:")."</label> ";
+            print "<label>".__("Interval:")."</label> ";
 
-			print_select_hash("update_interval", $update_interval, $update_intervals,
-				'dojoType="fox.form.Select"');
+            print_select_hash("update_interval", $update_interval, $update_intervals,
+                'dojoType="fox.form.Select"');
 
-			print "</fieldset>";
+            print "</fieldset>";
 
-			/* Purge intl */
+            /* Purge intl */
 
-			$purge_interval = $row["purge_interval"];
+            $purge_interval = $row["purge_interval"];
 
-			print "<fieldset>";
+            print "<fieldset>";
 
-			print "<label>" . __('Article purging:') . "</label> ";
+            print "<label>" . __('Article purging:') . "</label> ";
 
-			print_select_hash("purge_interval", $purge_interval, $purge_intervals,
-				'dojoType="fox.form.Select" ' .
-				((FORCE_ARTICLE_PURGE == 0) ? "" : 'disabled="1"'));
+            print_select_hash("purge_interval", $purge_interval, $purge_intervals,
+                'dojoType="fox.form.Select" ' .
+                ((FORCE_ARTICLE_PURGE == 0) ? "" : 'disabled="1"'));
 
-			print "</fieldset>";
+            print "</fieldset>";
 
-			print "</section>";
+            print "</section>";
 
-			$auth_login = htmlspecialchars($row["auth_login"]);
-			$auth_pass = htmlspecialchars($row["auth_pass"]);
+            $auth_login = htmlspecialchars($row["auth_login"]);
+            $auth_pass = htmlspecialchars($row["auth_pass"]);
 
-			$auth_enabled = $auth_login !== '' || $auth_pass !== '';
+            $auth_enabled = $auth_login !== '' || $auth_pass !== '';
 
-			$auth_style = $auth_enabled ? '' : 'display: none';
-			print "<div id='feedEditDlg_loginContainer' style='$auth_style'>";
-			print "<header>".__("Authentication")."</header>";
-			print "<section>";
+            $auth_style = $auth_enabled ? '' : 'display: none';
+            print "<div id='feedEditDlg_loginContainer' style='$auth_style'>";
+            print "<header>".__("Authentication")."</header>";
+            print "<section>";
 
-			print "<fieldset>";
+            print "<fieldset>";
 
-			print "<input dojoType='dijit.form.TextBox' id='feedEditDlg_login'
+            print "<input dojoType='dijit.form.TextBox' id='feedEditDlg_login'
 				placeHolder='".__("Login")."'
 				autocomplete='new-password'
 				name='auth_login' value=\"$auth_login\">";
 
-			print "</fieldset><fieldset>";
+            print "</fieldset><fieldset>";
 
-			print "<input dojoType='dijit.form.TextBox' type='password' name='auth_pass'
+            print "<input dojoType='dijit.form.TextBox' type='password' name='auth_pass'
 				autocomplete='new-password'
 				placeHolder='".__("Password")."'
 				value=\"$auth_pass\">";
 
-			print "<div dojoType='dijit.Tooltip' connectId='feedEditDlg_login' position='below'>
+            print "<div dojoType='dijit.Tooltip' connectId='feedEditDlg_login' position='below'>
 				".__('<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds.')."
 				</div>";
 
-			print "</fieldset>";
+            print "</fieldset>";
 
-			print "</section></div>";
+            print "</section></div>";
 
-			$auth_checked = $auth_enabled ? 'checked' : '';
-			print "<label class='checkbox'>
+            $auth_checked = $auth_enabled ? 'checked' : '';
+            print "<label class='checkbox'>
 				<input type='checkbox' $auth_checked name='need_auth' dojoType='dijit.form.CheckBox' id='feedEditDlg_loginCheck'
 						onclick='displayIfChecked(this, \"feedEditDlg_loginContainer\")'>
 					".__('This feed requires authentication.')."</label>";
 
-			print '</div><div dojoType="dijit.layout.ContentPane" title="'.__('Options').'">';
+            print '</div><div dojoType="dijit.layout.ContentPane" title="'.__('Options').'">';
 
-			print "<section class='narrow'>";
+            print "<section class='narrow'>";
 
-			$include_in_digest = $row["include_in_digest"];
+            $include_in_digest = $row["include_in_digest"];
 
-			if ($include_in_digest) {
-				$checked = "checked=\"1\"";
-			} else {
-				$checked = "";
-			}
+            if ($include_in_digest) {
+                $checked = "checked=\"1\"";
+            } else {
+                $checked = "";
+            }
 
-			print "<fieldset class='narrow'>";
+            print "<fieldset class='narrow'>";
 
-			print "<label class='checkbox'><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" id=\"include_in_digest\"
+            print "<label class='checkbox'><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" id=\"include_in_digest\"
 				name=\"include_in_digest\"
 				$checked> ".__('Include in e-mail digest')."</label>";
 
-			print "</fieldset>";
+            print "</fieldset>";
 
-			$always_display_enclosures = $row["always_display_enclosures"];
+            $always_display_enclosures = $row["always_display_enclosures"];
 
-			if ($always_display_enclosures) {
-				$checked = "checked";
-			} else {
-				$checked = "";
-			}
+            if ($always_display_enclosures) {
+                $checked = "checked";
+            } else {
+                $checked = "";
+            }
 
-			print "<fieldset class='narrow'>";
+            print "<fieldset class='narrow'>";
 
-			print "<label class='checkbox'><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" id=\"always_display_enclosures\"
+            print "<label class='checkbox'><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" id=\"always_display_enclosures\"
 				name=\"always_display_enclosures\"
 				$checked> ".__('Always display image attachments')."</label>";
 
-			print "</fieldset>";
+            print "</fieldset>";
 
-			$hide_images = $row["hide_images"];
+            $hide_images = $row["hide_images"];
 
-			if ($hide_images) {
-				$checked = "checked=\"1\"";
-			} else {
-				$checked = "";
-			}
+            if ($hide_images) {
+                $checked = "checked=\"1\"";
+            } else {
+                $checked = "";
+            }
 
-			print "<fieldset class='narrow'>";
+            print "<fieldset class='narrow'>";
 
-			print "<label class='checkbox'><input dojoType='dijit.form.CheckBox' type='checkbox' id='hide_images'
+            print "<label class='checkbox'><input dojoType='dijit.form.CheckBox' type='checkbox' id='hide_images'
 				name='hide_images' $checked> ".__('Do not embed media')."</label>";
 
-			print "</fieldset>";
+            print "</fieldset>";
 
-			$cache_images = $row["cache_images"];
+            $cache_images = $row["cache_images"];
 
-			if ($cache_images) {
-				$checked = "checked=\"1\"";
-			} else {
-				$checked = "";
-			}
+            if ($cache_images) {
+                $checked = "checked=\"1\"";
+            } else {
+                $checked = "";
+            }
 
-			print "<fieldset class='narrow'>";
+            print "<fieldset class='narrow'>";
 
-			print "<label class='checkbox'><input dojoType='dijit.form.CheckBox' type='checkbox' id='cache_images'
+            print "<label class='checkbox'><input dojoType='dijit.form.CheckBox' type='checkbox' id='cache_images'
 				name='cache_images' $checked> ". __('Cache media')."</label>";
 
-			print "</fieldset>";
+            print "</fieldset>";
 
-			$mark_unread_on_update = $row["mark_unread_on_update"];
+            $mark_unread_on_update = $row["mark_unread_on_update"];
 
-			if ($mark_unread_on_update) {
-				$checked = "checked";
-			} else {
-				$checked = "";
-			}
+            if ($mark_unread_on_update) {
+                $checked = "checked";
+            } else {
+                $checked = "";
+            }
 
-			print "<fieldset class='narrow'>";
+            print "<fieldset class='narrow'>";
 
-			print "<label class='checkbox'><input dojoType='dijit.form.CheckBox' type='checkbox' id='mark_unread_on_update'
+            print "<label class='checkbox'><input dojoType='dijit.form.CheckBox' type='checkbox' id='mark_unread_on_update'
 				name='mark_unread_on_update' $checked> ".__('Mark updated articles as unread')."</label>";
 
-			print "</fieldset>";
+            print "</fieldset>";
 
-			print '</div><div dojoType="dijit.layout.ContentPane" title="'.__('Icon').'">';
+            print '</div><div dojoType="dijit.layout.ContentPane" title="'.__('Icon').'">';
 
-			/* Icon */
+            /* Icon */
 
-			print "<img class='feedIcon feed-editor-icon' src=\"".Feeds::getFeedIcon($feed_id)."\">";
+            print "<img class='feedIcon feed-editor-icon' src=\"".Feeds::getFeedIcon($feed_id)."\">";
 
-			print "<form onsubmit='return false;' id='feed_icon_upload_form'
+            print "<form onsubmit='return false;' id='feed_icon_upload_form'
 				enctype='multipart/form-data' method='POST'>
 			<label class='dijitButton'>".__("Choose file...")."
 				<input style='display: none' id='icon_file' size='10' name='icon_file' type='file'>
@@ -775,231 +775,231 @@ 
 				type='submit'>".__('Remove')."</button>
 			</form>";
 
-			print "</section>";
+            print "</section>";
 
-			print '</div><div dojoType="dijit.layout.ContentPane" title="'.__('Plugins').'">';
+            print '</div><div dojoType="dijit.layout.ContentPane" title="'.__('Plugins').'">';
 
-			PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_EDIT_FEED,
-				"hook_prefs_edit_feed", $feed_id);
+            PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_EDIT_FEED,
+                "hook_prefs_edit_feed", $feed_id);
 
-			print "</div></div>";
+            print "</div></div>";
 
-			$title = htmlspecialchars($title, ENT_QUOTES);
+            $title = htmlspecialchars($title, ENT_QUOTES);
 
-			print "<footer>
+            print "<footer>
 				<button style='float : left' class='alt-danger' dojoType='dijit.form.Button' onclick='return CommonDialogs.unsubscribeFeed($feed_id, \"$title\")'>".
-					__('Unsubscribe')."</button>
+                    __('Unsubscribe')."</button>
 				<button dojoType='dijit.form.Button' class='alt-primary' onclick=\"return dijit.byId('feedEditDlg').execute()\">".__('Save')."</button>
 				<button dojoType='dijit.form.Button' onclick=\"return dijit.byId('feedEditDlg').hide()\">".__('Cancel')."</button>
 				</footer>";
-		}
-	}
+        }
+    }
 
-	public function editfeeds() {
-		global $purge_intervals;
-		global $update_intervals;
+    public function editfeeds() {
+        global $purge_intervals;
+        global $update_intervals;
 
-		$feed_ids = clean($_REQUEST["ids"]);
+        $feed_ids = clean($_REQUEST["ids"]);
 
-		print_notice("Enable the options you wish to apply using checkboxes on the right:");
+        print_notice("Enable the options you wish to apply using checkboxes on the right:");
 
-		print "<p>";
+        print "<p>";
 
-		print_hidden("ids", "$feed_ids");
-		print_hidden("op", "pref-feeds");
-		print_hidden("method", "batchEditSave");
+        print_hidden("ids", "$feed_ids");
+        print_hidden("op", "pref-feeds");
+        print_hidden("method", "batchEditSave");
 
-		print "<header>".__("Feed")."</header>";
-		print "<section>";
+        print "<header>".__("Feed")."</header>";
+        print "<section>";
 
-		/* Category */
+        /* Category */
 
-		if (get_pref('ENABLE_FEED_CATS')) {
+        if (get_pref('ENABLE_FEED_CATS')) {
 
-			print "<fieldset>";
+            print "<fieldset>";
 
-			print "<label>" . __('Place in category:') . "</label> ";
+            print "<label>" . __('Place in category:') . "</label> ";
 
-			print_feed_cat_select("cat_id", false,
-				'disabled="1" dojoType="fox.form.Select"');
+            print_feed_cat_select("cat_id", false,
+                'disabled="1" dojoType="fox.form.Select"');
 
-			$this->batch_edit_cbox("cat_id");
+            $this->batch_edit_cbox("cat_id");
 
-			print "</fieldset>";
-		}
+            print "</fieldset>";
+        }
 
-		/* FTS Stemming Language */
+        /* FTS Stemming Language */
 
-		if (DB_TYPE == "pgsql") {
-			print "<fieldset>";
+        if (DB_TYPE == "pgsql") {
+            print "<fieldset>";
 
-			print "<label>" . __('Language:') . "</label> ";
-			print_select("feed_language", "", $this::get_ts_languages(),
-				'disabled="1" dojoType="fox.form.Select"');
+            print "<label>" . __('Language:') . "</label> ";
+            print_select("feed_language", "", $this::get_ts_languages(),
+                'disabled="1" dojoType="fox.form.Select"');
 
-			$this->batch_edit_cbox("feed_language");
+            $this->batch_edit_cbox("feed_language");
 
-			print "</fieldset>";
-		}
+            print "</fieldset>";
+        }
 
-		print "</section>";
+        print "</section>";
 
-		print "<header>".__("Update")."</header>";
-		print "<section>";
+        print "<header>".__("Update")."</header>";
+        print "<section>";
 
-		/* Update Interval */
+        /* Update Interval */
 
-		print "<fieldset>";
+        print "<fieldset>";
 
-		print "<label>".__("Interval:")."</label> ";
+        print "<label>".__("Interval:")."</label> ";
 
-		print_select_hash("update_interval", "", $update_intervals,
-			'disabled="1" dojoType="fox.form.Select"');
+        print_select_hash("update_interval", "", $update_intervals,
+            'disabled="1" dojoType="fox.form.Select"');
 
-		$this->batch_edit_cbox("update_interval");
+        $this->batch_edit_cbox("update_interval");
 
-		print "</fieldset>";
+        print "</fieldset>";
 
-		/* Purge intl */
+        /* Purge intl */
 
-		if (FORCE_ARTICLE_PURGE == 0) {
+        if (FORCE_ARTICLE_PURGE == 0) {
 
-			print "<fieldset>";
+            print "<fieldset>";
 
-			print "<label>" . __('Article purging:') . "</label> ";
+            print "<label>" . __('Article purging:') . "</label> ";
 
-			print_select_hash("purge_interval", "", $purge_intervals,
-				'disabled="1" dojoType="fox.form.Select"');
+            print_select_hash("purge_interval", "", $purge_intervals,
+                'disabled="1" dojoType="fox.form.Select"');
 
-			$this->batch_edit_cbox("purge_interval");
+            $this->batch_edit_cbox("purge_interval");
 
-			print "</fieldset>";
-		}
+            print "</fieldset>";
+        }
 
-		print "</section>";
-		print "<header>".__("Authentication")."</header>";
-		print "<section>";
+        print "</section>";
+        print "<header>".__("Authentication")."</header>";
+        print "<section>";
 
-		print "<fieldset>";
+        print "<fieldset>";
 
-		print "<input dojoType='dijit.form.TextBox'
+        print "<input dojoType='dijit.form.TextBox'
 			placeHolder=\"".__("Login")."\" disabled='1'
 			autocomplete='new-password'
 			name='auth_login' value=''>";
 
-		$this->batch_edit_cbox("auth_login");
+        $this->batch_edit_cbox("auth_login");
 
-		print "<input dojoType='dijit.form.TextBox' type='password' name='auth_pass'
+        print "<input dojoType='dijit.form.TextBox' type='password' name='auth_pass'
 			autocomplete='new-password'
 			placeHolder=\"".__("Password")."\" disabled='1'
 			value=''>";
 
-		$this->batch_edit_cbox("auth_pass");
+        $this->batch_edit_cbox("auth_pass");
 
-		print "</fieldset>";
+        print "</fieldset>";
 
-		print "</section>";
-		print "<header>".__("Options")."</header>";
-		print "<section>";
+        print "</section>";
+        print "<header>".__("Options")."</header>";
+        print "<section>";
 
-		print "<fieldset class='narrow'>";
-		print "<label class='checkbox'><input disabled='1' type='checkbox' id='include_in_digest'
+        print "<fieldset class='narrow'>";
+        print "<label class='checkbox'><input disabled='1' type='checkbox' id='include_in_digest'
 			name='include_in_digest' dojoType='dijit.form.CheckBox'>&nbsp;".__('Include in e-mail digest')."</label>";
 
-		print "&nbsp;"; $this->batch_edit_cbox("include_in_digest", "include_in_digest_l");
+        print "&nbsp;"; $this->batch_edit_cbox("include_in_digest", "include_in_digest_l");
 
-		print "</fieldset><fieldset class='narrow'>";
+        print "</fieldset><fieldset class='narrow'>";
 
-		print "<label class='checkbox'><input disabled='1' type='checkbox' id='always_display_enclosures'
+        print "<label class='checkbox'><input disabled='1' type='checkbox' id='always_display_enclosures'
 			name='always_display_enclosures' dojoType='dijit.form.CheckBox'>&nbsp;".__('Always display image attachments')."</label>";
 
-		print "&nbsp;"; $this->batch_edit_cbox("always_display_enclosures", "always_display_enclosures_l");
+        print "&nbsp;"; $this->batch_edit_cbox("always_display_enclosures", "always_display_enclosures_l");
 
-		print "</fieldset><fieldset class='narrow'>";
+        print "</fieldset><fieldset class='narrow'>";
 
-		print "<label class='checkbox'><input disabled='1' type='checkbox' id='hide_images'
+        print "<label class='checkbox'><input disabled='1' type='checkbox' id='hide_images'
 			name='hide_images' dojoType='dijit.form.CheckBox'>&nbsp;". __('Do not embed media')."</label>";
 
-		print "&nbsp;"; $this->batch_edit_cbox("hide_images", "hide_images_l");
+        print "&nbsp;"; $this->batch_edit_cbox("hide_images", "hide_images_l");
 
-		print "</fieldset><fieldset class='narrow'>";
+        print "</fieldset><fieldset class='narrow'>";
 
-		print "<label class='checkbox'><input disabled='1' type='checkbox' id='cache_images'
+        print "<label class='checkbox'><input disabled='1' type='checkbox' id='cache_images'
 			name='cache_images' dojoType='dijit.form.CheckBox'>&nbsp;".__('Cache media')."</label>";
 
-		print "&nbsp;"; $this->batch_edit_cbox("cache_images", "cache_images_l");
+        print "&nbsp;"; $this->batch_edit_cbox("cache_images", "cache_images_l");
 
-		print "</fieldset><fieldset class='narrow'>";
+        print "</fieldset><fieldset class='narrow'>";
 
-		print "<label class='checkbox'><input disabled='1' type='checkbox' id='mark_unread_on_update'
+        print "<label class='checkbox'><input disabled='1' type='checkbox' id='mark_unread_on_update'
 			name='mark_unread_on_update' dojoType='dijit.form.CheckBox'>&nbsp;".__('Mark updated articles as unread')."</label>";
 
-		print "&nbsp;"; $this->batch_edit_cbox("mark_unread_on_update", "mark_unread_on_update_l");
+        print "&nbsp;"; $this->batch_edit_cbox("mark_unread_on_update", "mark_unread_on_update_l");
 
-		print "</fieldset>";
+        print "</fieldset>";
 
-		print "</section>";
+        print "</section>";
 
-		print "<footer>
+        print "<footer>
 			<button dojoType='dijit.form.Button' type='submit' class='alt-primary'
 				onclick=\"return dijit.byId('feedEditDlg').execute()\">".
-				__('Save')."</button>
+                __('Save')."</button>
 			<button dojoType='dijit.form.Button'
 			onclick=\"return dijit.byId('feedEditDlg').hide()\">".
-				__('Cancel')."</button>
+                __('Cancel')."</button>
 			</footer>";
 
-		return;
-	}
-
-	public function batchEditSave() {
-		return $this->editsaveops(true);
-	}
-
-	public function editSave() {
-		return $this->editsaveops(false);
-	}
-
-	public function editsaveops($batch) {
-
-		$feed_title = trim(clean($_POST["title"]));
-		$feed_url = trim(clean($_POST["feed_url"]));
-		$site_url = trim(clean($_POST["site_url"]));
-		$upd_intl = (int) clean($_POST["update_interval"]);
-		$purge_intl = (int) clean($_POST["purge_interval"]);
-		$feed_id = (int) clean($_POST["id"]); /* editSave */
-		$feed_ids = explode(",", clean($_POST["ids"])); /* batchEditSave */
-		$cat_id = (int) clean($_POST["cat_id"]);
-		$auth_login = trim(clean($_POST["auth_login"]));
-		$auth_pass = trim(clean($_POST["auth_pass"]));
-		$private = checkbox_to_sql_bool(clean($_POST["private"]));
-		$include_in_digest = checkbox_to_sql_bool(
-			clean($_POST["include_in_digest"]));
-		$cache_images = checkbox_to_sql_bool(
-			clean($_POST["cache_images"]));
-		$hide_images = checkbox_to_sql_bool(
-			clean($_POST["hide_images"]));
-		$always_display_enclosures = checkbox_to_sql_bool(
-			clean($_POST["always_display_enclosures"]));
-
-		$mark_unread_on_update = checkbox_to_sql_bool(
-			clean($_POST["mark_unread_on_update"]));
-
-		$feed_language = trim(clean($_POST["feed_language"]));
-
-		if (!$batch) {
-			if (clean($_POST["need_auth"]) !== 'on') {
-				$auth_login = '';
-				$auth_pass = '';
-			}
-
-			/* $sth = $this->pdo->prepare("SELECT feed_url FROM ttrss_feeds WHERE id = ?");
+        return;
+    }
+
+    public function batchEditSave() {
+        return $this->editsaveops(true);
+    }
+
+    public function editSave() {
+        return $this->editsaveops(false);
+    }
+
+    public function editsaveops($batch) {
+
+        $feed_title = trim(clean($_POST["title"]));
+        $feed_url = trim(clean($_POST["feed_url"]));
+        $site_url = trim(clean($_POST["site_url"]));
+        $upd_intl = (int) clean($_POST["update_interval"]);
+        $purge_intl = (int) clean($_POST["purge_interval"]);
+        $feed_id = (int) clean($_POST["id"]); /* editSave */
+        $feed_ids = explode(",", clean($_POST["ids"])); /* batchEditSave */
+        $cat_id = (int) clean($_POST["cat_id"]);
+        $auth_login = trim(clean($_POST["auth_login"]));
+        $auth_pass = trim(clean($_POST["auth_pass"]));
+        $private = checkbox_to_sql_bool(clean($_POST["private"]));
+        $include_in_digest = checkbox_to_sql_bool(
+            clean($_POST["include_in_digest"]));
+        $cache_images = checkbox_to_sql_bool(
+            clean($_POST["cache_images"]));
+        $hide_images = checkbox_to_sql_bool(
+            clean($_POST["hide_images"]));
+        $always_display_enclosures = checkbox_to_sql_bool(
+            clean($_POST["always_display_enclosures"]));
+
+        $mark_unread_on_update = checkbox_to_sql_bool(
+            clean($_POST["mark_unread_on_update"]));
+
+        $feed_language = trim(clean($_POST["feed_language"]));
+
+        if (!$batch) {
+            if (clean($_POST["need_auth"]) !== 'on') {
+                $auth_login = '';
+                $auth_pass = '';
+            }
+
+            /* $sth = $this->pdo->prepare("SELECT feed_url FROM ttrss_feeds WHERE id = ?");
 			$sth->execute([$feed_id]);
 			$row = $sth->fetch();$orig_feed_url = $row["feed_url"];
 
 			$reset_basic_info = $orig_feed_url != $feed_url; */
 
-			$sth = $this->pdo->prepare("UPDATE ttrss_feeds SET
+            $sth = $this->pdo->prepare("UPDATE ttrss_feeds SET
 				cat_id = :cat_id,
 				title = :title,
 				feed_url = :feed_url,
@@ -1018,253 +1018,253 @@ 
 				feed_language = :feed_language
 			WHERE id = :id AND owner_uid = :uid");
 
-			$sth->execute([":title" => $feed_title,
-					":cat_id" => $cat_id ? $cat_id : null,
-					":feed_url" => $feed_url,
-					":site_url" => $site_url,
-					":upd_intl" => $upd_intl,
-					":purge_intl" => $purge_intl,
-					":auth_login" => $auth_login,
-					":auth_pass" => $auth_pass,
-					":private" => (int)$private,
-					":cache_images" => (int)$cache_images,
-					":hide_images" => (int)$hide_images,
-					":include_in_digest" => (int)$include_in_digest,
-					":always_display_enclosures" => (int)$always_display_enclosures,
-					":mark_unread_on_update" => (int)$mark_unread_on_update,
-					":feed_language" => $feed_language,
-					":id" => $feed_id,
-					":uid" => $_SESSION['uid']]);
+            $sth->execute([":title" => $feed_title,
+                    ":cat_id" => $cat_id ? $cat_id : null,
+                    ":feed_url" => $feed_url,
+                    ":site_url" => $site_url,
+                    ":upd_intl" => $upd_intl,
+                    ":purge_intl" => $purge_intl,
+                    ":auth_login" => $auth_login,
+                    ":auth_pass" => $auth_pass,
+                    ":private" => (int)$private,
+                    ":cache_images" => (int)$cache_images,
+                    ":hide_images" => (int)$hide_images,
+                    ":include_in_digest" => (int)$include_in_digest,
+                    ":always_display_enclosures" => (int)$always_display_enclosures,
+                    ":mark_unread_on_update" => (int)$mark_unread_on_update,
+                    ":feed_language" => $feed_language,
+                    ":id" => $feed_id,
+                    ":uid" => $_SESSION['uid']]);
 
 /*			if ($reset_basic_info) {
 				RSSUtils::set_basic_feed_info($feed_id);
 			} */
 
-			PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_SAVE_FEED,
-				"hook_prefs_save_feed", $feed_id);
+            PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_SAVE_FEED,
+                "hook_prefs_save_feed", $feed_id);
 
-		} else {
-			$feed_data = array();
+        } else {
+            $feed_data = array();
 
-			foreach (array_keys($_POST) as $k) {
-				if ($k != "op" && $k != "method" && $k != "ids") {
-					$feed_data[$k] = clean($_POST[$k]);
-				}
-			}
+            foreach (array_keys($_POST) as $k) {
+                if ($k != "op" && $k != "method" && $k != "ids") {
+                    $feed_data[$k] = clean($_POST[$k]);
+                }
+            }
 
-			$this->pdo->beginTransaction();
+            $this->pdo->beginTransaction();
 
-			$feed_ids_qmarks = arr_qmarks($feed_ids);
+            $feed_ids_qmarks = arr_qmarks($feed_ids);
 
-			foreach (array_keys($feed_data) as $k) {
+            foreach (array_keys($feed_data) as $k) {
 
-				$qpart = "";
+                $qpart = "";
 
-				switch ($k) {
-					case "title":
-						$qpart = "title = " . $this->pdo->quote($feed_title);
-						break;
+                switch ($k) {
+                    case "title":
+                        $qpart = "title = " . $this->pdo->quote($feed_title);
+                        break;
 
-					case "feed_url":
-						$qpart = "feed_url = " . $this->pdo->quote($feed_url);
-						break;
+                    case "feed_url":
+                        $qpart = "feed_url = " . $this->pdo->quote($feed_url);
+                        break;
 
-					case "update_interval":
-						$qpart = "update_interval = " . $this->pdo->quote($upd_intl);
-						break;
+                    case "update_interval":
+                        $qpart = "update_interval = " . $this->pdo->quote($upd_intl);
+                        break;
 
-					case "purge_interval":
-						$qpart = "purge_interval =" . $this->pdo->quote($purge_intl);
-						break;
+                    case "purge_interval":
+                        $qpart = "purge_interval =" . $this->pdo->quote($purge_intl);
+                        break;
 
-					case "auth_login":
-						$qpart = "auth_login = " . $this->pdo->quote($auth_login);
-						break;
+                    case "auth_login":
+                        $qpart = "auth_login = " . $this->pdo->quote($auth_login);
+                        break;
 
-					case "auth_pass":
-						$qpart = "auth_pass =" . $this->pdo->quote($auth_pass). ", auth_pass_encrypted = false";
-						break;
+                    case "auth_pass":
+                        $qpart = "auth_pass =" . $this->pdo->quote($auth_pass). ", auth_pass_encrypted = false";
+                        break;
 
-					case "private":
-						$qpart = "private = " . $this->pdo->quote($private);
-						break;
+                    case "private":
+                        $qpart = "private = " . $this->pdo->quote($private);
+                        break;
 
-					case "include_in_digest":
-						$qpart = "include_in_digest = " . $this->pdo->quote($include_in_digest);
-						break;
+                    case "include_in_digest":
+                        $qpart = "include_in_digest = " . $this->pdo->quote($include_in_digest);
+                        break;
 
-					case "always_display_enclosures":
-						$qpart = "always_display_enclosures = " . $this->pdo->quote($always_display_enclosures);
-						break;
+                    case "always_display_enclosures":
+                        $qpart = "always_display_enclosures = " . $this->pdo->quote($always_display_enclosures);
+                        break;
 
-					case "mark_unread_on_update":
-						$qpart = "mark_unread_on_update = " . $this->pdo->quote($mark_unread_on_update);
-						break;
+                    case "mark_unread_on_update":
+                        $qpart = "mark_unread_on_update = " . $this->pdo->quote($mark_unread_on_update);
+                        break;
 
-					case "cache_images":
-						$qpart = "cache_images = " . $this->pdo->quote($cache_images);
-						break;
+                    case "cache_images":
+                        $qpart = "cache_images = " . $this->pdo->quote($cache_images);
+                        break;
 
-					case "hide_images":
-						$qpart = "hide_images = " . $this->pdo->quote($hide_images);
-						break;
+                    case "hide_images":
+                        $qpart = "hide_images = " . $this->pdo->quote($hide_images);
+                        break;
 
-					case "cat_id":
-						if (get_pref('ENABLE_FEED_CATS')) {
-							if ($cat_id) {
-								$qpart = "cat_id = " . $this->pdo->quote($cat_id);
-							} else {
-								$qpart = 'cat_id = NULL';
-							}
-						} else {
-							$qpart = "";
-						}
+                    case "cat_id":
+                        if (get_pref('ENABLE_FEED_CATS')) {
+                            if ($cat_id) {
+                                $qpart = "cat_id = " . $this->pdo->quote($cat_id);
+                            } else {
+                                $qpart = 'cat_id = NULL';
+                            }
+                        } else {
+                            $qpart = "";
+                        }
 
-						break;
+                        break;
 
-					case "feed_language":
-						$qpart = "feed_language = " . $this->pdo->quote($feed_language);
-						break;
+                    case "feed_language":
+                        $qpart = "feed_language = " . $this->pdo->quote($feed_language);
+                        break;
 
-				}
+                }
 
-				if ($qpart) {
-					$sth = $this->pdo->prepare("UPDATE ttrss_feeds SET $qpart WHERE id IN ($feed_ids_qmarks)
+                if ($qpart) {
+                    $sth = $this->pdo->prepare("UPDATE ttrss_feeds SET $qpart WHERE id IN ($feed_ids_qmarks)
 						AND owner_uid = ?");
-					$sth->execute(array_merge($feed_ids, [$_SESSION['uid']]));
-				}
-			}
+                    $sth->execute(array_merge($feed_ids, [$_SESSION['uid']]));
+                }
+            }
 
-			$this->pdo->commit();
-		}
-		return;
-	}
+            $this->pdo->commit();
+        }
+        return;
+    }
 
-	public function remove() {
+    public function remove() {
 
-		$ids = explode(",", clean($_REQUEST["ids"]));
+        $ids = explode(",", clean($_REQUEST["ids"]));
 
-		foreach ($ids as $id) {
-			Pref_Feeds::remove_feed($id, $_SESSION["uid"]);
-		}
+        foreach ($ids as $id) {
+            Pref_Feeds::remove_feed($id, $_SESSION["uid"]);
+        }
 
-		return;
-	}
+        return;
+    }
 
-	public function removeCat() {
-		$ids = explode(",", clean($_REQUEST["ids"]));
-		foreach ($ids as $id) {
-			$this->remove_feed_category($id, $_SESSION["uid"]);
-		}
-	}
+    public function removeCat() {
+        $ids = explode(",", clean($_REQUEST["ids"]));
+        foreach ($ids as $id) {
+            $this->remove_feed_category($id, $_SESSION["uid"]);
+        }
+    }
 
-	public function addCat() {
-		$feed_cat = trim(clean($_REQUEST["cat"]));
+    public function addCat() {
+        $feed_cat = trim(clean($_REQUEST["cat"]));
 
-		Feeds::add_feed_category($feed_cat);
-	}
+        Feeds::add_feed_category($feed_cat);
+    }
 
-	public function index() {
+    public function index() {
 
-		print "<div dojoType='dijit.layout.AccordionContainer' region='center'>";
-		print "<div style='padding : 0px' dojoType='dijit.layout.AccordionPane'
+        print "<div dojoType='dijit.layout.AccordionContainer' region='center'>";
+        print "<div style='padding : 0px' dojoType='dijit.layout.AccordionPane'
 			title=\"<i class='material-icons'>rss_feed</i> ".__('Feeds')."\">";
 
-		$sth = $this->pdo->prepare("SELECT COUNT(id) AS num_errors
+        $sth = $this->pdo->prepare("SELECT COUNT(id) AS num_errors
 			FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ?");
-		$sth->execute([$_SESSION['uid']]);
+        $sth->execute([$_SESSION['uid']]);
 
-		if ($row = $sth->fetch()) {
-			$num_errors = $row["num_errors"];
-		} else {
-			$num_errors = 0;
-		}
+        if ($row = $sth->fetch()) {
+            $num_errors = $row["num_errors"];
+        } else {
+            $num_errors = 0;
+        }
 
-		if ($num_errors > 0) {
+        if ($num_errors > 0) {
 
-			$error_button = "<button dojoType=\"dijit.form.Button\"
+            $error_button = "<button dojoType=\"dijit.form.Button\"
 			  		onclick=\"CommonDialogs.showFeedsWithErrors()\" id=\"errorButton\">" .
-				__("Feeds with errors") . "</button>";
-		}
+                __("Feeds with errors") . "</button>";
+        }
 
-		$inactive_button = "<button dojoType=\"dijit.form.Button\"
+        $inactive_button = "<button dojoType=\"dijit.form.Button\"
 				id=\"pref_feeds_inactive_btn\"
 				style=\"display : none\"
 				onclick=\"dijit.byId('feedTree').showInactiveFeeds()\">" .
-				__("Inactive feeds") . "</button>";
+                __("Inactive feeds") . "</button>";
 
-		$feed_search = clean($_REQUEST["search"]);
+        $feed_search = clean($_REQUEST["search"]);
 
-		if (array_key_exists("search", $_REQUEST)) {
-			$_SESSION["prefs_feed_search"] = $feed_search;
-		} else {
-			$feed_search = $_SESSION["prefs_feed_search"];
-		}
+        if (array_key_exists("search", $_REQUEST)) {
+            $_SESSION["prefs_feed_search"] = $feed_search;
+        } else {
+            $feed_search = $_SESSION["prefs_feed_search"];
+        }
 
-		print '<div dojoType="dijit.layout.BorderContainer" gutters="false">';
+        print '<div dojoType="dijit.layout.BorderContainer" gutters="false">';
 
-		print "<div region='top' dojoType=\"fox.Toolbar\">"; #toolbar
+        print "<div region='top' dojoType=\"fox.Toolbar\">"; #toolbar
 
-		print "<div style='float : right; padding-right : 4px;'>
+        print "<div style='float : right; padding-right : 4px;'>
 			<input dojoType=\"dijit.form.TextBox\" id=\"feed_search\" size=\"20\" type=\"search\"
 				value=\"$feed_search\">
 			<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('feedTree').reload()\">".
-				__('Search')."</button>
+                __('Search')."</button>
 			</div>";
 
-		print "<div dojoType=\"fox.form.DropDownButton\">".
-				"<span>" . __('Select')."</span>";
-		print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
-		print "<div onclick=\"dijit.byId('feedTree').model.setAllChecked(true)\"
+        print "<div dojoType=\"fox.form.DropDownButton\">".
+                "<span>" . __('Select')."</span>";
+        print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
+        print "<div onclick=\"dijit.byId('feedTree').model.setAllChecked(true)\"
 			dojoType=\"dijit.MenuItem\">".__('All')."</div>";
-		print "<div onclick=\"dijit.byId('feedTree').model.setAllChecked(false)\"
+        print "<div onclick=\"dijit.byId('feedTree').model.setAllChecked(false)\"
 			dojoType=\"dijit.MenuItem\">".__('None')."</div>";
-		print "</div></div>";
+        print "</div></div>";
 
-		print "<div dojoType=\"fox.form.DropDownButton\">".
-				"<span>" . __('Feeds')."</span>";
-		print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
-		print "<div onclick=\"CommonDialogs.quickAddFeed()\"
+        print "<div dojoType=\"fox.form.DropDownButton\">".
+                "<span>" . __('Feeds')."</span>";
+        print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
+        print "<div onclick=\"CommonDialogs.quickAddFeed()\"
 			dojoType=\"dijit.MenuItem\">".__('Subscribe to feed')."</div>";
-		print "<div onclick=\"dijit.byId('feedTree').editSelectedFeed()\"
+        print "<div onclick=\"dijit.byId('feedTree').editSelectedFeed()\"
 			dojoType=\"dijit.MenuItem\">".__('Edit selected feeds')."</div>";
-		print "<div onclick=\"dijit.byId('feedTree').resetFeedOrder()\"
+        print "<div onclick=\"dijit.byId('feedTree').resetFeedOrder()\"
 			dojoType=\"dijit.MenuItem\">".__('Reset sort order')."</div>";
-		print "<div onclick=\"dijit.byId('feedTree').batchSubscribe()\"
+        print "<div onclick=\"dijit.byId('feedTree').batchSubscribe()\"
 			dojoType=\"dijit.MenuItem\">".__('Batch subscribe')."</div>";
-		print "<div dojoType=\"dijit.MenuItem\" onclick=\"dijit.byId('feedTree').removeSelectedFeeds()\">"
-			.__('Unsubscribe')."</div> ";
-		print "</div></div>";
-
-		if (get_pref('ENABLE_FEED_CATS')) {
-			print "<div dojoType=\"fox.form.DropDownButton\">".
-					"<span>" . __('Categories')."</span>";
-			print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
-			print "<div onclick=\"dijit.byId('feedTree').createCategory()\"
+        print "<div dojoType=\"dijit.MenuItem\" onclick=\"dijit.byId('feedTree').removeSelectedFeeds()\">"
+            .__('Unsubscribe')."</div> ";
+        print "</div></div>";
+
+        if (get_pref('ENABLE_FEED_CATS')) {
+            print "<div dojoType=\"fox.form.DropDownButton\">".
+                    "<span>" . __('Categories')."</span>";
+            print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
+            print "<div onclick=\"dijit.byId('feedTree').createCategory()\"
 				dojoType=\"dijit.MenuItem\">".__('Add category')."</div>";
-			print "<div onclick=\"dijit.byId('feedTree').resetCatOrder()\"
+            print "<div onclick=\"dijit.byId('feedTree').resetCatOrder()\"
 				dojoType=\"dijit.MenuItem\">".__('Reset sort order')."</div>";
-			print "<div onclick=\"dijit.byId('feedTree').removeSelectedCategories()\"
+            print "<div onclick=\"dijit.byId('feedTree').removeSelectedCategories()\"
 				dojoType=\"dijit.MenuItem\">".__('Remove selected')."</div>";
-			print "</div></div>";
+            print "</div></div>";
 
-		}
+        }
 
-		print $error_button;
-		print $inactive_button;
+        print $error_button;
+        print $inactive_button;
 
-		print "</div>"; # toolbar
+        print "</div>"; # toolbar
 
-		//print '</div>';
-		print '<div style="padding : 0px" dojoType="dijit.layout.ContentPane" region="center">';
+        //print '</div>';
+        print '<div style="padding : 0px" dojoType="dijit.layout.ContentPane" region="center">';
 
-		print "<div id=\"feedlistLoading\">
+        print "<div id=\"feedlistLoading\">
 		<img src='images/indicator_tiny.gif'>".
-		 __("Loading, please wait...")."</div>";
+            __("Loading, please wait...")."</div>";
 
-		$auto_expand = $feed_search != "" ? "true" : "false";
+        $auto_expand = $feed_search != "" ? "true" : "false";
 
-		print "<div dojoType=\"fox.PrefFeedStore\" jsId=\"feedStore\"
+        print "<div dojoType=\"fox.PrefFeedStore\" jsId=\"feedStore\"
 			url=\"backend.php?op=pref-feeds&method=getfeedtree\">
 		</div>
 		<div dojoType=\"lib.CheckBoxStoreModel\" jsId=\"feedModel\" store=\"feedStore\"
@@ -1297,23 +1297,23 @@ 
 #			".__('<b>Hint:</b> you can drag feeds and categories around.')."
 #			</div>";
 
-		print '</div>';
-		print '</div>';
+        print '</div>';
+        print '</div>';
 
-		print "</div>"; # feeds pane
+        print "</div>"; # feeds pane
 
-		print "<div dojoType='dijit.layout.AccordionPane'
+        print "<div dojoType='dijit.layout.AccordionPane'
 			title='<i class=\"material-icons\">import_export</i> ".__('OPML')."'>";
 
-		print "<h3>" . __("Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings.") . "</h3>";
+        print "<h3>" . __("Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings.") . "</h3>";
 
-		print_notice("Only main settings profile can be migrated using OPML.");
+        print_notice("Only main settings profile can be migrated using OPML.");
 
-		print "<iframe id=\"upload_iframe\"
+        print "<iframe id=\"upload_iframe\"
 			name=\"upload_iframe\" onload=\"Helpers.OPML.onImportComplete(this)\"
 			style=\"width: 400px; height: 100px; display: none;\"></iframe>";
 
-		print "<form  name='opml_form' style='display : inline-block' target='upload_iframe'
+        print "<form  name='opml_form' style='display : inline-block' target='upload_iframe'
 			enctype='multipart/form-data' method='POST'
 			action='backend.php'>
 			<label class='dijitButton'>".__("Choose file...")."
@@ -1322,116 +1322,116 @@ 
 			<input type='hidden' name='op' value='dlg'>
 			<input type='hidden' name='method' value='importOpml'>
 			<button dojoType='dijit.form.Button' class='alt-primary' onclick=\"return Helpers.OPML.import();\" type=\"submit\">" .
-			__('Import OPML') . "</button>";
+            __('Import OPML') . "</button>";
 
-		print "</form>";
+        print "</form>";
 
-		print "<form dojoType='dijit.form.Form' id='opmlExportForm' style='display : inline-block'>";
+        print "<form dojoType='dijit.form.Form' id='opmlExportForm' style='display : inline-block'>";
 
-		print "<button dojoType='dijit.form.Button'
+        print "<button dojoType='dijit.form.Button'
 			onclick='Helpers.OPML.export()' >" .
-			__('Export OPML') . "</button>";
+            __('Export OPML') . "</button>";
 
-		print " <label class='checkbox'>";
-		print_checkbox("include_settings", true, "1", "");
-		print " " . __("Include settings");
-		print "</label>";
+        print " <label class='checkbox'>";
+        print_checkbox("include_settings", true, "1", "");
+        print " " . __("Include settings");
+        print "</label>";
 
-		print "</form>";
+        print "</form>";
 
-		print "<p/>";
+        print "<p/>";
 
-		print "<h2>" . __("Published OPML") . "</h2>";
+        print "<h2>" . __("Published OPML") . "</h2>";
 
-		print "<p>" . __('Your OPML can be published publicly and can be subscribed by anyone who knows the URL below.') .
-			" " .
-			__("Published OPML does not include your Tiny Tiny RSS settings, feeds that require authentication or feeds hidden from Popular feeds.") . "</p>";
+        print "<p>" . __('Your OPML can be published publicly and can be subscribed by anyone who knows the URL below.') .
+            " " .
+            __("Published OPML does not include your Tiny Tiny RSS settings, feeds that require authentication or feeds hidden from Popular feeds.") . "</p>";
 
-		print "<button dojoType='dijit.form.Button' class='alt-primary' onclick=\"return App.displayDlg('".__("Public OPML URL")."','pubOPMLUrl')\">".
-			__('Display published OPML URL')."</button> ";
+        print "<button dojoType='dijit.form.Button' class='alt-primary' onclick=\"return App.displayDlg('".__("Public OPML URL")."','pubOPMLUrl')\">".
+            __('Display published OPML URL')."</button> ";
 
-		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION,
-			"hook_prefs_tab_section", "prefFeedsOPML");
+        PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION,
+            "hook_prefs_tab_section", "prefFeedsOPML");
 
-		print "</div>"; # pane
+        print "</div>"; # pane
 
-		print "<div dojoType=\"dijit.layout.AccordionPane\"
+        print "<div dojoType=\"dijit.layout.AccordionPane\"
 			title=\"<i class='material-icons'>share</i> ".__('Published & shared articles / Generated feeds')."\">";
 
-		print "<h3>" . __('Published articles can be subscribed by anyone who knows the following URL:') . "</h3>";
+        print "<h3>" . __('Published articles can be subscribed by anyone who knows the following URL:') . "</h3>";
 
-		$rss_url = '-2::' . htmlspecialchars(get_self_url_prefix() .
-				"/public.php?op=rss&id=-2&view-mode=all_articles");;
+        $rss_url = '-2::' . htmlspecialchars(get_self_url_prefix() .
+                "/public.php?op=rss&id=-2&view-mode=all_articles");;
 
-		print "<button dojoType='dijit.form.Button' class='alt-primary' onclick=\"return App.displayDlg('".__("Show as feed")."','generatedFeed', '$rss_url')\">".
-			__('Display URL')."</button> ";
+        print "<button dojoType='dijit.form.Button' class='alt-primary' onclick=\"return App.displayDlg('".__("Show as feed")."','generatedFeed', '$rss_url')\">".
+            __('Display URL')."</button> ";
 
-		print "<button class=\"alt-danger\" dojoType=\"dijit.form.Button\" onclick=\"return Helpers.clearFeedAccessKeys()\">".
-			__('Clear all generated URLs')."</button> ";
+        print "<button class=\"alt-danger\" dojoType=\"dijit.form.Button\" onclick=\"return Helpers.clearFeedAccessKeys()\">".
+            __('Clear all generated URLs')."</button> ";
 
-		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION,
-			"hook_prefs_tab_section", "prefFeedsPublishedGenerated");
+        PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION,
+            "hook_prefs_tab_section", "prefFeedsPublishedGenerated");
 
-		print "</div>"; #pane
+        print "</div>"; #pane
 
-		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB,
-			"hook_prefs_tab", "prefFeeds");
+        PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB,
+            "hook_prefs_tab", "prefFeeds");
 
-		print "</div>"; #container
-	}
+        print "</div>"; #container
+    }
 
-	private function feedlist_init_cat($cat_id) {
-		$obj = array();
-		$cat_id = (int) $cat_id;
+    private function feedlist_init_cat($cat_id) {
+        $obj = array();
+        $cat_id = (int) $cat_id;
 
-		if ($cat_id > 0) {
-			$cat_unread = CCache::find($cat_id, $_SESSION["uid"], true);
-		} else if ($cat_id == 0 || $cat_id == -2) {
-			$cat_unread = Feeds::getCategoryUnread($cat_id);
-		}
+        if ($cat_id > 0) {
+            $cat_unread = CCache::find($cat_id, $_SESSION["uid"], true);
+        } else if ($cat_id == 0 || $cat_id == -2) {
+            $cat_unread = Feeds::getCategoryUnread($cat_id);
+        }
 
-		$obj['id'] = 'CAT:' . $cat_id;
-		$obj['items'] = array();
-		$obj['name'] = Feeds::getCategoryTitle($cat_id);
-		$obj['type'] = 'category';
-		$obj['unread'] = (int) $cat_unread;
-		$obj['bare_id'] = $cat_id;
+        $obj['id'] = 'CAT:' . $cat_id;
+        $obj['items'] = array();
+        $obj['name'] = Feeds::getCategoryTitle($cat_id);
+        $obj['type'] = 'category';
+        $obj['unread'] = (int) $cat_unread;
+        $obj['bare_id'] = $cat_id;
 
-		return $obj;
-	}
+        return $obj;
+    }
 
-	private function feedlist_init_feed($feed_id, $title = false, $unread = false, $error = '', $updated = '') {
-		$obj = array();
-		$feed_id = (int) $feed_id;
+    private function feedlist_init_feed($feed_id, $title = false, $unread = false, $error = '', $updated = '') {
+        $obj = array();
+        $feed_id = (int) $feed_id;
 
-		if (!$title)
-			$title = Feeds::getFeedTitle($feed_id, false);
+        if (!$title)
+            $title = Feeds::getFeedTitle($feed_id, false);
 
-		if ($unread === false)
-			$unread = getFeedUnread($feed_id, false);
+        if ($unread === false)
+            $unread = getFeedUnread($feed_id, false);
 
-		$obj['id'] = 'FEED:' . $feed_id;
-		$obj['name'] = $title;
-		$obj['unread'] = (int) $unread;
-		$obj['type'] = 'feed';
-		$obj['error'] = $error;
-		$obj['updated'] = $updated;
-		$obj['icon'] = Feeds::getFeedIcon($feed_id);
-		$obj['bare_id'] = $feed_id;
-		$obj['auxcounter'] = 0;
+        $obj['id'] = 'FEED:' . $feed_id;
+        $obj['name'] = $title;
+        $obj['unread'] = (int) $unread;
+        $obj['type'] = 'feed';
+        $obj['error'] = $error;
+        $obj['updated'] = $updated;
+        $obj['icon'] = Feeds::getFeedIcon($feed_id);
+        $obj['bare_id'] = $feed_id;
+        $obj['auxcounter'] = 0;
 
-		return $obj;
-	}
+        return $obj;
+    }
 
-	public function inactiveFeeds() {
+    public function inactiveFeeds() {
 
-		if (DB_TYPE == "pgsql") {
-			$interval_qpart = "NOW() - INTERVAL '3 months'";
-		} else {
-			$interval_qpart = "DATE_SUB(NOW(), INTERVAL 3 MONTH)";
-		}
+        if (DB_TYPE == "pgsql") {
+            $interval_qpart = "NOW() - INTERVAL '3 months'";
+        } else {
+            $interval_qpart = "DATE_SUB(NOW(), INTERVAL 3 MONTH)";
+        }
 
-		$sth = $this->pdo->prepare("SELECT ttrss_feeds.title, ttrss_feeds.site_url,
+        $sth = $this->pdo->prepare("SELECT ttrss_feeds.title, ttrss_feeds.site_url,
 		  		ttrss_feeds.feed_url, ttrss_feeds.id, MAX(updated) AS last_article
 			FROM ttrss_feeds, ttrss_entries, ttrss_user_entries WHERE
 				(SELECT MAX(updated) FROM ttrss_entries, ttrss_user_entries WHERE
@@ -1442,356 +1442,356 @@ 
 				ttrss_entries.id = ref_id
 			GROUP BY ttrss_feeds.title, ttrss_feeds.id, ttrss_feeds.site_url, ttrss_feeds.feed_url
 			ORDER BY last_article");
-		$sth->execute([$_SESSION['uid']]);
+        $sth->execute([$_SESSION['uid']]);
 
-		print "<div dojoType='fox.Toolbar'>";
-		print "<div dojoType='fox.form.DropDownButton'>".
-				"<span>" . __('Select')."</span>";
-		print "<div dojoType='dijit.Menu' style='display: none'>";
-		print "<div onclick=\"Tables.select('inactive-feeds-list', true)\"
+        print "<div dojoType='fox.Toolbar'>";
+        print "<div dojoType='fox.form.DropDownButton'>".
+                "<span>" . __('Select')."</span>";
+        print "<div dojoType='dijit.Menu' style='display: none'>";
+        print "<div onclick=\"Tables.select('inactive-feeds-list', true)\"
 			dojoType='dijit.MenuItem'>".__('All')."</div>";
-		print "<div onclick=\"Tables.select('inactive-feeds-list', false)\"
+        print "<div onclick=\"Tables.select('inactive-feeds-list', false)\"
 			dojoType='dijit.MenuItem'>".__('None')."</div>";
-		print "</div></div>";
-		print "</div>"; #toolbar
+        print "</div></div>";
+        print "</div>"; #toolbar
 
-		print "<div class='panel panel-scrollable'>";
-		print "<table width='100%' id='inactive-feeds-list'>";
+        print "<div class='panel panel-scrollable'>";
+        print "<table width='100%' id='inactive-feeds-list'>";
 
-		$lnum = 1;
+        $lnum = 1;
 
-		while ($line = $sth->fetch()) {
+        while ($line = $sth->fetch()) {
 
-			$feed_id = $line["id"];
+            $feed_id = $line["id"];
 
-			print "<tr data-row-id='$feed_id'>";
+            print "<tr data-row-id='$feed_id'>";
 
-			print "<td width='5%' align='center'><input
+            print "<td width='5%' align='center'><input
 				onclick='Tables.onRowChecked(this);' dojoType='dijit.form.CheckBox'
 				type='checkbox'></td>";
-			print "<td>";
+            print "<td>";
 
-			print "<a href='#' ".
-				"title=\"".__("Click to edit feed")."\" ".
-				"onclick=\"CommonDialogs.editFeed(".$line["id"].")\">".
-				htmlspecialchars($line["title"])."</a>";
+            print "<a href='#' ".
+                "title=\"".__("Click to edit feed")."\" ".
+                "onclick=\"CommonDialogs.editFeed(".$line["id"].")\">".
+                htmlspecialchars($line["title"])."</a>";
 
-			print "</td><td class='text-muted' align='right'>";
-			print make_local_datetime($line['last_article'], false);
-			print "</td>";
-			print "</tr>";
+            print "</td><td class='text-muted' align='right'>";
+            print make_local_datetime($line['last_article'], false);
+            print "</td>";
+            print "</tr>";
 
-			++$lnum;
-		}
+            ++$lnum;
+        }
 
-		print "</table>";
-		print "</div>";
+        print "</table>";
+        print "</div>";
 
-		print "<footer>
+        print "<footer>
 			<button style='float : left' class=\"alt-danger\" dojoType='dijit.form.Button' onclick=\"dijit.byId('inactiveFeedsDlg').removeSelected()\">"
-			.__('Unsubscribe from selected feeds')."</button>
+            .__('Unsubscribe from selected feeds')."</button>
 			<button dojoType='dijit.form.Button' onclick=\"dijit.byId('inactiveFeedsDlg').hide()\">"
-			.__('Close this window')."</button>
+            .__('Close this window')."</button>
 			</footer>";
 
-	}
+    }
 
-	public function feedsWithErrors() {
-		$sth = $this->pdo->prepare("SELECT id,title,feed_url,last_error,site_url
+    public function feedsWithErrors() {
+        $sth = $this->pdo->prepare("SELECT id,title,feed_url,last_error,site_url
 			FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ?");
-		$sth->execute([$_SESSION['uid']]);
+        $sth->execute([$_SESSION['uid']]);
 
-		print "<div dojoType=\"fox.Toolbar\">";
-		print "<div dojoType=\"fox.form.DropDownButton\">".
-				"<span>" . __('Select')."</span>";
-		print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
-		print "<div onclick=\"Tables.select('error-feeds-list', true)\"
+        print "<div dojoType=\"fox.Toolbar\">";
+        print "<div dojoType=\"fox.form.DropDownButton\">".
+                "<span>" . __('Select')."</span>";
+        print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
+        print "<div onclick=\"Tables.select('error-feeds-list', true)\"
 			dojoType=\"dijit.MenuItem\">".__('All')."</div>";
-		print "<div onclick=\"Tables.select('error-feeds-list', false)\"
+        print "<div onclick=\"Tables.select('error-feeds-list', false)\"
 			dojoType=\"dijit.MenuItem\">".__('None')."</div>";
-		print "</div></div>";
-		print "</div>"; #toolbar
+        print "</div></div>";
+        print "</div>"; #toolbar
 
-		print "<div class='panel panel-scrollable'>";
-		print "<table width='100%' id='error-feeds-list'>";
+        print "<div class='panel panel-scrollable'>";
+        print "<table width='100%' id='error-feeds-list'>";
 
-		$lnum = 1;
+        $lnum = 1;
 
-		while ($line = $sth->fetch()) {
+        while ($line = $sth->fetch()) {
 
-			$feed_id = $line["id"];
+            $feed_id = $line["id"];
 
-			print "<tr data-row-id='$feed_id'>";
+            print "<tr data-row-id='$feed_id'>";
 
-			print "<td width='5%' align='center'><input
+            print "<td width='5%' align='center'><input
 				onclick='Tables.onRowChecked(this);' dojoType=\"dijit.form.CheckBox\"
 				type=\"checkbox\"></td>";
-			print "<td>";
+            print "<td>";
 
-			print "<a class=\"visibleLink\" href=\"#\" ".
-				"title=\"".__("Click to edit feed")."\" ".
-				"onclick=\"CommonDialogs.editFeed(".$line["id"].")\">".
-				htmlspecialchars($line["title"])."</a>: ";
+            print "<a class=\"visibleLink\" href=\"#\" ".
+                "title=\"".__("Click to edit feed")."\" ".
+                "onclick=\"CommonDialogs.editFeed(".$line["id"].")\">".
+                htmlspecialchars($line["title"])."</a>: ";
 
-			print "<span class=\"text-muted\">";
-			print htmlspecialchars($line["last_error"]);
-			print "</span>";
+            print "<span class=\"text-muted\">";
+            print htmlspecialchars($line["last_error"]);
+            print "</span>";
 
-			print "</td>";
-			print "</tr>";
+            print "</td>";
+            print "</tr>";
 
-			++$lnum;
-		}
+            ++$lnum;
+        }
 
-		print "</table>";
-		print "</div>";
+        print "</table>";
+        print "</div>";
 
-		print "<footer>";
-		print "<button style='float : left' class=\"alt-danger\" dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('errorFeedsDlg').removeSelected()\">"
-			.__('Unsubscribe from selected feeds')."</button> ";
+        print "<footer>";
+        print "<button style='float : left' class=\"alt-danger\" dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('errorFeedsDlg').removeSelected()\">"
+            .__('Unsubscribe from selected feeds')."</button> ";
 
-		print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('errorFeedsDlg').hide()\">".
-			__('Close this window')."</button>";
+        print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('errorFeedsDlg').hide()\">".
+            __('Close this window')."</button>";
 
-		print "</footer>";
-	}
+        print "</footer>";
+    }
 
-	private function remove_feed_category($id, $owner_uid) {
+    private function remove_feed_category($id, $owner_uid) {
 
-		$sth = $this->pdo->prepare("DELETE FROM ttrss_feed_categories
+        $sth = $this->pdo->prepare("DELETE FROM ttrss_feed_categories
 			WHERE id = ? AND owner_uid = ?");
-		$sth->execute([$id, $owner_uid]);
+        $sth->execute([$id, $owner_uid]);
 
-		CCache::remove($id, $owner_uid, true);
-	}
+        CCache::remove($id, $owner_uid, true);
+    }
 
-	public static function remove_feed($id, $owner_uid) {
-		foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_UNSUBSCRIBE_FEED) as $p) {
-			if (! $p->hook_unsubscribe_feed($id, $owner_uid)) {
+    public static function remove_feed($id, $owner_uid) {
+        foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_UNSUBSCRIBE_FEED) as $p) {
+            if (! $p->hook_unsubscribe_feed($id, $owner_uid)) {
                 user_error("Feed $id (owner: $owner_uid) not removed due to plugin error (HOOK_UNSUBSCRIBE_FEED).", E_USER_WARNING);
                 return;
-			}
-		}
+            }
+        }
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		if ($id > 0) {
-			$pdo->beginTransaction();
+        if ($id > 0) {
+            $pdo->beginTransaction();
 
-			/* save starred articles in Archived feed */
+            /* save starred articles in Archived feed */
 
-			/* prepare feed if necessary */
+            /* prepare feed if necessary */
 
-			$sth = $pdo->prepare("SELECT feed_url FROM ttrss_feeds WHERE id = ?
+            $sth = $pdo->prepare("SELECT feed_url FROM ttrss_feeds WHERE id = ?
 				AND owner_uid = ?");
-			$sth->execute([$id, $owner_uid]);
+            $sth->execute([$id, $owner_uid]);
 
-			if ($row = $sth->fetch()) {
-				$feed_url = $row["feed_url"];
+            if ($row = $sth->fetch()) {
+                $feed_url = $row["feed_url"];
 
-				$sth = $pdo->prepare("SELECT id FROM ttrss_archived_feeds
+                $sth = $pdo->prepare("SELECT id FROM ttrss_archived_feeds
 					WHERE feed_url = ? AND owner_uid = ?");
-				$sth->execute([$feed_url, $owner_uid]);
+                $sth->execute([$feed_url, $owner_uid]);
 
-				if ($row = $sth->fetch()) {
-					$archive_id = $row["id"];
-				} else {
-					$res = $pdo->query("SELECT MAX(id) AS id FROM ttrss_archived_feeds");
-					$row = $res->fetch();
+                if ($row = $sth->fetch()) {
+                    $archive_id = $row["id"];
+                } else {
+                    $res = $pdo->query("SELECT MAX(id) AS id FROM ttrss_archived_feeds");
+                    $row = $res->fetch();
 
-					$new_feed_id = (int)$row['id'] + 1;
+                    $new_feed_id = (int)$row['id'] + 1;
 
-					$sth = $pdo->prepare("INSERT INTO ttrss_archived_feeds
+                    $sth = $pdo->prepare("INSERT INTO ttrss_archived_feeds
 						(id, owner_uid, title, feed_url, site_url, created)
 							SELECT ?, owner_uid, title, feed_url, site_url, NOW() from ttrss_feeds
 							WHERE id = ?");
-					$sth->execute([$new_feed_id, $id]);
+                    $sth->execute([$new_feed_id, $id]);
 
-					$archive_id = $new_feed_id;
-				}
+                    $archive_id = $new_feed_id;
+                }
 
-				$sth = $pdo->prepare("UPDATE ttrss_user_entries SET feed_id = NULL,
+                $sth = $pdo->prepare("UPDATE ttrss_user_entries SET feed_id = NULL,
 					orig_feed_id = ? WHERE feed_id = ? AND
 						marked = true AND owner_uid = ?");
 
-				$sth->execute([$archive_id, $id, $owner_uid]);
+                $sth->execute([$archive_id, $id, $owner_uid]);
 
-				/* Remove access key for the feed */
+                /* Remove access key for the feed */
 
-				$sth = $pdo->prepare("DELETE FROM ttrss_access_keys WHERE
+                $sth = $pdo->prepare("DELETE FROM ttrss_access_keys WHERE
 					feed_id = ? AND owner_uid = ?");
-				$sth->execute([$id, $owner_uid]);
+                $sth->execute([$id, $owner_uid]);
 
-				/* remove the feed */
+                /* remove the feed */
 
-				$sth = $pdo->prepare("DELETE FROM ttrss_feeds
+                $sth = $pdo->prepare("DELETE FROM ttrss_feeds
 					WHERE id = ? AND owner_uid = ?");
-				$sth->execute([$id, $owner_uid]);
-			}
+                $sth->execute([$id, $owner_uid]);
+            }
 
-			$pdo->commit();
+            $pdo->commit();
 
-			if (file_exists(ICONS_DIR . "/$id.ico")) {
-				unlink(ICONS_DIR . "/$id.ico");
-			}
+            if (file_exists(ICONS_DIR . "/$id.ico")) {
+                unlink(ICONS_DIR . "/$id.ico");
+            }
 
-			CCache::remove($id, $owner_uid);
+            CCache::remove($id, $owner_uid);
 
-		} else {
-			Labels::remove(Labels::feed_to_label_id($id), $owner_uid);
-			//CCache::remove($id, $owner_uid); don't think labels are cached
-		}
-	}
+        } else {
+            Labels::remove(Labels::feed_to_label_id($id), $owner_uid);
+            //CCache::remove($id, $owner_uid); don't think labels are cached
+        }
+    }
 
-	public function batchSubscribe() {
-		print_hidden("op", "pref-feeds");
-		print_hidden("method", "batchaddfeeds");
+    public function batchSubscribe() {
+        print_hidden("op", "pref-feeds");
+        print_hidden("method", "batchaddfeeds");
 
-		print "<header class='horizontal'>".__("One valid feed per line (no detection is done)")."</header>";
-		print "<section>";
+        print "<header class='horizontal'>".__("One valid feed per line (no detection is done)")."</header>";
+        print "<section>";
 
-		print "<textarea
+        print "<textarea
 			style='font-size : 12px; width : 98%; height: 200px;'
 			dojoType='dijit.form.SimpleTextarea' name='feeds'></textarea>";
 
-		if (get_pref('ENABLE_FEED_CATS')) {
-			print "<fieldset>";
-			print "<label>" . __('Place in category:') . "</label> ";
-			print_feed_cat_select("cat", false, 'dojoType="fox.form.Select"');
-			print "</fieldset>";
-		}
+        if (get_pref('ENABLE_FEED_CATS')) {
+            print "<fieldset>";
+            print "<label>" . __('Place in category:') . "</label> ";
+            print_feed_cat_select("cat", false, 'dojoType="fox.form.Select"');
+            print "</fieldset>";
+        }
 
-		print "</section>";
+        print "</section>";
 
-		print "<div id='feedDlg_loginContainer' style='display : none'>";
+        print "<div id='feedDlg_loginContainer' style='display : none'>";
 
-		print "<header>" . __("Authentication") . "</header>";
-		print "<section>";
+        print "<header>" . __("Authentication") . "</header>";
+        print "<section>";
 
-		print "<input dojoType='dijit.form.TextBox' name='login' placeHolder=\"".__("Login")."\">
+        print "<input dojoType='dijit.form.TextBox' name='login' placeHolder=\"".__("Login")."\">
 			<input placeHolder=\"".__("Password")."\" dojoType=\"dijit.form.TextBox\" type='password'
 				autocomplete='new-password' name='pass''></div>";
 
-		print "</section>";
-		print "</div>";
+        print "</section>";
+        print "</div>";
 
-		print "<fieldset class='narrow'>
+        print "<fieldset class='narrow'>
 			<label class='checkbox'><input type='checkbox' name='need_auth' dojoType='dijit.form.CheckBox'
 					onclick='displayIfChecked(this, \"feedDlg_loginContainer\")'> ".
-				__('Feeds require authentication.')."</label></div>";
-		print "</fieldset>";
+                __('Feeds require authentication.')."</label></div>";
+        print "</fieldset>";
 
-		print "<footer>
+        print "<footer>
 			<button dojoType='dijit.form.Button' type='submit' class='alt-primary'>".__('Subscribe')."</button>
 			<button dojoType='dijit.form.Button' onclick=\"return dijit.byId('batchSubDlg').hide()\">".__('Cancel')."</button>
 			</footer>";
-	}
+    }
 
-	public function batchAddFeeds() {
-		$cat_id = clean($_REQUEST['cat']);
-		$feeds = explode("\n", clean($_REQUEST['feeds']));
-		$login = clean($_REQUEST['login']);
-		$pass = trim(clean($_REQUEST['pass']));
+    public function batchAddFeeds() {
+        $cat_id = clean($_REQUEST['cat']);
+        $feeds = explode("\n", clean($_REQUEST['feeds']));
+        $login = clean($_REQUEST['login']);
+        $pass = trim(clean($_REQUEST['pass']));
 
-		$csth = $this->pdo->prepare("SELECT id FROM ttrss_feeds
+        $csth = $this->pdo->prepare("SELECT id FROM ttrss_feeds
 						WHERE feed_url = ? AND owner_uid = ?");
 
-		$isth = $this->pdo->prepare("INSERT INTO ttrss_feeds
+        $isth = $this->pdo->prepare("INSERT INTO ttrss_feeds
 							(owner_uid,feed_url,title,cat_id,auth_login,auth_pass,update_method,auth_pass_encrypted)
 						VALUES (?, ?, '[Unknown]', ?, ?, ?, 0, false)");
 
-		foreach ($feeds as $feed) {
-			$feed = trim($feed);
+        foreach ($feeds as $feed) {
+            $feed = trim($feed);
 
-			if (Feeds::validate_feed_url($feed)) {
+            if (Feeds::validate_feed_url($feed)) {
 
-				$this->pdo->beginTransaction();
+                $this->pdo->beginTransaction();
 
-				$csth->execute([$feed, $_SESSION['uid']]);
+                $csth->execute([$feed, $_SESSION['uid']]);
 
-				if (!$csth->fetch()) {
-					$isth->execute([$_SESSION['uid'], $feed, $cat_id ? $cat_id : null, $login, $pass]);
-				}
+                if (!$csth->fetch()) {
+                    $isth->execute([$_SESSION['uid'], $feed, $cat_id ? $cat_id : null, $login, $pass]);
+                }
 
-				$this->pdo->commit();
-			}
-		}
-	}
+                $this->pdo->commit();
+            }
+        }
+    }
 
-	public function regenOPMLKey() {
-		$this->update_feed_access_key('OPML:Publish',
-		false, $_SESSION["uid"]);
+    public function regenOPMLKey() {
+        $this->update_feed_access_key('OPML:Publish',
+        false, $_SESSION["uid"]);
 
-		$new_link = Opml::opml_publish_url();
+        $new_link = Opml::opml_publish_url();
 
-		print json_encode(array("link" => $new_link));
-	}
+        print json_encode(array("link" => $new_link));
+    }
 
-	public function regenFeedKey() {
-		$feed_id = clean($_REQUEST['id']);
-		$is_cat = clean($_REQUEST['is_cat']);
+    public function regenFeedKey() {
+        $feed_id = clean($_REQUEST['id']);
+        $is_cat = clean($_REQUEST['is_cat']);
 
-		$new_key = $this->update_feed_access_key($feed_id, $is_cat);
+        $new_key = $this->update_feed_access_key($feed_id, $is_cat);
 
-		print json_encode(["link" => $new_key]);
-	}
+        print json_encode(["link" => $new_key]);
+    }
 
 
-	private function update_feed_access_key($feed_id, $is_cat, $owner_uid = false) {
-		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
+    private function update_feed_access_key($feed_id, $is_cat, $owner_uid = false) {
+        if (!$owner_uid) $owner_uid = $_SESSION["uid"];
 
-		// clear old value and generate new one
-		$sth = $this->pdo->prepare("DELETE FROM ttrss_access_keys
+        // clear old value and generate new one
+        $sth = $this->pdo->prepare("DELETE FROM ttrss_access_keys
 			WHERE feed_id = ? AND is_cat = ? AND owner_uid = ?");
-		$sth->execute([$feed_id, bool_to_sql_bool($is_cat), $owner_uid]);
+        $sth->execute([$feed_id, bool_to_sql_bool($is_cat), $owner_uid]);
 
-		return Feeds::get_feed_access_key($feed_id, $is_cat, $owner_uid);
-	}
+        return Feeds::get_feed_access_key($feed_id, $is_cat, $owner_uid);
+    }
 
-	// Silent
-	public function clearKeys() {
-		$sth = $this->pdo->prepare("DELETE FROM ttrss_access_keys WHERE
+    // Silent
+    public function clearKeys() {
+        $sth = $this->pdo->prepare("DELETE FROM ttrss_access_keys WHERE
 			owner_uid = ?");
-		$sth->execute([$_SESSION['uid']]);
-	}
-
-	private function calculate_children_count($cat) {
-		$c = 0;
-
-		foreach ($cat['items'] as $child) {
-			if ($child['type'] == 'category') {
-				$c += $this->calculate_children_count($child);
-			} else {
-				$c += 1;
-			}
-		}
-
-		return $c;
-	}
-
-	public function getinactivefeeds() {
-		if (DB_TYPE == "pgsql") {
-			$interval_qpart = "NOW() - INTERVAL '3 months'";
-		} else {
-			$interval_qpart = "DATE_SUB(NOW(), INTERVAL 3 MONTH)";
-		}
-
-		$sth = $this->pdo->prepare("SELECT COUNT(id) AS num_inactive FROM ttrss_feeds WHERE
+        $sth->execute([$_SESSION['uid']]);
+    }
+
+    private function calculate_children_count($cat) {
+        $c = 0;
+
+        foreach ($cat['items'] as $child) {
+            if ($child['type'] == 'category') {
+                $c += $this->calculate_children_count($child);
+            } else {
+                $c += 1;
+            }
+        }
+
+        return $c;
+    }
+
+    public function getinactivefeeds() {
+        if (DB_TYPE == "pgsql") {
+            $interval_qpart = "NOW() - INTERVAL '3 months'";
+        } else {
+            $interval_qpart = "DATE_SUB(NOW(), INTERVAL 3 MONTH)";
+        }
+
+        $sth = $this->pdo->prepare("SELECT COUNT(id) AS num_inactive FROM ttrss_feeds WHERE
 				(SELECT MAX(updated) FROM ttrss_entries, ttrss_user_entries WHERE
 					ttrss_entries.id = ref_id AND
 						ttrss_user_entries.feed_id = ttrss_feeds.id) < $interval_qpart AND
 			  ttrss_feeds.owner_uid = ?");
-		$sth->execute([$_SESSION['uid']]);
-
-		if ($row = $sth->fetch()) {
-			print (int)$row["num_inactive"];
-		}
-	}
-
-	public static function subscribe_to_feed_url() {
-		$url_path = get_self_url_prefix() .
-			"/public.php?op=subscribe&feed_url=%s";
-		return $url_path;
-	}
+        $sth->execute([$_SESSION['uid']]);
+
+        if ($row = $sth->fetch()) {
+            print (int)$row["num_inactive"];
+        }
+    }
+
+    public static function subscribe_to_feed_url() {
+        $url_path = get_self_url_prefix() .
+            "/public.php?op=subscribe&feed_url=%s";
+        return $url_path;
+    }
 
 }

Braces +40 added lines, -26 removed lines

@@ -42,10 +42,11 @@ 
 
 	private function get_category_items($cat_id) {
 
-		if (clean($_REQUEST['mode']) != 2)
-			$search = $_SESSION["prefs_feed_search"];
-		else
-			$search = "";
+		if (clean($_REQUEST['mode']) != 2) {
+					$search = $_SESSION["prefs_feed_search"];
+		} else {
+					$search = "";
+		}
 
 		// first one is set by API
 		$show_empty_cats = clean($_REQUEST['force_show_empty']) ||
@@ -76,8 +77,9 @@ 
 			$num_children = $this->calculate_children_count($cat);
 			$cat['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', (int) $num_children), $num_children);
 
-			if ($num_children > 0 || $show_empty_cats)
-				array_push($items, $cat);
+			if ($num_children > 0 || $show_empty_cats) {
+							array_push($items, $cat);
+			}
 
 		}
 
@@ -117,10 +119,11 @@ 
 
 	public function makefeedtree() {
 
-		if (clean($_REQUEST['mode']) != 2)
-			$search = $_SESSION["prefs_feed_search"];
-		else
-			$search = "";
+		if (clean($_REQUEST['mode']) != 2) {
+					$search = $_SESSION["prefs_feed_search"];
+		} else {
+					$search = "";
+		}
 
 		$root = array();
 		$root['id'] = 'root';
@@ -231,8 +234,9 @@ 
 				$num_children = $this->calculate_children_count($cat);
 				$cat['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', (int) $num_children), $num_children);
 
-				if ($num_children > 0 || $show_empty_cats)
-					array_push($root['items'], $cat);
+				if ($num_children > 0 || $show_empty_cats) {
+									array_push($root['items'], $cat);
+				}
 
 				$root['param'] += count($cat['items']);
 			}
@@ -279,8 +283,9 @@ 
 
 			$cat['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', count($cat['items'])), count($cat['items']));
 
-			if (count($cat['items']) > 0 || $show_empty_cats)
-				array_push($root['items'], $cat);
+			if (count($cat['items']) > 0 || $show_empty_cats) {
+							array_push($root['items'], $cat);
+			}
 
 			$num_children = $this->calculate_children_count($root);
 			$root['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', (int) $num_children), $num_children);
@@ -343,8 +348,9 @@ 
 	private function process_category_order(&$data_map, $item_id, $parent_id = false, $nest_level = 0) {
 
 		$prefix = "";
-		for ($i = 0; $i < $nest_level; $i++)
-			$prefix .= "   ";
+		for ($i = 0; $i < $nest_level; $i++) {
+					$prefix .= "   ";
+		}
 
 		Debug::log("$prefix C: $item_id P: $parent_id");
 
@@ -409,8 +415,9 @@ 
 		#file_put_contents("/tmp/saveorder.json", clean($_POST['payload']));
 		#$data = json_decode(file_get_contents("/tmp/saveorder.json"), true);
 
-		if (!is_array($data['items']))
-			$data['items'] = json_decode($data['items'], true);
+		if (!is_array($data['items'])) {
+					$data['items'] = json_decode($data['items'], true);
+		}
 
 #		print_r($data['items']);
 
@@ -494,7 +501,9 @@ 
 			}
 		}
 
-		if (is_file($icon_file)) @unlink($icon_file);
+		if (is_file($icon_file)) {
+		    @unlink($icon_file);
+		}
 
 		print $rc;
 		return;
@@ -590,8 +599,9 @@ 
 			if (DB_TYPE == "pgsql") {
 				$feed_language = $row["feed_language"];
 
-				if (!$feed_language)
-					$feed_language = get_pref('DEFAULT_SEARCH_LANGUAGE');
+				if (!$feed_language) {
+									$feed_language = get_pref('DEFAULT_SEARCH_LANGUAGE');
+				}
 
 				print "<fieldset>";
 
@@ -1404,11 +1414,13 @@ 
 		$obj = array();
 		$feed_id = (int) $feed_id;
 
-		if (!$title)
-			$title = Feeds::getFeedTitle($feed_id, false);
+		if (!$title) {
+					$title = Feeds::getFeedTitle($feed_id, false);
+		}
 
-		if ($unread === false)
-			$unread = getFeedUnread($feed_id, false);
+		if ($unread === false) {
+					$unread = getFeedUnread($feed_id, false);
+		}
 
 		$obj['id'] = 'FEED:' . $feed_id;
 		$obj['name'] = $title;
@@ -1738,7 +1750,9 @@ 
 
 
 	private function update_feed_access_key($feed_id, $is_cat, $owner_uid = false) {
-		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
+		if (!$owner_uid) {
+		    $owner_uid = $_SESSION["uid"];
+		}
 
 		// clear old value and generate new one
 		$sth = $this->pdo->prepare("DELETE FROM ttrss_access_keys

classes/pref/users.php

Spacing +10 added lines, -10 removed lines

@@ -52,7 +52,7 @@ 
 				}
 
 				print "<fieldset>";
-				print "<label>" . __("Login:") . "</label>";
+				print "<label>".__("Login:")."</label>";
 				print "<input style='font-size : 16px'
 					dojoType='dijit.form.ValidationTextBox' required='1'
 					$sel_disabled name='login' value=\"$login\">";
@@ -65,7 +65,7 @@ 
 
 				print "<fieldset>";
 
-				print "<label>" . __('Access level: ') . "</label> ";
+				print "<label>".__('Access level: ')."</label> ";
 
 				if (!$sel_disabled) {
 					print_select_hash("access_level", $access_level, $access_level_names,
@@ -79,7 +79,7 @@ 
 				print "</fieldset>";
 				print "<fieldset>";
 
-				print "<label>" . __("New password:") . "</label> ";
+				print "<label>".__("New password:")."</label> ";
 				print "<input dojoType='dijit.form.TextBox' type='password' size='20' placeholder='Change password'
 					name='password'>";
 
@@ -91,7 +91,7 @@ 
 				print "<section>";
 
 				print "<fieldset>";
-				print "<label>" . __("E-mail:") . "</label> ";
+				print "<label>".__("E-mail:")."</label> ";
 				print "<input dojoType='dijit.form.TextBox' size='30' name='email'
 					value=\"$email\">";
 				print "</fieldset>";
@@ -337,7 +337,7 @@ 
 			}
 
 			print "<div dojoType='fox.form.DropDownButton'>".
-					"<span>" . __('Select')."</span>";
+					"<span>".__('Select')."</span>";
 			print "<div dojoType='dijit.Menu' style='display: none'>";
 			print "<div onclick=\"Tables.select('prefUserList', true)\"
 				dojoType='dijit.MenuItem'>".__('All')."</div>";
@@ -405,12 +405,12 @@ 
 				print "<td align='center'><input onclick='Tables.onRowChecked(this); event.stopPropagation();'
 					dojoType='dijit.form.CheckBox' type='checkbox'></td>";
 
-				print "<td title='".__('Click to edit')."'><i class='material-icons'>person</i> " . $line["login"] . "</td>";
+				print "<td title='".__('Click to edit')."'><i class='material-icons'>person</i> ".$line["login"]."</td>";
 
-				print "<td>" .	$access_level_names[$line["access_level"]] . "</td>";
-				print "<td>" . $line["num_feeds"] . "</td>";
-				print "<td>" . $line["created"] . "</td>";
-				print "<td>" . $line["last_login"] . "</td>";
+				print "<td>".$access_level_names[$line["access_level"]]."</td>";
+				print "<td>".$line["num_feeds"]."</td>";
+				print "<td>".$line["created"]."</td>";
+				print "<td>".$line["last_login"]."</td>";
 
 				print "</tr>";
 

Indentation +266 added lines, -266 removed lines

@@ -1,130 +1,130 @@ 
 <?php
 class Pref_Users extends Handler_Protected {
-		public function before($method) {
-			if (parent::before($method)) {
-				if ($_SESSION["access_level"] < 10) {
-					print __("Your access level is insufficient to open this tab.");
-					return false;
-				}
-				return true;
-			}
-			return false;
-		}
+        public function before($method) {
+            if (parent::before($method)) {
+                if ($_SESSION["access_level"] < 10) {
+                    print __("Your access level is insufficient to open this tab.");
+                    return false;
+                }
+                return true;
+            }
+            return false;
+        }
 
-		public function csrf_ignore($method) {
-			$csrf_ignored = array("index", "edit", "userdetails");
+        public function csrf_ignore($method) {
+            $csrf_ignored = array("index", "edit", "userdetails");
 
-			return array_search($method, $csrf_ignored) !== false;
-		}
+            return array_search($method, $csrf_ignored) !== false;
+        }
 
-		public function edit() {
-			global $access_level_names;
+        public function edit() {
+            global $access_level_names;
 
-			print "<form id='user_edit_form' onsubmit='return false' dojoType='dijit.form.Form'>";
+            print "<form id='user_edit_form' onsubmit='return false' dojoType='dijit.form.Form'>";
 
-			print '<div dojoType="dijit.layout.TabContainer" style="height : 400px">
+            print '<div dojoType="dijit.layout.TabContainer" style="height : 400px">
         		<div dojoType="dijit.layout.ContentPane" title="'.__('Edit user').'">';
 
-			//print "<form id=\"user_edit_form\" onsubmit='return false' dojoType=\"dijit.form.Form\">";
+            //print "<form id=\"user_edit_form\" onsubmit='return false' dojoType=\"dijit.form.Form\">";
 
-			$id = (int) clean($_REQUEST["id"]);
+            $id = (int) clean($_REQUEST["id"]);
 
-			print_hidden("id", "$id");
-			print_hidden("op", "pref-users");
-			print_hidden("method", "editSave");
+            print_hidden("id", "$id");
+            print_hidden("op", "pref-users");
+            print_hidden("method", "editSave");
 
-			$sth = $this->pdo->prepare("SELECT * FROM ttrss_users WHERE id = ?");
-			$sth->execute([$id]);
+            $sth = $this->pdo->prepare("SELECT * FROM ttrss_users WHERE id = ?");
+            $sth->execute([$id]);
 
-			if ($row = $sth->fetch()) {
+            if ($row = $sth->fetch()) {
 
-				$login = $row["login"];
-				$access_level = $row["access_level"];
-				$email = $row["email"];
+                $login = $row["login"];
+                $access_level = $row["access_level"];
+                $email = $row["email"];
 
-				$sel_disabled = ($id == $_SESSION["uid"] || $login == "admin") ? "disabled" : "";
+                $sel_disabled = ($id == $_SESSION["uid"] || $login == "admin") ? "disabled" : "";
 
-				print "<header>".__("User")."</header>";
-				print "<section>";
+                print "<header>".__("User")."</header>";
+                print "<section>";
 
-				if ($sel_disabled) {
-					print_hidden("login", "$login");
-				}
+                if ($sel_disabled) {
+                    print_hidden("login", "$login");
+                }
 
-				print "<fieldset>";
-				print "<label>" . __("Login:") . "</label>";
-				print "<input style='font-size : 16px'
+                print "<fieldset>";
+                print "<label>" . __("Login:") . "</label>";
+                print "<input style='font-size : 16px'
 					dojoType='dijit.form.ValidationTextBox' required='1'
 					$sel_disabled name='login' value=\"$login\">";
-				print "</fieldset>";
+                print "</fieldset>";
 
-				print "</section>";
+                print "</section>";
 
-				print "<header>".__("Authentication")."</header>";
-				print "<section>";
+                print "<header>".__("Authentication")."</header>";
+                print "<section>";
 
-				print "<fieldset>";
+                print "<fieldset>";
 
-				print "<label>" . __('Access level: ') . "</label> ";
+                print "<label>" . __('Access level: ') . "</label> ";
 
-				if (!$sel_disabled) {
-					print_select_hash("access_level", $access_level, $access_level_names,
-						"dojoType=\"fox.form.Select\" $sel_disabled");
-				} else {
-					print_select_hash("", $access_level, $access_level_names,
-						"dojoType=\"fox.form.Select\" $sel_disabled");
-					print_hidden("access_level", "$access_level");
-				}
+                if (!$sel_disabled) {
+                    print_select_hash("access_level", $access_level, $access_level_names,
+                        "dojoType=\"fox.form.Select\" $sel_disabled");
+                } else {
+                    print_select_hash("", $access_level, $access_level_names,
+                        "dojoType=\"fox.form.Select\" $sel_disabled");
+                    print_hidden("access_level", "$access_level");
+                }
 
-				print "</fieldset>";
-				print "<fieldset>";
+                print "</fieldset>";
+                print "<fieldset>";
 
-				print "<label>" . __("New password:") . "</label> ";
-				print "<input dojoType='dijit.form.TextBox' type='password' size='20' placeholder='Change password'
+                print "<label>" . __("New password:") . "</label> ";
+                print "<input dojoType='dijit.form.TextBox' type='password' size='20' placeholder='Change password'
 					name='password'>";
 
-				print "</fieldset>";
+                print "</fieldset>";
 
-				print "</section>";
+                print "</section>";
 
-				print "<header>".__("Options")."</header>";
-				print "<section>";
+                print "<header>".__("Options")."</header>";
+                print "<section>";
 
-				print "<fieldset>";
-				print "<label>" . __("E-mail:") . "</label> ";
-				print "<input dojoType='dijit.form.TextBox' size='30' name='email'
+                print "<fieldset>";
+                print "<label>" . __("E-mail:") . "</label> ";
+                print "<input dojoType='dijit.form.TextBox' size='30' name='email'
 					value=\"$email\">";
-				print "</fieldset>";
+                print "</fieldset>";
 
-				print "</section>";
+                print "</section>";
 
-				print "</table>";
+                print "</table>";
 
-			}
+            }
 
-			print '</div>'; #tab
-			print "<div href=\"backend.php?op=pref-users&method=userdetails&id=$id\"
+            print '</div>'; #tab
+            print "<div href=\"backend.php?op=pref-users&method=userdetails&id=$id\"
 				dojoType=\"dijit.layout.ContentPane\" title=\"".__('User details')."\">";
 
-			print '</div>';
-			print '</div>';
+            print '</div>';
+            print '</div>';
 
-			print "<footer>
+            print "<footer>
 				<button dojoType='dijit.form.Button' class='alt-primary' type='submit' onclick=\"dijit.byId('userEditDlg').execute()\">".
-				__('Save')."</button>
+                __('Save')."</button>
 				<button dojoType='dijit.form.Button' onclick=\"dijit.byId('userEditDlg').hide()\">".
-				__('Cancel')."</button>
+                __('Cancel')."</button>
 				</footer>";
 
-			print "</form>";
+            print "</form>";
 
-			return;
-		}
+            return;
+        }
 
-		public function userdetails() {
-			$id = (int) clean($_REQUEST["id"]);
+        public function userdetails() {
+            $id = (int) clean($_REQUEST["id"]);
 
-			$sth = $this->pdo->prepare("SELECT login,
+            $sth = $this->pdo->prepare("SELECT login,
 				".SUBSTRING_FOR_DATE."(last_login,1,16) AS last_login,
 				access_level,
 				(SELECT COUNT(int_id) FROM ttrss_user_entries
@@ -132,242 +132,242 @@ 
 				".SUBSTRING_FOR_DATE."(created,1,16) AS created
 				FROM ttrss_users
 				WHERE id = ?");
-			$sth->execute([$id]);
+            $sth->execute([$id]);
 
-			if ($row = $sth->fetch()) {
-				print "<table width='100%'>";
+            if ($row = $sth->fetch()) {
+                print "<table width='100%'>";
 
-				$last_login = make_local_datetime(
-					$row["last_login"], true);
+                $last_login = make_local_datetime(
+                    $row["last_login"], true);
 
-				$created = make_local_datetime(
-					$row["created"], true);
+                $created = make_local_datetime(
+                    $row["created"], true);
 
-				$stored_articles = $row["stored_articles"];
+                $stored_articles = $row["stored_articles"];
 
-				print "<tr><td>".__('Registered')."</td><td>$created</td></tr>";
-				print "<tr><td>".__('Last logged in')."</td><td>$last_login</td></tr>";
+                print "<tr><td>".__('Registered')."</td><td>$created</td></tr>";
+                print "<tr><td>".__('Last logged in')."</td><td>$last_login</td></tr>";
 
-				$sth = $this->pdo->prepare("SELECT COUNT(id) as num_feeds FROM ttrss_feeds
+                $sth = $this->pdo->prepare("SELECT COUNT(id) as num_feeds FROM ttrss_feeds
 					WHERE owner_uid = ?");
-				$sth->execute([$id]);
-				$row = $sth->fetch();
-				$num_feeds = $row["num_feeds"];
+                $sth->execute([$id]);
+                $row = $sth->fetch();
+                $num_feeds = $row["num_feeds"];
 
-				print "<tr><td>".__('Subscribed feeds count')."</td><td>$num_feeds</td></tr>";
-				print "<tr><td>".__('Stored articles')."</td><td>$stored_articles</td></tr>";
+                print "<tr><td>".__('Subscribed feeds count')."</td><td>$num_feeds</td></tr>";
+                print "<tr><td>".__('Stored articles')."</td><td>$stored_articles</td></tr>";
 
-				print "</table>";
+                print "</table>";
 
-				print "<h1>".__('Subscribed feeds')."</h1>";
+                print "<h1>".__('Subscribed feeds')."</h1>";
 
-				$sth = $this->pdo->prepare("SELECT id,title,site_url FROM ttrss_feeds
+                $sth = $this->pdo->prepare("SELECT id,title,site_url FROM ttrss_feeds
 					WHERE owner_uid = ? ORDER BY title");
-				$sth->execute([$id]);
+                $sth->execute([$id]);
 
-				print "<ul class=\"panel panel-scrollable list list-unstyled\">";
+                print "<ul class=\"panel panel-scrollable list list-unstyled\">";
 
-				while ($line = $sth->fetch()) {
+                while ($line = $sth->fetch()) {
 
-					$icon_file = ICONS_URL."/".$line["id"].".ico";
+                    $icon_file = ICONS_URL."/".$line["id"].".ico";
 
-					if (file_exists($icon_file) && filesize($icon_file) > 0) {
-						$feed_icon = "<img class=\"icon\" src=\"$icon_file\">";
-					} else {
-						$feed_icon = "<img class=\"icon\" src=\"images/blank_icon.gif\">";
-					}
+                    if (file_exists($icon_file) && filesize($icon_file) > 0) {
+                        $feed_icon = "<img class=\"icon\" src=\"$icon_file\">";
+                    } else {
+                        $feed_icon = "<img class=\"icon\" src=\"images/blank_icon.gif\">";
+                    }
 
-					print "<li>$feed_icon&nbsp;<a href=\"".$line["site_url"]."\">".$line["title"]."</a></li>";
+                    print "<li>$feed_icon&nbsp;<a href=\"".$line["site_url"]."\">".$line["title"]."</a></li>";
 
-				}
+                }
 
-				print "</ul>";
+                print "</ul>";
 
 
-			} else {
-				print "<h1>".__('User not found')."</h1>";
-			}
+            } else {
+                print "<h1>".__('User not found')."</h1>";
+            }
 
-		}
+        }
 
-		public function editSave() {
-			$login = trim(clean($_REQUEST["login"]));
-			$uid = clean($_REQUEST["id"]);
-			$access_level = (int) clean($_REQUEST["access_level"]);
-			$email = trim(clean($_REQUEST["email"]));
-			$password = clean($_REQUEST["password"]);
+        public function editSave() {
+            $login = trim(clean($_REQUEST["login"]));
+            $uid = clean($_REQUEST["id"]);
+            $access_level = (int) clean($_REQUEST["access_level"]);
+            $email = trim(clean($_REQUEST["email"]));
+            $password = clean($_REQUEST["password"]);
 
-			if ($password) {
-				$salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
-				$pwd_hash = encrypt_password($password, $salt, true);
-				$pass_query_part = "pwd_hash = ".$this->pdo->quote($pwd_hash).",
+            if ($password) {
+                $salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
+                $pwd_hash = encrypt_password($password, $salt, true);
+                $pass_query_part = "pwd_hash = ".$this->pdo->quote($pwd_hash).",
 					salt = ".$this->pdo->quote($salt).",";
-			} else {
-				$pass_query_part = "";
-			}
+            } else {
+                $pass_query_part = "";
+            }
 
-			$sth = $this->pdo->prepare("UPDATE ttrss_users SET $pass_query_part login = ?,
+            $sth = $this->pdo->prepare("UPDATE ttrss_users SET $pass_query_part login = ?,
 				access_level = ?, email = ?, otp_enabled = false WHERE id = ?");
-			$sth->execute([$login, $access_level, $email, $uid]);
+            $sth->execute([$login, $access_level, $email, $uid]);
 
-		}
+        }
 
-		public function remove() {
-			$ids = explode(",", clean($_REQUEST["ids"]));
+        public function remove() {
+            $ids = explode(",", clean($_REQUEST["ids"]));
 
-			foreach ($ids as $id) {
-				if ($id != $_SESSION["uid"] && $id != 1) {
-					$sth = $this->pdo->prepare("DELETE FROM ttrss_tags WHERE owner_uid = ?");
-					$sth->execute([$id]);
+            foreach ($ids as $id) {
+                if ($id != $_SESSION["uid"] && $id != 1) {
+                    $sth = $this->pdo->prepare("DELETE FROM ttrss_tags WHERE owner_uid = ?");
+                    $sth->execute([$id]);
 
-					$sth = $this->pdo->prepare("DELETE FROM ttrss_feeds WHERE owner_uid = ?");
-					$sth->execute([$id]);
+                    $sth = $this->pdo->prepare("DELETE FROM ttrss_feeds WHERE owner_uid = ?");
+                    $sth->execute([$id]);
 
-					$sth = $this->pdo->prepare("DELETE FROM ttrss_users WHERE id = ?");
-					$sth->execute([$id]);
-				}
-			}
-		}
+                    $sth = $this->pdo->prepare("DELETE FROM ttrss_users WHERE id = ?");
+                    $sth->execute([$id]);
+                }
+            }
+        }
 
-		public function add() {
-			$login = trim(clean($_REQUEST["login"]));
-			$tmp_user_pwd = make_password();
-			$salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
-			$pwd_hash = encrypt_password($tmp_user_pwd, $salt, true);
+        public function add() {
+            $login = trim(clean($_REQUEST["login"]));
+            $tmp_user_pwd = make_password();
+            $salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
+            $pwd_hash = encrypt_password($tmp_user_pwd, $salt, true);
 
-			if (!$login) return; // no blank usernames
+            if (!$login) return; // no blank usernames
 
-			$sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE
+            $sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE
 				login = ?");
-			$sth->execute([$login]);
+            $sth->execute([$login]);
 
-			if (!$sth->fetch()) {
+            if (!$sth->fetch()) {
 
-				$sth = $this->pdo->prepare("INSERT INTO ttrss_users
+                $sth = $this->pdo->prepare("INSERT INTO ttrss_users
 					(login,pwd_hash,access_level,last_login,created, salt)
 					VALUES (?, ?, 0, null, NOW(), ?)");
-				$sth->execute([$login, $pwd_hash, $salt]);
+                $sth->execute([$login, $pwd_hash, $salt]);
 
-				$sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE
+                $sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE
 					login = ? AND pwd_hash = ?");
-				$sth->execute([$login, $pwd_hash]);
+                $sth->execute([$login, $pwd_hash]);
 
-				if ($row = $sth->fetch()) {
+                if ($row = $sth->fetch()) {
 
-					$new_uid = $row['id'];
+                    $new_uid = $row['id'];
 
-					print T_sprintf("Added user %s with password %s",
-						$login, $tmp_user_pwd);
+                    print T_sprintf("Added user %s with password %s",
+                        $login, $tmp_user_pwd);
 
-					initialize_user($new_uid);
+                    initialize_user($new_uid);
 
-				} else {
+                } else {
 
-					print T_sprintf("Could not create user %s", $login);
+                    print T_sprintf("Could not create user %s", $login);
 
-				}
-			} else {
-				print T_sprintf("User %s already exists.", $login);
-			}
-		}
+                }
+            } else {
+                print T_sprintf("User %s already exists.", $login);
+            }
+        }
 
-		public static function resetUserPassword($uid, $format_output = false) {
+        public static function resetUserPassword($uid, $format_output = false) {
 
-			$pdo = Db::pdo();
+            $pdo = Db::pdo();
 
-			$sth = $pdo->prepare("SELECT login FROM ttrss_users WHERE id = ?");
-			$sth->execute([$uid]);
+            $sth = $pdo->prepare("SELECT login FROM ttrss_users WHERE id = ?");
+            $sth->execute([$uid]);
 
-			if ($row = $sth->fetch()) {
+            if ($row = $sth->fetch()) {
 
-				$login = $row["login"];
+                $login = $row["login"];
 
-				$new_salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
-				$tmp_user_pwd = make_password();
+                $new_salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
+                $tmp_user_pwd = make_password();
 
-				$pwd_hash = encrypt_password($tmp_user_pwd, $new_salt, true);
+                $pwd_hash = encrypt_password($tmp_user_pwd, $new_salt, true);
 
-				$sth = $pdo->prepare("UPDATE ttrss_users
+                $sth = $pdo->prepare("UPDATE ttrss_users
 					  SET pwd_hash = ?, salt = ?, otp_enabled = false
 					WHERE id = ?");
-				$sth->execute([$pwd_hash, $new_salt, $uid]);
+                $sth->execute([$pwd_hash, $new_salt, $uid]);
 
-				$message = T_sprintf("Changed password of user %s to %s", "<strong>$login</strong>", "<strong>$tmp_user_pwd</strong>");
+                $message = T_sprintf("Changed password of user %s to %s", "<strong>$login</strong>", "<strong>$tmp_user_pwd</strong>");
 
-				if ($format_output)
-					print_notice($message);
-				else
-					print $message;
+                if ($format_output)
+                    print_notice($message);
+                else
+                    print $message;
 
-			}
-		}
+            }
+        }
 
-		public function resetPass() {
-			$uid = clean($_REQUEST["id"]);
-			Pref_Users::resetUserPassword($uid);
-		}
+        public function resetPass() {
+            $uid = clean($_REQUEST["id"]);
+            Pref_Users::resetUserPassword($uid);
+        }
 
-		public function index() {
+        public function index() {
 
-			global $access_level_names;
+            global $access_level_names;
 
-			print "<div dojoType='dijit.layout.BorderContainer' gutters='false'>";
-			print "<div style='padding : 0px' dojoType='dijit.layout.ContentPane' region='top'>";
-			print "<div dojoType='fox.Toolbar'>";
+            print "<div dojoType='dijit.layout.BorderContainer' gutters='false'>";
+            print "<div style='padding : 0px' dojoType='dijit.layout.ContentPane' region='top'>";
+            print "<div dojoType='fox.Toolbar'>";
 
-			$user_search = trim(clean($_REQUEST["search"]));
+            $user_search = trim(clean($_REQUEST["search"]));
 
-			if (array_key_exists("search", $_REQUEST)) {
-				$_SESSION["prefs_user_search"] = $user_search;
-			} else {
-				$user_search = $_SESSION["prefs_user_search"];
-			}
+            if (array_key_exists("search", $_REQUEST)) {
+                $_SESSION["prefs_user_search"] = $user_search;
+            } else {
+                $user_search = $_SESSION["prefs_user_search"];
+            }
 
-			print "<div style='float : right; padding-right : 4px;'>
+            print "<div style='float : right; padding-right : 4px;'>
 				<input dojoType='dijit.form.TextBox' id='user_search' size='20' type='search'
 					value=\"$user_search\">
 				<button dojoType='dijit.form.Button' onclick='Users.reload()'>".
-					__('Search')."</button>
+                    __('Search')."</button>
 				</div>";
 
-			$sort = clean($_REQUEST["sort"]);
+            $sort = clean($_REQUEST["sort"]);
 
-			if (!$sort || $sort == "undefined") {
-				$sort = "login";
-			}
+            if (!$sort || $sort == "undefined") {
+                $sort = "login";
+            }
 
-			print "<div dojoType='fox.form.DropDownButton'>".
-					"<span>" . __('Select')."</span>";
-			print "<div dojoType='dijit.Menu' style='display: none'>";
-			print "<div onclick=\"Tables.select('prefUserList', true)\"
+            print "<div dojoType='fox.form.DropDownButton'>".
+                    "<span>" . __('Select')."</span>";
+            print "<div dojoType='dijit.Menu' style='display: none'>";
+            print "<div onclick=\"Tables.select('prefUserList', true)\"
 				dojoType='dijit.MenuItem'>".__('All')."</div>";
-			print "<div onclick=\"Tables.select('prefUserList', false)\"
+            print "<div onclick=\"Tables.select('prefUserList', false)\"
 				dojoType='dijit.MenuItem'>".__('None')."</div>";
-			print "</div></div>";
+            print "</div></div>";
 
-			print "<button dojoType='dijit.form.Button' onclick='Users.add()'>".__('Create user')."</button>";
+            print "<button dojoType='dijit.form.Button' onclick='Users.add()'>".__('Create user')."</button>";
 
-			print "
+            print "
 				<button dojoType='dijit.form.Button' onclick='Users.editSelected()'>".
-				__('Edit')."</button dojoType=\"dijit.form.Button\">
+                __('Edit')."</button dojoType=\"dijit.form.Button\">
 				<button dojoType='dijit.form.Button' onclick='Users.removeSelected()'>".
-				__('Remove')."</button dojoType=\"dijit.form.Button\">
+                __('Remove')."</button dojoType=\"dijit.form.Button\">
 				<button dojoType='dijit.form.Button' onclick='Users.resetSelected()'>".
-				__('Reset password')."</button dojoType=\"dijit.form.Button\">";
+                __('Reset password')."</button dojoType=\"dijit.form.Button\">";
 
-			PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION,
-				"hook_prefs_tab_section", "prefUsersToolbar");
+            PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION,
+                "hook_prefs_tab_section", "prefUsersToolbar");
 
-			print "</div>"; #toolbar
-			print "</div>"; #pane
-			print "<div style='padding : 0px' dojoType='dijit.layout.ContentPane' region='center'>";
+            print "</div>"; #toolbar
+            print "</div>"; #pane
+            print "<div style='padding : 0px' dojoType='dijit.layout.ContentPane' region='center'>";
 
-			$sort = $this->validate_field($sort,
-				["login", "access_level", "created", "num_feeds", "created", "last_login"], "login");
+            $sort = $this->validate_field($sort,
+                ["login", "access_level", "created", "num_feeds", "created", "last_login"], "login");
 
-			if ($sort != "login") $sort = "$sort DESC";
+            if ($sort != "login") $sort = "$sort DESC";
 
-			$sth = $this->pdo->prepare("SELECT
+            $sth = $this->pdo->prepare("SELECT
 					tu.id,
 					login,access_level,email,
 					".SUBSTRING_FOR_DATE."(last_login,1,16) as last_login,
@@ -378,11 +378,11 @@ 
 				WHERE
 					(:search = '' OR login LIKE :search) AND tu.id > 0
 				ORDER BY $sort");
-			$sth->execute([":search" => $user_search ? "%$user_search%" : ""]);
+            $sth->execute([":search" => $user_search ? "%$user_search%" : ""]);
 
-			print "<p><table width='100%' cellspacing='0' class='prefUserList' id='prefUserList'>";
+            print "<p><table width='100%' cellspacing='0' class='prefUserList' id='prefUserList'>";
 
-			print "<tr class='title'>
+            print "<tr class='title'>
 						<td align='center' width='5%'>&nbsp;</td>
 						<td width='20%'><a href='#' onclick=\"Users.reload('login')\">".__('Login')."</a></td>
 						<td width='20%'><a href='#' onclick=\"Users.reload('access_level')\">".__('Access Level')."</a></td>
@@ -390,57 +390,57 @@ 
 						<td width='20%'><a href='#' onclick=\"Users.reload('created')\">".__('Registered')."</a></td>
 						<td width='20%'><a href='#' onclick=\"Users.reload('last_login')\">".__('Last login')."</a></td></tr>";
 
-			$lnum = 0;
+            $lnum = 0;
 
-			while ($line = $sth->fetch()) {
+            while ($line = $sth->fetch()) {
 
-				$uid = $line["id"];
+                $uid = $line["id"];
 
-				print "<tr data-row-id='$uid' onclick='Users.edit($uid)'>";
+                print "<tr data-row-id='$uid' onclick='Users.edit($uid)'>";
 
-				$line["login"] = htmlspecialchars($line["login"]);
-				$line["created"] = make_local_datetime($line["created"], false);
-				$line["last_login"] = make_local_datetime($line["last_login"], false);
+                $line["login"] = htmlspecialchars($line["login"]);
+                $line["created"] = make_local_datetime($line["created"], false);
+                $line["last_login"] = make_local_datetime($line["last_login"], false);
 
-				print "<td align='center'><input onclick='Tables.onRowChecked(this); event.stopPropagation();'
+                print "<td align='center'><input onclick='Tables.onRowChecked(this); event.stopPropagation();'
 					dojoType='dijit.form.CheckBox' type='checkbox'></td>";
 
-				print "<td title='".__('Click to edit')."'><i class='material-icons'>person</i> " . $line["login"] . "</td>";
+                print "<td title='".__('Click to edit')."'><i class='material-icons'>person</i> " . $line["login"] . "</td>";
 
-				print "<td>" .	$access_level_names[$line["access_level"]] . "</td>";
-				print "<td>" . $line["num_feeds"] . "</td>";
-				print "<td>" . $line["created"] . "</td>";
-				print "<td>" . $line["last_login"] . "</td>";
+                print "<td>" .	$access_level_names[$line["access_level"]] . "</td>";
+                print "<td>" . $line["num_feeds"] . "</td>";
+                print "<td>" . $line["created"] . "</td>";
+                print "<td>" . $line["last_login"] . "</td>";
 
-				print "</tr>";
+                print "</tr>";
 
-				++$lnum;
-			}
+                ++$lnum;
+            }
 
-			print "</table>";
+            print "</table>";
 
-			if ($lnum == 0) {
-				if (!$user_search) {
-					print_warning(__('No users defined.'));
-				} else {
-					print_warning(__('No matching users found.'));
-				}
-			}
+            if ($lnum == 0) {
+                if (!$user_search) {
+                    print_warning(__('No users defined.'));
+                } else {
+                    print_warning(__('No matching users found.'));
+                }
+            }
 
-			print "</div>"; #pane
+            print "</div>"; #pane
 
-			PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB,
-				"hook_prefs_tab", "prefUsers");
+            PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB,
+                "hook_prefs_tab", "prefUsers");
 
-			print "</div>"; #container
+            print "</div>"; #container
 
-		}
+        }
 
-		public function validate_field($string, $allowed, $default = "") {
-			if (in_array($string, $allowed))
-				return $string;
-			else
-				return $default;
-		}
+        public function validate_field($string, $allowed, $default = "") {
+            if (in_array($string, $allowed))
+                return $string;
+            else
+                return $default;
+        }
 
 }

Braces +17 added lines, -10 removed lines

@@ -235,7 +235,10 @@ 
 			$salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
 			$pwd_hash = encrypt_password($tmp_user_pwd, $salt, true);
 
-			if (!$login) return; // no blank usernames
+			if (!$login) {
+			    return;
+			}
+			// no blank usernames
 
 			$sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE
 				login = ?");
@@ -294,10 +297,11 @@ 
 
 				$message = T_sprintf("Changed password of user %s to %s", "<strong>$login</strong>", "<strong>$tmp_user_pwd</strong>");
 
-				if ($format_output)
-					print_notice($message);
-				else
-					print $message;
+				if ($format_output) {
+									print_notice($message);
+				} else {
+									print $message;
+				}
 
 			}
 		}
@@ -365,7 +369,9 @@ 
 			$sort = $this->validate_field($sort,
 				["login", "access_level", "created", "num_feeds", "created", "last_login"], "login");
 
-			if ($sort != "login") $sort = "$sort DESC";
+			if ($sort != "login") {
+			    $sort = "$sort DESC";
+			}
 
 			$sth = $this->pdo->prepare("SELECT
 					tu.id,
@@ -437,10 +443,11 @@ 
 		}
 
 		public function validate_field($string, $allowed, $default = "") {
-			if (in_array($string, $allowed))
-				return $string;
-			else
-				return $default;
+			if (in_array($string, $allowed)) {
+							return $string;
+			} else {
+							return $default;
+			}
 		}
 
 }

classes/debug.php

Spacing +3 added lines, -3 removed lines

@@ -40,7 +40,7 @@ 
 
         $ts = strftime("%H:%M:%S", time());
         if (function_exists('posix_getpid')) {
-            $ts = "$ts/" . posix_getpid();
+            $ts = "$ts/".posix_getpid();
         }
 
         if (Debug::$logfile) {
@@ -60,7 +60,7 @@ 
 
                     if (!$locked) {
                         fclose($fp);
-                        user_error("Unable to lock debugging log file: " . Debug::$logfile, E_USER_WARNING);
+                        user_error("Unable to lock debugging log file: ".Debug::$logfile, E_USER_WARNING);
                         return;
                     }
                 }
@@ -77,7 +77,7 @@ 
                     return;
 
             } else {
-                user_error("Unable to open debugging log file: " . Debug::$logfile, E_USER_WARNING);
+                user_error("Unable to open debugging log file: ".Debug::$logfile, E_USER_WARNING);
             }
         }
 

Indentation +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 class Debug {
-	public static $LOG_DISABLED = -1;
+    public static $LOG_DISABLED = -1;
     public static $LOG_NORMAL = 0;
     public static $LOG_VERBOSE = 1;
     public static $LOG_EXTENDED = 2;
@@ -10,7 +10,7 @@ 
     private static $logfile = false;
     private static $loglevel = 0;
 
-	public static function set_logfile($logfile) {
+    public static function set_logfile($logfile) {
         Debug::$logfile = $logfile;
     }
 

Braces +6 added lines, -3 removed lines

@@ -36,7 +36,9 @@ 
 
     public static function log($message, $level = 0) {
 
-        if (!Debug::$enabled || Debug::$loglevel < $level) return false;
+        if (!Debug::$enabled || Debug::$loglevel < $level) {
+            return false;
+        }
 
         $ts = strftime("%H:%M:%S", time());
         if (function_exists('posix_getpid')) {
@@ -73,8 +75,9 @@ 
 
                 fclose($fp);
 
-                if (Debug::$quiet)
-                    return;
+                if (Debug::$quiet) {
+                                    return;
+                }
 
             } else {
                 user_error("Unable to open debugging log file: " . Debug::$logfile, E_USER_WARNING);

classes/logger/syslog.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 			$priority = LOG_INFO;
 		}
 
-		$errname = Logger::$errornames[$errno] . " ($errno)";
+		$errname = Logger::$errornames[$errno]." ($errno)";
 
 		syslog($priority, "[tt-rss] $errname ($file:$line) $errstr");
 

Indentation +24 added lines, -24 removed lines

@@ -1,33 +1,33 @@
 <?php
 class Logger_Syslog {
 
-	/**
-	 * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-	 */
-	public function log_error($errno, $errstr, $file, $line, $context) {
+    /**
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function log_error($errno, $errstr, $file, $line, $context) {
 
-		switch ($errno) {
-		case E_ERROR:
-		case E_PARSE:
-		case E_CORE_ERROR:
-		case E_COMPILE_ERROR:
-		case E_USER_ERROR:
-			$priority = LOG_ERR;
-			break;
-		case E_WARNING:
-		case E_CORE_WARNING:
-		case E_COMPILE_WARNING:
-		case E_USER_WARNING:
-			$priority = LOG_WARNING;
-			break;
-		default:
-			$priority = LOG_INFO;
-		}
+        switch ($errno) {
+        case E_ERROR:
+        case E_PARSE:
+        case E_CORE_ERROR:
+        case E_COMPILE_ERROR:
+        case E_USER_ERROR:
+            $priority = LOG_ERR;
+            break;
+        case E_WARNING:
+        case E_CORE_WARNING:
+        case E_COMPILE_WARNING:
+        case E_USER_WARNING:
+            $priority = LOG_WARNING;
+            break;
+        default:
+            $priority = LOG_INFO;
+        }
 
-		$errname = Logger::$errornames[$errno] . " ($errno)";
+        $errname = Logger::$errornames[$errno] . " ($errno)";
 
-		syslog($priority, "[tt-rss] $errname ($file:$line) $errstr");
+        syslog($priority, "[tt-rss] $errname ($file:$line) $errstr");
 
-	}
+    }
 
 }

classes/logger/sql.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 
 			foreach ($server_params as $n => $p) {
 				if (isset($_SERVER[$p]))
-					$context .= "\n$n: " . $_SERVER[$p];
+					$context .= "\n$n: ".$_SERVER[$p];
 			}
 
 			// passed error message may contain invalid unicode characters, failing to insert an error here

Indentation +27 added lines, -27 removed lines

@@ -1,45 +1,45 @@
 <?php
 class Logger_SQL {
 
-	private $pdo;
+    private $pdo;
 
-	public function log_error($errno, $errstr, $file, $line, $context) {
+    public function log_error($errno, $errstr, $file, $line, $context) {
 
-		// separate PDO connection object is used for logging
-		if (!$this->pdo) $this->pdo = Db::instance()->pdo_connect();
+        // separate PDO connection object is used for logging
+        if (!$this->pdo) $this->pdo = Db::instance()->pdo_connect();
 
-		if ($this->pdo && get_schema_version() > 117) {
+        if ($this->pdo && get_schema_version() > 117) {
 
-			$owner_uid = $_SESSION["uid"] ? $_SESSION["uid"] : null;
+            $owner_uid = $_SESSION["uid"] ? $_SESSION["uid"] : null;
 
-			// limit context length, DOMDocument dumps entire XML in here sometimes, which may be huge
-			$context = mb_substr($context, 0, 8192);
+            // limit context length, DOMDocument dumps entire XML in here sometimes, which may be huge
+            $context = mb_substr($context, 0, 8192);
 
-			$server_params = [
-				"IP" => "REMOTE_ADDR",
-				"Request URI" => "REQUEST_URI",
-				"User agent" => "HTTP_USER_AGENT",
-			];
+            $server_params = [
+                "IP" => "REMOTE_ADDR",
+                "Request URI" => "REQUEST_URI",
+                "User agent" => "HTTP_USER_AGENT",
+            ];
 
-			foreach ($server_params as $n => $p) {
-				if (isset($_SERVER[$p]))
-					$context .= "\n$n: " . $_SERVER[$p];
-			}
+            foreach ($server_params as $n => $p) {
+                if (isset($_SERVER[$p]))
+                    $context .= "\n$n: " . $_SERVER[$p];
+            }
 
-			// passed error message may contain invalid unicode characters, failing to insert an error here
-			// would break the execution entirely by generating an actual fatal error instead of a E_WARNING etc
-			$errstr = UConverter::transcode($errstr, 'UTF-8', 'UTF-8');
-			$context = UConverter::transcode($context, 'UTF-8', 'UTF-8');
+            // passed error message may contain invalid unicode characters, failing to insert an error here
+            // would break the execution entirely by generating an actual fatal error instead of a E_WARNING etc
+            $errstr = UConverter::transcode($errstr, 'UTF-8', 'UTF-8');
+            $context = UConverter::transcode($context, 'UTF-8', 'UTF-8');
 
-			$sth = $this->pdo->prepare("INSERT INTO ttrss_error_log
+            $sth = $this->pdo->prepare("INSERT INTO ttrss_error_log
 				(errno, errstr, filename, lineno, context, owner_uid, created_at) VALUES
 				(?, ?, ?, ?, ?, ?, NOW())");
-			$sth->execute([$errno, $errstr, $file, $line, $context, $owner_uid]);
+            $sth->execute([$errno, $errstr, $file, $line, $context, $owner_uid]);
 
-			return $sth->rowCount();
-		}
+            return $sth->rowCount();
+        }
 
-		return false;
-	}
+        return false;
+    }
 
 }

Braces +6 added lines, -3 removed lines

@@ -6,7 +6,9 @@ 
 	public function log_error($errno, $errstr, $file, $line, $context) {
 
 		// separate PDO connection object is used for logging
-		if (!$this->pdo) $this->pdo = Db::instance()->pdo_connect();
+		if (!$this->pdo) {
+		    $this->pdo = Db::instance()->pdo_connect();
+		}
 
 		if ($this->pdo && get_schema_version() > 117) {
 
@@ -22,8 +24,9 @@ 
 			];
 
 			foreach ($server_params as $n => $p) {
-				if (isset($_SERVER[$p]))
-					$context .= "\n$n: " . $_SERVER[$p];
+				if (isset($_SERVER[$p])) {
+									$context .= "\n$n: " . $_SERVER[$p];
+				}
 			}
 
 			// passed error message may contain invalid unicode characters, failing to insert an error here

classes/rssutils.php

Switch Indentation +26 added lines, -26 removed lines

@@ -1349,35 +1349,35 @@
 					continue;
 
 				switch ($rule["type"]) {
-					case "title":
-						$match = @preg_match("/$reg_exp/iu", $title);
-						break;
-					case "content":
-						// we don't need to deal with multiline regexps
-						$content = preg_replace("/[\r\n\t]/", "", $content);
+				case "title":
+					$match = @preg_match("/$reg_exp/iu", $title);
+					break;
+				case "content":
+					// we don't need to deal with multiline regexps
+					$content = preg_replace("/[\r\n\t]/", "", $content);
 
-						$match = @preg_match("/$reg_exp/iu", $content);
-						break;
-					case "both":
-						// we don't need to deal with multiline regexps
-						$content = preg_replace("/[\r\n\t]/", "", $content);
+					$match = @preg_match("/$reg_exp/iu", $content);
+					break;
+				case "both":
+					// we don't need to deal with multiline regexps
+					$content = preg_replace("/[\r\n\t]/", "", $content);
 
-						$match = (@preg_match("/$reg_exp/iu", $title) || @preg_match("/$reg_exp/iu", $content));
-						break;
-					case "link":
-						$match = @preg_match("/$reg_exp/iu", $link);
-						break;
-					case "author":
-						$match = @preg_match("/$reg_exp/iu", $author);
-						break;
-					case "tag":
-						foreach ($tags as $tag) {
-							if (@preg_match("/$reg_exp/iu", $tag)) {
-								$match = true;
-								break;
-							}
+					$match = (@preg_match("/$reg_exp/iu", $title) || @preg_match("/$reg_exp/iu", $content));
+					break;
+				case "link":
+					$match = @preg_match("/$reg_exp/iu", $link);
+					break;
+				case "author":
+					$match = @preg_match("/$reg_exp/iu", $author);
+					break;
+				case "tag":
+					foreach ($tags as $tag) {
+						if (@preg_match("/$reg_exp/iu", $tag)) {
+							$match = true;
+							break;
 						}
-						break;
+					}
+					break;
 				}
 
 				if ($rule_inverse) $match = !$match;

Spacing +32 added lines, -32 removed lines

@@ -7,11 +7,11 @@ 
 			if ($k != "feed" && isset($v)) {
 				$x = strip_tags(is_array($v) ? implode(",", $v) : $v);
 
-				$tmp .= sha1("$k:" . sha1($x));
+				$tmp .= sha1("$k:".sha1($x));
 			}
 		}
 
-		return sha1(implode(",", $pluginhost->get_plugin_names()) . $tmp);
+		return sha1(implode(",", $pluginhost->get_plugin_names()).$tmp);
 	}
 
 	// Strips utf8mb4 characters (i.e. emoji) for mysql
@@ -137,7 +137,7 @@ 
 			//update_rss_feed($line["id"], true);
 
 			if ($tline = $usth->fetch()) {
-				Debug::log(" => " . $tline["last_updated"] . ", " . $tline["id"] . " " . $tline["owner_uid"]);
+				Debug::log(" => ".$tline["last_updated"].", ".$tline["id"]." ".$tline["owner_uid"]);
 
 				if (array_search($tline["owner_uid"], $batch_owners) === FALSE)
 					array_push($batch_owners, $tline["owner_uid"]);
@@ -323,7 +323,7 @@ 
 
 		$date_feed_processed = date('Y-m-d H:i');
 
-		$cache_filename = CACHE_DIR . "/feeds/" . sha1($fetch_url) . ".xml";
+		$cache_filename = CACHE_DIR."/feeds/".sha1($fetch_url).".xml";
 
 		$pluginhost = new PluginHost();
 		$user_plugins = get_pref("_ENABLED_PLUGINS", $owner_uid);
@@ -340,7 +340,7 @@ 
 		Debug::log("running HOOK_FETCH_FEED handlers...", Debug::$LOG_VERBOSE);
 
 		foreach ($pluginhost->get_hooks(PluginHost::HOOK_FETCH_FEED) as $plugin) {
-			Debug::log("... " . get_class($plugin), Debug::$LOG_VERBOSE);
+			Debug::log("... ".get_class($plugin), Debug::$LOG_VERBOSE);
 			$start = microtime(true);
 			$feed_data = $plugin->hook_fetch_feed($feed_data, $fetch_url, $owner_uid, $feed, 0, $auth_login, $auth_pass);
 			Debug::log(sprintf("=== %.4f (sec)", microtime(true) - $start), Debug::$LOG_VERBOSE);
@@ -402,7 +402,7 @@ 
 			$feed_data = trim($feed_data);
 
 			Debug::log("fetch done.", Debug::$LOG_VERBOSE);
-			Debug::log("source last modified: " . $fetch_last_modified, Debug::$LOG_VERBOSE);
+			Debug::log("source last modified: ".$fetch_last_modified, Debug::$LOG_VERBOSE);
 
 			if ($feed_data && $fetch_last_modified != $stored_last_modified) {
 				$sth = $pdo->prepare("UPDATE ttrss_feeds SET last_modified = ? WHERE id = ?");
@@ -410,7 +410,7 @@ 
 			}
 
 			// cache vanilla feed data for re-use
-			if ($feed_data && !$auth_pass && !$auth_login && is_writable(CACHE_DIR . "/feeds")) {
+			if ($feed_data && !$auth_pass && !$auth_login && is_writable(CACHE_DIR."/feeds")) {
 				$new_rss_hash = sha1($feed_data);
 
 				if ($new_rss_hash != $rss_hash) {
@@ -445,7 +445,7 @@ 
 		$feed_data_checksum = md5($feed_data);
 
 		foreach ($pluginhost->get_hooks(PluginHost::HOOK_FEED_FETCHED) as $plugin) {
-			Debug::log("... " . get_class($plugin), Debug::$LOG_VERBOSE);
+			Debug::log("... ".get_class($plugin), Debug::$LOG_VERBOSE);
 			$start = microtime(true);
 			$feed_data = $plugin->hook_feed_fetched($feed_data, $fetch_url, $owner_uid, $feed);
 			Debug::log(sprintf("=== %.4f (sec)", microtime(true) - $start), Debug::$LOG_VERBOSE);
@@ -467,7 +467,7 @@ 
 			// We use local pluginhost here because we need to load different per-user feed plugins
 
 			foreach ($pluginhost->get_hooks(PluginHost::HOOK_FEED_PARSED) as $plugin) {
-				Debug::log("... " . get_class($plugin), Debug::$LOG_VERBOSE);
+				Debug::log("... ".get_class($plugin), Debug::$LOG_VERBOSE);
 				$start = microtime(true);
 				$plugin->hook_feed_parsed($rss);
 				Debug::log(sprintf("=== %.4f (sec)", microtime(true) - $start), Debug::$LOG_VERBOSE);
@@ -499,14 +499,14 @@ 
 			$site_url = mb_substr(rewrite_relative_url($fetch_url, clean($rss->get_link())), 0, 245);
 
 			Debug::log("site_url: $site_url", Debug::$LOG_VERBOSE);
-			Debug::log("feed_title: " . clean($rss->get_title()), Debug::$LOG_VERBOSE);
+			Debug::log("feed_title: ".clean($rss->get_title()), Debug::$LOG_VERBOSE);
 
 			if ($favicon_needs_check || $force_refetch) {
 
 				/* terrible hack: if we crash on floicon shit here, we won't check
 				 * the icon avgcolor again (unless the icon got updated) */
 
-				$favicon_file = ICONS_DIR . "/$feed.ico";
+				$favicon_file = ICONS_DIR."/$feed.ico";
 				$favicon_modified = @filemtime($favicon_file);
 
 				Debug::log("checking favicon...", Debug::$LOG_VERBOSE);
@@ -527,7 +527,7 @@ 
 
 					$favicon_color = calculate_avg_color($favicon_file);
 
-					$favicon_colorstring = ",favicon_avg_color = " . $pdo->quote($favicon_color);
+					$favicon_colorstring = ",favicon_avg_color = ".$pdo->quote($favicon_color);
 
 				} else if ($favicon_avg_color == 'fail') {
 					Debug::log("floicon failed on this file, not trying to recalculate avg color", Debug::$LOG_VERBOSE);
@@ -546,7 +546,7 @@ 
 				print_r($filters);
 			}
 
-			Debug::log("" . count($filters) . " filters loaded.", Debug::$LOG_VERBOSE);
+			Debug::log("".count($filters)." filters loaded.", Debug::$LOG_VERBOSE);
 
 			$items = $rss->get_items();
 
@@ -588,13 +588,13 @@ 
 
 				$entry_guid = "$owner_uid,$entry_guid";
 
-				$entry_guid_hashed = 'SHA1:' . sha1($entry_guid);
+				$entry_guid_hashed = 'SHA1:'.sha1($entry_guid);
 
 				Debug::log("guid $entry_guid / $entry_guid_hashed", Debug::$LOG_VERBOSE);
 
-				$entry_timestamp = (int)$item->get_date();
+				$entry_timestamp = (int) $item->get_date();
 
-				Debug::log("orig date: " . $item->get_date(), Debug::$LOG_VERBOSE);
+				Debug::log("orig date: ".$item->get_date(), Debug::$LOG_VERBOSE);
 
 				$entry_title = strip_tags($item->get_title());
 
@@ -606,7 +606,7 @@ 
 				Debug::log("link $entry_link", Debug::$LOG_VERBOSE);
 				Debug::log("language $entry_language", Debug::$LOG_VERBOSE);
 
-				if (!$entry_title) $entry_title = date("Y-m-d H:i:s", $entry_timestamp);;
+				if (!$entry_title) $entry_title = date("Y-m-d H:i:s", $entry_timestamp); ;
 
 				$entry_content = $item->get_content();
 				if (!$entry_content) $entry_content = $item->get_description();
@@ -627,7 +627,7 @@ 
 				Debug::log("looking for tags...", Debug::$LOG_VERBOSE);
 
 				$entry_tags = $item->get_categories();
-				Debug::log("tags found: " . join(", ", $entry_tags), Debug::$LOG_VERBOSE);
+				Debug::log("tags found: ".join(", ", $entry_tags), Debug::$LOG_VERBOSE);
 
 				Debug::log("done collecting data.", Debug::$LOG_VERBOSE);
 
@@ -692,14 +692,14 @@ 
 				Debug::log("hash differs, applying plugin filters:", Debug::$LOG_VERBOSE);
 
 				foreach ($pluginhost->get_hooks(PluginHost::HOOK_ARTICLE_FILTER) as $plugin) {
-					Debug::log("... " . get_class($plugin), Debug::$LOG_VERBOSE);
+					Debug::log("... ".get_class($plugin), Debug::$LOG_VERBOSE);
 
 					$start = microtime(true);
 					$article = $plugin->hook_article_filter($article);
 
 					Debug::log(sprintf("=== %.4f (sec)", microtime(true) - $start), Debug::$LOG_VERBOSE);
 
-					$entry_plugin_data .= mb_strtolower(get_class($plugin)) . ",";
+					$entry_plugin_data .= mb_strtolower(get_class($plugin)).",";
 				}
 
                 if (Debug::get_loglevel() >= 3) {
@@ -772,7 +772,7 @@ 
 					Debug::log("applying plugin filter actions...", Debug::$LOG_VERBOSE);
 
 					foreach ($plugin_filter_names as $pfn) {
-						list($pfclass,$pfaction) = explode(":", $pfn["param"]);
+						list($pfclass, $pfaction) = explode(":", $pfn["param"]);
 
 						if (isset($plugin_filter_actions[$pfclass])) {
 							$plugin = $pluginhost->get_plugin($pfclass);
@@ -867,7 +867,7 @@ 
 							$entry_current_hash,
 							$date_feed_processed,
 							$entry_comments,
-							(int)$num_comments,
+							(int) $num_comments,
 							$entry_plugin_data,
 							"$entry_language",
 							"$entry_author"]);
@@ -979,7 +979,7 @@ 
 						":content" => "$entry_content",
 						":content_hash" => $entry_current_hash,
 						":updated" => $entry_timestamp_fmt,
-						":num_comments" => (int)$num_comments,
+						":num_comments" => (int) $num_comments,
 						":plugin_data" => $entry_plugin_data,
 						":author" => "$entry_author",
 						":lang" => $entry_language,
@@ -987,7 +987,7 @@ 
 
 					if (DB_TYPE == "pgsql") {
 						$params[":ts_lang"] = $feed_language;
-						$params[":ts_content"] = mb_substr(strip_tags($entry_title . " " . $entry_content), 0, 900000);
+						$params[":ts_content"] = mb_substr(strip_tags($entry_title." ".$entry_content), 0, 900000);
 					}
 
 					$sth->execute($params);
@@ -1067,7 +1067,7 @@ 
 				foreach ($enclosures as $enc) {
 					$enc_url = $enc[0];
 					$enc_type = $enc[1];
-					$enc_dur = (int)$enc[2];
+					$enc_dur = (int) $enc[2];
 					$enc_title = $enc[3];
 					$enc_width = intval($enc[4]);
 					$enc_height = intval($enc[5]);
@@ -1075,7 +1075,7 @@ 
 					$esth->execute([$enc_url, $enc_type, $entry_ref_id]);
 
 					if (!$esth->fetch()) {
-						$usth->execute([$enc_url, $enc_type, (string)$enc_title, $enc_dur, $entry_ref_id, $enc_width, $enc_height]);
+						$usth->execute([$enc_url, $enc_type, (string) $enc_title, $enc_dur, $entry_ref_id, $enc_width, $enc_height]);
 					}
 				}
 
@@ -1109,7 +1109,7 @@ 
 				$filtered_tags = array_unique($filtered_tags);
 
 				if (Debug::get_loglevel() >= Debug::$LOG_VERBOSE) {
-					Debug::log("filtered tags: " . implode(", ", $filtered_tags), Debug::$LOG_VERBOSE);
+					Debug::log("filtered tags: ".implode(", ", $filtered_tags), Debug::$LOG_VERBOSE);
 
 				}
 
@@ -1297,11 +1297,11 @@ 
 		$num_deleted = 0;
 
 		if (is_writable(LOCK_DIRECTORY)) {
-			$files = glob(LOCK_DIRECTORY . "/*.lock");
+			$files = glob(LOCK_DIRECTORY."/*.lock");
 
 			if ($files) {
 				foreach ($files as $file) {
-					if (!file_is_locked(basename($file)) && time() - filemtime($file) > 86400*2) {
+					if (!file_is_locked(basename($file)) && time() - filemtime($file) > 86400 * 2) {
 						unlink($file);
 						++$num_deleted;
 					}
@@ -1516,7 +1516,7 @@ 
 	public static function check_feed_favicon($site_url, $feed) {
 		#		print "FAVICON [$site_url]: $favicon_url\n";
 
-		$icon_file = ICONS_DIR . "/$feed.ico";
+		$icon_file = ICONS_DIR."/$feed.ico";
 
 		if (!file_exists($icon_file)) {
 			$favicon_url = RSSUtils::get_favicon_url($site_url);
@@ -1570,14 +1570,14 @@ 
 
 	public static function is_gzipped($feed_data) {
 		return strpos(substr($feed_data, 0, 3),
-				"\x1f" . "\x8b" . "\x08", 0) === 0;
+				"\x1f"."\x8b"."\x08", 0) === 0;
 	}
 
 	public static function load_filters($feed_id, $owner_uid) {
 		$filters = array();
 
 		$feed_id = (int) $feed_id;
-		$cat_id = (int)Feeds::getFeedCategory($feed_id);
+		$cat_id = (int) Feeds::getFeedCategory($feed_id);
 
 		if ($cat_id == 0)
 			$null_cat_qpart = "cat_id IS NULL OR";

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

@@ -139,7 +139,7 @@ 
 			if ($tline = $usth->fetch()) {
 				Debug::log(" => " . $tline["last_updated"] . ", " . $tline["id"] . " " . $tline["owner_uid"]);
 
-				if (array_search($tline["owner_uid"], $batch_owners) === FALSE)
+				if (array_search($tline["owner_uid"], $batch_owners) === false)
 					array_push($batch_owners, $tline["owner_uid"]);
 
 				$fstarted = microtime(true);
@@ -1309,7 +1309,7 @@ 
 			}
 		}
 
-		Debug::log("Removed $num_deleted old lock files.");
+		Debug::log("removed $num_deleted old lock files.");
 	}
 
 	/**
@@ -1401,7 +1401,7 @@ 
 				if (is_array($matched_rules)) array_push($matched_rules, $rule);
 				if (is_array($matched_filters)) array_push($matched_filters, $filter);
 
-				foreach ($filter["actions"] AS $action) {
+				foreach ($filter["actions"] as $action) {
 					array_push($matches, $action);
 
 					// if Stop action encountered, perform no further processing
@@ -1488,7 +1488,7 @@ 
 
 		$crows = $res->rowCount();
 
-		Debug::log("Removed $frows (feeds) $crows (cats) orphaned counter cache entries.");
+		Debug::log("removed $frows (feeds) $crows (cats) orphaned counter cache entries.");
 	}
 
 	public static function housekeeping_user($owner_uid) {

Indentation +1270 added lines, -1270 removed lines

@@ -1,50 +1,50 @@ 
 <?php
 class RSSUtils {
-	public static function calculate_article_hash($article, $pluginhost) {
-		$tmp = "";
-
-		foreach ($article as $k => $v) {
-			if ($k != "feed" && isset($v)) {
-				$x = strip_tags(is_array($v) ? implode(",", $v) : $v);
-
-				$tmp .= sha1("$k:" . sha1($x));
-			}
-		}
-
-		return sha1(implode(",", $pluginhost->get_plugin_names()) . $tmp);
-	}
-
-	// Strips utf8mb4 characters (i.e. emoji) for mysql
-	public static function strip_utf8mb4($str) {
-		return preg_replace('/[\x{10000}-\x{10FFFF}]/u', "\xEF\xBF\xBD", $str);
-	}
-
-	public static function cleanup_feed_browser() {
-		$pdo = Db::pdo();
-		$pdo->query("DELETE FROM ttrss_feedbrowser_cache");
-	}
-
-	public static function update_daemon_common($limit = DAEMON_FEED_LIMIT) {
-		$schema_version = get_schema_version();
-
-		if ($schema_version != SCHEMA_VERSION) {
-			die("Schema version is wrong, please upgrade the database.\n");
-		}
-
-		$pdo = Db::pdo();
-
-		if (!SINGLE_USER_MODE && DAEMON_UPDATE_LOGIN_LIMIT > 0) {
-			if (DB_TYPE == "pgsql") {
-				$login_thresh_qpart = "AND ttrss_users.last_login >= NOW() - INTERVAL '".DAEMON_UPDATE_LOGIN_LIMIT." days'";
-			} else {
-				$login_thresh_qpart = "AND ttrss_users.last_login >= DATE_SUB(NOW(), INTERVAL ".DAEMON_UPDATE_LOGIN_LIMIT." DAY)";
-			}
-		} else {
-			$login_thresh_qpart = "";
-		}
-
-		if (DB_TYPE == "pgsql") {
-			$update_limit_qpart = "AND ((
+    public static function calculate_article_hash($article, $pluginhost) {
+        $tmp = "";
+
+        foreach ($article as $k => $v) {
+            if ($k != "feed" && isset($v)) {
+                $x = strip_tags(is_array($v) ? implode(",", $v) : $v);
+
+                $tmp .= sha1("$k:" . sha1($x));
+            }
+        }
+
+        return sha1(implode(",", $pluginhost->get_plugin_names()) . $tmp);
+    }
+
+    // Strips utf8mb4 characters (i.e. emoji) for mysql
+    public static function strip_utf8mb4($str) {
+        return preg_replace('/[\x{10000}-\x{10FFFF}]/u', "\xEF\xBF\xBD", $str);
+    }
+
+    public static function cleanup_feed_browser() {
+        $pdo = Db::pdo();
+        $pdo->query("DELETE FROM ttrss_feedbrowser_cache");
+    }
+
+    public static function update_daemon_common($limit = DAEMON_FEED_LIMIT) {
+        $schema_version = get_schema_version();
+
+        if ($schema_version != SCHEMA_VERSION) {
+            die("Schema version is wrong, please upgrade the database.\n");
+        }
+
+        $pdo = Db::pdo();
+
+        if (!SINGLE_USER_MODE && DAEMON_UPDATE_LOGIN_LIMIT > 0) {
+            if (DB_TYPE == "pgsql") {
+                $login_thresh_qpart = "AND ttrss_users.last_login >= NOW() - INTERVAL '".DAEMON_UPDATE_LOGIN_LIMIT." days'";
+            } else {
+                $login_thresh_qpart = "AND ttrss_users.last_login >= DATE_SUB(NOW(), INTERVAL ".DAEMON_UPDATE_LOGIN_LIMIT." DAY)";
+            }
+        } else {
+            $login_thresh_qpart = "";
+        }
+
+        if (DB_TYPE == "pgsql") {
+            $update_limit_qpart = "AND ((
 					ttrss_feeds.update_interval = 0
 					AND ttrss_user_prefs.value != '-1'
 					AND ttrss_feeds.last_updated < NOW() - CAST((ttrss_user_prefs.value || ' minutes') AS INTERVAL)
@@ -55,8 +55,8 @@ 
 					AND ttrss_user_prefs.value != '-1')
 				OR (last_updated = '1970-01-01 00:00:00'
 					AND ttrss_user_prefs.value != '-1'))";
-		} else {
-			$update_limit_qpart = "AND ((
+        } else {
+            $update_limit_qpart = "AND ((
 					ttrss_feeds.update_interval = 0
 					AND ttrss_user_prefs.value != '-1'
 					AND ttrss_feeds.last_updated < DATE_SUB(NOW(), INTERVAL CONVERT(ttrss_user_prefs.value, SIGNED INTEGER) MINUTE)
@@ -67,22 +67,22 @@ 
 					AND ttrss_user_prefs.value != '-1')
 				OR (last_updated = '1970-01-01 00:00:00'
 					AND ttrss_user_prefs.value != '-1'))";
-		}
+        }
 
-		// Test if feed is currently being updated by another process.
-		if (DB_TYPE == "pgsql") {
-			$updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < NOW() - INTERVAL '10 minutes')";
-		} else {
-			$updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < DATE_SUB(NOW(), INTERVAL 10 MINUTE))";
-		}
+        // Test if feed is currently being updated by another process.
+        if (DB_TYPE == "pgsql") {
+            $updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < NOW() - INTERVAL '10 minutes')";
+        } else {
+            $updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < DATE_SUB(NOW(), INTERVAL 10 MINUTE))";
+        }
 
-		$query_limit = $limit ? sprintf("LIMIT %d", $limit) : "";
+        $query_limit = $limit ? sprintf("LIMIT %d", $limit) : "";
 
-		// Update the least recently updated feeds first
-		$query_order = "ORDER BY last_updated";
-		if (DB_TYPE == "pgsql") $query_order .= " NULLS FIRST";
+        // Update the least recently updated feeds first
+        $query_order = "ORDER BY last_updated";
+        if (DB_TYPE == "pgsql") $query_order .= " NULLS FIRST";
 
-		$query = "SELECT DISTINCT ttrss_feeds.feed_url, ttrss_feeds.last_updated
+        $query = "SELECT DISTINCT ttrss_feeds.feed_url, ttrss_feeds.last_updated
 			FROM
 				ttrss_feeds, ttrss_users, ttrss_user_prefs
 			WHERE
@@ -94,32 +94,32 @@ 
 				$updstart_thresh_qpart
 				$query_order $query_limit";
 
-		$res = $pdo->query($query);
+        $res = $pdo->query($query);
 
-		$feeds_to_update = array();
-		while ($line = $res->fetch()) {
-			array_push($feeds_to_update, $line['feed_url']);
-		}
+        $feeds_to_update = array();
+        while ($line = $res->fetch()) {
+            array_push($feeds_to_update, $line['feed_url']);
+        }
 
-		Debug::log(sprintf("Scheduled %d feeds to update...", count($feeds_to_update)));
+        Debug::log(sprintf("Scheduled %d feeds to update...", count($feeds_to_update)));
 
-		// Update last_update_started before actually starting the batch
-		// in order to minimize collision risk for parallel daemon tasks
-		if (count($feeds_to_update) > 0) {
-			$feeds_qmarks = arr_qmarks($feeds_to_update);
+        // Update last_update_started before actually starting the batch
+        // in order to minimize collision risk for parallel daemon tasks
+        if (count($feeds_to_update) > 0) {
+            $feeds_qmarks = arr_qmarks($feeds_to_update);
 
-			$tmph = $pdo->prepare("UPDATE ttrss_feeds SET last_update_started = NOW()
+            $tmph = $pdo->prepare("UPDATE ttrss_feeds SET last_update_started = NOW()
 				WHERE feed_url IN ($feeds_qmarks)");
-			$tmph->execute($feeds_to_update);
-		}
+            $tmph->execute($feeds_to_update);
+        }
 
-		$nf = 0;
-		$bstarted = microtime(true);
+        $nf = 0;
+        $bstarted = microtime(true);
 
-		$batch_owners = array();
+        $batch_owners = array();
 
-		// since we have the data cached, we can deal with other feeds with the same url
-		$usth = $pdo->prepare("SELECT DISTINCT ttrss_feeds.id,last_updated,ttrss_feeds.owner_uid
+        // since we have the data cached, we can deal with other feeds with the same url
+        $usth = $pdo->prepare("SELECT DISTINCT ttrss_feeds.id,last_updated,ttrss_feeds.owner_uid
 			FROM ttrss_feeds, ttrss_users, ttrss_user_prefs WHERE
 				ttrss_user_prefs.owner_uid = ttrss_feeds.owner_uid AND
 				ttrss_users.id = ttrss_user_prefs.owner_uid AND
@@ -130,715 +130,715 @@ 
 				$login_thresh_qpart
 			ORDER BY ttrss_feeds.id $query_limit");
 
-		foreach ($feeds_to_update as $feed) {
-			Debug::log("Base feed: $feed");
+        foreach ($feeds_to_update as $feed) {
+            Debug::log("Base feed: $feed");
 
-			$usth->execute([$feed]);
-			//update_rss_feed($line["id"], true);
+            $usth->execute([$feed]);
+            //update_rss_feed($line["id"], true);
 
-			if ($tline = $usth->fetch()) {
-				Debug::log(" => " . $tline["last_updated"] . ", " . $tline["id"] . " " . $tline["owner_uid"]);
+            if ($tline = $usth->fetch()) {
+                Debug::log(" => " . $tline["last_updated"] . ", " . $tline["id"] . " " . $tline["owner_uid"]);
 
-				if (array_search($tline["owner_uid"], $batch_owners) === FALSE)
-					array_push($batch_owners, $tline["owner_uid"]);
+                if (array_search($tline["owner_uid"], $batch_owners) === FALSE)
+                    array_push($batch_owners, $tline["owner_uid"]);
 
-				$fstarted = microtime(true);
+                $fstarted = microtime(true);
 
-				try {
-					RSSUtils::update_rss_feed($tline["id"], true, false);
-				} catch (PDOException $e) {
-					Logger::get()->log_error(E_USER_NOTICE, $e->getMessage(), $e->getFile(), $e->getLine(), $e->getTraceAsString());
+                try {
+                    RSSUtils::update_rss_feed($tline["id"], true, false);
+                } catch (PDOException $e) {
+                    Logger::get()->log_error(E_USER_NOTICE, $e->getMessage(), $e->getFile(), $e->getLine(), $e->getTraceAsString());
 
-					try {
-						$pdo->rollback();
-					} catch (PDOException $e) {
-						// it doesn't matter if there wasn't actually anything to rollback, PDO Exception can be
-						// thrown outside of an active transaction during feed update
-					}
-				}
+                    try {
+                        $pdo->rollback();
+                    } catch (PDOException $e) {
+                        // it doesn't matter if there wasn't actually anything to rollback, PDO Exception can be
+                        // thrown outside of an active transaction during feed update
+                    }
+                }
 
-				Debug::log(sprintf("    %.4f (sec)", microtime(true) - $fstarted));
+                Debug::log(sprintf("    %.4f (sec)", microtime(true) - $fstarted));
 
-				++$nf;
-			}
-		}
+                ++$nf;
+            }
+        }
 
-		if ($nf > 0) {
-			Debug::log(sprintf("Processed %d feeds in %.4f (sec), %.4f (sec/feed avg)", $nf,
-				microtime(true) - $bstarted, (microtime(true) - $bstarted) / $nf));
-		}
+        if ($nf > 0) {
+            Debug::log(sprintf("Processed %d feeds in %.4f (sec), %.4f (sec/feed avg)", $nf,
+                microtime(true) - $bstarted, (microtime(true) - $bstarted) / $nf));
+        }
 
-		foreach ($batch_owners as $owner_uid) {
-			Debug::log("Running housekeeping tasks for user $owner_uid...");
+        foreach ($batch_owners as $owner_uid) {
+            Debug::log("Running housekeeping tasks for user $owner_uid...");
 
-			RSSUtils::housekeeping_user($owner_uid);
-		}
+            RSSUtils::housekeeping_user($owner_uid);
+        }
 
-		// Send feed digests by email if needed.
-		Digest::send_headlines_digests();
+        // Send feed digests by email if needed.
+        Digest::send_headlines_digests();
 
-		return $nf;
-	}
+        return $nf;
+    }
 
-	// this is used when subscribing
-	public static function set_basic_feed_info($feed) {
+    // this is used when subscribing
+    public static function set_basic_feed_info($feed) {
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare("SELECT owner_uid,feed_url,auth_pass,auth_login
+        $sth = $pdo->prepare("SELECT owner_uid,feed_url,auth_pass,auth_login
 				FROM ttrss_feeds WHERE id = ?");
-		$sth->execute([$feed]);
+        $sth->execute([$feed]);
 
-		if ($row = $sth->fetch()) {
+        if ($row = $sth->fetch()) {
 
-			$owner_uid = $row["owner_uid"];
-			$auth_login = $row["auth_login"];
-			$auth_pass = $row["auth_pass"];
-			$fetch_url = $row["feed_url"];
+            $owner_uid = $row["owner_uid"];
+            $auth_login = $row["auth_login"];
+            $auth_pass = $row["auth_pass"];
+            $fetch_url = $row["feed_url"];
 
-			$pluginhost = new PluginHost();
-			$user_plugins = get_pref("_ENABLED_PLUGINS", $owner_uid);
+            $pluginhost = new PluginHost();
+            $user_plugins = get_pref("_ENABLED_PLUGINS", $owner_uid);
 
-			$pluginhost->load(PLUGINS, PluginHost::KIND_ALL);
-			$pluginhost->load($user_plugins, PluginHost::KIND_USER, $owner_uid);
-			$pluginhost->load_data();
+            $pluginhost->load(PLUGINS, PluginHost::KIND_ALL);
+            $pluginhost->load($user_plugins, PluginHost::KIND_USER, $owner_uid);
+            $pluginhost->load_data();
 
-			$basic_info = array();
-			foreach ($pluginhost->get_hooks(PluginHost::HOOK_FEED_BASIC_INFO) as $plugin) {
-				$basic_info = $plugin->hook_feed_basic_info($basic_info, $fetch_url, $owner_uid, $feed, $auth_login, $auth_pass);
-			}
+            $basic_info = array();
+            foreach ($pluginhost->get_hooks(PluginHost::HOOK_FEED_BASIC_INFO) as $plugin) {
+                $basic_info = $plugin->hook_feed_basic_info($basic_info, $fetch_url, $owner_uid, $feed, $auth_login, $auth_pass);
+            }
 
-			if (!$basic_info) {
-				$feed_data = fetch_file_contents($fetch_url, false,
-					$auth_login, $auth_pass, false,
-					FEED_FETCH_TIMEOUT,
-					0);
+            if (!$basic_info) {
+                $feed_data = fetch_file_contents($fetch_url, false,
+                    $auth_login, $auth_pass, false,
+                    FEED_FETCH_TIMEOUT,
+                    0);
 
-				$feed_data = trim($feed_data);
+                $feed_data = trim($feed_data);
 
-				$rss = new FeedParser($feed_data);
-				$rss->init();
+                $rss = new FeedParser($feed_data);
+                $rss->init();
 
-				if (!$rss->error()) {
-					$basic_info = array(
-						'title' => mb_substr(clean($rss->get_title()), 0, 199),
-						'site_url' => mb_substr(rewrite_relative_url($fetch_url, clean($rss->get_link())), 0, 245)
-					);
-				}
-			}
+                if (!$rss->error()) {
+                    $basic_info = array(
+                        'title' => mb_substr(clean($rss->get_title()), 0, 199),
+                        'site_url' => mb_substr(rewrite_relative_url($fetch_url, clean($rss->get_link())), 0, 245)
+                    );
+                }
+            }
 
-			if ($basic_info && is_array($basic_info)) {
-				$sth = $pdo->prepare("SELECT title, site_url FROM ttrss_feeds WHERE id = ?");
-				$sth->execute([$feed]);
+            if ($basic_info && is_array($basic_info)) {
+                $sth = $pdo->prepare("SELECT title, site_url FROM ttrss_feeds WHERE id = ?");
+                $sth->execute([$feed]);
 
-				if ($row = $sth->fetch()) {
+                if ($row = $sth->fetch()) {
 
-					$registered_title = $row["title"];
-					$orig_site_url = $row["site_url"];
+                    $registered_title = $row["title"];
+                    $orig_site_url = $row["site_url"];
 
-					if ($basic_info['title'] && (!$registered_title || $registered_title == "[Unknown]")) {
+                    if ($basic_info['title'] && (!$registered_title || $registered_title == "[Unknown]")) {
 
-						$sth = $pdo->prepare("UPDATE ttrss_feeds SET
+                        $sth = $pdo->prepare("UPDATE ttrss_feeds SET
 							title = ? WHERE id = ?");
-						$sth->execute([$basic_info['title'], $feed]);
-					}
+                        $sth->execute([$basic_info['title'], $feed]);
+                    }
 
-					if ($basic_info['site_url'] && $orig_site_url != $basic_info['site_url']) {
-						$sth = $pdo->prepare("UPDATE ttrss_feeds SET
+                    if ($basic_info['site_url'] && $orig_site_url != $basic_info['site_url']) {
+                        $sth = $pdo->prepare("UPDATE ttrss_feeds SET
 							site_url = ? WHERE id = ?");
-						$sth->execute([$basic_info['site_url'], $feed]);
-					}
+                        $sth->execute([$basic_info['site_url'], $feed]);
+                    }
 
-				}
-			}
-		}
-	}
+                }
+            }
+        }
+    }
 
-	/**
-	 * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-	 */
-	public static function update_rss_feed($feed, $no_cache = false) {
+    /**
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public static function update_rss_feed($feed, $no_cache = false) {
 
-		reset_fetch_domain_quota();
+        reset_fetch_domain_quota();
 
-		Debug::log("start", Debug::$LOG_VERBOSE);
+        Debug::log("start", Debug::$LOG_VERBOSE);
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare("SELECT title, site_url FROM ttrss_feeds WHERE id = ?");
-		$sth->execute([$feed]);
+        $sth = $pdo->prepare("SELECT title, site_url FROM ttrss_feeds WHERE id = ?");
+        $sth->execute([$feed]);
 
-		if (!$row = $sth->fetch()) {
-			Debug::log("feed $feed not found, skipping.");
-			user_error("Attempt to update unknown/invalid feed $feed", E_USER_WARNING);
-			return false;
-		}
+        if (!$row = $sth->fetch()) {
+            Debug::log("feed $feed not found, skipping.");
+            user_error("Attempt to update unknown/invalid feed $feed", E_USER_WARNING);
+            return false;
+        }
 
-		$title = $row["title"];
-		$site_url = $row["site_url"];
+        $title = $row["title"];
+        $site_url = $row["site_url"];
 
-		// feed was batch-subscribed or something, we need to get basic info
-		// this is not optimal currently as it fetches stuff separately TODO: optimize
-		if ($title == "[Unknown]" || !$title || !$site_url) {
-			Debug::log("setting basic feed info for $feed [$title, $site_url]...");
-			RSSUtils::set_basic_feed_info($feed);
-		}
+        // feed was batch-subscribed or something, we need to get basic info
+        // this is not optimal currently as it fetches stuff separately TODO: optimize
+        if ($title == "[Unknown]" || !$title || !$site_url) {
+            Debug::log("setting basic feed info for $feed [$title, $site_url]...");
+            RSSUtils::set_basic_feed_info($feed);
+        }
 
-		$sth = $pdo->prepare("SELECT id,update_interval,auth_login,
+        $sth = $pdo->prepare("SELECT id,update_interval,auth_login,
 			feed_url,auth_pass,cache_images,
 			mark_unread_on_update, owner_uid,
 			auth_pass_encrypted, feed_language,
 			last_modified,
 			".SUBSTRING_FOR_DATE."(last_unconditional, 1, 19) AS last_unconditional
 			FROM ttrss_feeds WHERE id = ?");
-		$sth->execute([$feed]);
+        $sth->execute([$feed]);
 
-		if ($row = $sth->fetch()) {
+        if ($row = $sth->fetch()) {
 
-			$owner_uid = $row["owner_uid"];
-			$mark_unread_on_update = $row["mark_unread_on_update"];
+            $owner_uid = $row["owner_uid"];
+            $mark_unread_on_update = $row["mark_unread_on_update"];
 
-			$sth = $pdo->prepare("UPDATE ttrss_feeds SET last_update_started = NOW()
+            $sth = $pdo->prepare("UPDATE ttrss_feeds SET last_update_started = NOW()
 				WHERE id = ?");
-			$sth->execute([$feed]);
+            $sth->execute([$feed]);
 
-			$auth_login = $row["auth_login"];
-			$auth_pass = $row["auth_pass"];
-			$stored_last_modified = $row["last_modified"];
-			$last_unconditional = $row["last_unconditional"];
-			$cache_images = $row["cache_images"];
-			$fetch_url = $row["feed_url"];
+            $auth_login = $row["auth_login"];
+            $auth_pass = $row["auth_pass"];
+            $stored_last_modified = $row["last_modified"];
+            $last_unconditional = $row["last_unconditional"];
+            $cache_images = $row["cache_images"];
+            $fetch_url = $row["feed_url"];
 
-			$feed_language = mb_strtolower($row["feed_language"]);
+            $feed_language = mb_strtolower($row["feed_language"]);
 
-			if (!$feed_language)
-				$feed_language = mb_strtolower(get_pref('DEFAULT_SEARCH_LANGUAGE', $owner_uid));
+            if (!$feed_language)
+                $feed_language = mb_strtolower(get_pref('DEFAULT_SEARCH_LANGUAGE', $owner_uid));
 
-			if (!$feed_language)
-				$feed_language = 'simple';
+            if (!$feed_language)
+                $feed_language = 'simple';
 
-		} else {
-			return false;
-		}
+        } else {
+            return false;
+        }
 
-		$date_feed_processed = date('Y-m-d H:i');
+        $date_feed_processed = date('Y-m-d H:i');
 
-		$cache_filename = CACHE_DIR . "/feeds/" . sha1($fetch_url) . ".xml";
+        $cache_filename = CACHE_DIR . "/feeds/" . sha1($fetch_url) . ".xml";
 
-		$pluginhost = new PluginHost();
-		$user_plugins = get_pref("_ENABLED_PLUGINS", $owner_uid);
+        $pluginhost = new PluginHost();
+        $user_plugins = get_pref("_ENABLED_PLUGINS", $owner_uid);
 
-		$pluginhost->load(PLUGINS, PluginHost::KIND_ALL);
-		$pluginhost->load($user_plugins, PluginHost::KIND_USER, $owner_uid);
-		$pluginhost->load_data();
+        $pluginhost->load(PLUGINS, PluginHost::KIND_ALL);
+        $pluginhost->load($user_plugins, PluginHost::KIND_USER, $owner_uid);
+        $pluginhost->load_data();
 
-		$rss_hash = false;
+        $rss_hash = false;
 
-		$force_refetch = isset($_REQUEST["force_refetch"]);
-		$feed_data = "";
+        $force_refetch = isset($_REQUEST["force_refetch"]);
+        $feed_data = "";
 
-		Debug::log("running HOOK_FETCH_FEED handlers...", Debug::$LOG_VERBOSE);
+        Debug::log("running HOOK_FETCH_FEED handlers...", Debug::$LOG_VERBOSE);
 
-		foreach ($pluginhost->get_hooks(PluginHost::HOOK_FETCH_FEED) as $plugin) {
-			Debug::log("... " . get_class($plugin), Debug::$LOG_VERBOSE);
-			$start = microtime(true);
-			$feed_data = $plugin->hook_fetch_feed($feed_data, $fetch_url, $owner_uid, $feed, 0, $auth_login, $auth_pass);
-			Debug::log(sprintf("=== %.4f (sec)", microtime(true) - $start), Debug::$LOG_VERBOSE);
-		}
+        foreach ($pluginhost->get_hooks(PluginHost::HOOK_FETCH_FEED) as $plugin) {
+            Debug::log("... " . get_class($plugin), Debug::$LOG_VERBOSE);
+            $start = microtime(true);
+            $feed_data = $plugin->hook_fetch_feed($feed_data, $fetch_url, $owner_uid, $feed, 0, $auth_login, $auth_pass);
+            Debug::log(sprintf("=== %.4f (sec)", microtime(true) - $start), Debug::$LOG_VERBOSE);
+        }
 
-		if ($feed_data) {
-			Debug::log("feed data has been modified by a plugin.", Debug::$LOG_VERBOSE);
-		} else {
-			Debug::log("feed data has not been modified by a plugin.", Debug::$LOG_VERBOSE);
-		}
+        if ($feed_data) {
+            Debug::log("feed data has been modified by a plugin.", Debug::$LOG_VERBOSE);
+        } else {
+            Debug::log("feed data has not been modified by a plugin.", Debug::$LOG_VERBOSE);
+        }
 
-		// try cache
-		if (!$feed_data &&
-			file_exists($cache_filename) &&
-			is_readable($cache_filename) &&
-			!$auth_login && !$auth_pass &&
-			filemtime($cache_filename) > time() - 30) {
+        // try cache
+        if (!$feed_data &&
+            file_exists($cache_filename) &&
+            is_readable($cache_filename) &&
+            !$auth_login && !$auth_pass &&
+            filemtime($cache_filename) > time() - 30) {
 
-			Debug::log("using local cache [$cache_filename].", Debug::$LOG_VERBOSE);
+            Debug::log("using local cache [$cache_filename].", Debug::$LOG_VERBOSE);
 
-			@$feed_data = file_get_contents($cache_filename);
+            @$feed_data = file_get_contents($cache_filename);
 
-			if ($feed_data) {
-				$rss_hash = sha1($feed_data);
-			}
+            if ($feed_data) {
+                $rss_hash = sha1($feed_data);
+            }
 
-		} else {
-			Debug::log("local cache will not be used for this feed", Debug::$LOG_VERBOSE);
-		}
+        } else {
+            Debug::log("local cache will not be used for this feed", Debug::$LOG_VERBOSE);
+        }
 
-		global $fetch_last_modified;
+        global $fetch_last_modified;
 
-		// fetch feed from source
-		if (!$feed_data) {
-			Debug::log("last unconditional update request: $last_unconditional", Debug::$LOG_VERBOSE);
+        // fetch feed from source
+        if (!$feed_data) {
+            Debug::log("last unconditional update request: $last_unconditional", Debug::$LOG_VERBOSE);
 
-			if (ini_get("open_basedir") && function_exists("curl_init")) {
-				Debug::log("not using CURL due to open_basedir restrictions", Debug::$LOG_VERBOSE);
-			}
+            if (ini_get("open_basedir") && function_exists("curl_init")) {
+                Debug::log("not using CURL due to open_basedir restrictions", Debug::$LOG_VERBOSE);
+            }
 
-			if (time() - strtotime($last_unconditional) > MAX_CONDITIONAL_INTERVAL) {
-				Debug::log("maximum allowed interval for conditional requests exceeded, forcing refetch", Debug::$LOG_VERBOSE);
+            if (time() - strtotime($last_unconditional) > MAX_CONDITIONAL_INTERVAL) {
+                Debug::log("maximum allowed interval for conditional requests exceeded, forcing refetch", Debug::$LOG_VERBOSE);
 
-				$force_refetch = true;
-			} else {
-				Debug::log("stored last modified for conditional request: $stored_last_modified", Debug::$LOG_VERBOSE);
-			}
+                $force_refetch = true;
+            } else {
+                Debug::log("stored last modified for conditional request: $stored_last_modified", Debug::$LOG_VERBOSE);
+            }
 
-			Debug::log("fetching [$fetch_url] (force_refetch: $force_refetch)...", Debug::$LOG_VERBOSE);
+            Debug::log("fetching [$fetch_url] (force_refetch: $force_refetch)...", Debug::$LOG_VERBOSE);
 
-			$feed_data = fetch_file_contents([
-				"url" => $fetch_url,
-				"login" => $auth_login,
-				"pass" => $auth_pass,
-				"timeout" => $no_cache ? FEED_FETCH_NO_CACHE_TIMEOUT : FEED_FETCH_TIMEOUT,
-				"last_modified" => $force_refetch ? "" : $stored_last_modified
-			]);
+            $feed_data = fetch_file_contents([
+                "url" => $fetch_url,
+                "login" => $auth_login,
+                "pass" => $auth_pass,
+                "timeout" => $no_cache ? FEED_FETCH_NO_CACHE_TIMEOUT : FEED_FETCH_TIMEOUT,
+                "last_modified" => $force_refetch ? "" : $stored_last_modified
+            ]);
 
-			$feed_data = trim($feed_data);
+            $feed_data = trim($feed_data);
 
-			Debug::log("fetch done.", Debug::$LOG_VERBOSE);
-			Debug::log("source last modified: " . $fetch_last_modified, Debug::$LOG_VERBOSE);
+            Debug::log("fetch done.", Debug::$LOG_VERBOSE);
+            Debug::log("source last modified: " . $fetch_last_modified, Debug::$LOG_VERBOSE);
 
-			if ($feed_data && $fetch_last_modified != $stored_last_modified) {
-				$sth = $pdo->prepare("UPDATE ttrss_feeds SET last_modified = ? WHERE id = ?");
-				$sth->execute([substr($fetch_last_modified, 0, 245), $feed]);
-			}
+            if ($feed_data && $fetch_last_modified != $stored_last_modified) {
+                $sth = $pdo->prepare("UPDATE ttrss_feeds SET last_modified = ? WHERE id = ?");
+                $sth->execute([substr($fetch_last_modified, 0, 245), $feed]);
+            }
 
-			// cache vanilla feed data for re-use
-			if ($feed_data && !$auth_pass && !$auth_login && is_writable(CACHE_DIR . "/feeds")) {
-				$new_rss_hash = sha1($feed_data);
+            // cache vanilla feed data for re-use
+            if ($feed_data && !$auth_pass && !$auth_login && is_writable(CACHE_DIR . "/feeds")) {
+                $new_rss_hash = sha1($feed_data);
 
-				if ($new_rss_hash != $rss_hash) {
-					Debug::log("saving $cache_filename", Debug::$LOG_VERBOSE);
-					@file_put_contents($cache_filename, $feed_data);
-				}
-			}
-		}
+                if ($new_rss_hash != $rss_hash) {
+                    Debug::log("saving $cache_filename", Debug::$LOG_VERBOSE);
+                    @file_put_contents($cache_filename, $feed_data);
+                }
+            }
+        }
 
-		if (!$feed_data) {
-			global $fetch_last_error;
-			global $fetch_last_error_code;
+        if (!$feed_data) {
+            global $fetch_last_error;
+            global $fetch_last_error_code;
 
-			Debug::log("unable to fetch: $fetch_last_error [$fetch_last_error_code]", Debug::$LOG_VERBOSE);
+            Debug::log("unable to fetch: $fetch_last_error [$fetch_last_error_code]", Debug::$LOG_VERBOSE);
 
-			// If-Modified-Since
-			if ($fetch_last_error_code != 304) {
-				$error_message = $fetch_last_error;
-			} else {
-				Debug::log("source claims data not modified, nothing to do.", Debug::$LOG_VERBOSE);
-				$error_message = "";
-			}
+            // If-Modified-Since
+            if ($fetch_last_error_code != 304) {
+                $error_message = $fetch_last_error;
+            } else {
+                Debug::log("source claims data not modified, nothing to do.", Debug::$LOG_VERBOSE);
+                $error_message = "";
+            }
 
-			$sth = $pdo->prepare("UPDATE ttrss_feeds SET last_error = ?,
+            $sth = $pdo->prepare("UPDATE ttrss_feeds SET last_error = ?,
 					last_updated = NOW() WHERE id = ?");
-			$sth->execute([$error_message, $feed]);
+            $sth->execute([$error_message, $feed]);
 
-			return;
-		}
+            return;
+        }
 
-		Debug::log("running HOOK_FEED_FETCHED handlers...", Debug::$LOG_VERBOSE);
-		$feed_data_checksum = md5($feed_data);
+        Debug::log("running HOOK_FEED_FETCHED handlers...", Debug::$LOG_VERBOSE);
+        $feed_data_checksum = md5($feed_data);
 
-		foreach ($pluginhost->get_hooks(PluginHost::HOOK_FEED_FETCHED) as $plugin) {
-			Debug::log("... " . get_class($plugin), Debug::$LOG_VERBOSE);
-			$start = microtime(true);
-			$feed_data = $plugin->hook_feed_fetched($feed_data, $fetch_url, $owner_uid, $feed);
-			Debug::log(sprintf("=== %.4f (sec)", microtime(true) - $start), Debug::$LOG_VERBOSE);
-		}
+        foreach ($pluginhost->get_hooks(PluginHost::HOOK_FEED_FETCHED) as $plugin) {
+            Debug::log("... " . get_class($plugin), Debug::$LOG_VERBOSE);
+            $start = microtime(true);
+            $feed_data = $plugin->hook_feed_fetched($feed_data, $fetch_url, $owner_uid, $feed);
+            Debug::log(sprintf("=== %.4f (sec)", microtime(true) - $start), Debug::$LOG_VERBOSE);
+        }
 
-		if (md5($feed_data) != $feed_data_checksum) {
-			Debug::log("feed data has been modified by a plugin.", Debug::$LOG_VERBOSE);
-		} else {
-			Debug::log("feed data has not been modified by a plugin.", Debug::$LOG_VERBOSE);
-		}
+        if (md5($feed_data) != $feed_data_checksum) {
+            Debug::log("feed data has been modified by a plugin.", Debug::$LOG_VERBOSE);
+        } else {
+            Debug::log("feed data has not been modified by a plugin.", Debug::$LOG_VERBOSE);
+        }
 
-		$rss = new FeedParser($feed_data);
-		$rss->init();
+        $rss = new FeedParser($feed_data);
+        $rss->init();
 
-		if (!$rss->error()) {
+        if (!$rss->error()) {
 
-			Debug::log("running HOOK_FEED_PARSED handlers...", Debug::$LOG_VERBOSE);
+            Debug::log("running HOOK_FEED_PARSED handlers...", Debug::$LOG_VERBOSE);
 
-			// We use local pluginhost here because we need to load different per-user feed plugins
+            // We use local pluginhost here because we need to load different per-user feed plugins
 
-			foreach ($pluginhost->get_hooks(PluginHost::HOOK_FEED_PARSED) as $plugin) {
-				Debug::log("... " . get_class($plugin), Debug::$LOG_VERBOSE);
-				$start = microtime(true);
-				$plugin->hook_feed_parsed($rss);
-				Debug::log(sprintf("=== %.4f (sec)", microtime(true) - $start), Debug::$LOG_VERBOSE);
-			}
+            foreach ($pluginhost->get_hooks(PluginHost::HOOK_FEED_PARSED) as $plugin) {
+                Debug::log("... " . get_class($plugin), Debug::$LOG_VERBOSE);
+                $start = microtime(true);
+                $plugin->hook_feed_parsed($rss);
+                Debug::log(sprintf("=== %.4f (sec)", microtime(true) - $start), Debug::$LOG_VERBOSE);
+            }
 
-			Debug::log("language: $feed_language", Debug::$LOG_VERBOSE);
-			Debug::log("processing feed data...", Debug::$LOG_VERBOSE);
+            Debug::log("language: $feed_language", Debug::$LOG_VERBOSE);
+            Debug::log("processing feed data...", Debug::$LOG_VERBOSE);
 
-			if (DB_TYPE == "pgsql") {
-				$favicon_interval_qpart = "favicon_last_checked < NOW() - INTERVAL '12 hour'";
-			} else {
-				$favicon_interval_qpart = "favicon_last_checked < DATE_SUB(NOW(), INTERVAL 12 HOUR)";
-			}
+            if (DB_TYPE == "pgsql") {
+                $favicon_interval_qpart = "favicon_last_checked < NOW() - INTERVAL '12 hour'";
+            } else {
+                $favicon_interval_qpart = "favicon_last_checked < DATE_SUB(NOW(), INTERVAL 12 HOUR)";
+            }
 
-			$sth = $pdo->prepare("SELECT owner_uid,favicon_avg_color,
+            $sth = $pdo->prepare("SELECT owner_uid,favicon_avg_color,
 				(favicon_last_checked IS NULL OR $favicon_interval_qpart) AS
 						favicon_needs_check
 				FROM ttrss_feeds WHERE id = ?");
-			$sth->execute([$feed]);
+            $sth->execute([$feed]);
 
-			if ($row = $sth->fetch()) {
-				$favicon_needs_check = $row["favicon_needs_check"];
-				$favicon_avg_color = $row["favicon_avg_color"];
-				$owner_uid = $row["owner_uid"];
-			} else {
-				return false;
-			}
+            if ($row = $sth->fetch()) {
+                $favicon_needs_check = $row["favicon_needs_check"];
+                $favicon_avg_color = $row["favicon_avg_color"];
+                $owner_uid = $row["owner_uid"];
+            } else {
+                return false;
+            }
 
-			$site_url = mb_substr(rewrite_relative_url($fetch_url, clean($rss->get_link())), 0, 245);
+            $site_url = mb_substr(rewrite_relative_url($fetch_url, clean($rss->get_link())), 0, 245);
 
-			Debug::log("site_url: $site_url", Debug::$LOG_VERBOSE);
-			Debug::log("feed_title: " . clean($rss->get_title()), Debug::$LOG_VERBOSE);
+            Debug::log("site_url: $site_url", Debug::$LOG_VERBOSE);
+            Debug::log("feed_title: " . clean($rss->get_title()), Debug::$LOG_VERBOSE);
 
-			if ($favicon_needs_check || $force_refetch) {
+            if ($favicon_needs_check || $force_refetch) {
 
-				/* terrible hack: if we crash on floicon shit here, we won't check
+                /* terrible hack: if we crash on floicon shit here, we won't check
 				 * the icon avgcolor again (unless the icon got updated) */
 
-				$favicon_file = ICONS_DIR . "/$feed.ico";
-				$favicon_modified = @filemtime($favicon_file);
+                $favicon_file = ICONS_DIR . "/$feed.ico";
+                $favicon_modified = @filemtime($favicon_file);
 
-				Debug::log("checking favicon...", Debug::$LOG_VERBOSE);
+                Debug::log("checking favicon...", Debug::$LOG_VERBOSE);
 
-				RSSUtils::check_feed_favicon($site_url, $feed);
-				$favicon_modified_new = @filemtime($favicon_file);
+                RSSUtils::check_feed_favicon($site_url, $feed);
+                $favicon_modified_new = @filemtime($favicon_file);
 
-				if ($favicon_modified_new > $favicon_modified)
-					$favicon_avg_color = '';
+                if ($favicon_modified_new > $favicon_modified)
+                    $favicon_avg_color = '';
 
-				$favicon_colorstring = "";
-				if (file_exists($favicon_file) && function_exists("imagecreatefromstring") && $favicon_avg_color == '') {
-					require_once "colors.php";
+                $favicon_colorstring = "";
+                if (file_exists($favicon_file) && function_exists("imagecreatefromstring") && $favicon_avg_color == '') {
+                    require_once "colors.php";
 
-					$sth = $pdo->prepare("UPDATE ttrss_feeds SET favicon_avg_color = 'fail' WHERE
+                    $sth = $pdo->prepare("UPDATE ttrss_feeds SET favicon_avg_color = 'fail' WHERE
 							id = ?");
-					$sth->execute([$feed]);
+                    $sth->execute([$feed]);
 
-					$favicon_color = calculate_avg_color($favicon_file);
+                    $favicon_color = calculate_avg_color($favicon_file);
 
-					$favicon_colorstring = ",favicon_avg_color = " . $pdo->quote($favicon_color);
+                    $favicon_colorstring = ",favicon_avg_color = " . $pdo->quote($favicon_color);
 
-				} else if ($favicon_avg_color == 'fail') {
-					Debug::log("floicon failed on this file, not trying to recalculate avg color", Debug::$LOG_VERBOSE);
-				}
+                } else if ($favicon_avg_color == 'fail') {
+                    Debug::log("floicon failed on this file, not trying to recalculate avg color", Debug::$LOG_VERBOSE);
+                }
 
-				$sth = $pdo->prepare("UPDATE ttrss_feeds SET favicon_last_checked = NOW()
+                $sth = $pdo->prepare("UPDATE ttrss_feeds SET favicon_last_checked = NOW()
 					$favicon_colorstring WHERE id = ?");
-				$sth->execute([$feed]);
-			}
+                $sth->execute([$feed]);
+            }
 
-			Debug::log("loading filters & labels...", Debug::$LOG_VERBOSE);
+            Debug::log("loading filters & labels...", Debug::$LOG_VERBOSE);
 
-			$filters = RSSUtils::load_filters($feed, $owner_uid);
+            $filters = RSSUtils::load_filters($feed, $owner_uid);
 
-			if (Debug::get_loglevel() >= Debug::$LOG_EXTENDED) {
-				print_r($filters);
-			}
+            if (Debug::get_loglevel() >= Debug::$LOG_EXTENDED) {
+                print_r($filters);
+            }
 
-			Debug::log("" . count($filters) . " filters loaded.", Debug::$LOG_VERBOSE);
+            Debug::log("" . count($filters) . " filters loaded.", Debug::$LOG_VERBOSE);
 
-			$items = $rss->get_items();
+            $items = $rss->get_items();
 
-			if (!is_array($items)) {
-				Debug::log("no articles found.", Debug::$LOG_VERBOSE);
+            if (!is_array($items)) {
+                Debug::log("no articles found.", Debug::$LOG_VERBOSE);
 
-				$sth = $pdo->prepare("UPDATE ttrss_feeds
+                $sth = $pdo->prepare("UPDATE ttrss_feeds
 					SET last_updated = NOW(), last_unconditional = NOW(), last_error = '' WHERE id = ?");
-				$sth->execute([$feed]);
+                $sth->execute([$feed]);
 
-				return true; // no articles
-			}
+                return true; // no articles
+            }
 
-			Debug::log("processing articles...", Debug::$LOG_VERBOSE);
+            Debug::log("processing articles...", Debug::$LOG_VERBOSE);
 
-			$tstart = time();
+            $tstart = time();
 
-			foreach ($items as $item) {
-				$pdo->beginTransaction();
+            foreach ($items as $item) {
+                $pdo->beginTransaction();
 
-				if (Debug::get_loglevel() >= 3) {
-					print_r($item);
-				}
+                if (Debug::get_loglevel() >= 3) {
+                    print_r($item);
+                }
 
-				if (ini_get("max_execution_time") > 0 && time() - $tstart >= ini_get("max_execution_time") * 0.7) {
-					Debug::log("looks like there's too many articles to process at once, breaking out", Debug::$LOG_VERBOSE);
-					$pdo->commit();
-					break;
-				}
+                if (ini_get("max_execution_time") > 0 && time() - $tstart >= ini_get("max_execution_time") * 0.7) {
+                    Debug::log("looks like there's too many articles to process at once, breaking out", Debug::$LOG_VERBOSE);
+                    $pdo->commit();
+                    break;
+                }
 
-				$entry_guid = strip_tags($item->get_id());
-				if (!$entry_guid) $entry_guid = strip_tags($item->get_link());
-				if (!$entry_guid) $entry_guid = RSSUtils::make_guid_from_title($item->get_title());
+                $entry_guid = strip_tags($item->get_id());
+                if (!$entry_guid) $entry_guid = strip_tags($item->get_link());
+                if (!$entry_guid) $entry_guid = RSSUtils::make_guid_from_title($item->get_title());
 
-				if (!$entry_guid) {
-					$pdo->commit();
-					continue;
-				}
+                if (!$entry_guid) {
+                    $pdo->commit();
+                    continue;
+                }
 
-				$entry_guid = "$owner_uid,$entry_guid";
+                $entry_guid = "$owner_uid,$entry_guid";
 
-				$entry_guid_hashed = 'SHA1:' . sha1($entry_guid);
+                $entry_guid_hashed = 'SHA1:' . sha1($entry_guid);
 
-				Debug::log("guid $entry_guid / $entry_guid_hashed", Debug::$LOG_VERBOSE);
+                Debug::log("guid $entry_guid / $entry_guid_hashed", Debug::$LOG_VERBOSE);
 
-				$entry_timestamp = (int)$item->get_date();
+                $entry_timestamp = (int)$item->get_date();
 
-				Debug::log("orig date: " . $item->get_date(), Debug::$LOG_VERBOSE);
+                Debug::log("orig date: " . $item->get_date(), Debug::$LOG_VERBOSE);
 
-				$entry_title = strip_tags($item->get_title());
+                $entry_title = strip_tags($item->get_title());
 
-				$entry_link = rewrite_relative_url($site_url, clean($item->get_link()));
+                $entry_link = rewrite_relative_url($site_url, clean($item->get_link()));
 
-				$entry_language = mb_substr(trim($item->get_language()), 0, 2);
+                $entry_language = mb_substr(trim($item->get_language()), 0, 2);
 
-				Debug::log("title $entry_title", Debug::$LOG_VERBOSE);
-				Debug::log("link $entry_link", Debug::$LOG_VERBOSE);
-				Debug::log("language $entry_language", Debug::$LOG_VERBOSE);
+                Debug::log("title $entry_title", Debug::$LOG_VERBOSE);
+                Debug::log("link $entry_link", Debug::$LOG_VERBOSE);
+                Debug::log("language $entry_language", Debug::$LOG_VERBOSE);
 
-				if (!$entry_title) $entry_title = date("Y-m-d H:i:s", $entry_timestamp);;
+                if (!$entry_title) $entry_title = date("Y-m-d H:i:s", $entry_timestamp);;
 
-				$entry_content = $item->get_content();
-				if (!$entry_content) $entry_content = $item->get_description();
+                $entry_content = $item->get_content();
+                if (!$entry_content) $entry_content = $item->get_description();
 
-				if (Debug::get_loglevel() >= 3) {
-					print "content: ";
-					print htmlspecialchars($entry_content);
-					print "\n";
-				}
+                if (Debug::get_loglevel() >= 3) {
+                    print "content: ";
+                    print htmlspecialchars($entry_content);
+                    print "\n";
+                }
 
-				$entry_comments = mb_substr(strip_tags($item->get_comments_url()), 0, 245);
-				$num_comments = (int) $item->get_comments_count();
+                $entry_comments = mb_substr(strip_tags($item->get_comments_url()), 0, 245);
+                $num_comments = (int) $item->get_comments_count();
 
-				$entry_author = strip_tags($item->get_author());
-				$entry_guid = mb_substr($entry_guid, 0, 245);
+                $entry_author = strip_tags($item->get_author());
+                $entry_guid = mb_substr($entry_guid, 0, 245);
 
-				Debug::log("author $entry_author", Debug::$LOG_VERBOSE);
-				Debug::log("looking for tags...", Debug::$LOG_VERBOSE);
+                Debug::log("author $entry_author", Debug::$LOG_VERBOSE);
+                Debug::log("looking for tags...", Debug::$LOG_VERBOSE);
 
-				$entry_tags = $item->get_categories();
-				Debug::log("tags found: " . join(", ", $entry_tags), Debug::$LOG_VERBOSE);
+                $entry_tags = $item->get_categories();
+                Debug::log("tags found: " . join(", ", $entry_tags), Debug::$LOG_VERBOSE);
 
-				Debug::log("done collecting data.", Debug::$LOG_VERBOSE);
+                Debug::log("done collecting data.", Debug::$LOG_VERBOSE);
 
-				$sth = $pdo->prepare("SELECT id, content_hash, lang FROM ttrss_entries
+                $sth = $pdo->prepare("SELECT id, content_hash, lang FROM ttrss_entries
 					WHERE guid = ? OR guid = ?");
-				$sth->execute([$entry_guid, $entry_guid_hashed]);
-
-				if ($row = $sth->fetch()) {
-					$base_entry_id = $row["id"];
-					$entry_stored_hash = $row["content_hash"];
-					$article_labels = Article::get_article_labels($base_entry_id, $owner_uid);
-
-					$existing_tags = Article::get_article_tags($base_entry_id, $owner_uid);
-					$entry_tags = array_unique(array_merge($entry_tags, $existing_tags));
-				} else {
-					$base_entry_id = false;
-					$entry_stored_hash = "";
-					$article_labels = array();
-				}
-
-				$article = array("owner_uid" => $owner_uid, // read only
-					"guid" => $entry_guid, // read only
-					"guid_hashed" => $entry_guid_hashed, // read only
-					"title" => $entry_title,
-					"content" => $entry_content,
-					"link" => $entry_link,
-					"labels" => $article_labels, // current limitation: can add labels to article, can't remove them
-					"tags" => $entry_tags,
-					"author" => $entry_author,
-					"force_catchup" => false, // ugly hack for the time being
-					"score_modifier" => 0, // no previous value, plugin should recalculate score modifier based on content if needed
-					"language" => $entry_language,
-					"timestamp" => $entry_timestamp,
-					"num_comments" => $num_comments,
-					"feed" => array("id" => $feed,
-						"fetch_url" => $fetch_url,
-						"site_url" => $site_url,
-						"cache_images" => $cache_images)
-				);
-
-				$entry_plugin_data = "";
-				$entry_current_hash = RSSUtils::calculate_article_hash($article, $pluginhost);
-
-				Debug::log("article hash: $entry_current_hash [stored=$entry_stored_hash]", Debug::$LOG_VERBOSE);
-
-				if ($entry_current_hash == $entry_stored_hash && !isset($_REQUEST["force_rehash"])) {
-					Debug::log("stored article seems up to date [IID: $base_entry_id], updating timestamp only", Debug::$LOG_VERBOSE);
-
-					// we keep encountering the entry in feeds, so we need to
-					// update date_updated column so that we don't get horrible
-					// dupes when the entry gets purged and reinserted again e.g.
-					// in the case of SLOW SLOW OMG SLOW updating feeds
-
-					$sth = $pdo->prepare("UPDATE ttrss_entries SET date_updated = NOW()
+                $sth->execute([$entry_guid, $entry_guid_hashed]);
+
+                if ($row = $sth->fetch()) {
+                    $base_entry_id = $row["id"];
+                    $entry_stored_hash = $row["content_hash"];
+                    $article_labels = Article::get_article_labels($base_entry_id, $owner_uid);
+
+                    $existing_tags = Article::get_article_tags($base_entry_id, $owner_uid);
+                    $entry_tags = array_unique(array_merge($entry_tags, $existing_tags));
+                } else {
+                    $base_entry_id = false;
+                    $entry_stored_hash = "";
+                    $article_labels = array();
+                }
+
+                $article = array("owner_uid" => $owner_uid, // read only
+                    "guid" => $entry_guid, // read only
+                    "guid_hashed" => $entry_guid_hashed, // read only
+                    "title" => $entry_title,
+                    "content" => $entry_content,
+                    "link" => $entry_link,
+                    "labels" => $article_labels, // current limitation: can add labels to article, can't remove them
+                    "tags" => $entry_tags,
+                    "author" => $entry_author,
+                    "force_catchup" => false, // ugly hack for the time being
+                    "score_modifier" => 0, // no previous value, plugin should recalculate score modifier based on content if needed
+                    "language" => $entry_language,
+                    "timestamp" => $entry_timestamp,
+                    "num_comments" => $num_comments,
+                    "feed" => array("id" => $feed,
+                        "fetch_url" => $fetch_url,
+                        "site_url" => $site_url,
+                        "cache_images" => $cache_images)
+                );
+
+                $entry_plugin_data = "";
+                $entry_current_hash = RSSUtils::calculate_article_hash($article, $pluginhost);
+
+                Debug::log("article hash: $entry_current_hash [stored=$entry_stored_hash]", Debug::$LOG_VERBOSE);
+
+                if ($entry_current_hash == $entry_stored_hash && !isset($_REQUEST["force_rehash"])) {
+                    Debug::log("stored article seems up to date [IID: $base_entry_id], updating timestamp only", Debug::$LOG_VERBOSE);
+
+                    // we keep encountering the entry in feeds, so we need to
+                    // update date_updated column so that we don't get horrible
+                    // dupes when the entry gets purged and reinserted again e.g.
+                    // in the case of SLOW SLOW OMG SLOW updating feeds
+
+                    $sth = $pdo->prepare("UPDATE ttrss_entries SET date_updated = NOW()
 						WHERE id = ?");
-					$sth->execute([$base_entry_id]);
+                    $sth->execute([$base_entry_id]);
 
-					$pdo->commit();
-					continue;
-				}
+                    $pdo->commit();
+                    continue;
+                }
 
-				Debug::log("hash differs, applying plugin filters:", Debug::$LOG_VERBOSE);
+                Debug::log("hash differs, applying plugin filters:", Debug::$LOG_VERBOSE);
 
-				foreach ($pluginhost->get_hooks(PluginHost::HOOK_ARTICLE_FILTER) as $plugin) {
-					Debug::log("... " . get_class($plugin), Debug::$LOG_VERBOSE);
+                foreach ($pluginhost->get_hooks(PluginHost::HOOK_ARTICLE_FILTER) as $plugin) {
+                    Debug::log("... " . get_class($plugin), Debug::$LOG_VERBOSE);
 
-					$start = microtime(true);
-					$article = $plugin->hook_article_filter($article);
+                    $start = microtime(true);
+                    $article = $plugin->hook_article_filter($article);
 
-					Debug::log(sprintf("=== %.4f (sec)", microtime(true) - $start), Debug::$LOG_VERBOSE);
+                    Debug::log(sprintf("=== %.4f (sec)", microtime(true) - $start), Debug::$LOG_VERBOSE);
 
-					$entry_plugin_data .= mb_strtolower(get_class($plugin)) . ",";
-				}
+                    $entry_plugin_data .= mb_strtolower(get_class($plugin)) . ",";
+                }
 
                 if (Debug::get_loglevel() >= 3) {
-					print "processed content: ";
-					print htmlspecialchars($article["content"]);
-					print "\n";
-				}
+                    print "processed content: ";
+                    print htmlspecialchars($article["content"]);
+                    print "\n";
+                }
 
-				Debug::log("plugin data: $entry_plugin_data", Debug::$LOG_VERBOSE);
+                Debug::log("plugin data: $entry_plugin_data", Debug::$LOG_VERBOSE);
 
-				// Workaround: 4-byte unicode requires utf8mb4 in MySQL. See https://tt-rss.org/forum/viewtopic.php?f=1&t=3377&p=20077#p20077
-				if (DB_TYPE == "mysql" && MYSQL_CHARSET != "UTF8MB4") {
-					foreach ($article as $k => $v) {
-						// i guess we'll have to take the risk of 4byte unicode labels & tags here
-						if (is_string($article[$k])) {
-							$article[$k] = RSSUtils::strip_utf8mb4($v);
-						}
-					}
-				}
+                // Workaround: 4-byte unicode requires utf8mb4 in MySQL. See https://tt-rss.org/forum/viewtopic.php?f=1&t=3377&p=20077#p20077
+                if (DB_TYPE == "mysql" && MYSQL_CHARSET != "UTF8MB4") {
+                    foreach ($article as $k => $v) {
+                        // i guess we'll have to take the risk of 4byte unicode labels & tags here
+                        if (is_string($article[$k])) {
+                            $article[$k] = RSSUtils::strip_utf8mb4($v);
+                        }
+                    }
+                }
 
-				/* Collect article tags here so we could filter by them: */
+                /* Collect article tags here so we could filter by them: */
 
-				$matched_rules = [];
-				$matched_filters = [];
+                $matched_rules = [];
+                $matched_filters = [];
 
-				$article_filters = RSSUtils::get_article_filters($filters, $article["title"],
-					$article["content"], $article["link"], $article["author"],
-					$article["tags"], $matched_rules, $matched_filters);
+                $article_filters = RSSUtils::get_article_filters($filters, $article["title"],
+                    $article["content"], $article["link"], $article["author"],
+                    $article["tags"], $matched_rules, $matched_filters);
 
-				// $article_filters should be renamed to something like $filter_actions; actual filter objects are in $matched_filters
-				foreach ($pluginhost->get_hooks(PluginHost::HOOK_FILTER_TRIGGERED) as $plugin) {
-					$plugin->hook_filter_triggered($feed, $owner_uid, $article, $matched_filters, $matched_rules, $article_filters);
-				}
+                // $article_filters should be renamed to something like $filter_actions; actual filter objects are in $matched_filters
+                foreach ($pluginhost->get_hooks(PluginHost::HOOK_FILTER_TRIGGERED) as $plugin) {
+                    $plugin->hook_filter_triggered($feed, $owner_uid, $article, $matched_filters, $matched_rules, $article_filters);
+                }
 
-				$matched_filter_ids = array_map(function($f) { return $f['id']; }, $matched_filters);
+                $matched_filter_ids = array_map(function($f) { return $f['id']; }, $matched_filters);
 
-				if (count($matched_filter_ids) > 0) {
-					$filter_ids_qmarks = arr_qmarks($matched_filter_ids);
+                if (count($matched_filter_ids) > 0) {
+                    $filter_ids_qmarks = arr_qmarks($matched_filter_ids);
 
-					$fsth = $pdo->prepare("UPDATE ttrss_filters2 SET last_triggered = NOW() WHERE
+                    $fsth = $pdo->prepare("UPDATE ttrss_filters2 SET last_triggered = NOW() WHERE
 							   id IN ($filter_ids_qmarks) AND owner_uid = ?");
 
-					$fsth->execute(array_merge($matched_filter_ids, [$owner_uid]));
-				}
+                    $fsth->execute(array_merge($matched_filter_ids, [$owner_uid]));
+                }
 
-				if (Debug::get_loglevel() >= Debug::$LOG_EXTENDED) {
-					Debug::log("matched filters: ", Debug::$LOG_VERBOSE);
+                if (Debug::get_loglevel() >= Debug::$LOG_EXTENDED) {
+                    Debug::log("matched filters: ", Debug::$LOG_VERBOSE);
 
-					if (count($matched_filters != 0)) {
-						print_r($matched_filters);
-					}
+                    if (count($matched_filters != 0)) {
+                        print_r($matched_filters);
+                    }
 
-					Debug::log("matched filter rules: ", Debug::$LOG_VERBOSE);
+                    Debug::log("matched filter rules: ", Debug::$LOG_VERBOSE);
 
-					if (count($matched_rules) != 0) {
-						print_r($matched_rules);
-					}
+                    if (count($matched_rules) != 0) {
+                        print_r($matched_rules);
+                    }
 
-					Debug::log("filter actions: ", Debug::$LOG_VERBOSE);
+                    Debug::log("filter actions: ", Debug::$LOG_VERBOSE);
 
-					if (count($article_filters) != 0) {
-						print_r($article_filters);
-					}
-				}
+                    if (count($article_filters) != 0) {
+                        print_r($article_filters);
+                    }
+                }
 
-				$plugin_filter_names = RSSUtils::find_article_filters($article_filters, "plugin");
-				$plugin_filter_actions = $pluginhost->get_filter_actions();
+                $plugin_filter_names = RSSUtils::find_article_filters($article_filters, "plugin");
+                $plugin_filter_actions = $pluginhost->get_filter_actions();
 
-				if (count($plugin_filter_names) > 0) {
-					Debug::log("applying plugin filter actions...", Debug::$LOG_VERBOSE);
+                if (count($plugin_filter_names) > 0) {
+                    Debug::log("applying plugin filter actions...", Debug::$LOG_VERBOSE);
 
-					foreach ($plugin_filter_names as $pfn) {
-						list($pfclass,$pfaction) = explode(":", $pfn["param"]);
+                    foreach ($plugin_filter_names as $pfn) {
+                        list($pfclass,$pfaction) = explode(":", $pfn["param"]);
 
-						if (isset($plugin_filter_actions[$pfclass])) {
-							$plugin = $pluginhost->get_plugin($pfclass);
+                        if (isset($plugin_filter_actions[$pfclass])) {
+                            $plugin = $pluginhost->get_plugin($pfclass);
 
-							Debug::log("... $pfclass: $pfaction", Debug::$LOG_VERBOSE);
+                            Debug::log("... $pfclass: $pfaction", Debug::$LOG_VERBOSE);
 
-							if ($plugin) {
-								$start = microtime(true);
-								$article = $plugin->hook_article_filter_action($article, $pfaction);
+                            if ($plugin) {
+                                $start = microtime(true);
+                                $article = $plugin->hook_article_filter_action($article, $pfaction);
 
-								Debug::log(sprintf("=== %.4f (sec)", microtime(true) - $start), Debug::$LOG_VERBOSE);
-							} else {
-								Debug::log("??? $pfclass: plugin object not found.", Debug::$LOG_VERBOSE);
-							}
-						} else {
-							Debug::log("??? $pfclass: filter plugin not registered.", Debug::$LOG_VERBOSE);
-						}
-					}
-				}
+                                Debug::log(sprintf("=== %.4f (sec)", microtime(true) - $start), Debug::$LOG_VERBOSE);
+                            } else {
+                                Debug::log("??? $pfclass: plugin object not found.", Debug::$LOG_VERBOSE);
+                            }
+                        } else {
+                            Debug::log("??? $pfclass: filter plugin not registered.", Debug::$LOG_VERBOSE);
+                        }
+                    }
+                }
 
-				$entry_tags = $article["tags"];
-				$entry_title = strip_tags($article["title"]);
-				$entry_author = mb_substr(strip_tags($article["author"]), 0, 245);
-				$entry_link = strip_tags($article["link"]);
-				$entry_content = $article["content"]; // escaped below
-				$entry_force_catchup = $article["force_catchup"];
-				$article_labels = $article["labels"];
-				$entry_score_modifier = (int) $article["score_modifier"];
-				$entry_language = $article["language"];
-				$entry_timestamp = $article["timestamp"];
-				$num_comments = $article["num_comments"];
+                $entry_tags = $article["tags"];
+                $entry_title = strip_tags($article["title"]);
+                $entry_author = mb_substr(strip_tags($article["author"]), 0, 245);
+                $entry_link = strip_tags($article["link"]);
+                $entry_content = $article["content"]; // escaped below
+                $entry_force_catchup = $article["force_catchup"];
+                $article_labels = $article["labels"];
+                $entry_score_modifier = (int) $article["score_modifier"];
+                $entry_language = $article["language"];
+                $entry_timestamp = $article["timestamp"];
+                $num_comments = $article["num_comments"];
 
-				if ($entry_timestamp == -1 || !$entry_timestamp || $entry_timestamp > time()) {
-					$entry_timestamp = time();
-				}
+                if ($entry_timestamp == -1 || !$entry_timestamp || $entry_timestamp > time()) {
+                    $entry_timestamp = time();
+                }
 
-				$entry_timestamp_fmt = strftime("%Y/%m/%d %H:%M:%S", $entry_timestamp);
+                $entry_timestamp_fmt = strftime("%Y/%m/%d %H:%M:%S", $entry_timestamp);
 
-				Debug::log("date $entry_timestamp [$entry_timestamp_fmt]", Debug::$LOG_VERBOSE);
-				Debug::log("num_comments: $num_comments", Debug::$LOG_VERBOSE);
+                Debug::log("date $entry_timestamp [$entry_timestamp_fmt]", Debug::$LOG_VERBOSE);
+                Debug::log("num_comments: $num_comments", Debug::$LOG_VERBOSE);
 
-				if (Debug::get_loglevel() >= Debug::$LOG_EXTENDED) {
-					Debug::log("article labels:", Debug::$LOG_VERBOSE);
+                if (Debug::get_loglevel() >= Debug::$LOG_EXTENDED) {
+                    Debug::log("article labels:", Debug::$LOG_VERBOSE);
 
-					if (count($article_labels) != 0) {
-						print_r($article_labels);
-					}
-				}
+                    if (count($article_labels) != 0) {
+                        print_r($article_labels);
+                    }
+                }
 
-				Debug::log("force catchup: $entry_force_catchup", Debug::$LOG_VERBOSE);
+                Debug::log("force catchup: $entry_force_catchup", Debug::$LOG_VERBOSE);
 
-				if ($cache_images)
-					RSSUtils::cache_media($entry_content, $site_url);
+                if ($cache_images)
+                    RSSUtils::cache_media($entry_content, $site_url);
 
-				$csth = $pdo->prepare("SELECT id FROM ttrss_entries
+                $csth = $pdo->prepare("SELECT id FROM ttrss_entries
 					WHERE guid = ? OR guid = ?");
-				$csth->execute([$entry_guid, $entry_guid_hashed]);
+                $csth->execute([$entry_guid, $entry_guid_hashed]);
 
-				if (!$row = $csth->fetch()) {
+                if (!$row = $csth->fetch()) {
 
-					Debug::log("base guid [$entry_guid or $entry_guid_hashed] not found, creating...", Debug::$LOG_VERBOSE);
+                    Debug::log("base guid [$entry_guid or $entry_guid_hashed] not found, creating...", Debug::$LOG_VERBOSE);
 
-					// base post entry does not exist, create it
+                    // base post entry does not exist, create it
 
-					$usth = $pdo->prepare(
-						"INSERT INTO ttrss_entries
+                    $usth = $pdo->prepare(
+                        "INSERT INTO ttrss_entries
 							(title,
 							guid,
 							link,
@@ -859,110 +859,110 @@ 
 							NOW(),
 							?, ?, ?, ?,	?, ?)");
 
-						$usth->execute([$entry_title,
-							$entry_guid_hashed,
-							$entry_link,
-							$entry_timestamp_fmt,
-							"$entry_content",
-							$entry_current_hash,
-							$date_feed_processed,
-							$entry_comments,
-							(int)$num_comments,
-							$entry_plugin_data,
-							"$entry_language",
-							"$entry_author"]);
+                        $usth->execute([$entry_title,
+                            $entry_guid_hashed,
+                            $entry_link,
+                            $entry_timestamp_fmt,
+                            "$entry_content",
+                            $entry_current_hash,
+                            $date_feed_processed,
+                            $entry_comments,
+                            (int)$num_comments,
+                            $entry_plugin_data,
+                            "$entry_language",
+                            "$entry_author"]);
 
-				}
+                }
 
-				$csth->execute([$entry_guid, $entry_guid_hashed]);
+                $csth->execute([$entry_guid, $entry_guid_hashed]);
 
-				$entry_ref_id = 0;
-				$entry_int_id = 0;
+                $entry_ref_id = 0;
+                $entry_int_id = 0;
 
-				if ($row = $csth->fetch()) {
+                if ($row = $csth->fetch()) {
 
-					Debug::log("base guid found, checking for user record", Debug::$LOG_VERBOSE);
+                    Debug::log("base guid found, checking for user record", Debug::$LOG_VERBOSE);
 
-					$ref_id = $row['id'];
-					$entry_ref_id = $ref_id;
+                    $ref_id = $row['id'];
+                    $entry_ref_id = $ref_id;
 
-					if (RSSUtils::find_article_filter($article_filters, "filter")) {
-						Debug::log("article is filtered out, nothing to do.", Debug::$LOG_VERBOSE);
-						$pdo->commit();
-						continue;
-					}
+                    if (RSSUtils::find_article_filter($article_filters, "filter")) {
+                        Debug::log("article is filtered out, nothing to do.", Debug::$LOG_VERBOSE);
+                        $pdo->commit();
+                        continue;
+                    }
 
-					$score = RSSUtils::calculate_article_score($article_filters) + $entry_score_modifier;
+                    $score = RSSUtils::calculate_article_score($article_filters) + $entry_score_modifier;
 
-					Debug::log("initial score: $score [including plugin modifier: $entry_score_modifier]", Debug::$LOG_VERBOSE);
+                    Debug::log("initial score: $score [including plugin modifier: $entry_score_modifier]", Debug::$LOG_VERBOSE);
 
-					// check for user post link to main table
+                    // check for user post link to main table
 
-					$sth = $pdo->prepare("SELECT ref_id, int_id FROM ttrss_user_entries WHERE
+                    $sth = $pdo->prepare("SELECT ref_id, int_id FROM ttrss_user_entries WHERE
 							ref_id = ? AND owner_uid = ?");
-					$sth->execute([$ref_id, $owner_uid]);
-
-					// okay it doesn't exist - create user entry
-					if ($row = $sth->fetch()) {
-						$entry_ref_id = $row["ref_id"];
-						$entry_int_id = $row["int_id"];
-
-						Debug::log("user record FOUND: RID: $entry_ref_id, IID: $entry_int_id", Debug::$LOG_VERBOSE);
-					} else {
-
-						Debug::log("user record not found, creating...", Debug::$LOG_VERBOSE);
-
-						if ($score >= -500 && !RSSUtils::find_article_filter($article_filters, 'catchup') && !$entry_force_catchup) {
-							$unread = 1;
-							$last_read_qpart = null;
-						} else {
-							$unread = 0;
-							$last_read_qpart = date("Y-m-d H:i"); // we can't use NOW() here because it gets quoted
-						}
-
-						if (RSSUtils::find_article_filter($article_filters, 'mark') || $score > 1000) {
-							$marked = 1;
-						} else {
-							$marked = 0;
-						}
-
-						if (RSSUtils::find_article_filter($article_filters, 'publish')) {
-							$published = 1;
-						} else {
-							$published = 0;
-						}
-
-						$last_marked = ($marked == 1) ? 'NOW()' : 'NULL';
-						$last_published = ($published == 1) ? 'NOW()' : 'NULL';
-
-						$sth = $pdo->prepare(
-							"INSERT INTO ttrss_user_entries
+                    $sth->execute([$ref_id, $owner_uid]);
+
+                    // okay it doesn't exist - create user entry
+                    if ($row = $sth->fetch()) {
+                        $entry_ref_id = $row["ref_id"];
+                        $entry_int_id = $row["int_id"];
+
+                        Debug::log("user record FOUND: RID: $entry_ref_id, IID: $entry_int_id", Debug::$LOG_VERBOSE);
+                    } else {
+
+                        Debug::log("user record not found, creating...", Debug::$LOG_VERBOSE);
+
+                        if ($score >= -500 && !RSSUtils::find_article_filter($article_filters, 'catchup') && !$entry_force_catchup) {
+                            $unread = 1;
+                            $last_read_qpart = null;
+                        } else {
+                            $unread = 0;
+                            $last_read_qpart = date("Y-m-d H:i"); // we can't use NOW() here because it gets quoted
+                        }
+
+                        if (RSSUtils::find_article_filter($article_filters, 'mark') || $score > 1000) {
+                            $marked = 1;
+                        } else {
+                            $marked = 0;
+                        }
+
+                        if (RSSUtils::find_article_filter($article_filters, 'publish')) {
+                            $published = 1;
+                        } else {
+                            $published = 0;
+                        }
+
+                        $last_marked = ($marked == 1) ? 'NOW()' : 'NULL';
+                        $last_published = ($published == 1) ? 'NOW()' : 'NULL';
+
+                        $sth = $pdo->prepare(
+                            "INSERT INTO ttrss_user_entries
 								(ref_id, owner_uid, feed_id, unread, last_read, marked,
 								published, score, tag_cache, label_cache, uuid,
 								last_marked, last_published)
 							VALUES (?, ?, ?, ?, ?, ?, ?, ?, '', '', '', ".$last_marked.", ".$last_published.")");
 
-						$sth->execute([$ref_id, $owner_uid, $feed, $unread, $last_read_qpart, $marked,
-							$published, $score]);
+                        $sth->execute([$ref_id, $owner_uid, $feed, $unread, $last_read_qpart, $marked,
+                            $published, $score]);
 
-						$sth = $pdo->prepare("SELECT int_id FROM ttrss_user_entries WHERE
+                        $sth = $pdo->prepare("SELECT int_id FROM ttrss_user_entries WHERE
 								ref_id = ? AND owner_uid = ? AND
 								feed_id = ? LIMIT 1");
 
-						$sth->execute([$ref_id, $owner_uid, $feed]);
+                        $sth->execute([$ref_id, $owner_uid, $feed]);
 
-						if ($row = $sth->fetch())
-							$entry_int_id = $row['int_id'];
-					}
+                        if ($row = $sth->fetch())
+                            $entry_int_id = $row['int_id'];
+                    }
 
-					Debug::log("resulting RID: $entry_ref_id, IID: $entry_int_id", Debug::$LOG_VERBOSE);
+                    Debug::log("resulting RID: $entry_ref_id, IID: $entry_int_id", Debug::$LOG_VERBOSE);
 
-					if (DB_TYPE == "pgsql")
-						$tsvector_qpart = "tsvector_combined = to_tsvector(:ts_lang, :ts_content),";
-					else
-						$tsvector_qpart = "";
+                    if (DB_TYPE == "pgsql")
+                        $tsvector_qpart = "tsvector_combined = to_tsvector(:ts_lang, :ts_content),";
+                    else
+                        $tsvector_qpart = "";
 
-					$sth = $pdo->prepare("UPDATE ttrss_entries
+                    $sth = $pdo->prepare("UPDATE ttrss_entries
 						SET title = :title,
 							$tsvector_qpart
 							content = :content,
@@ -975,634 +975,634 @@ 
 							lang = :lang
 						WHERE id = :id");
 
-					$params = [":title" => $entry_title,
-						":content" => "$entry_content",
-						":content_hash" => $entry_current_hash,
-						":updated" => $entry_timestamp_fmt,
-						":num_comments" => (int)$num_comments,
-						":plugin_data" => $entry_plugin_data,
-						":author" => "$entry_author",
-						":lang" => $entry_language,
-						":id" => $ref_id];
-
-					if (DB_TYPE == "pgsql") {
-						$params[":ts_lang"] = $feed_language;
-						$params[":ts_content"] = mb_substr(strip_tags($entry_title . " " . $entry_content), 0, 900000);
-					}
-
-					$sth->execute($params);
-
-					// update aux data
-					$sth = $pdo->prepare("UPDATE ttrss_user_entries
+                    $params = [":title" => $entry_title,
+                        ":content" => "$entry_content",
+                        ":content_hash" => $entry_current_hash,
+                        ":updated" => $entry_timestamp_fmt,
+                        ":num_comments" => (int)$num_comments,
+                        ":plugin_data" => $entry_plugin_data,
+                        ":author" => "$entry_author",
+                        ":lang" => $entry_language,
+                        ":id" => $ref_id];
+
+                    if (DB_TYPE == "pgsql") {
+                        $params[":ts_lang"] = $feed_language;
+                        $params[":ts_content"] = mb_substr(strip_tags($entry_title . " " . $entry_content), 0, 900000);
+                    }
+
+                    $sth->execute($params);
+
+                    // update aux data
+                    $sth = $pdo->prepare("UPDATE ttrss_user_entries
 							SET score = ? WHERE ref_id = ?");
-					$sth->execute([$score, $ref_id]);
+                    $sth->execute([$score, $ref_id]);
 
-					if ($mark_unread_on_update &&
-						!$entry_force_catchup &&
-						!RSSUtils::find_article_filter($article_filters, 'catchup')) {
+                    if ($mark_unread_on_update &&
+                        !$entry_force_catchup &&
+                        !RSSUtils::find_article_filter($article_filters, 'catchup')) {
 
-						Debug::log("article updated, marking unread as requested.", Debug::$LOG_VERBOSE);
+                        Debug::log("article updated, marking unread as requested.", Debug::$LOG_VERBOSE);
 
-						$sth = $pdo->prepare("UPDATE ttrss_user_entries
+                        $sth = $pdo->prepare("UPDATE ttrss_user_entries
 							SET last_read = null, unread = true WHERE ref_id = ?");
-						$sth->execute([$ref_id]);
-					} else {
-						Debug::log("article updated, but we're forbidden to mark it unread.", Debug::$LOG_VERBOSE);
-					}
-				}
+                        $sth->execute([$ref_id]);
+                    } else {
+                        Debug::log("article updated, but we're forbidden to mark it unread.", Debug::$LOG_VERBOSE);
+                    }
+                }
 
-				Debug::log("assigning labels [other]...", Debug::$LOG_VERBOSE);
+                Debug::log("assigning labels [other]...", Debug::$LOG_VERBOSE);
 
-				foreach ($article_labels as $label) {
-					Labels::add_article($entry_ref_id, $label[1], $owner_uid);
-				}
+                foreach ($article_labels as $label) {
+                    Labels::add_article($entry_ref_id, $label[1], $owner_uid);
+                }
 
-				Debug::log("assigning labels [filters]...", Debug::$LOG_VERBOSE);
+                Debug::log("assigning labels [filters]...", Debug::$LOG_VERBOSE);
 
-				RSSUtils::assign_article_to_label_filters($entry_ref_id, $article_filters,
-					$owner_uid, $article_labels);
+                RSSUtils::assign_article_to_label_filters($entry_ref_id, $article_filters,
+                    $owner_uid, $article_labels);
 
-				Debug::log("looking for enclosures...", Debug::$LOG_VERBOSE);
+                Debug::log("looking for enclosures...", Debug::$LOG_VERBOSE);
 
-				// enclosures
+                // enclosures
 
-				$enclosures = array();
+                $enclosures = array();
 
-				$encs = $item->get_enclosures();
+                $encs = $item->get_enclosures();
 
-				if (is_array($encs)) {
-					foreach ($encs as $e) {
-						$e_item = array(
-							rewrite_relative_url($site_url, $e->link),
-							$e->type, $e->length, $e->title, $e->width, $e->height);
+                if (is_array($encs)) {
+                    foreach ($encs as $e) {
+                        $e_item = array(
+                            rewrite_relative_url($site_url, $e->link),
+                            $e->type, $e->length, $e->title, $e->width, $e->height);
 
-						// Yet another episode of "mysql utf8_general_ci is gimped"
-						if (DB_TYPE == "mysql" && MYSQL_CHARSET != "UTF8MB4") {
-							for ($i = 0; $i < count($e_item); $i++) {
-								if (is_string($e_item[$i])) {
-									$e_item[$i] = RSSUtils::strip_utf8mb4($e_item[$i]);
-								}
-							}
-						}
+                        // Yet another episode of "mysql utf8_general_ci is gimped"
+                        if (DB_TYPE == "mysql" && MYSQL_CHARSET != "UTF8MB4") {
+                            for ($i = 0; $i < count($e_item); $i++) {
+                                if (is_string($e_item[$i])) {
+                                    $e_item[$i] = RSSUtils::strip_utf8mb4($e_item[$i]);
+                                }
+                            }
+                        }
 
-						array_push($enclosures, $e_item);
-					}
-				}
+                        array_push($enclosures, $e_item);
+                    }
+                }
 
-				if ($cache_images)
-					RSSUtils::cache_enclosures($enclosures, $site_url);
+                if ($cache_images)
+                    RSSUtils::cache_enclosures($enclosures, $site_url);
 
-				if (Debug::get_loglevel() >= Debug::$LOG_EXTENDED) {
-					Debug::log("article enclosures:", Debug::$LOG_VERBOSE);
-					print_r($enclosures);
-				}
+                if (Debug::get_loglevel() >= Debug::$LOG_EXTENDED) {
+                    Debug::log("article enclosures:", Debug::$LOG_VERBOSE);
+                    print_r($enclosures);
+                }
 
-				$esth = $pdo->prepare("SELECT id FROM ttrss_enclosures
+                $esth = $pdo->prepare("SELECT id FROM ttrss_enclosures
 						WHERE content_url = ? AND content_type = ? AND post_id = ?");
 
-				$usth = $pdo->prepare("INSERT INTO ttrss_enclosures
+                $usth = $pdo->prepare("INSERT INTO ttrss_enclosures
 							(content_url, content_type, title, duration, post_id, width, height) VALUES
 							(?, ?, ?, ?, ?, ?, ?)");
 
-				foreach ($enclosures as $enc) {
-					$enc_url = $enc[0];
-					$enc_type = $enc[1];
-					$enc_dur = (int)$enc[2];
-					$enc_title = $enc[3];
-					$enc_width = intval($enc[4]);
-					$enc_height = intval($enc[5]);
+                foreach ($enclosures as $enc) {
+                    $enc_url = $enc[0];
+                    $enc_type = $enc[1];
+                    $enc_dur = (int)$enc[2];
+                    $enc_title = $enc[3];
+                    $enc_width = intval($enc[4]);
+                    $enc_height = intval($enc[5]);
 
-					$esth->execute([$enc_url, $enc_type, $entry_ref_id]);
+                    $esth->execute([$enc_url, $enc_type, $entry_ref_id]);
 
-					if (!$esth->fetch()) {
-						$usth->execute([$enc_url, $enc_type, (string)$enc_title, $enc_dur, $entry_ref_id, $enc_width, $enc_height]);
-					}
-				}
+                    if (!$esth->fetch()) {
+                        $usth->execute([$enc_url, $enc_type, (string)$enc_title, $enc_dur, $entry_ref_id, $enc_width, $enc_height]);
+                    }
+                }
 
-				// check for manual tags (we have to do it here since they're loaded from filters)
+                // check for manual tags (we have to do it here since they're loaded from filters)
 
-				foreach ($article_filters as $f) {
-					if ($f["type"] == "tag") {
+                foreach ($article_filters as $f) {
+                    if ($f["type"] == "tag") {
 
-						$manual_tags = trim_array(explode(",", $f["param"]));
+                        $manual_tags = trim_array(explode(",", $f["param"]));
 
-						foreach ($manual_tags as $tag) {
-							array_push($entry_tags, $tag);
-						}
-					}
-				}
+                        foreach ($manual_tags as $tag) {
+                            array_push($entry_tags, $tag);
+                        }
+                    }
+                }
 
-				// Skip boring tags
+                // Skip boring tags
 
-				$boring_tags = trim_array(explode(",", mb_strtolower(get_pref(
-					'BLACKLISTED_TAGS', $owner_uid, ''), 'utf-8')));
+                $boring_tags = trim_array(explode(",", mb_strtolower(get_pref(
+                    'BLACKLISTED_TAGS', $owner_uid, ''), 'utf-8')));
 
-				$filtered_tags = array();
-				$tags_to_cache = array();
+                $filtered_tags = array();
+                $tags_to_cache = array();
 
-				foreach ($entry_tags as $tag) {
-					if (array_search($tag, $boring_tags) === false) {
-						array_push($filtered_tags, $tag);
-					}
-				}
+                foreach ($entry_tags as $tag) {
+                    if (array_search($tag, $boring_tags) === false) {
+                        array_push($filtered_tags, $tag);
+                    }
+                }
 
-				$filtered_tags = array_unique($filtered_tags);
+                $filtered_tags = array_unique($filtered_tags);
 
-				if (Debug::get_loglevel() >= Debug::$LOG_VERBOSE) {
-					Debug::log("filtered tags: " . implode(", ", $filtered_tags), Debug::$LOG_VERBOSE);
+                if (Debug::get_loglevel() >= Debug::$LOG_VERBOSE) {
+                    Debug::log("filtered tags: " . implode(", ", $filtered_tags), Debug::$LOG_VERBOSE);
 
-				}
+                }
 
-				// Save article tags in the database
+                // Save article tags in the database
 
-				if (count($filtered_tags) > 0) {
+                if (count($filtered_tags) > 0) {
 
-					$tsth = $pdo->prepare("SELECT id FROM ttrss_tags
+                    $tsth = $pdo->prepare("SELECT id FROM ttrss_tags
 							WHERE tag_name = ? AND post_int_id = ? AND
 							owner_uid = ? LIMIT 1");
 
-					$usth = $pdo->prepare("INSERT INTO ttrss_tags
+                    $usth = $pdo->prepare("INSERT INTO ttrss_tags
 									(owner_uid,tag_name,post_int_id)
 									VALUES (?, ?, ?)");
 
-					$filtered_tags = FeedItem_Common::normalize_categories($filtered_tags);
+                    $filtered_tags = FeedItem_Common::normalize_categories($filtered_tags);
 
-					foreach ($filtered_tags as $tag) {
-						$tsth->execute([$tag, $entry_int_id, $owner_uid]);
+                    foreach ($filtered_tags as $tag) {
+                        $tsth->execute([$tag, $entry_int_id, $owner_uid]);
 
-						if (!$tsth->fetch()) {
-							$usth->execute([$owner_uid, $tag, $entry_int_id]);
-						}
+                        if (!$tsth->fetch()) {
+                            $usth->execute([$owner_uid, $tag, $entry_int_id]);
+                        }
 
-						array_push($tags_to_cache, $tag);
-					}
+                        array_push($tags_to_cache, $tag);
+                    }
 
-					/* update the cache */
-					$tags_str = join(",", $tags_to_cache);
+                    /* update the cache */
+                    $tags_str = join(",", $tags_to_cache);
 
-					$tsth = $pdo->prepare("UPDATE ttrss_user_entries
+                    $tsth = $pdo->prepare("UPDATE ttrss_user_entries
 						SET tag_cache = ? WHERE ref_id = ?
 						AND owner_uid = ?");
-					$tsth->execute([$tags_str, $entry_ref_id, $owner_uid]);
-				}
+                    $tsth->execute([$tags_str, $entry_ref_id, $owner_uid]);
+                }
 
-				Debug::log("article processed", Debug::$LOG_VERBOSE);
+                Debug::log("article processed", Debug::$LOG_VERBOSE);
 
-				$pdo->commit();
-			}
+                $pdo->commit();
+            }
 
-			Debug::log("purging feed...", Debug::$LOG_VERBOSE);
+            Debug::log("purging feed...", Debug::$LOG_VERBOSE);
 
-			Feeds::purge_feed($feed, 0);
+            Feeds::purge_feed($feed, 0);
 
-			$sth = $pdo->prepare("UPDATE ttrss_feeds
+            $sth = $pdo->prepare("UPDATE ttrss_feeds
 				SET last_updated = NOW(), last_unconditional = NOW(), last_error = '' WHERE id = ?");
-			$sth->execute([$feed]);
+            $sth->execute([$feed]);
 
-		} else {
+        } else {
 
-			$error_msg = mb_substr($rss->error(), 0, 245);
+            $error_msg = mb_substr($rss->error(), 0, 245);
 
-			Debug::log("fetch error: $error_msg", Debug::$LOG_VERBOSE);
+            Debug::log("fetch error: $error_msg", Debug::$LOG_VERBOSE);
 
-			if (count($rss->errors()) > 1) {
-				foreach ($rss->errors() as $error) {
-					Debug::log("+ $error", Debug::$LOG_VERBOSE);
-				}
-			}
+            if (count($rss->errors()) > 1) {
+                foreach ($rss->errors() as $error) {
+                    Debug::log("+ $error", Debug::$LOG_VERBOSE);
+                }
+            }
 
-			$sth = $pdo->prepare("UPDATE ttrss_feeds SET last_error = ?,
+            $sth = $pdo->prepare("UPDATE ttrss_feeds SET last_error = ?,
 				last_updated = NOW(), last_unconditional = NOW() WHERE id = ?");
-			$sth->execute([$error_msg, $feed]);
+            $sth->execute([$error_msg, $feed]);
 
-			unset($rss);
+            unset($rss);
 
-			Debug::log("update failed.", Debug::$LOG_VERBOSE);
-			return false;
-		}
+            Debug::log("update failed.", Debug::$LOG_VERBOSE);
+            return false;
+        }
 
-		Debug::log("update done.", Debug::$LOG_VERBOSE);
+        Debug::log("update done.", Debug::$LOG_VERBOSE);
 
-		return true;
-	}
+        return true;
+    }
 
-	public static function cache_enclosures($enclosures, $site_url) {
-		$cache = new DiskCache("images");
+    public static function cache_enclosures($enclosures, $site_url) {
+        $cache = new DiskCache("images");
 
-		if ($cache->isWritable()) {
-			foreach ($enclosures as $enc) {
+        if ($cache->isWritable()) {
+            foreach ($enclosures as $enc) {
 
-				if (preg_match("/(image|audio|video)/", $enc[1])) {
-					$src = rewrite_relative_url($site_url, $enc[0]);
+                if (preg_match("/(image|audio|video)/", $enc[1])) {
+                    $src = rewrite_relative_url($site_url, $enc[0]);
 
-					$local_filename = sha1($src);
+                    $local_filename = sha1($src);
 
-					Debug::log("cache_enclosures: downloading: $src to $local_filename", Debug::$LOG_VERBOSE);
+                    Debug::log("cache_enclosures: downloading: $src to $local_filename", Debug::$LOG_VERBOSE);
 
-					if (!$cache->exists($local_filename)) {
+                    if (!$cache->exists($local_filename)) {
 
-						global $fetch_last_error_code;
-						global $fetch_last_error;
+                        global $fetch_last_error_code;
+                        global $fetch_last_error;
 
-						$file_content = fetch_file_contents(array("url" => $src,
-							"http_referrer" => $src,
-							"max_size" => MAX_CACHE_FILE_SIZE));
+                        $file_content = fetch_file_contents(array("url" => $src,
+                            "http_referrer" => $src,
+                            "max_size" => MAX_CACHE_FILE_SIZE));
 
-						if ($file_content) {
-							$cache->put($local_filename, $file_content);
-						} else {
-							Debug::log("cache_enclosures: failed with $fetch_last_error_code: $fetch_last_error");
-						}
-					} else if (is_writable($local_filename)) {
-						$cache->touch($local_filename);
-					}
-				}
-			}
-		}
-	}
+                        if ($file_content) {
+                            $cache->put($local_filename, $file_content);
+                        } else {
+                            Debug::log("cache_enclosures: failed with $fetch_last_error_code: $fetch_last_error");
+                        }
+                    } else if (is_writable($local_filename)) {
+                        $cache->touch($local_filename);
+                    }
+                }
+            }
+        }
+    }
 
-	public static function cache_media($html, $site_url) {
-		$cache = new DiskCache("images");
+    public static function cache_media($html, $site_url) {
+        $cache = new DiskCache("images");
 
-		if ($cache->isWritable()) {
-			$doc = new DOMDocument();
-			if ($doc->loadHTML($html)) {
-				$xpath = new DOMXPath($doc);
+        if ($cache->isWritable()) {
+            $doc = new DOMDocument();
+            if ($doc->loadHTML($html)) {
+                $xpath = new DOMXPath($doc);
 
-				$entries = $xpath->query('(//img[@src])|(//video/source[@src])|(//audio/source[@src])');
+                $entries = $xpath->query('(//img[@src])|(//video/source[@src])|(//audio/source[@src])');
 
-				foreach ($entries as $entry) {
-					if ($entry->hasAttribute('src') && strpos($entry->getAttribute('src'), "data:") !== 0) {
-						$src = rewrite_relative_url($site_url, $entry->getAttribute('src'));
+                foreach ($entries as $entry) {
+                    if ($entry->hasAttribute('src') && strpos($entry->getAttribute('src'), "data:") !== 0) {
+                        $src = rewrite_relative_url($site_url, $entry->getAttribute('src'));
 
-						$local_filename = sha1($src);
+                        $local_filename = sha1($src);
 
-						Debug::log("cache_media: checking $src", Debug::$LOG_VERBOSE);
+                        Debug::log("cache_media: checking $src", Debug::$LOG_VERBOSE);
 
-						if (!$cache->exists($local_filename)) {
-							Debug::log("cache_media: downloading: $src to $local_filename", Debug::$LOG_VERBOSE);
+                        if (!$cache->exists($local_filename)) {
+                            Debug::log("cache_media: downloading: $src to $local_filename", Debug::$LOG_VERBOSE);
 
-							global $fetch_last_error_code;
-							global $fetch_last_error;
+                            global $fetch_last_error_code;
+                            global $fetch_last_error;
 
-							$file_content = fetch_file_contents(array("url" => $src,
-								"http_referrer" => $src,
-								"max_size" => MAX_CACHE_FILE_SIZE));
+                            $file_content = fetch_file_contents(array("url" => $src,
+                                "http_referrer" => $src,
+                                "max_size" => MAX_CACHE_FILE_SIZE));
 
-							if ($file_content) {
-								$cache->put($local_filename, $file_content);
-							} else {
-								Debug::log("cache_media: failed with $fetch_last_error_code: $fetch_last_error");
-							}
-						} else if ($cache->isWritable($local_filename)) {
-							$cache->touch($local_filename);
-						}
-					}
-				}
-			}
-		}
-	}
+                            if ($file_content) {
+                                $cache->put($local_filename, $file_content);
+                            } else {
+                                Debug::log("cache_media: failed with $fetch_last_error_code: $fetch_last_error");
+                            }
+                        } else if ($cache->isWritable($local_filename)) {
+                            $cache->touch($local_filename);
+                        }
+                    }
+                }
+            }
+        }
+    }
 
-	public static function expire_error_log() {
-		Debug::log("Removing old error log entries...");
+    public static function expire_error_log() {
+        Debug::log("Removing old error log entries...");
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		if (DB_TYPE == "pgsql") {
-			$pdo->query("DELETE FROM ttrss_error_log
+        if (DB_TYPE == "pgsql") {
+            $pdo->query("DELETE FROM ttrss_error_log
 				WHERE created_at < NOW() - INTERVAL '7 days'");
-		} else {
-			$pdo->query("DELETE FROM ttrss_error_log
+        } else {
+            $pdo->query("DELETE FROM ttrss_error_log
 				WHERE created_at < DATE_SUB(NOW(), INTERVAL 7 DAY)");
-		}
-	}
+        }
+    }
 
-	public static function expire_feed_archive() {
-		Debug::log("Removing old archived feeds...");
+    public static function expire_feed_archive() {
+        Debug::log("Removing old archived feeds...");
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		if (DB_TYPE == "pgsql") {
-			$pdo->query("DELETE FROM ttrss_archived_feeds
+        if (DB_TYPE == "pgsql") {
+            $pdo->query("DELETE FROM ttrss_archived_feeds
 				WHERE created < NOW() - INTERVAL '1 month'");
-		} else {
-			$pdo->query("DELETE FROM ttrss_archived_feeds
+        } else {
+            $pdo->query("DELETE FROM ttrss_archived_feeds
 				WHERE created < DATE_SUB(NOW(), INTERVAL 1 MONTH)");
-		}
-	}
-
-	public static function expire_lock_files() {
-		Debug::log("Removing old lock files...", Debug::$LOG_VERBOSE);
-
-		$num_deleted = 0;
-
-		if (is_writable(LOCK_DIRECTORY)) {
-			$files = glob(LOCK_DIRECTORY . "/*.lock");
-
-			if ($files) {
-				foreach ($files as $file) {
-					if (!file_is_locked(basename($file)) && time() - filemtime($file) > 86400*2) {
-						unlink($file);
-						++$num_deleted;
-					}
-				}
-			}
-		}
-
-		Debug::log("Removed $num_deleted old lock files.");
-	}
-
-	/**
-	 * Source: http://www.php.net/manual/en/function.parse-url.php#104527
-	 * Returns the url query as associative array
-	 *
-	 * @param    string    query
-	 * @return    array    params
-	 */
-	public static function convertUrlQuery($query) {
-		$queryParts = explode('&', $query);
-
-		$params = array();
-
-		foreach ($queryParts as $param) {
-			$item = explode('=', $param);
-			$params[$item[0]] = $item[1];
-		}
-
-		return $params;
-	}
-
-	public static function get_article_filters($filters, $title, $content, $link, $author, $tags, &$matched_rules = false, &$matched_filters = false) {
-		$matches = array();
-
-		foreach ($filters as $filter) {
-			$match_any_rule = $filter["match_any_rule"];
-			$inverse = $filter["inverse"];
-			$filter_match = false;
-
-			foreach ($filter["rules"] as $rule) {
-				$match = false;
-				$reg_exp = str_replace('/', '\/', $rule["reg_exp"]);
-				$rule_inverse = $rule["inverse"];
-
-				if (!$reg_exp)
-					continue;
-
-				switch ($rule["type"]) {
-					case "title":
-						$match = @preg_match("/$reg_exp/iu", $title);
-						break;
-					case "content":
-						// we don't need to deal with multiline regexps
-						$content = preg_replace("/[\r\n\t]/", "", $content);
-
-						$match = @preg_match("/$reg_exp/iu", $content);
-						break;
-					case "both":
-						// we don't need to deal with multiline regexps
-						$content = preg_replace("/[\r\n\t]/", "", $content);
-
-						$match = (@preg_match("/$reg_exp/iu", $title) || @preg_match("/$reg_exp/iu", $content));
-						break;
-					case "link":
-						$match = @preg_match("/$reg_exp/iu", $link);
-						break;
-					case "author":
-						$match = @preg_match("/$reg_exp/iu", $author);
-						break;
-					case "tag":
-						foreach ($tags as $tag) {
-							if (@preg_match("/$reg_exp/iu", $tag)) {
-								$match = true;
-								break;
-							}
-						}
-						break;
-				}
-
-				if ($rule_inverse) $match = !$match;
-
-				if ($match_any_rule) {
-					if ($match) {
-						$filter_match = true;
-						break;
-					}
-				} else {
-					$filter_match = $match;
-					if (!$match) {
-						break;
-					}
-				}
-			}
-
-			if ($inverse) $filter_match = !$filter_match;
-
-			if ($filter_match) {
-				if (is_array($matched_rules)) array_push($matched_rules, $rule);
-				if (is_array($matched_filters)) array_push($matched_filters, $filter);
-
-				foreach ($filter["actions"] AS $action) {
-					array_push($matches, $action);
-
-					// if Stop action encountered, perform no further processing
-					if (isset($action["type"]) && $action["type"] == "stop") return $matches;
-				}
-			}
-		}
-
-		return $matches;
-	}
-
-	public static function find_article_filter($filters, $filter_name) {
-		foreach ($filters as $f) {
-			if ($f["type"] == $filter_name) {
-				return $f;
-			};
-		}
-		return false;
-	}
-
-	public static function find_article_filters($filters, $filter_name) {
-		$results = array();
-
-		foreach ($filters as $f) {
-			if ($f["type"] == $filter_name) {
-				array_push($results, $f);
-			};
-		}
-		return $results;
-	}
-
-	public static function calculate_article_score($filters) {
-		$score = 0;
-
-		foreach ($filters as $f) {
-			if ($f["type"] == "score") {
-				$score += $f["param"];
-			};
-		}
-		return $score;
-	}
-
-	public static function labels_contains_caption($labels, $caption) {
-		foreach ($labels as $label) {
-			if ($label[1] == $caption) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	public static function assign_article_to_label_filters($id, $filters, $owner_uid, $article_labels) {
-		foreach ($filters as $f) {
-			if ($f["type"] == "label") {
-				if (!RSSUtils::labels_contains_caption($article_labels, $f["param"])) {
-					Labels::add_article($id, $f["param"], $owner_uid);
-				}
-			}
-		}
-	}
-
-	public static function make_guid_from_title($title) {
-		return preg_replace("/[ \"\',.:;]/", "-",
-			mb_strtolower(strip_tags($title), 'utf-8'));
-	}
-
-	public static function cleanup_counters_cache() {
-		$pdo = Db::pdo();
-
-		$res = $pdo->query("DELETE FROM ttrss_counters_cache
+        }
+    }
+
+    public static function expire_lock_files() {
+        Debug::log("Removing old lock files...", Debug::$LOG_VERBOSE);
+
+        $num_deleted = 0;
+
+        if (is_writable(LOCK_DIRECTORY)) {
+            $files = glob(LOCK_DIRECTORY . "/*.lock");
+
+            if ($files) {
+                foreach ($files as $file) {
+                    if (!file_is_locked(basename($file)) && time() - filemtime($file) > 86400*2) {
+                        unlink($file);
+                        ++$num_deleted;
+                    }
+                }
+            }
+        }
+
+        Debug::log("Removed $num_deleted old lock files.");
+    }
+
+    /**
+     * Source: http://www.php.net/manual/en/function.parse-url.php#104527
+     * Returns the url query as associative array
+     *
+     * @param    string    query
+     * @return    array    params
+     */
+    public static function convertUrlQuery($query) {
+        $queryParts = explode('&', $query);
+
+        $params = array();
+
+        foreach ($queryParts as $param) {
+            $item = explode('=', $param);
+            $params[$item[0]] = $item[1];
+        }
+
+        return $params;
+    }
+
+    public static function get_article_filters($filters, $title, $content, $link, $author, $tags, &$matched_rules = false, &$matched_filters = false) {
+        $matches = array();
+
+        foreach ($filters as $filter) {
+            $match_any_rule = $filter["match_any_rule"];
+            $inverse = $filter["inverse"];
+            $filter_match = false;
+
+            foreach ($filter["rules"] as $rule) {
+                $match = false;
+                $reg_exp = str_replace('/', '\/', $rule["reg_exp"]);
+                $rule_inverse = $rule["inverse"];
+
+                if (!$reg_exp)
+                    continue;
+
+                switch ($rule["type"]) {
+                    case "title":
+                        $match = @preg_match("/$reg_exp/iu", $title);
+                        break;
+                    case "content":
+                        // we don't need to deal with multiline regexps
+                        $content = preg_replace("/[\r\n\t]/", "", $content);
+
+                        $match = @preg_match("/$reg_exp/iu", $content);
+                        break;
+                    case "both":
+                        // we don't need to deal with multiline regexps
+                        $content = preg_replace("/[\r\n\t]/", "", $content);
+
+                        $match = (@preg_match("/$reg_exp/iu", $title) || @preg_match("/$reg_exp/iu", $content));
+                        break;
+                    case "link":
+                        $match = @preg_match("/$reg_exp/iu", $link);
+                        break;
+                    case "author":
+                        $match = @preg_match("/$reg_exp/iu", $author);
+                        break;
+                    case "tag":
+                        foreach ($tags as $tag) {
+                            if (@preg_match("/$reg_exp/iu", $tag)) {
+                                $match = true;
+                                break;
+                            }
+                        }
+                        break;
+                }
+
+                if ($rule_inverse) $match = !$match;
+
+                if ($match_any_rule) {
+                    if ($match) {
+                        $filter_match = true;
+                        break;
+                    }
+                } else {
+                    $filter_match = $match;
+                    if (!$match) {
+                        break;
+                    }
+                }
+            }
+
+            if ($inverse) $filter_match = !$filter_match;
+
+            if ($filter_match) {
+                if (is_array($matched_rules)) array_push($matched_rules, $rule);
+                if (is_array($matched_filters)) array_push($matched_filters, $filter);
+
+                foreach ($filter["actions"] AS $action) {
+                    array_push($matches, $action);
+
+                    // if Stop action encountered, perform no further processing
+                    if (isset($action["type"]) && $action["type"] == "stop") return $matches;
+                }
+            }
+        }
+
+        return $matches;
+    }
+
+    public static function find_article_filter($filters, $filter_name) {
+        foreach ($filters as $f) {
+            if ($f["type"] == $filter_name) {
+                return $f;
+            };
+        }
+        return false;
+    }
+
+    public static function find_article_filters($filters, $filter_name) {
+        $results = array();
+
+        foreach ($filters as $f) {
+            if ($f["type"] == $filter_name) {
+                array_push($results, $f);
+            };
+        }
+        return $results;
+    }
+
+    public static function calculate_article_score($filters) {
+        $score = 0;
+
+        foreach ($filters as $f) {
+            if ($f["type"] == "score") {
+                $score += $f["param"];
+            };
+        }
+        return $score;
+    }
+
+    public static function labels_contains_caption($labels, $caption) {
+        foreach ($labels as $label) {
+            if ($label[1] == $caption) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public static function assign_article_to_label_filters($id, $filters, $owner_uid, $article_labels) {
+        foreach ($filters as $f) {
+            if ($f["type"] == "label") {
+                if (!RSSUtils::labels_contains_caption($article_labels, $f["param"])) {
+                    Labels::add_article($id, $f["param"], $owner_uid);
+                }
+            }
+        }
+    }
+
+    public static function make_guid_from_title($title) {
+        return preg_replace("/[ \"\',.:;]/", "-",
+            mb_strtolower(strip_tags($title), 'utf-8'));
+    }
+
+    public static function cleanup_counters_cache() {
+        $pdo = Db::pdo();
+
+        $res = $pdo->query("DELETE FROM ttrss_counters_cache
 			WHERE feed_id > 0 AND
 			(SELECT COUNT(id) FROM ttrss_feeds WHERE
 				id = feed_id AND
 				ttrss_counters_cache.owner_uid = ttrss_feeds.owner_uid) = 0");
 
-		$frows = $res->rowCount();
+        $frows = $res->rowCount();
 
-		$res = $pdo->query("DELETE FROM ttrss_cat_counters_cache
+        $res = $pdo->query("DELETE FROM ttrss_cat_counters_cache
 			WHERE feed_id > 0 AND
 			(SELECT COUNT(id) FROM ttrss_feed_categories WHERE
 				id = feed_id AND
 				ttrss_cat_counters_cache.owner_uid = ttrss_feed_categories.owner_uid) = 0");
 
-		$crows = $res->rowCount();
-
-		Debug::log("Removed $frows (feeds) $crows (cats) orphaned counter cache entries.");
-	}
-
-	public static function housekeeping_user($owner_uid) {
-		$tmph = new PluginHost();
-
-		load_user_plugins($owner_uid, $tmph);
-
-		$tmph->run_hooks(PluginHost::HOOK_HOUSE_KEEPING, "hook_house_keeping", "");
-	}
-
-	public static function housekeeping_common() {
-		DiskCache::expire();
-
-		RSSUtils::expire_lock_files();
-		RSSUtils::expire_error_log();
-		RSSUtils::expire_feed_archive();
-		RSSUtils::cleanup_feed_browser();
-
-		Article::purge_orphans();
-		RSSUtils::cleanup_counters_cache();
-
-		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_HOUSE_KEEPING, "hook_house_keeping", "");
-	}
-
-	public static function check_feed_favicon($site_url, $feed) {
-		#		print "FAVICON [$site_url]: $favicon_url\n";
-
-		$icon_file = ICONS_DIR . "/$feed.ico";
-
-		if (!file_exists($icon_file)) {
-			$favicon_url = RSSUtils::get_favicon_url($site_url);
-
-			if ($favicon_url) {
-				// Limiting to "image" type misses those served with text/plain
-				$contents = fetch_file_contents($favicon_url); // , "image");
-
-				if ($contents) {
-					// Crude image type matching.
-					// Patterns gleaned from the file(1) source code.
-					if (preg_match('/^\x00\x00\x01\x00/', $contents)) {
-						// 0       string  \000\000\001\000        MS Windows icon resource
-						//error_log("check_feed_favicon: favicon_url=$favicon_url isa MS Windows icon resource");
-					}
-					elseif (preg_match('/^GIF8/', $contents)) {
-						// 0       string          GIF8            GIF image data
-						//error_log("check_feed_favicon: favicon_url=$favicon_url isa GIF image");
-					}
-					elseif (preg_match('/^\x89PNG\x0d\x0a\x1a\x0a/', $contents)) {
-						// 0       string          \x89PNG\x0d\x0a\x1a\x0a         PNG image data
-						//error_log("check_feed_favicon: favicon_url=$favicon_url isa PNG image");
-					}
-					elseif (preg_match('/^\xff\xd8/', $contents)) {
-						// 0       beshort         0xffd8          JPEG image data
-						//error_log("check_feed_favicon: favicon_url=$favicon_url isa JPG image");
-					}
-					elseif (preg_match('/^BM/', $contents)) {
-						// 0	string		BM	PC bitmap (OS2, Windows BMP files)
-						//error_log("check_feed_favicon, favicon_url=$favicon_url isa BMP image");
-					}
-					else {
-						//error_log("check_feed_favicon: favicon_url=$favicon_url isa UNKNOWN type");
-						$contents = "";
-					}
-				}
-
-				if ($contents) {
-					$fp = @fopen($icon_file, "w");
-
-					if ($fp) {
-						fwrite($fp, $contents);
-						fclose($fp);
-						chmod($icon_file, 0644);
-					}
-				}
-			}
-			return $icon_file;
-		}
-	}
-
-	public static function is_gzipped($feed_data) {
-		return strpos(substr($feed_data, 0, 3),
-				"\x1f" . "\x8b" . "\x08", 0) === 0;
-	}
-
-	public static function load_filters($feed_id, $owner_uid) {
-		$filters = array();
-
-		$feed_id = (int) $feed_id;
-		$cat_id = (int)Feeds::getFeedCategory($feed_id);
-
-		if ($cat_id == 0)
-			$null_cat_qpart = "cat_id IS NULL OR";
-		else
-			$null_cat_qpart = "";
-
-		$pdo = Db::pdo();
-
-		$sth = $pdo->prepare("SELECT * FROM ttrss_filters2 WHERE
+        $crows = $res->rowCount();
+
+        Debug::log("Removed $frows (feeds) $crows (cats) orphaned counter cache entries.");
+    }
+
+    public static function housekeeping_user($owner_uid) {
+        $tmph = new PluginHost();
+
+        load_user_plugins($owner_uid, $tmph);
+
+        $tmph->run_hooks(PluginHost::HOOK_HOUSE_KEEPING, "hook_house_keeping", "");
+    }
+
+    public static function housekeeping_common() {
+        DiskCache::expire();
+
+        RSSUtils::expire_lock_files();
+        RSSUtils::expire_error_log();
+        RSSUtils::expire_feed_archive();
+        RSSUtils::cleanup_feed_browser();
+
+        Article::purge_orphans();
+        RSSUtils::cleanup_counters_cache();
+
+        PluginHost::getInstance()->run_hooks(PluginHost::HOOK_HOUSE_KEEPING, "hook_house_keeping", "");
+    }
+
+    public static function check_feed_favicon($site_url, $feed) {
+        #		print "FAVICON [$site_url]: $favicon_url\n";
+
+        $icon_file = ICONS_DIR . "/$feed.ico";
+
+        if (!file_exists($icon_file)) {
+            $favicon_url = RSSUtils::get_favicon_url($site_url);
+
+            if ($favicon_url) {
+                // Limiting to "image" type misses those served with text/plain
+                $contents = fetch_file_contents($favicon_url); // , "image");
+
+                if ($contents) {
+                    // Crude image type matching.
+                    // Patterns gleaned from the file(1) source code.
+                    if (preg_match('/^\x00\x00\x01\x00/', $contents)) {
+                        // 0       string  \000\000\001\000        MS Windows icon resource
+                        //error_log("check_feed_favicon: favicon_url=$favicon_url isa MS Windows icon resource");
+                    }
+                    elseif (preg_match('/^GIF8/', $contents)) {
+                        // 0       string          GIF8            GIF image data
+                        //error_log("check_feed_favicon: favicon_url=$favicon_url isa GIF image");
+                    }
+                    elseif (preg_match('/^\x89PNG\x0d\x0a\x1a\x0a/', $contents)) {
+                        // 0       string          \x89PNG\x0d\x0a\x1a\x0a         PNG image data
+                        //error_log("check_feed_favicon: favicon_url=$favicon_url isa PNG image");
+                    }
+                    elseif (preg_match('/^\xff\xd8/', $contents)) {
+                        // 0       beshort         0xffd8          JPEG image data
+                        //error_log("check_feed_favicon: favicon_url=$favicon_url isa JPG image");
+                    }
+                    elseif (preg_match('/^BM/', $contents)) {
+                        // 0	string		BM	PC bitmap (OS2, Windows BMP files)
+                        //error_log("check_feed_favicon, favicon_url=$favicon_url isa BMP image");
+                    }
+                    else {
+                        //error_log("check_feed_favicon: favicon_url=$favicon_url isa UNKNOWN type");
+                        $contents = "";
+                    }
+                }
+
+                if ($contents) {
+                    $fp = @fopen($icon_file, "w");
+
+                    if ($fp) {
+                        fwrite($fp, $contents);
+                        fclose($fp);
+                        chmod($icon_file, 0644);
+                    }
+                }
+            }
+            return $icon_file;
+        }
+    }
+
+    public static function is_gzipped($feed_data) {
+        return strpos(substr($feed_data, 0, 3),
+                "\x1f" . "\x8b" . "\x08", 0) === 0;
+    }
+
+    public static function load_filters($feed_id, $owner_uid) {
+        $filters = array();
+
+        $feed_id = (int) $feed_id;
+        $cat_id = (int)Feeds::getFeedCategory($feed_id);
+
+        if ($cat_id == 0)
+            $null_cat_qpart = "cat_id IS NULL OR";
+        else
+            $null_cat_qpart = "";
+
+        $pdo = Db::pdo();
+
+        $sth = $pdo->prepare("SELECT * FROM ttrss_filters2 WHERE
 				owner_uid = ? AND enabled = true ORDER BY order_id, title");
-		$sth->execute([$owner_uid]);
+        $sth->execute([$owner_uid]);
 
-		$check_cats = array_merge(
-			Feeds::getParentCategories($cat_id, $owner_uid),
-			[$cat_id]);
+        $check_cats = array_merge(
+            Feeds::getParentCategories($cat_id, $owner_uid),
+            [$cat_id]);
 
-		$check_cats_str = join(",", $check_cats);
-		$check_cats_fullids = array_map(function($a) { return "CAT:$a"; }, $check_cats);
+        $check_cats_str = join(",", $check_cats);
+        $check_cats_fullids = array_map(function($a) { return "CAT:$a"; }, $check_cats);
 
-		while ($line = $sth->fetch()) {
-			$filter_id = $line["id"];
+        while ($line = $sth->fetch()) {
+            $filter_id = $line["id"];
 
-			$match_any_rule = sql_bool_to_bool($line["match_any_rule"]);
+            $match_any_rule = sql_bool_to_bool($line["match_any_rule"]);
 
-			$sth2 = $pdo->prepare("SELECT
+            $sth2 = $pdo->prepare("SELECT
 					r.reg_exp, r.inverse, r.feed_id, r.cat_id, r.cat_filter, r.match_on, t.name AS type_name
 					FROM ttrss_filters2_rules AS r,
 					ttrss_filter_types AS t
@@ -1611,117 +1611,117 @@ 
 						  (($null_cat_qpart (cat_id IS NULL AND cat_filter = false) OR cat_id IN ($check_cats_str)) AND
 						  (feed_id IS NULL OR feed_id = ?))) AND
 						filter_type = t.id AND filter_id = ?");
-			$sth2->execute([$feed_id, $filter_id]);
+            $sth2->execute([$feed_id, $filter_id]);
 
-			$rules = array();
-			$actions = array();
+            $rules = array();
+            $actions = array();
 
-			while ($rule_line = $sth2->fetch()) {
-				#				print_r($rule_line);
+            while ($rule_line = $sth2->fetch()) {
+                #				print_r($rule_line);
 
-				if ($rule_line["match_on"]) {
-					$match_on = json_decode($rule_line["match_on"], true);
+                if ($rule_line["match_on"]) {
+                    $match_on = json_decode($rule_line["match_on"], true);
 
-					if (in_array("0", $match_on) || in_array($feed_id, $match_on) || count(array_intersect($check_cats_fullids, $match_on)) > 0) {
+                    if (in_array("0", $match_on) || in_array($feed_id, $match_on) || count(array_intersect($check_cats_fullids, $match_on)) > 0) {
 
-						$rule = array();
-						$rule["reg_exp"] = $rule_line["reg_exp"];
-						$rule["type"] = $rule_line["type_name"];
-						$rule["inverse"] = sql_bool_to_bool($rule_line["inverse"]);
+                        $rule = array();
+                        $rule["reg_exp"] = $rule_line["reg_exp"];
+                        $rule["type"] = $rule_line["type_name"];
+                        $rule["inverse"] = sql_bool_to_bool($rule_line["inverse"]);
 
-						array_push($rules, $rule);
-					} else if (!$match_any_rule) {
-						// this filter contains a rule that doesn't match to this feed/category combination
-						// thus filter has to be rejected
+                        array_push($rules, $rule);
+                    } else if (!$match_any_rule) {
+                        // this filter contains a rule that doesn't match to this feed/category combination
+                        // thus filter has to be rejected
 
-						$rules = [];
-						break;
-					}
+                        $rules = [];
+                        break;
+                    }
 
-				} else {
+                } else {
 
-					$rule = array();
-					$rule["reg_exp"] = $rule_line["reg_exp"];
-					$rule["type"] = $rule_line["type_name"];
-					$rule["inverse"] = sql_bool_to_bool($rule_line["inverse"]);
+                    $rule = array();
+                    $rule["reg_exp"] = $rule_line["reg_exp"];
+                    $rule["type"] = $rule_line["type_name"];
+                    $rule["inverse"] = sql_bool_to_bool($rule_line["inverse"]);
 
-					array_push($rules, $rule);
-				}
-			}
+                    array_push($rules, $rule);
+                }
+            }
 
-			if (count($rules) > 0) {
-				$sth2 = $pdo->prepare("SELECT a.action_param,t.name AS type_name
+            if (count($rules) > 0) {
+                $sth2 = $pdo->prepare("SELECT a.action_param,t.name AS type_name
 						FROM ttrss_filters2_actions AS a,
 						ttrss_filter_actions AS t
 						WHERE
 							action_id = t.id AND filter_id = ?");
-				$sth2->execute([$filter_id]);
-
-				while ($action_line = $sth2->fetch()) {
-					#				print_r($action_line);
-
-					$action = array();
-					$action["type"] = $action_line["type_name"];
-					$action["param"] = $action_line["action_param"];
-
-					array_push($actions, $action);
-				}
-			}
-
-			$filter = [];
-			$filter["id"] = $filter_id;
-			$filter["match_any_rule"] = sql_bool_to_bool($line["match_any_rule"]);
-			$filter["inverse"] = sql_bool_to_bool($line["inverse"]);
-			$filter["rules"] = $rules;
-			$filter["actions"] = $actions;
-
-			if (count($rules) > 0 && count($actions) > 0) {
-				array_push($filters, $filter);
-			}
-		}
-
-		return $filters;
-	}
-
-	/**
-	 * Try to determine the favicon URL for a feed.
-	 * adapted from wordpress favicon plugin by Jeff Minard (http://thecodepro.com/)
-	 * http://dev.wp-plugins.org/file/favatars/trunk/favatars.php
-	 *
-	 * @param string $url A feed or page URL
-	 * @access public
-	 * @return mixed The favicon URL, or false if none was found.
-	 */
-	public static function get_favicon_url($url) {
-
-		$favicon_url = false;
-
-		if ($html = @fetch_file_contents($url)) {
-
-			$doc = new DOMDocument();
-			if ($doc->loadHTML($html)) {
-				$xpath = new DOMXPath($doc);
-
-				$base = $xpath->query('/html/head/base[@href]');
-				foreach ($base as $b) {
-					$url = rewrite_relative_url($url, $b->getAttribute("href"));
-					break;
-				}
-
-				$entries = $xpath->query('/html/head/link[@rel="shortcut icon" or @rel="icon"]');
-				if (count($entries) > 0) {
-					foreach ($entries as $entry) {
-						$favicon_url = rewrite_relative_url($url, $entry->getAttribute("href"));
-						break;
-					}
-				}
-			}
-		}
-
-		if (!$favicon_url)
-			$favicon_url = rewrite_relative_url($url, "/favicon.ico");
-
-		return $favicon_url;
-	}
+                $sth2->execute([$filter_id]);
+
+                while ($action_line = $sth2->fetch()) {
+                    #				print_r($action_line);
+
+                    $action = array();
+                    $action["type"] = $action_line["type_name"];
+                    $action["param"] = $action_line["action_param"];
+
+                    array_push($actions, $action);
+                }
+            }
+
+            $filter = [];
+            $filter["id"] = $filter_id;
+            $filter["match_any_rule"] = sql_bool_to_bool($line["match_any_rule"]);
+            $filter["inverse"] = sql_bool_to_bool($line["inverse"]);
+            $filter["rules"] = $rules;
+            $filter["actions"] = $actions;
+
+            if (count($rules) > 0 && count($actions) > 0) {
+                array_push($filters, $filter);
+            }
+        }
+
+        return $filters;
+    }
+
+    /**
+     * Try to determine the favicon URL for a feed.
+     * adapted from wordpress favicon plugin by Jeff Minard (http://thecodepro.com/)
+     * http://dev.wp-plugins.org/file/favatars/trunk/favatars.php
+     *
+     * @param string $url A feed or page URL
+     * @access public
+     * @return mixed The favicon URL, or false if none was found.
+     */
+    public static function get_favicon_url($url) {
+
+        $favicon_url = false;
+
+        if ($html = @fetch_file_contents($url)) {
+
+            $doc = new DOMDocument();
+            if ($doc->loadHTML($html)) {
+                $xpath = new DOMXPath($doc);
+
+                $base = $xpath->query('/html/head/base[@href]');
+                foreach ($base as $b) {
+                    $url = rewrite_relative_url($url, $b->getAttribute("href"));
+                    break;
+                }
+
+                $entries = $xpath->query('/html/head/link[@rel="shortcut icon" or @rel="icon"]');
+                if (count($entries) > 0) {
+                    foreach ($entries as $entry) {
+                        $favicon_url = rewrite_relative_url($url, $entry->getAttribute("href"));
+                        break;
+                    }
+                }
+            }
+        }
+
+        if (!$favicon_url)
+            $favicon_url = rewrite_relative_url($url, "/favicon.ico");
+
+        return $favicon_url;
+    }
 
 }

Braces +73 added lines, -46 removed lines

@@ -80,7 +80,9 @@ 
 
 		// Update the least recently updated feeds first
 		$query_order = "ORDER BY last_updated";
-		if (DB_TYPE == "pgsql") $query_order .= " NULLS FIRST";
+		if (DB_TYPE == "pgsql") {
+		    $query_order .= " NULLS FIRST";
+		}
 
 		$query = "SELECT DISTINCT ttrss_feeds.feed_url, ttrss_feeds.last_updated
 			FROM
@@ -139,8 +141,9 @@ 
 			if ($tline = $usth->fetch()) {
 				Debug::log(" => " . $tline["last_updated"] . ", " . $tline["id"] . " " . $tline["owner_uid"]);
 
-				if (array_search($tline["owner_uid"], $batch_owners) === FALSE)
-					array_push($batch_owners, $tline["owner_uid"]);
+				if (array_search($tline["owner_uid"], $batch_owners) === FALSE) {
+									array_push($batch_owners, $tline["owner_uid"]);
+				}
 
 				$fstarted = microtime(true);
 
@@ -311,11 +314,13 @@ 
 
 			$feed_language = mb_strtolower($row["feed_language"]);
 
-			if (!$feed_language)
-				$feed_language = mb_strtolower(get_pref('DEFAULT_SEARCH_LANGUAGE', $owner_uid));
+			if (!$feed_language) {
+							$feed_language = mb_strtolower(get_pref('DEFAULT_SEARCH_LANGUAGE', $owner_uid));
+			}
 
-			if (!$feed_language)
-				$feed_language = 'simple';
+			if (!$feed_language) {
+							$feed_language = 'simple';
+			}
 
 		} else {
 			return false;
@@ -514,8 +519,9 @@ 
 				RSSUtils::check_feed_favicon($site_url, $feed);
 				$favicon_modified_new = @filemtime($favicon_file);
 
-				if ($favicon_modified_new > $favicon_modified)
-					$favicon_avg_color = '';
+				if ($favicon_modified_new > $favicon_modified) {
+									$favicon_avg_color = '';
+				}
 
 				$favicon_colorstring = "";
 				if (file_exists($favicon_file) && function_exists("imagecreatefromstring") && $favicon_avg_color == '') {
@@ -578,8 +584,12 @@ 
 				}
 
 				$entry_guid = strip_tags($item->get_id());
-				if (!$entry_guid) $entry_guid = strip_tags($item->get_link());
-				if (!$entry_guid) $entry_guid = RSSUtils::make_guid_from_title($item->get_title());
+				if (!$entry_guid) {
+				    $entry_guid = strip_tags($item->get_link());
+				}
+				if (!$entry_guid) {
+				    $entry_guid = RSSUtils::make_guid_from_title($item->get_title());
+				}
 
 				if (!$entry_guid) {
 					$pdo->commit();
@@ -606,10 +616,15 @@ 
 				Debug::log("link $entry_link", Debug::$LOG_VERBOSE);
 				Debug::log("language $entry_language", Debug::$LOG_VERBOSE);
 
-				if (!$entry_title) $entry_title = date("Y-m-d H:i:s", $entry_timestamp);;
+				if (!$entry_title) {
+				    $entry_title = date("Y-m-d H:i:s", $entry_timestamp);
+				}
+				;
 
 				$entry_content = $item->get_content();
-				if (!$entry_content) $entry_content = $item->get_description();
+				if (!$entry_content) {
+				    $entry_content = $item->get_description();
+				}
 
 				if (Debug::get_loglevel() >= 3) {
 					print "content: ";
@@ -824,8 +839,9 @@ 
 
 				Debug::log("force catchup: $entry_force_catchup", Debug::$LOG_VERBOSE);
 
-				if ($cache_images)
-					RSSUtils::cache_media($entry_content, $site_url);
+				if ($cache_images) {
+									RSSUtils::cache_media($entry_content, $site_url);
+				}
 
 				$csth = $pdo->prepare("SELECT id FROM ttrss_entries
 					WHERE guid = ? OR guid = ?");
@@ -951,16 +967,18 @@ 
 
 						$sth->execute([$ref_id, $owner_uid, $feed]);
 
-						if ($row = $sth->fetch())
-							$entry_int_id = $row['int_id'];
+						if ($row = $sth->fetch()) {
+													$entry_int_id = $row['int_id'];
+						}
 					}
 
 					Debug::log("resulting RID: $entry_ref_id, IID: $entry_int_id", Debug::$LOG_VERBOSE);
 
-					if (DB_TYPE == "pgsql")
-						$tsvector_qpart = "tsvector_combined = to_tsvector(:ts_lang, :ts_content),";
-					else
-						$tsvector_qpart = "";
+					if (DB_TYPE == "pgsql") {
+											$tsvector_qpart = "tsvector_combined = to_tsvector(:ts_lang, :ts_content),";
+					} else {
+											$tsvector_qpart = "";
+					}
 
 					$sth = $pdo->prepare("UPDATE ttrss_entries
 						SET title = :title,
@@ -1049,8 +1067,9 @@ 
 					}
 				}
 
-				if ($cache_images)
-					RSSUtils::cache_enclosures($enclosures, $site_url);
+				if ($cache_images) {
+									RSSUtils::cache_enclosures($enclosures, $site_url);
+				}
 
 				if (Debug::get_loglevel() >= Debug::$LOG_EXTENDED) {
 					Debug::log("article enclosures:", Debug::$LOG_VERBOSE);
@@ -1345,8 +1364,9 @@ 
 				$reg_exp = str_replace('/', '\/', $rule["reg_exp"]);
 				$rule_inverse = $rule["inverse"];
 
-				if (!$reg_exp)
-					continue;
+				if (!$reg_exp) {
+									continue;
+				}
 
 				switch ($rule["type"]) {
 					case "title":
@@ -1380,7 +1400,9 @@ 
 						break;
 				}
 
-				if ($rule_inverse) $match = !$match;
+				if ($rule_inverse) {
+				    $match = !$match;
+				}
 
 				if ($match_any_rule) {
 					if ($match) {
@@ -1395,17 +1417,25 @@ 
 				}
 			}
 
-			if ($inverse) $filter_match = !$filter_match;
+			if ($inverse) {
+			    $filter_match = !$filter_match;
+			}
 
 			if ($filter_match) {
-				if (is_array($matched_rules)) array_push($matched_rules, $rule);
-				if (is_array($matched_filters)) array_push($matched_filters, $filter);
+				if (is_array($matched_rules)) {
+				    array_push($matched_rules, $rule);
+				}
+				if (is_array($matched_filters)) {
+				    array_push($matched_filters, $filter);
+				}
 
 				foreach ($filter["actions"] AS $action) {
 					array_push($matches, $action);
 
 					// if Stop action encountered, perform no further processing
-					if (isset($action["type"]) && $action["type"] == "stop") return $matches;
+					if (isset($action["type"]) && $action["type"] == "stop") {
+					    return $matches;
+					}
 				}
 			}
 		}
@@ -1531,24 +1561,19 @@ 
 					if (preg_match('/^\x00\x00\x01\x00/', $contents)) {
 						// 0       string  \000\000\001\000        MS Windows icon resource
 						//error_log("check_feed_favicon: favicon_url=$favicon_url isa MS Windows icon resource");
-					}
-					elseif (preg_match('/^GIF8/', $contents)) {
+					} elseif (preg_match('/^GIF8/', $contents)) {
 						// 0       string          GIF8            GIF image data
 						//error_log("check_feed_favicon: favicon_url=$favicon_url isa GIF image");
-					}
-					elseif (preg_match('/^\x89PNG\x0d\x0a\x1a\x0a/', $contents)) {
+					} elseif (preg_match('/^\x89PNG\x0d\x0a\x1a\x0a/', $contents)) {
 						// 0       string          \x89PNG\x0d\x0a\x1a\x0a         PNG image data
 						//error_log("check_feed_favicon: favicon_url=$favicon_url isa PNG image");
-					}
-					elseif (preg_match('/^\xff\xd8/', $contents)) {
+					} elseif (preg_match('/^\xff\xd8/', $contents)) {
 						// 0       beshort         0xffd8          JPEG image data
 						//error_log("check_feed_favicon: favicon_url=$favicon_url isa JPG image");
-					}
-					elseif (preg_match('/^BM/', $contents)) {
+					} elseif (preg_match('/^BM/', $contents)) {
 						// 0	string		BM	PC bitmap (OS2, Windows BMP files)
 						//error_log("check_feed_favicon, favicon_url=$favicon_url isa BMP image");
-					}
-					else {
+					} else {
 						//error_log("check_feed_favicon: favicon_url=$favicon_url isa UNKNOWN type");
 						$contents = "";
 					}
@@ -1579,10 +1604,11 @@ 
 		$feed_id = (int) $feed_id;
 		$cat_id = (int)Feeds::getFeedCategory($feed_id);
 
-		if ($cat_id == 0)
-			$null_cat_qpart = "cat_id IS NULL OR";
-		else
-			$null_cat_qpart = "";
+		if ($cat_id == 0) {
+					$null_cat_qpart = "cat_id IS NULL OR";
+		} else {
+					$null_cat_qpart = "";
+		}
 
 		$pdo = Db::pdo();
 
@@ -1718,8 +1744,9 @@ 
 			}
 		}
 
-		if (!$favicon_url)
-			$favicon_url = rewrite_relative_url($url, "/favicon.ico");
+		if (!$favicon_url) {
+					$favicon_url = rewrite_relative_url($url, "/favicon.ico");
+		}
 
 		return $favicon_url;
 	}

classes/digest.php

Spacing +4 added lines, -4 removed lines

@@ -37,7 +37,7 @@ 
 					time() - $preferred_ts <= 7200
 				) {
 
-					Debug::log("Sending digest for UID:" . $line['id'] . " - " . $line["email"]);
+					Debug::log("Sending digest for UID:".$line['id']." - ".$line["email"]);
 
 					$do_catchup = get_pref('DIGEST_CATCHUP', $line['id'], false);
 
@@ -123,13 +123,13 @@ 
 
 		$sth = $pdo->prepare("SELECT ttrss_entries.title,
 				ttrss_feeds.title AS feed_title,
-				COALESCE(ttrss_feed_categories.title, '" . __('Uncategorized') . "') AS cat_title,
+				COALESCE(ttrss_feed_categories.title, '" . __('Uncategorized')."') AS cat_title,
 				date_updated,
 				ttrss_user_entries.ref_id,
 				link,
 				score,
 				content,
-				" . SUBSTRING_FOR_DATE . "(last_updated,1,19) AS last_updated
+				" . SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
 			FROM
 				ttrss_user_entries,ttrss_entries,ttrss_feeds
 			LEFT JOIN
@@ -165,7 +165,7 @@ 
 				$user_id);
 
 			if (get_pref('ENABLE_FEED_CATS', $user_id)) {
-				$line['feed_title'] = $line['cat_title'] . " / " . $line['feed_title'];
+				$line['feed_title'] = $line['cat_title']." / ".$line['feed_title'];
 			}
 
 			$article_labels = Article::get_article_labels($line["ref_id"], $user_id);

Indentation +133 added lines, -133 removed lines

@@ -2,126 +2,126 @@ 
 class Digest
 {
 
-	/**
-	 * Send by mail a digest of last articles.
-	 *
-	 * @param mixed $link The database connection.
-	 * @param integer $limit The maximum number of articles by digest.
-	 * @return boolean Return false if digests are not enabled.
-	 */
-	public static function send_headlines_digests() {
+    /**
+     * Send by mail a digest of last articles.
+     *
+     * @param mixed $link The database connection.
+     * @param integer $limit The maximum number of articles by digest.
+     * @return boolean Return false if digests are not enabled.
+     */
+    public static function send_headlines_digests() {
 
-		$user_limit = 15; // amount of users to process (e.g. emails to send out)
-		$limit = 1000; // maximum amount of headlines to include
+        $user_limit = 15; // amount of users to process (e.g. emails to send out)
+        $limit = 1000; // maximum amount of headlines to include
 
-		Debug::log("Sending digests, batch of max $user_limit users, headline limit = $limit");
+        Debug::log("Sending digests, batch of max $user_limit users, headline limit = $limit");
 
-		if (DB_TYPE == "pgsql") {
-			$interval_qpart = "last_digest_sent < NOW() - INTERVAL '1 days'";
-		} else if (DB_TYPE == "mysql") {
-			$interval_qpart = "last_digest_sent < DATE_SUB(NOW(), INTERVAL 1 DAY)";
-		}
+        if (DB_TYPE == "pgsql") {
+            $interval_qpart = "last_digest_sent < NOW() - INTERVAL '1 days'";
+        } else if (DB_TYPE == "mysql") {
+            $interval_qpart = "last_digest_sent < DATE_SUB(NOW(), INTERVAL 1 DAY)";
+        }
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		$res = $pdo->query("SELECT id,email FROM ttrss_users
+        $res = $pdo->query("SELECT id,email FROM ttrss_users
 				WHERE email != '' AND (last_digest_sent IS NULL OR $interval_qpart)");
 
-		while ($line = $res->fetch()) {
+        while ($line = $res->fetch()) {
 
-			if (@get_pref('DIGEST_ENABLE', $line['id'], false)) {
-				$preferred_ts = strtotime(get_pref('DIGEST_PREFERRED_TIME', $line['id'], '00:00'));
+            if (@get_pref('DIGEST_ENABLE', $line['id'], false)) {
+                $preferred_ts = strtotime(get_pref('DIGEST_PREFERRED_TIME', $line['id'], '00:00'));
 
-				// try to send digests within 2 hours of preferred time
-				if ($preferred_ts && time() >= $preferred_ts &&
-					time() - $preferred_ts <= 7200
-				) {
+                // try to send digests within 2 hours of preferred time
+                if ($preferred_ts && time() >= $preferred_ts &&
+                    time() - $preferred_ts <= 7200
+                ) {
 
-					Debug::log("Sending digest for UID:" . $line['id'] . " - " . $line["email"]);
+                    Debug::log("Sending digest for UID:" . $line['id'] . " - " . $line["email"]);
 
-					$do_catchup = get_pref('DIGEST_CATCHUP', $line['id'], false);
+                    $do_catchup = get_pref('DIGEST_CATCHUP', $line['id'], false);
 
-					global $tz_offset;
+                    global $tz_offset;
 
-					// reset tz_offset global to prevent tz cache clash between users
-					$tz_offset = -1;
+                    // reset tz_offset global to prevent tz cache clash between users
+                    $tz_offset = -1;
 
-					$tuple = Digest::prepare_headlines_digest($line["id"], 1, $limit);
-					$digest = $tuple[0];
-					$headlines_count = $tuple[1];
-					$affected_ids = $tuple[2];
-					$digest_text = $tuple[3];
+                    $tuple = Digest::prepare_headlines_digest($line["id"], 1, $limit);
+                    $digest = $tuple[0];
+                    $headlines_count = $tuple[1];
+                    $affected_ids = $tuple[2];
+                    $digest_text = $tuple[3];
 
-					if ($headlines_count > 0) {
+                    if ($headlines_count > 0) {
 
-						$mailer = new Mailer();
+                        $mailer = new Mailer();
 
-						//$rc = $mail->quickMail($line["email"], $line["login"], DIGEST_SUBJECT, $digest, $digest_text);
+                        //$rc = $mail->quickMail($line["email"], $line["login"], DIGEST_SUBJECT, $digest, $digest_text);
 
-						$rc = $mailer->mail(["to_name" => $line["login"],
-							"to_address" => $line["email"],
-							"subject" => DIGEST_SUBJECT,
-							"message" => $digest_text,
-							"message_html" => $digest]);
+                        $rc = $mailer->mail(["to_name" => $line["login"],
+                            "to_address" => $line["email"],
+                            "subject" => DIGEST_SUBJECT,
+                            "message" => $digest_text,
+                            "message_html" => $digest]);
 
-						//if (!$rc && $debug) Debug::log("ERROR: " . $mailer->lastError());
+                        //if (!$rc && $debug) Debug::log("ERROR: " . $mailer->lastError());
 
-						Debug::log("RC=$rc");
+                        Debug::log("RC=$rc");
 
-						if ($rc && $do_catchup) {
-							Debug::log("Marking affected articles as read...");
-							Article::catchupArticlesById($affected_ids, 0, $line["id"]);
-						}
-					} else {
-						Debug::log("No headlines");
-					}
+                        if ($rc && $do_catchup) {
+                            Debug::log("Marking affected articles as read...");
+                            Article::catchupArticlesById($affected_ids, 0, $line["id"]);
+                        }
+                    } else {
+                        Debug::log("No headlines");
+                    }
 
-					$sth = $pdo->prepare("UPDATE ttrss_users SET last_digest_sent = NOW()
+                    $sth = $pdo->prepare("UPDATE ttrss_users SET last_digest_sent = NOW()
 						WHERE id = ?");
-					$sth->execute([$line["id"]]);
+                    $sth->execute([$line["id"]]);
 
-				}
-			}
-		}
+                }
+            }
+        }
 
-		Debug::log("All done.");
+        Debug::log("All done.");
 
-	}
+    }
 
-	public static function prepare_headlines_digest($user_id, $days = 1, $limit = 1000) {
+    public static function prepare_headlines_digest($user_id, $days = 1, $limit = 1000) {
 
-		require_once "lib/MiniTemplator.class.php";
+        require_once "lib/MiniTemplator.class.php";
 
-		$tpl = new MiniTemplator;
-		$tpl_t = new MiniTemplator;
+        $tpl = new MiniTemplator;
+        $tpl_t = new MiniTemplator;
 
-		$tpl->readTemplateFromFile("templates/digest_template_html.txt");
-		$tpl_t->readTemplateFromFile("templates/digest_template.txt");
+        $tpl->readTemplateFromFile("templates/digest_template_html.txt");
+        $tpl_t->readTemplateFromFile("templates/digest_template.txt");
 
-		$user_tz_string = get_pref('USER_TIMEZONE', $user_id);
-		$local_ts = convert_timestamp(time(), 'UTC', $user_tz_string);
+        $user_tz_string = get_pref('USER_TIMEZONE', $user_id);
+        $local_ts = convert_timestamp(time(), 'UTC', $user_tz_string);
 
-		$tpl->setVariable('CUR_DATE', date('Y/m/d', $local_ts));
-		$tpl->setVariable('CUR_TIME', date('G:i', $local_ts));
-		$tpl->setVariable('TTRSS_HOST', SELF_URL_PATH);
+        $tpl->setVariable('CUR_DATE', date('Y/m/d', $local_ts));
+        $tpl->setVariable('CUR_TIME', date('G:i', $local_ts));
+        $tpl->setVariable('TTRSS_HOST', SELF_URL_PATH);
 
-		$tpl_t->setVariable('CUR_DATE', date('Y/m/d', $local_ts));
-		$tpl_t->setVariable('CUR_TIME', date('G:i', $local_ts));
-		$tpl_t->setVariable('TTRSS_HOST', SELF_URL_PATH);
+        $tpl_t->setVariable('CUR_DATE', date('Y/m/d', $local_ts));
+        $tpl_t->setVariable('CUR_TIME', date('G:i', $local_ts));
+        $tpl_t->setVariable('TTRSS_HOST', SELF_URL_PATH);
 
-		$affected_ids = array();
+        $affected_ids = array();
 
-		$days = (int) $days;
+        $days = (int) $days;
 
-		if (DB_TYPE == "pgsql") {
-			$interval_qpart = "ttrss_entries.date_updated > NOW() - INTERVAL '$days days'";
-		} else if (DB_TYPE == "mysql") {
-			$interval_qpart = "ttrss_entries.date_updated > DATE_SUB(NOW(), INTERVAL $days DAY)";
-		}
+        if (DB_TYPE == "pgsql") {
+            $interval_qpart = "ttrss_entries.date_updated > NOW() - INTERVAL '$days days'";
+        } else if (DB_TYPE == "mysql") {
+            $interval_qpart = "ttrss_entries.date_updated > DATE_SUB(NOW(), INTERVAL $days DAY)";
+        }
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare("SELECT ttrss_entries.title,
+        $sth = $pdo->prepare("SELECT ttrss_entries.title,
 				ttrss_feeds.title AS feed_title,
 				COALESCE(ttrss_feed_categories.title, '" . __('Uncategorized') . "') AS cat_title,
 				date_updated,
@@ -143,76 +143,76 @@ 
 				AND score >= 0
 			ORDER BY ttrss_feed_categories.title, ttrss_feeds.title, score DESC, date_updated DESC
 			LIMIT :limit");
-		$sth->bindParam(':user_id', intval($user_id, 10), PDO::PARAM_INT);
-		$sth->bindParam(':limit', intval($limit, 10), PDO::PARAM_INT);
-		$sth->execute();
+        $sth->bindParam(':user_id', intval($user_id, 10), PDO::PARAM_INT);
+        $sth->bindParam(':limit', intval($limit, 10), PDO::PARAM_INT);
+        $sth->execute();
 
-		$headlines_count = 0;
-		$headlines = array();
+        $headlines_count = 0;
+        $headlines = array();
 
-		while ($line = $sth->fetch()) {
-			array_push($headlines, $line);
-			$headlines_count++;
-		}
+        while ($line = $sth->fetch()) {
+            array_push($headlines, $line);
+            $headlines_count++;
+        }
 
-		for ($i = 0; $i < sizeof($headlines); $i++) {
+        for ($i = 0; $i < sizeof($headlines); $i++) {
 
-			$line = $headlines[$i];
+            $line = $headlines[$i];
 
-			array_push($affected_ids, $line["ref_id"]);
+            array_push($affected_ids, $line["ref_id"]);
 
-			$updated = make_local_datetime($line['last_updated'], false,
-				$user_id);
+            $updated = make_local_datetime($line['last_updated'], false,
+                $user_id);
 
-			if (get_pref('ENABLE_FEED_CATS', $user_id)) {
-				$line['feed_title'] = $line['cat_title'] . " / " . $line['feed_title'];
-			}
+            if (get_pref('ENABLE_FEED_CATS', $user_id)) {
+                $line['feed_title'] = $line['cat_title'] . " / " . $line['feed_title'];
+            }
 
-			$article_labels = Article::get_article_labels($line["ref_id"], $user_id);
-			$article_labels_formatted = "";
+            $article_labels = Article::get_article_labels($line["ref_id"], $user_id);
+            $article_labels_formatted = "";
 
-			if (is_array($article_labels) && count($article_labels) > 0) {
-				$article_labels_formatted = implode(", ", array_map(function($a) {
-					return $a[1];
-				}, $article_labels));
-			}
+            if (is_array($article_labels) && count($article_labels) > 0) {
+                $article_labels_formatted = implode(", ", array_map(function($a) {
+                    return $a[1];
+                }, $article_labels));
+            }
 
-			$tpl->setVariable('FEED_TITLE', $line["feed_title"]);
-			$tpl->setVariable('ARTICLE_TITLE', $line["title"]);
-			$tpl->setVariable('ARTICLE_LINK', $line["link"]);
-			$tpl->setVariable('ARTICLE_UPDATED', $updated);
-			$tpl->setVariable('ARTICLE_EXCERPT',
-				truncate_string(strip_tags($line["content"]), 300));
+            $tpl->setVariable('FEED_TITLE', $line["feed_title"]);
+            $tpl->setVariable('ARTICLE_TITLE', $line["title"]);
+            $tpl->setVariable('ARTICLE_LINK', $line["link"]);
+            $tpl->setVariable('ARTICLE_UPDATED', $updated);
+            $tpl->setVariable('ARTICLE_EXCERPT',
+                truncate_string(strip_tags($line["content"]), 300));
 //			$tpl->setVariable('ARTICLE_CONTENT',
 //				strip_tags($article_content));
-			$tpl->setVariable('ARTICLE_LABELS', $article_labels_formatted, true);
+            $tpl->setVariable('ARTICLE_LABELS', $article_labels_formatted, true);
 
-			$tpl->addBlock('article');
+            $tpl->addBlock('article');
 
-			$tpl_t->setVariable('FEED_TITLE', $line["feed_title"]);
-			$tpl_t->setVariable('ARTICLE_TITLE', $line["title"]);
-			$tpl_t->setVariable('ARTICLE_LINK', $line["link"]);
-			$tpl_t->setVariable('ARTICLE_UPDATED', $updated);
-			$tpl_t->setVariable('ARTICLE_LABELS', $article_labels_formatted, true);
-			$tpl_t->setVariable('ARTICLE_EXCERPT',
-				truncate_string(strip_tags($line["content"]), 300, "..."), true);
+            $tpl_t->setVariable('FEED_TITLE', $line["feed_title"]);
+            $tpl_t->setVariable('ARTICLE_TITLE', $line["title"]);
+            $tpl_t->setVariable('ARTICLE_LINK', $line["link"]);
+            $tpl_t->setVariable('ARTICLE_UPDATED', $updated);
+            $tpl_t->setVariable('ARTICLE_LABELS', $article_labels_formatted, true);
+            $tpl_t->setVariable('ARTICLE_EXCERPT',
+                truncate_string(strip_tags($line["content"]), 300, "..."), true);
 
-			$tpl_t->addBlock('article');
+            $tpl_t->addBlock('article');
 
-			if ($headlines[$i]['feed_title'] != $headlines[$i + 1]['feed_title']) {
-				$tpl->addBlock('feed');
-				$tpl_t->addBlock('feed');
-			}
+            if ($headlines[$i]['feed_title'] != $headlines[$i + 1]['feed_title']) {
+                $tpl->addBlock('feed');
+                $tpl_t->addBlock('feed');
+            }
 
-		}
+        }
 
-		$tpl->addBlock('digest');
-		$tpl->generateOutputToString($tmp);
+        $tpl->addBlock('digest');
+        $tpl->generateOutputToString($tmp);
 
-		$tpl_t->addBlock('digest');
-		$tpl_t->generateOutputToString($tmp_t);
+        $tpl_t->addBlock('digest');
+        $tpl_t->generateOutputToString($tmp_t);
 
-		return array($tmp, $headlines_count, $affected_ids, $tmp_t);
-	}
+        return array($tmp, $headlines_count, $affected_ids, $tmp_t);
+    }
 
 }

classes/ccache.php

Spacing +2 added lines, -2 removed lines

@@ -135,7 +135,7 @@ 
 				$sth->execute([":uid" => $owner_uid, ":cat" => $feed_id]);
 
 				while ($line = $sth->fetch()) {
-					CCache::update((int)$line["id"], $owner_uid, false, false);
+					CCache::update((int) $line["id"], $owner_uid, false, false);
 				}
 			}
 
@@ -197,7 +197,7 @@ 
 					$sth->execute([$owner_uid, $feed_id]);
 
 					if ($row = $sth->fetch()) {
-						CCache::update((int)$row["cat_id"], $owner_uid, true, true, true);
+						CCache::update((int) $row["cat_id"], $owner_uid, true, true, true);
 					}
 				}
 			}

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

@@ -168,7 +168,7 @@
 
 		if ($sth->fetch()) {
 
-			$sth = $pdo->prepare("UPDATE $table SET
+			$sth = $pdo->prepare("update $table SET
 				value = ?, updated = NOW() WHERE
 				feed_id = ? AND owner_uid = ?");
 

Indentation +130 added lines, -130 removed lines

@@ -1,211 +1,211 @@
 <?php
 class CCache {
-	public static function zero_all($owner_uid) {
-		$pdo = Db::pdo();
+    public static function zero_all($owner_uid) {
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare("UPDATE ttrss_counters_cache SET
+        $sth = $pdo->prepare("UPDATE ttrss_counters_cache SET
 			value = 0 WHERE owner_uid = ?");
-		$sth->execute([$owner_uid]);
+        $sth->execute([$owner_uid]);
 
-		$sth = $pdo->prepare("UPDATE ttrss_cat_counters_cache SET
+        $sth = $pdo->prepare("UPDATE ttrss_cat_counters_cache SET
 			value = 0 WHERE owner_uid = ?");
-		$sth->execute([$owner_uid]);
-	}
+        $sth->execute([$owner_uid]);
+    }
 
-	public static function remove($feed_id, $owner_uid, $is_cat = false) {
+    public static function remove($feed_id, $owner_uid, $is_cat = false) {
 
-		$feed_id = (int) $feed_id;
+        $feed_id = (int) $feed_id;
 
-		if (!$is_cat) {
-			$table = "ttrss_counters_cache";
-		} else {
-			$table = "ttrss_cat_counters_cache";
-		}
+        if (!$is_cat) {
+            $table = "ttrss_counters_cache";
+        } else {
+            $table = "ttrss_cat_counters_cache";
+        }
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare("DELETE FROM $table WHERE
+        $sth = $pdo->prepare("DELETE FROM $table WHERE
 			feed_id = ? AND owner_uid = ?");
-		$sth->execute([$feed_id, $owner_uid]);
+        $sth->execute([$feed_id, $owner_uid]);
 
-	}
+    }
 
-	public static function update_all($owner_uid) {
+    public static function update_all($owner_uid) {
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		if (get_pref('ENABLE_FEED_CATS', $owner_uid)) {
+        if (get_pref('ENABLE_FEED_CATS', $owner_uid)) {
 
-			$sth = $pdo->prepare("SELECT feed_id FROM ttrss_cat_counters_cache
+            $sth = $pdo->prepare("SELECT feed_id FROM ttrss_cat_counters_cache
 				WHERE feed_id > 0 AND owner_uid = ?");
-			$sth->execute([$owner_uid]);
+            $sth->execute([$owner_uid]);
 
-			while ($line = $sth->fetch()) {
-				CCache::update($line["feed_id"], $owner_uid, true);
-			}
+            while ($line = $sth->fetch()) {
+                CCache::update($line["feed_id"], $owner_uid, true);
+            }
 
-			/* We have to manually include category 0 */
+            /* We have to manually include category 0 */
 
-			CCache::update(0, $owner_uid, true);
+            CCache::update(0, $owner_uid, true);
 
-		} else {
-			$sth = $pdo->prepare("SELECT feed_id FROM ttrss_counters_cache
+        } else {
+            $sth = $pdo->prepare("SELECT feed_id FROM ttrss_counters_cache
 				WHERE feed_id > 0 AND owner_uid = ?");
-			$sth->execute([$owner_uid]);
+            $sth->execute([$owner_uid]);
 
-			while ($line = $sth->fetch()) {
-				print CCache::update($line["feed_id"], $owner_uid);
+            while ($line = $sth->fetch()) {
+                print CCache::update($line["feed_id"], $owner_uid);
 
-			}
+            }
 
-		}
-	}
+        }
+    }
 
-	public static function find($feed_id, $owner_uid, $is_cat = false,
-						 $no_update = false) {
+    public static function find($feed_id, $owner_uid, $is_cat = false,
+                            $no_update = false) {
 
-		// "" (null) is valid and should be cast to 0 (uncategorized)
-		// everything else i.e. tags are not
-		if (!is_numeric($feed_id) && $feed_id)
-			return;
+        // "" (null) is valid and should be cast to 0 (uncategorized)
+        // everything else i.e. tags are not
+        if (!is_numeric($feed_id) && $feed_id)
+            return;
 
-		$feed_id = (int) $feed_id;
+        $feed_id = (int) $feed_id;
 
-		if (!$is_cat) {
-			$table = "ttrss_counters_cache";
-		} else {
-			$table = "ttrss_cat_counters_cache";
-		}
+        if (!$is_cat) {
+            $table = "ttrss_counters_cache";
+        } else {
+            $table = "ttrss_cat_counters_cache";
+        }
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare("SELECT value FROM $table
+        $sth = $pdo->prepare("SELECT value FROM $table
 			WHERE owner_uid = ? AND feed_id = ?
 			LIMIT 1");
 
-		$sth->execute([$owner_uid, $feed_id]);
+        $sth->execute([$owner_uid, $feed_id]);
 
-		if ($row = $sth->fetch()) {
-			return $row["value"];
-		} else {
-			if ($no_update) {
-				return -1;
-			} else {
-				return CCache::update($feed_id, $owner_uid, $is_cat);
-			}
-		}
+        if ($row = $sth->fetch()) {
+            return $row["value"];
+        } else {
+            if ($no_update) {
+                return -1;
+            } else {
+                return CCache::update($feed_id, $owner_uid, $is_cat);
+            }
+        }
 
-	}
+    }
 
-	public static function update($feed_id, $owner_uid, $is_cat = false,
-						   $update_pcat = true, $pcat_fast = false) {
+    public static function update($feed_id, $owner_uid, $is_cat = false,
+                            $update_pcat = true, $pcat_fast = false) {
 
-		// "" (null) is valid and should be cast to 0 (uncategorized)
-		// everything else i.e. tags are not
-		if (!is_numeric($feed_id) && $feed_id)
-			return;
+        // "" (null) is valid and should be cast to 0 (uncategorized)
+        // everything else i.e. tags are not
+        if (!is_numeric($feed_id) && $feed_id)
+            return;
 
-		$feed_id = (int) $feed_id;
+        $feed_id = (int) $feed_id;
 
-		$prev_unread = CCache::find($feed_id, $owner_uid, $is_cat, true);
+        $prev_unread = CCache::find($feed_id, $owner_uid, $is_cat, true);
 
-		/* When updating a label, all we need to do is recalculate feed counters
+        /* When updating a label, all we need to do is recalculate feed counters
 		 * because labels are not cached */
 
-		if ($feed_id < 0) {
-			CCache::update_all($owner_uid);
-			return;
-		}
+        if ($feed_id < 0) {
+            CCache::update_all($owner_uid);
+            return;
+        }
 
-		if (!$is_cat) {
-			$table = "ttrss_counters_cache";
-		} else {
-			$table = "ttrss_cat_counters_cache";
-		}
+        if (!$is_cat) {
+            $table = "ttrss_counters_cache";
+        } else {
+            $table = "ttrss_cat_counters_cache";
+        }
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		if ($is_cat && $feed_id >= 0) {
-			/* Recalculate counters for child feeds */
+        if ($is_cat && $feed_id >= 0) {
+            /* Recalculate counters for child feeds */
 
-			if (!$pcat_fast) {
-				$sth = $pdo->prepare("SELECT id FROM ttrss_feeds
+            if (!$pcat_fast) {
+                $sth = $pdo->prepare("SELECT id FROM ttrss_feeds
 						WHERE owner_uid = :uid AND
 							(cat_id = :cat OR (:cat = 0 AND cat_id IS NULL))");
-				$sth->execute([":uid" => $owner_uid, ":cat" => $feed_id]);
+                $sth->execute([":uid" => $owner_uid, ":cat" => $feed_id]);
 
-				while ($line = $sth->fetch()) {
-					CCache::update((int)$line["id"], $owner_uid, false, false);
-				}
-			}
+                while ($line = $sth->fetch()) {
+                    CCache::update((int)$line["id"], $owner_uid, false, false);
+                }
+            }
 
-			$sth = $pdo->prepare("SELECT SUM(value) AS sv
+            $sth = $pdo->prepare("SELECT SUM(value) AS sv
 				FROM ttrss_counters_cache, ttrss_feeds
 				WHERE ttrss_feeds.id = feed_id AND
 				(cat_id = :cat OR (:cat = 0 AND cat_id IS NULL)) AND
 				ttrss_counters_cache.owner_uid = :uid AND
 				ttrss_feeds.owner_uid = :uid");
-			$sth->execute([":uid" => $owner_uid, ":cat" => $feed_id]);
-			$row = $sth->fetch();
+            $sth->execute([":uid" => $owner_uid, ":cat" => $feed_id]);
+            $row = $sth->fetch();
 
-			$unread = (int) $row["sv"];
+            $unread = (int) $row["sv"];
 
-		} else {
-			$unread = (int) Feeds::getFeedArticles($feed_id, $is_cat, true, $owner_uid);
-		}
+        } else {
+            $unread = (int) Feeds::getFeedArticles($feed_id, $is_cat, true, $owner_uid);
+        }
 
-		$tr_in_progress = false;
+        $tr_in_progress = false;
 
-		try {
-			$pdo->beginTransaction();
-		} catch (Exception $e) {
-			$tr_in_progress = true;
-		}
+        try {
+            $pdo->beginTransaction();
+        } catch (Exception $e) {
+            $tr_in_progress = true;
+        }
 
-		$sth = $pdo->prepare("SELECT feed_id FROM $table
+        $sth = $pdo->prepare("SELECT feed_id FROM $table
 			WHERE owner_uid = ? AND feed_id = ? LIMIT 1");
-		$sth->execute([$owner_uid, $feed_id]);
+        $sth->execute([$owner_uid, $feed_id]);
 
-		if ($sth->fetch()) {
+        if ($sth->fetch()) {
 
-			$sth = $pdo->prepare("UPDATE $table SET
+            $sth = $pdo->prepare("UPDATE $table SET
 				value = ?, updated = NOW() WHERE
 				feed_id = ? AND owner_uid = ?");
 
-			$sth->execute([$unread, $feed_id, $owner_uid]);
+            $sth->execute([$unread, $feed_id, $owner_uid]);
 
-		} else {
-			$sth = $pdo->prepare("INSERT INTO $table
+        } else {
+            $sth = $pdo->prepare("INSERT INTO $table
 				(feed_id, value, owner_uid, updated)
 				VALUES
 				(?, ?, ?, NOW())");
-			$sth->execute([$feed_id, $unread, $owner_uid]);
-		}
+            $sth->execute([$feed_id, $unread, $owner_uid]);
+        }
 
-		if (!$tr_in_progress) $pdo->commit();
+        if (!$tr_in_progress) $pdo->commit();
 
-		if ($feed_id > 0 && $prev_unread != $unread) {
+        if ($feed_id > 0 && $prev_unread != $unread) {
 
-			if (!$is_cat) {
+            if (!$is_cat) {
 
-				/* Update parent category */
+                /* Update parent category */
 
-				if ($update_pcat) {
+                if ($update_pcat) {
 
-					$sth = $pdo->prepare("SELECT cat_id FROM ttrss_feeds
+                    $sth = $pdo->prepare("SELECT cat_id FROM ttrss_feeds
 						WHERE owner_uid = ? AND id = ?");
-					$sth->execute([$owner_uid, $feed_id]);
-
-					if ($row = $sth->fetch()) {
-						CCache::update((int)$row["cat_id"], $owner_uid, true, true, true);
-					}
-				}
-			}
-		} else if ($feed_id < 0) {
-			CCache::update_all($owner_uid);
-		}
-
-		return $unread;
-	}
+                    $sth->execute([$owner_uid, $feed_id]);
+
+                    if ($row = $sth->fetch()) {
+                        CCache::update((int)$row["cat_id"], $owner_uid, true, true, true);
+                    }
+                }
+            }
+        } else if ($feed_id < 0) {
+            CCache::update_all($owner_uid);
+        }
+
+        return $unread;
+    }
 
 }

Braces +9 added lines, -5 removed lines

@@ -66,8 +66,9 @@ 
 
 		// "" (null) is valid and should be cast to 0 (uncategorized)
 		// everything else i.e. tags are not
-		if (!is_numeric($feed_id) && $feed_id)
-			return;
+		if (!is_numeric($feed_id) && $feed_id) {
+					return;
+		}
 
 		$feed_id = (int) $feed_id;
 
@@ -102,8 +103,9 @@ 
 
 		// "" (null) is valid and should be cast to 0 (uncategorized)
 		// everything else i.e. tags are not
-		if (!is_numeric($feed_id) && $feed_id)
-			return;
+		if (!is_numeric($feed_id) && $feed_id) {
+					return;
+		}
 
 		$feed_id = (int) $feed_id;
 
@@ -182,7 +184,9 @@ 
 			$sth->execute([$feed_id, $unread, $owner_uid]);
 		}
 
-		if (!$tr_in_progress) $pdo->commit();
+		if (!$tr_in_progress) {
+		    $pdo->commit();
+		}
 
 		if ($feed_id > 0 && $prev_unread != $unread) {
 

classes/feeditem/common.php

Spacing +1 added lines, -1 removed lines

@@ -175,7 +175,7 @@
 
 			// we don't support numeric tags
 			if (is_numeric($cat))
-				$cat = 't:' . $cat;
+				$cat = 't:'.$cat;
 
 			$cat = preg_replace('/[,\'\"]/', "", $cat);
 

Indentation +141 added lines, -141 removed lines

@@ -1,196 +1,196 @@
 <?php
 abstract class FeedItem_Common extends FeedItem {
-	protected $elem;
-	protected $xpath;
-	protected $doc;
+    protected $elem;
+    protected $xpath;
+    protected $doc;
 
-	public function __construct($elem, $doc, $xpath) {
-		$this->elem = $elem;
-		$this->xpath = $xpath;
-		$this->doc = $doc;
+    public function __construct($elem, $doc, $xpath) {
+        $this->elem = $elem;
+        $this->xpath = $xpath;
+        $this->doc = $doc;
 
-		try {
+        try {
 
-			$source = $elem->getElementsByTagName("source")->item(0);
+            $source = $elem->getElementsByTagName("source")->item(0);
 
-			// we don't need <source> element
-			if ($source)
-				$elem->removeChild($source);
-		} catch (DOMException $e) {
-			//
-		}
-	}
+            // we don't need <source> element
+            if ($source)
+                $elem->removeChild($source);
+        } catch (DOMException $e) {
+            //
+        }
+    }
 
-	public function get_element() {
-		return $this->elem;
-	}
+    public function get_element() {
+        return $this->elem;
+    }
 
-	public function get_author() {
-		$author = $this->elem->getElementsByTagName("author")->item(0);
+    public function get_author() {
+        $author = $this->elem->getElementsByTagName("author")->item(0);
 
-		if ($author) {
-			$name = $author->getElementsByTagName("name")->item(0);
+        if ($author) {
+            $name = $author->getElementsByTagName("name")->item(0);
 
-			if ($name) return clean($name->nodeValue);
+            if ($name) return clean($name->nodeValue);
 
-			$email = $author->getElementsByTagName("email")->item(0);
+            $email = $author->getElementsByTagName("email")->item(0);
 
-			if ($email) return clean($email->nodeValue);
+            if ($email) return clean($email->nodeValue);
 
-			if ($author->nodeValue)
-				return clean($author->nodeValue);
-		}
+            if ($author->nodeValue)
+                return clean($author->nodeValue);
+        }
 
-		$author_elems = $this->xpath->query("dc:creator", $this->elem);
-		$authors = [];
+        $author_elems = $this->xpath->query("dc:creator", $this->elem);
+        $authors = [];
 
-		foreach ($author_elems as $author) {
-			array_push($authors, clean($author->nodeValue));
-		}
+        foreach ($author_elems as $author) {
+            array_push($authors, clean($author->nodeValue));
+        }
 
-		return implode(", ", $authors);
-	}
+        return implode(", ", $authors);
+    }
 
-	public function get_comments_url() {
-		//RSS only. Use a query here to avoid namespace clashes (e.g. with slash).
-		//might give a wrong result if a default namespace was declared (possible with XPath 2.0)
-		$com_url = $this->xpath->query("comments", $this->elem)->item(0);
+    public function get_comments_url() {
+        //RSS only. Use a query here to avoid namespace clashes (e.g. with slash).
+        //might give a wrong result if a default namespace was declared (possible with XPath 2.0)
+        $com_url = $this->xpath->query("comments", $this->elem)->item(0);
 
-		if ($com_url)
-			return clean($com_url->nodeValue);
+        if ($com_url)
+            return clean($com_url->nodeValue);
 
-		//Atom Threading Extension (RFC 4685) stuff. Could be used in RSS feeds, so it's in common.
-		//'text/html' for type is too restrictive?
-		$com_url = $this->xpath->query("atom:link[@rel='replies' and contains(@type,'text/html')]/@href", $this->elem)->item(0);
+        //Atom Threading Extension (RFC 4685) stuff. Could be used in RSS feeds, so it's in common.
+        //'text/html' for type is too restrictive?
+        $com_url = $this->xpath->query("atom:link[@rel='replies' and contains(@type,'text/html')]/@href", $this->elem)->item(0);
 
-		if ($com_url)
-			return clean($com_url->nodeValue);
-	}
+        if ($com_url)
+            return clean($com_url->nodeValue);
+    }
 
-	public function get_comments_count() {
-		//also query for ATE stuff here
-		$query = "slash:comments|thread:total|atom:link[@rel='replies']/@thread:count";
-		$comments = $this->xpath->query($query, $this->elem)->item(0);
+    public function get_comments_count() {
+        //also query for ATE stuff here
+        $query = "slash:comments|thread:total|atom:link[@rel='replies']/@thread:count";
+        $comments = $this->xpath->query($query, $this->elem)->item(0);
 
-		if ($comments) {
-			return clean($comments->nodeValue);
-		}
-	}
+        if ($comments) {
+            return clean($comments->nodeValue);
+        }
+    }
 
-	// this is common for both Atom and RSS types and deals with various media: elements
-	public function get_enclosures() {
-		$encs = [];
+    // this is common for both Atom and RSS types and deals with various media: elements
+    public function get_enclosures() {
+        $encs = [];
 
-		$enclosures = $this->xpath->query("media:content", $this->elem);
+        $enclosures = $this->xpath->query("media:content", $this->elem);
 
-		foreach ($enclosures as $enclosure) {
-			$enc = new FeedEnclosure();
+        foreach ($enclosures as $enclosure) {
+            $enc = new FeedEnclosure();
 
-			$enc->type = clean($enclosure->getAttribute("type"));
-			$enc->link = clean($enclosure->getAttribute("url"));
-			$enc->length = clean($enclosure->getAttribute("length"));
-			$enc->height = clean($enclosure->getAttribute("height"));
-			$enc->width = clean($enclosure->getAttribute("width"));
+            $enc->type = clean($enclosure->getAttribute("type"));
+            $enc->link = clean($enclosure->getAttribute("url"));
+            $enc->length = clean($enclosure->getAttribute("length"));
+            $enc->height = clean($enclosure->getAttribute("height"));
+            $enc->width = clean($enclosure->getAttribute("width"));
 
-			$medium = clean($enclosure->getAttribute("medium"));
-			if (!$enc->type && $medium) {
-				$enc->type = strtolower("$medium/generic");
-			}
+            $medium = clean($enclosure->getAttribute("medium"));
+            if (!$enc->type && $medium) {
+                $enc->type = strtolower("$medium/generic");
+            }
 
-			$desc = $this->xpath->query("media:description", $enclosure)->item(0);
-			if ($desc) $enc->title = clean($desc->nodeValue);
+            $desc = $this->xpath->query("media:description", $enclosure)->item(0);
+            if ($desc) $enc->title = clean($desc->nodeValue);
 
-			array_push($encs, $enc);
-		}
+            array_push($encs, $enc);
+        }
 
-		$enclosures = $this->xpath->query("media:group", $this->elem);
+        $enclosures = $this->xpath->query("media:group", $this->elem);
 
-		foreach ($enclosures as $enclosure) {
-			$enc = new FeedEnclosure();
+        foreach ($enclosures as $enclosure) {
+            $enc = new FeedEnclosure();
 
-			$content = $this->xpath->query("media:content", $enclosure)->item(0);
+            $content = $this->xpath->query("media:content", $enclosure)->item(0);
 
-			if ($content) {
-				$enc->type = clean($content->getAttribute("type"));
-				$enc->link = clean($content->getAttribute("url"));
-				$enc->length = clean($content->getAttribute("length"));
-				$enc->height = clean($content->getAttribute("height"));
-				$enc->width = clean($content->getAttribute("width"));
+            if ($content) {
+                $enc->type = clean($content->getAttribute("type"));
+                $enc->link = clean($content->getAttribute("url"));
+                $enc->length = clean($content->getAttribute("length"));
+                $enc->height = clean($content->getAttribute("height"));
+                $enc->width = clean($content->getAttribute("width"));
 
-				$medium = clean($content->getAttribute("medium"));
-				if (!$enc->type && $medium) {
-					$enc->type = strtolower("$medium/generic");
-				}
+                $medium = clean($content->getAttribute("medium"));
+                if (!$enc->type && $medium) {
+                    $enc->type = strtolower("$medium/generic");
+                }
 
-				$desc = $this->xpath->query("media:description", $content)->item(0);
-				if ($desc) {
-					$enc->title = clean($desc->nodeValue);
-				} else {
-					$desc = $this->xpath->query("media:description", $enclosure)->item(0);
-					if ($desc) $enc->title = clean($desc->nodeValue);
-				}
+                $desc = $this->xpath->query("media:description", $content)->item(0);
+                if ($desc) {
+                    $enc->title = clean($desc->nodeValue);
+                } else {
+                    $desc = $this->xpath->query("media:description", $enclosure)->item(0);
+                    if ($desc) $enc->title = clean($desc->nodeValue);
+                }
 
-				array_push($encs, $enc);
-			}
-		}
+                array_push($encs, $enc);
+            }
+        }
 
-		$enclosures = $this->xpath->query("media:thumbnail", $this->elem);
+        $enclosures = $this->xpath->query("media:thumbnail", $this->elem);
 
-		foreach ($enclosures as $enclosure) {
-			$enc = new FeedEnclosure();
+        foreach ($enclosures as $enclosure) {
+            $enc = new FeedEnclosure();
 
-			$enc->type = "image/generic";
-			$enc->link = clean($enclosure->getAttribute("url"));
-			$enc->height = clean($enclosure->getAttribute("height"));
-			$enc->width = clean($enclosure->getAttribute("width"));
+            $enc->type = "image/generic";
+            $enc->link = clean($enclosure->getAttribute("url"));
+            $enc->height = clean($enclosure->getAttribute("height"));
+            $enc->width = clean($enclosure->getAttribute("width"));
 
-			array_push($encs, $enc);
-		}
+            array_push($encs, $enc);
+        }
 
-		return $encs;
-	}
+        return $encs;
+    }
 
-	public function count_children($node) {
-		return $node->getElementsByTagName("*")->length;
-	}
+    public function count_children($node) {
+        return $node->getElementsByTagName("*")->length;
+    }
 
-	public function subtree_or_text($node) {
-		if ($this->count_children($node) == 0) {
-			return $node->nodeValue;
-		} else {
-			return $node->c14n();
-		}
-	}
+    public function subtree_or_text($node) {
+        if ($this->count_children($node) == 0) {
+            return $node->nodeValue;
+        } else {
+            return $node->c14n();
+        }
+    }
 
-	public static function normalize_categories($cats) {
+    public static function normalize_categories($cats) {
 
-		$tmp = [];
+        $tmp = [];
 
-		foreach ($cats as $rawcat) {
-			$tmp = array_merge($tmp, explode(",", $rawcat));
-		}
+        foreach ($cats as $rawcat) {
+            $tmp = array_merge($tmp, explode(",", $rawcat));
+        }
 
-		$tmp = array_map(function($srccat) {
-			$cat = clean(trim(mb_strtolower($srccat)));
+        $tmp = array_map(function($srccat) {
+            $cat = clean(trim(mb_strtolower($srccat)));
 
-			// we don't support numeric tags
-			if (is_numeric($cat))
-				$cat = 't:' . $cat;
+            // we don't support numeric tags
+            if (is_numeric($cat))
+                $cat = 't:' . $cat;
 
-			$cat = preg_replace('/[,\'\"]/', "", $cat);
+            $cat = preg_replace('/[,\'\"]/', "", $cat);
 
-			if (DB_TYPE == "mysql") {
-				$cat = preg_replace('/[\x{10000}-\x{10FFFF}]/u', "\xEF\xBF\xBD", $cat);
-			}
+            if (DB_TYPE == "mysql") {
+                $cat = preg_replace('/[\x{10000}-\x{10FFFF}]/u', "\xEF\xBF\xBD", $cat);
+            }
 
-			if (mb_strlen($cat) > 250)
-				$cat = mb_substr($cat, 0, 250);
+            if (mb_strlen($cat) > 250)
+                $cat = mb_substr($cat, 0, 250);
 
-			return $cat;
-		}, $tmp);
+            return $cat;
+        }, $tmp);
 
-		asort($tmp);
+        asort($tmp);
 
-		return array_unique($tmp);
-	}
+        return array_unique($tmp);
+    }
 }

Braces +30 added lines, -16 removed lines

@@ -14,8 +14,9 @@ 
 			$source = $elem->getElementsByTagName("source")->item(0);
 
 			// we don't need <source> element
-			if ($source)
-				$elem->removeChild($source);
+			if ($source) {
+							$elem->removeChild($source);
+			}
 		} catch (DOMException $e) {
 			//
 		}
@@ -31,14 +32,19 @@ 
 		if ($author) {
 			$name = $author->getElementsByTagName("name")->item(0);
 
-			if ($name) return clean($name->nodeValue);
+			if ($name) {
+			    return clean($name->nodeValue);
+			}
 
 			$email = $author->getElementsByTagName("email")->item(0);
 
-			if ($email) return clean($email->nodeValue);
+			if ($email) {
+			    return clean($email->nodeValue);
+			}
 
-			if ($author->nodeValue)
-				return clean($author->nodeValue);
+			if ($author->nodeValue) {
+							return clean($author->nodeValue);
+			}
 		}
 
 		$author_elems = $this->xpath->query("dc:creator", $this->elem);
@@ -56,15 +62,17 @@ 
 		//might give a wrong result if a default namespace was declared (possible with XPath 2.0)
 		$com_url = $this->xpath->query("comments", $this->elem)->item(0);
 
-		if ($com_url)
-			return clean($com_url->nodeValue);
+		if ($com_url) {
+					return clean($com_url->nodeValue);
+		}
 
 		//Atom Threading Extension (RFC 4685) stuff. Could be used in RSS feeds, so it's in common.
 		//'text/html' for type is too restrictive?
 		$com_url = $this->xpath->query("atom:link[@rel='replies' and contains(@type,'text/html')]/@href", $this->elem)->item(0);
 
-		if ($com_url)
-			return clean($com_url->nodeValue);
+		if ($com_url) {
+					return clean($com_url->nodeValue);
+		}
 	}
 
 	public function get_comments_count() {
@@ -98,7 +106,9 @@ 
 			}
 
 			$desc = $this->xpath->query("media:description", $enclosure)->item(0);
-			if ($desc) $enc->title = clean($desc->nodeValue);
+			if ($desc) {
+			    $enc->title = clean($desc->nodeValue);
+			}
 
 			array_push($encs, $enc);
 		}
@@ -127,7 +137,9 @@ 
 					$enc->title = clean($desc->nodeValue);
 				} else {
 					$desc = $this->xpath->query("media:description", $enclosure)->item(0);
-					if ($desc) $enc->title = clean($desc->nodeValue);
+					if ($desc) {
+					    $enc->title = clean($desc->nodeValue);
+					}
 				}
 
 				array_push($encs, $enc);
@@ -174,8 +186,9 @@ 
 			$cat = clean(trim(mb_strtolower($srccat)));
 
 			// we don't support numeric tags
-			if (is_numeric($cat))
-				$cat = 't:' . $cat;
+			if (is_numeric($cat)) {
+							$cat = 't:' . $cat;
+			}
 
 			$cat = preg_replace('/[,\'\"]/', "", $cat);
 
@@ -183,8 +196,9 @@ 
 				$cat = preg_replace('/[\x{10000}-\x{10FFFF}]/u', "\xEF\xBF\xBD", $cat);
 			}
 
-			if (mb_strlen($cat) > 250)
-				$cat = mb_substr($cat, 0, 250);
+			if (mb_strlen($cat) > 250) {
+							$cat = mb_substr($cat, 0, 250);
+			}
 
 			return $cat;
 		}, $tmp);