codysnider / tt-rss

classes/db.php

Spacing +9 added lines, -9 removed lines

@@ -19,7 +19,7 @@ 
 
 	private function legacy_connect() {
 
-		user_error("Legacy connect requested to " . DB_TYPE, E_USER_NOTICE);
+		user_error("Legacy connect requested to ".DB_TYPE, E_USER_NOTICE);
 
 		$er = error_reporting(E_ALL);
 
@@ -31,18 +31,18 @@ 
 				$this->adapter = new Db_Pgsql();
 				break;
 			default:
-				die("Unknown DB_TYPE: " . DB_TYPE);
+				die("Unknown DB_TYPE: ".DB_TYPE);
 		}
 
 		if (!$this->adapter) {
-			print("Error initializing database adapter for " . DB_TYPE);
+			print("Error initializing database adapter for ".DB_TYPE);
 			exit(100);
 		}
 
 		$this->link = $this->adapter->connect(DB_HOST, DB_USER, DB_PASS, DB_NAME, defined('DB_PORT') ? DB_PORT : "");
 
 		if (!$this->link) {
-			print("Error connecting through adapter: " . $this->adapter->last_error());
+			print("Error connecting through adapter: ".$this->adapter->last_error());
 			exit(101);
 		}
 
@@ -53,15 +53,15 @@ 
 	// normal usage is Db::pdo()->prepare(...) etc
 	public function pdo_connect() {
 
-		$db_port = defined('DB_PORT') && DB_PORT ? ';port=' . DB_PORT : '';
-		$db_host = defined('DB_HOST') && DB_HOST ? ';host=' . DB_HOST : '';
+		$db_port = defined('DB_PORT') && DB_PORT ? ';port='.DB_PORT : '';
+		$db_host = defined('DB_HOST') && DB_HOST ? ';host='.DB_HOST : '';
 
 		try {
-			$pdo = new PDO(DB_TYPE . ':dbname=' . DB_NAME . $db_host . $db_port,
+			$pdo = new PDO(DB_TYPE.':dbname='.DB_NAME.$db_host.$db_port,
 				DB_USER,
 				DB_PASS);
 		} catch (Exception $e) {
-			print "<pre>Exception while creating PDO object:" . $e->getMessage() . "</pre>";
+			print "<pre>Exception while creating PDO object:".$e->getMessage()."</pre>";
 			exit(101);
 		}
 
@@ -78,7 +78,7 @@ 
 			$pdo->query("SET time_zone = '+0:0'");
 
 			if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) {
-				$pdo->query("SET NAMES " . MYSQL_CHARSET);
+				$pdo->query("SET NAMES ".MYSQL_CHARSET);
 			}
 		}
 

classes/mailer.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
 				return 0;
 		}
 
-		$headers = [ "From: $from_combined", "Content-Type: text/plain; charset=UTF-8" ];
+		$headers = ["From: $from_combined", "Content-Type: text/plain; charset=UTF-8"];
 
 		return mail($to_combined, $subject, $message, implode("\r\n", array_merge($headers, $additional_headers)));
 	}

classes/db/prefs.php

Spacing +2 added lines, -2 removed lines

@@ -102,7 +102,7 @@ 
 		if ($type_name == "bool") {
 			return $value == "true";
 		} else if ($type_name == "integer") {
-			return (int)$value;
+			return (int) $value;
 		} else {
 			return $value;
 		}
@@ -149,7 +149,7 @@ 
 					$value = "false";
 				}
 			} else if ($type_name == "integer") {
-				$value = (int)$value;
+				$value = (int) $value;
 			}
 
 			if ($pref_name == 'USER_TIMEZONE' && $value == '') {

classes/db/mysqli.php

Spacing +2 added lines, -2 removed lines

@@ -14,7 +14,7 @@ 
 
 			return $this->link;
 		} else {
-			print("Unable to connect to database (as $user to $host, database $db): " . mysqli_connect_error());
+			print("Unable to connect to database (as $user to $host, database $db): ".mysqli_connect_error());
 			exit(102);
 		}
 	}
@@ -31,7 +31,7 @@ 
 			$this->last_error = @mysqli_error($this->link);
 
 			@mysqli_query($this->link, "ROLLBACK");
-			user_error("Query $query failed: " . ($this->link ? $this->last_error : "No connection"),
+			user_error("Query $query failed: ".($this->link ? $this->last_error : "No connection"),
 				$die_on_error ? E_USER_ERROR : E_USER_WARNING);
 		}
 

classes/db/pgsql.php

Spacing +3 added lines, -3 removed lines

@@ -15,13 +15,13 @@ 
 		}
 
 		if (is_numeric($port) && $port > 0) {
-			$string = "$string port=" . $port;
+			$string = "$string port=".$port;
 		}
 
 		$this->link = pg_connect($string);
 
 		if (!$this->link) {
-			print("Unable to connect to database (as $user to $host, database $db):" . pg_last_error());
+			print("Unable to connect to database (as $user to $host, database $db):".pg_last_error());
 			exit(102);
 		}
 
@@ -44,7 +44,7 @@ 
 
 			@pg_query($this->link, "ROLLBACK");
 			$query = htmlspecialchars($query); // just in case
-			user_error("Query $query failed: " . ($this->link ? $this->last_error : "No connection"),
+			user_error("Query $query failed: ".($this->link ? $this->last_error : "No connection"),
 				$die_on_error ? E_USER_ERROR : E_USER_WARNING);
 		}
 		return $result;

classes/pref/system.php

Spacing +7 added lines, -7 removed lines

@@ -60,14 +60,14 @@ 
 					$line[$k] = htmlspecialchars($v);
 				}
 
-				print "<td class='errno'>" . Logger::$errornames[$line["errno"]] . " (" . $line["errno"] . ")</td>";
-				print "<td class='filename'>" . $line["filename"] . ":" . $line["lineno"] . "</td>";
-				print "<td class='errstr'>" . $line["errstr"] . "<hr/>" . nl2br($line["context"]) . "</td>";
-				print "<td class='login'>" . $line["login"] . "</td>";
+				print "<td class='errno'>".Logger::$errornames[$line["errno"]]." (".$line["errno"].")</td>";
+				print "<td class='filename'>".$line["filename"].":".$line["lineno"]."</td>";
+				print "<td class='errstr'>".$line["errstr"]."<hr/>".nl2br($line["context"])."</td>";
+				print "<td class='login'>".$line["login"]."</td>";
 
-				print "<td class='timestamp'>" .
+				print "<td class='timestamp'>".
 					make_local_datetime(
-					$line["created_at"], false) . "</td>";
+					$line["created_at"], false)."</td>";
 
 				print "</tr>";
 			}
@@ -90,7 +90,7 @@ 
 		ob_end_clean();
 
 		print "<div class='phpinfo'>";
-		print preg_replace( '%^.*<body>(.*)</body>.*$%ms','$1', $info);
+		print preg_replace('%^.*<body>(.*)</body>.*$%ms', '$1', $info);
 		print "</div>";
 
 		print "</div>";

classes/pref/labels.php

Spacing +3 added lines, -3 removed lines

@@ -35,7 +35,7 @@ 
 
 			print "</section>";
 
-			print "<header>" . __("Colors") . "</header>";
+			print "<header>".__("Colors")."</header>";
 			print "<section>";
 
 			print "<table>";
@@ -93,7 +93,7 @@ 
 
 		while ($line = $sth->fetch()) {
 			$label = array();
-			$label['id'] = 'LABEL:' . $line['id'];
+			$label['id'] = 'LABEL:'.$line['id'];
 			$label['bare_id'] = $line['id'];
 			$label['name'] = $line['caption'];
 			$label['fg_color'] = $line['fg_color'];
@@ -254,7 +254,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=\"dijit.byId('labelTree').model.setAllChecked(true)\"
 			dojoType=\"dijit.MenuItem\">".__('All')."</div>";

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