codysnider / tt-rss

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

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

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

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

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

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

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

classes/handler/public.php

Spacing +28 added lines, -29 removed lines

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

classes/feedparser.php

Spacing +3 added lines, -3 removed lines

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