@@ -19,7 +19,7 @@ |
||
19 | 19 | |
20 | 20 | $doc = new DOMDocument(); |
21 | 21 | |
22 | - @$doc->loadHTML('<?xml encoding="UTF-8">' . $article["content"]); |
|
22 | + @$doc->loadHTML('<?xml encoding="UTF-8">'.$article["content"]); |
|
23 | 23 | |
24 | 24 | if ($doc) { |
25 | 25 | $xpath = new DOMXPath($doc); |
@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | |
20 | 20 | private function legacy_connect() { |
21 | 21 | |
22 | - user_error("Legacy connect requested to " . DB_TYPE, E_USER_NOTICE); |
|
22 | + user_error("Legacy connect requested to ".DB_TYPE, E_USER_NOTICE); |
|
23 | 23 | |
24 | 24 | $er = error_reporting(E_ALL); |
25 | 25 | |
@@ -31,18 +31,18 @@ discard block |
||
31 | 31 | $this->adapter = new Db_Pgsql(); |
32 | 32 | break; |
33 | 33 | default: |
34 | - die("Unknown DB_TYPE: " . DB_TYPE); |
|
34 | + die("Unknown DB_TYPE: ".DB_TYPE); |
|
35 | 35 | } |
36 | 36 | |
37 | 37 | if (!$this->adapter) { |
38 | - print("Error initializing database adapter for " . DB_TYPE); |
|
38 | + print("Error initializing database adapter for ".DB_TYPE); |
|
39 | 39 | exit(100); |
40 | 40 | } |
41 | 41 | |
42 | 42 | $this->link = $this->adapter->connect(DB_HOST, DB_USER, DB_PASS, DB_NAME, defined('DB_PORT') ? DB_PORT : ""); |
43 | 43 | |
44 | 44 | if (!$this->link) { |
45 | - print("Error connecting through adapter: " . $this->adapter->last_error()); |
|
45 | + print("Error connecting through adapter: ".$this->adapter->last_error()); |
|
46 | 46 | exit(101); |
47 | 47 | } |
48 | 48 | |
@@ -53,15 +53,15 @@ discard block |
||
53 | 53 | // normal usage is Db::pdo()->prepare(...) etc |
54 | 54 | public function pdo_connect() { |
55 | 55 | |
56 | - $db_port = defined('DB_PORT') && DB_PORT ? ';port=' . DB_PORT : ''; |
|
57 | - $db_host = defined('DB_HOST') && DB_HOST ? ';host=' . DB_HOST : ''; |
|
56 | + $db_port = defined('DB_PORT') && DB_PORT ? ';port='.DB_PORT : ''; |
|
57 | + $db_host = defined('DB_HOST') && DB_HOST ? ';host='.DB_HOST : ''; |
|
58 | 58 | |
59 | 59 | try { |
60 | - $pdo = new PDO(DB_TYPE . ':dbname=' . DB_NAME . $db_host . $db_port, |
|
60 | + $pdo = new PDO(DB_TYPE.':dbname='.DB_NAME.$db_host.$db_port, |
|
61 | 61 | DB_USER, |
62 | 62 | DB_PASS); |
63 | 63 | } catch (Exception $e) { |
64 | - print "<pre>Exception while creating PDO object:" . $e->getMessage() . "</pre>"; |
|
64 | + print "<pre>Exception while creating PDO object:".$e->getMessage()."</pre>"; |
|
65 | 65 | exit(101); |
66 | 66 | } |
67 | 67 | |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | $pdo->query("SET time_zone = '+0:0'"); |
79 | 79 | |
80 | 80 | if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) { |
81 | - $pdo->query("SET NAMES " . MYSQL_CHARSET); |
|
81 | + $pdo->query("SET NAMES ".MYSQL_CHARSET); |
|
82 | 82 | } |
83 | 83 | } |
84 | 84 |
@@ -38,7 +38,7 @@ |
||
38 | 38 | return 0; |
39 | 39 | } |
40 | 40 | |
41 | - $headers = [ "From: $from_combined", "Content-Type: text/plain; charset=UTF-8" ]; |
|
41 | + $headers = ["From: $from_combined", "Content-Type: text/plain; charset=UTF-8"]; |
|
42 | 42 | |
43 | 43 | return mail($to_combined, $subject, $message, implode("\r\n", array_merge($headers, $additional_headers))); |
44 | 44 | } |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | if ($type_name == "bool") { |
103 | 103 | return $value == "true"; |
104 | 104 | } else if ($type_name == "integer") { |
105 | - return (int)$value; |
|
105 | + return (int) $value; |
|
106 | 106 | } else { |
107 | 107 | return $value; |
108 | 108 | } |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | $value = "false"; |
150 | 150 | } |
151 | 151 | } else if ($type_name == "integer") { |
152 | - $value = (int)$value; |
|
152 | + $value = (int) $value; |
|
153 | 153 | } |
154 | 154 | |
155 | 155 | if ($pref_name == 'USER_TIMEZONE' && $value == '') { |
@@ -60,14 +60,14 @@ discard block |
||
60 | 60 | $line[$k] = htmlspecialchars($v); |
61 | 61 | } |
62 | 62 | |
63 | - print "<td class='errno'>" . Logger::$errornames[$line["errno"]] . " (" . $line["errno"] . ")</td>"; |
|
64 | - print "<td class='filename'>" . $line["filename"] . ":" . $line["lineno"] . "</td>"; |
|
65 | - print "<td class='errstr'>" . $line["errstr"] . "<hr/>" . nl2br($line["context"]) . "</td>"; |
|
66 | - print "<td class='login'>" . $line["login"] . "</td>"; |
|
63 | + print "<td class='errno'>".Logger::$errornames[$line["errno"]]." (".$line["errno"].")</td>"; |
|
64 | + print "<td class='filename'>".$line["filename"].":".$line["lineno"]."</td>"; |
|
65 | + print "<td class='errstr'>".$line["errstr"]."<hr/>".nl2br($line["context"])."</td>"; |
|
66 | + print "<td class='login'>".$line["login"]."</td>"; |
|
67 | 67 | |
68 | - print "<td class='timestamp'>" . |
|
68 | + print "<td class='timestamp'>". |
|
69 | 69 | make_local_datetime( |
70 | - $line["created_at"], false) . "</td>"; |
|
70 | + $line["created_at"], false)."</td>"; |
|
71 | 71 | |
72 | 72 | print "</tr>"; |
73 | 73 | } |
@@ -90,7 +90,7 @@ discard block |
||
90 | 90 | ob_end_clean(); |
91 | 91 | |
92 | 92 | print "<div class='phpinfo'>"; |
93 | - print preg_replace( '%^.*<body>(.*)</body>.*$%ms','$1', $info); |
|
93 | + print preg_replace('%^.*<body>(.*)</body>.*$%ms', '$1', $info); |
|
94 | 94 | print "</div>"; |
95 | 95 | |
96 | 96 | print "</div>"; |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | |
36 | 36 | print "</section>"; |
37 | 37 | |
38 | - print "<header>" . __("Colors") . "</header>"; |
|
38 | + print "<header>".__("Colors")."</header>"; |
|
39 | 39 | print "<section>"; |
40 | 40 | |
41 | 41 | print "<table>"; |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | |
94 | 94 | while ($line = $sth->fetch()) { |
95 | 95 | $label = array(); |
96 | - $label['id'] = 'LABEL:' . $line['id']; |
|
96 | + $label['id'] = 'LABEL:'.$line['id']; |
|
97 | 97 | $label['bare_id'] = $line['id']; |
98 | 98 | $label['name'] = $line['caption']; |
99 | 99 | $label['fg_color'] = $line['fg_color']; |
@@ -254,7 +254,7 @@ discard block |
||
254 | 254 | print "<div dojoType='fox.Toolbar'>"; |
255 | 255 | |
256 | 256 | print "<div dojoType='fox.form.DropDownButton'>". |
257 | - "<span>" . __('Select')."</span>"; |
|
257 | + "<span>".__('Select')."</span>"; |
|
258 | 258 | print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">"; |
259 | 259 | print "<div onclick=\"dijit.byId('labelTree').model.setAllChecked(true)\" |
260 | 260 | dojoType=\"dijit.MenuItem\">".__('All')."</div>"; |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | } |
53 | 53 | |
54 | 54 | print "<fieldset>"; |
55 | - print "<label>" . __("Login:") . "</label>"; |
|
55 | + print "<label>".__("Login:")."</label>"; |
|
56 | 56 | print "<input style='font-size : 16px' |
57 | 57 | dojoType='dijit.form.ValidationTextBox' required='1' |
58 | 58 | $sel_disabled name='login' value=\"$login\">"; |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | |
66 | 66 | print "<fieldset>"; |
67 | 67 | |
68 | - print "<label>" . __('Access level: ') . "</label> "; |
|
68 | + print "<label>".__('Access level: ')."</label> "; |
|
69 | 69 | |
70 | 70 | if (!$sel_disabled) { |
71 | 71 | print_select_hash("access_level", $access_level, $access_level_names, |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | print "</fieldset>"; |
80 | 80 | print "<fieldset>"; |
81 | 81 | |
82 | - print "<label>" . __("New password:") . "</label> "; |
|
82 | + print "<label>".__("New password:")."</label> "; |
|
83 | 83 | print "<input dojoType='dijit.form.TextBox' type='password' size='20' placeholder='Change password' |
84 | 84 | name='password'>"; |
85 | 85 | |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | print "<section>"; |
92 | 92 | |
93 | 93 | print "<fieldset>"; |
94 | - print "<label>" . __("E-mail:") . "</label> "; |
|
94 | + print "<label>".__("E-mail:")."</label> "; |
|
95 | 95 | print "<input dojoType='dijit.form.TextBox' size='30' name='email' |
96 | 96 | value=\"$email\">"; |
97 | 97 | print "</fieldset>"; |
@@ -337,7 +337,7 @@ discard block |
||
337 | 337 | } |
338 | 338 | |
339 | 339 | print "<div dojoType='fox.form.DropDownButton'>". |
340 | - "<span>" . __('Select')."</span>"; |
|
340 | + "<span>".__('Select')."</span>"; |
|
341 | 341 | print "<div dojoType='dijit.Menu' style='display: none'>"; |
342 | 342 | print "<div onclick=\"Tables.select('prefUserList', true)\" |
343 | 343 | dojoType='dijit.MenuItem'>".__('All')."</div>"; |
@@ -405,12 +405,12 @@ discard block |
||
405 | 405 | print "<td align='center'><input onclick='Tables.onRowChecked(this); event.stopPropagation();' |
406 | 406 | dojoType='dijit.form.CheckBox' type='checkbox'></td>"; |
407 | 407 | |
408 | - print "<td title='".__('Click to edit')."'><i class='material-icons'>person</i> " . $line["login"] . "</td>"; |
|
408 | + print "<td title='".__('Click to edit')."'><i class='material-icons'>person</i> ".$line["login"]."</td>"; |
|
409 | 409 | |
410 | - print "<td>" . $access_level_names[$line["access_level"]] . "</td>"; |
|
411 | - print "<td>" . $line["num_feeds"] . "</td>"; |
|
412 | - print "<td>" . $line["created"] . "</td>"; |
|
413 | - print "<td>" . $line["last_login"] . "</td>"; |
|
410 | + print "<td>".$access_level_names[$line["access_level"]]."</td>"; |
|
411 | + print "<td>".$line["num_feeds"]."</td>"; |
|
412 | + print "<td>".$line["created"]."</td>"; |
|
413 | + print "<td>".$line["last_login"]."</td>"; |
|
414 | 414 | |
415 | 415 | print "</tr>"; |
416 | 416 |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | |
41 | 41 | $ts = strftime("%H:%M:%S", time()); |
42 | 42 | if (function_exists('posix_getpid')) { |
43 | - $ts = "$ts/" . posix_getpid(); |
|
43 | + $ts = "$ts/".posix_getpid(); |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | if (Debug::$logfile) { |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | |
61 | 61 | if (!$locked) { |
62 | 62 | fclose($fp); |
63 | - user_error("Unable to lock debugging log file: " . Debug::$logfile, E_USER_WARNING); |
|
63 | + user_error("Unable to lock debugging log file: ".Debug::$logfile, E_USER_WARNING); |
|
64 | 64 | return; |
65 | 65 | } |
66 | 66 | } |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | return; |
78 | 78 | |
79 | 79 | } else { |
80 | - user_error("Unable to open debugging log file: " . Debug::$logfile, E_USER_WARNING); |
|
80 | + user_error("Unable to open debugging log file: ".Debug::$logfile, E_USER_WARNING); |
|
81 | 81 | } |
82 | 82 | } |
83 | 83 |
@@ -24,7 +24,7 @@ |
||
24 | 24 | $priority = LOG_INFO; |
25 | 25 | } |
26 | 26 | |
27 | - $errname = Logger::$errornames[$errno] . " ($errno)"; |
|
27 | + $errname = Logger::$errornames[$errno]." ($errno)"; |
|
28 | 28 | |
29 | 29 | syslog($priority, "[tt-rss] $errname ($file:$line) $errstr"); |
30 | 30 |