@@ -15,9 +15,9 @@ |
||
15 | 15 | // 3. plugin classes are loaded by PluginHandler from plugins.local/ and plugins/ (TODO: use generic autoloader?) |
16 | 16 | |
17 | 17 | if ($namespace && $class_name) { |
18 | - $class_file = "$root_dir/vendor/$namespace/" . str_replace('\\', '/', $class_name) . ".php"; |
|
18 | + $class_file = "$root_dir/vendor/$namespace/".str_replace('\\', '/', $class_name).".php"; |
|
19 | 19 | } else { |
20 | - $class_file = "$root_dir/classes/" . str_replace("_", "/", strtolower($class)) . ".php"; |
|
20 | + $class_file = "$root_dir/classes/".str_replace("_", "/", strtolower($class)).".php"; |
|
21 | 21 | } |
22 | 22 | |
23 | 23 | if (file_exists($class_file)) |
@@ -1,3 +1,3 @@ |
||
1 | 1 | <?php # This file has been generated at: Thu Nov 22 22:14:43 MSK 2018 |
2 | 2 | define('GENERATED_CONFIG_CHECK', 26); |
3 | -$required_defines = array( 'DB_TYPE', 'DB_HOST', 'DB_USER', 'DB_NAME', 'DB_PASS', 'MYSQL_CHARSET', 'SELF_URL_PATH', 'SINGLE_USER_MODE', 'SIMPLE_UPDATE_MODE', 'PHP_EXECUTABLE', 'LOCK_DIRECTORY', 'CACHE_DIR', 'ICONS_DIR', 'ICONS_URL', 'AUTH_AUTO_CREATE', 'AUTH_AUTO_LOGIN', 'FORCE_ARTICLE_PURGE', 'SPHINX_SERVER', 'SPHINX_INDEX', 'ENABLE_REGISTRATION', 'REG_NOTIFY_ADDRESS', 'REG_MAX_USERS', 'SESSION_COOKIE_LIFETIME', 'SMTP_FROM_NAME', 'SMTP_FROM_ADDRESS', 'DIGEST_SUBJECT', 'CHECK_FOR_UPDATES', 'ENABLE_GZIP_OUTPUT', 'PLUGINS', 'LOG_DESTINATION', 'CONFIG_VERSION'); ?> |
|
3 | +$required_defines = array('DB_TYPE', 'DB_HOST', 'DB_USER', 'DB_NAME', 'DB_PASS', 'MYSQL_CHARSET', 'SELF_URL_PATH', 'SINGLE_USER_MODE', 'SIMPLE_UPDATE_MODE', 'PHP_EXECUTABLE', 'LOCK_DIRECTORY', 'CACHE_DIR', 'ICONS_DIR', 'ICONS_URL', 'AUTH_AUTO_CREATE', 'AUTH_AUTO_LOGIN', 'FORCE_ARTICLE_PURGE', 'SPHINX_SERVER', 'SPHINX_INDEX', 'ENABLE_REGISTRATION', 'REG_NOTIFY_ADDRESS', 'REG_MAX_USERS', 'SESSION_COOKIE_LIFETIME', 'SMTP_FROM_NAME', 'SMTP_FROM_ADDRESS', 'DIGEST_SUBJECT', 'CHECK_FOR_UPDATES', 'ENABLE_GZIP_OUTPUT', 'PLUGINS', 'LOG_DESTINATION', 'CONFIG_VERSION'); ?> |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | |
77 | 77 | $pdo = DB::pdo(); |
78 | 78 | |
79 | - print_r(in_array("CAT:6",$default_ids)); |
|
79 | + print_r(in_array("CAT:6", $default_ids)); |
|
80 | 80 | |
81 | 81 | if (!$root_id) { |
82 | 82 | print "<select multiple=\true\" id=\"$id\" name=\"$id\" $attributes>"; |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | while ($line = $sth->fetch()) { |
103 | 103 | |
104 | 104 | for ($i = 0; $i < $nest_level; $i++) |
105 | - $line["title"] = " - " . $line["title"]; |
|
105 | + $line["title"] = " - ".$line["title"]; |
|
106 | 106 | |
107 | 107 | $is_selected = in_array("CAT:".$line["id"], $default_ids) ? "selected=\"1\"" : ""; |
108 | 108 | |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | |
112 | 112 | if ($line["num_children"] > 0) |
113 | 113 | print_feed_multi_select($id, $default_ids, $attributes, |
114 | - $include_all_feeds, $line["id"], $nest_level+1); |
|
114 | + $include_all_feeds, $line["id"], $nest_level + 1); |
|
115 | 115 | |
116 | 116 | $f_sth = $pdo->prepare("SELECT id,title FROM ttrss_feeds |
117 | 117 | WHERE cat_id = ? AND owner_uid = ? ORDER BY title"); |
@@ -121,10 +121,10 @@ discard block |
||
121 | 121 | while ($fline = $f_sth->fetch()) { |
122 | 122 | $is_selected = (in_array($fline["id"], $default_ids)) ? "selected=\"1\"" : ""; |
123 | 123 | |
124 | - $fline["title"] = " + " . $fline["title"]; |
|
124 | + $fline["title"] = " + ".$fline["title"]; |
|
125 | 125 | |
126 | 126 | for ($i = 0; $i < $nest_level; $i++) |
127 | - $fline["title"] = " - " . $fline["title"]; |
|
127 | + $fline["title"] = " - ".$fline["title"]; |
|
128 | 128 | |
129 | 129 | printf("<option $is_selected value='%d'>%s</option>", |
130 | 130 | $fline["id"], htmlspecialchars($fline["title"])); |
@@ -144,10 +144,10 @@ discard block |
||
144 | 144 | while ($fline = $f_sth->fetch()) { |
145 | 145 | $is_selected = in_array($fline["id"], $default_ids) ? "selected=\"1\"" : ""; |
146 | 146 | |
147 | - $fline["title"] = " + " . $fline["title"]; |
|
147 | + $fline["title"] = " + ".$fline["title"]; |
|
148 | 148 | |
149 | 149 | for ($i = 0; $i < $nest_level; $i++) |
150 | - $fline["title"] = " - " . $fline["title"]; |
|
150 | + $fline["title"] = " - ".$fline["title"]; |
|
151 | 151 | |
152 | 152 | printf("<option $is_selected value='%d'>%s</option>", |
153 | 153 | $fline["id"], htmlspecialchars($fline["title"])); |
@@ -204,7 +204,7 @@ discard block |
||
204 | 204 | } |
205 | 205 | |
206 | 206 | for ($i = 0; $i < $nest_level; $i++) |
207 | - $line["title"] = " - " . $line["title"]; |
|
207 | + $line["title"] = " - ".$line["title"]; |
|
208 | 208 | |
209 | 209 | if ($line["title"]) |
210 | 210 | printf("<option $is_selected value='%d'>%s</option>", |
@@ -212,7 +212,7 @@ discard block |
||
212 | 212 | |
213 | 213 | if ($line["num_children"] > 0) |
214 | 214 | print_feed_cat_select($id, $default_id, $attributes, |
215 | - $include_all_cats, $line["id"], $nest_level+1); |
|
215 | + $include_all_cats, $line["id"], $nest_level + 1); |
|
216 | 216 | } |
217 | 217 | |
218 | 218 | if (!$root_id) { |
@@ -245,7 +245,7 @@ discard block |
||
245 | 245 | $query = ""; |
246 | 246 | |
247 | 247 | if (!(strpos($filename, "?") === FALSE)) { |
248 | - $query = substr($filename, strpos($filename, "?")+1); |
|
248 | + $query = substr($filename, strpos($filename, "?") + 1); |
|
249 | 249 | $filename = substr($filename, 0, strpos($filename, "?")); |
250 | 250 | } |
251 | 251 | |
@@ -300,7 +300,7 @@ discard block |
||
300 | 300 | } |
301 | 301 | |
302 | 302 | if ($entry) $entry .= "<a target=\"_blank\" rel=\"noopener noreferrer\" |
303 | - href=\"$url\">" . basename($url) . "</a>"; |
|
303 | + href=\"$url\">".basename($url)."</a>"; |
|
304 | 304 | |
305 | 305 | $entry .= "</div>"; |
306 | 306 | |
@@ -319,7 +319,7 @@ discard block |
||
319 | 319 | WHERE owner_uid = ? ORDER BY caption"); |
320 | 320 | $sth->execute([$_SESSION['uid']]); |
321 | 321 | |
322 | - print "<select default=\"$value\" name=\"" . htmlspecialchars($name) . |
|
322 | + print "<select default=\"$value\" name=\"".htmlspecialchars($name). |
|
323 | 323 | "\" $attributes>"; |
324 | 324 | |
325 | 325 | while ($line = $sth->fetch()) { |
@@ -327,7 +327,7 @@ discard block |
||
327 | 327 | $issel = ($line["caption"] == $value) ? "selected=\"1\"" : ""; |
328 | 328 | |
329 | 329 | print "<option value=\"".htmlspecialchars($line["caption"])."\" |
330 | - $issel>" . htmlspecialchars($line["caption"]) . "</option>"; |
|
330 | + $issel>".htmlspecialchars($line["caption"])."</option>"; |
|
331 | 331 | |
332 | 332 | } |
333 | 333 |
@@ -13,12 +13,12 @@ discard block |
||
13 | 13 | if (!is_object($a)) { |
14 | 14 | array_push($fmt_args, $a); |
15 | 15 | } else { |
16 | - array_push($fmt_args, "[" . get_class($a) . "]"); |
|
16 | + array_push($fmt_args, "[".get_class($a)."]"); |
|
17 | 17 | } |
18 | 18 | } |
19 | 19 | } |
20 | 20 | |
21 | - $filename = str_replace(dirname(__DIR__) . "/", "", $e["file"]); |
|
21 | + $filename = str_replace(dirname(__DIR__)."/", "", $e["file"]); |
|
22 | 22 | |
23 | 23 | $rv .= sprintf("%d. %s(%s): %s(%s)\n", |
24 | 24 | $idx, $filename, $e["line"], $e["function"], implode(", ", $fmt_args)); |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | $errno = $error["type"]; |
53 | 53 | $file = $error["file"]; |
54 | 54 | $line = $error["line"]; |
55 | - $errstr = $error["message"]; |
|
55 | + $errstr = $error["message"]; |
|
56 | 56 | |
57 | 57 | if (!$errno) return false; |
58 | 58 |
@@ -3,7 +3,7 @@ |
||
3 | 3 | header("Location: install/"); |
4 | 4 | } |
5 | 5 | |
6 | - set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR . |
|
6 | + set_include_path(dirname(__FILE__)."/include".PATH_SEPARATOR. |
|
7 | 7 | get_include_path()); |
8 | 8 | |
9 | 9 | if (!file_exists("config.php")) { |
@@ -19,7 +19,7 @@ |
||
19 | 19 | } |
20 | 20 | |
21 | 21 | function get_js() { |
22 | - return file_get_contents(dirname(__FILE__) . "/init.js"); |
|
22 | + return file_get_contents(dirname(__FILE__)."/init.js"); |
|
23 | 23 | } |
24 | 24 | |
25 | 25 | function hook_render_article($article) { |
@@ -69,7 +69,7 @@ |
||
69 | 69 | |
70 | 70 | $real_url = preg_replace("/\?$/", "", $real_url); |
71 | 71 | |
72 | - $article["plugin_data"] = "unburn,$owner_uid:" . $article["plugin_data"]; |
|
72 | + $article["plugin_data"] = "unburn,$owner_uid:".$article["plugin_data"]; |
|
73 | 73 | $article["link"] = $real_url; |
74 | 74 | } |
75 | 75 | } |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | print "<div dojoType=\"dijit.layout.AccordionPane\" |
23 | 23 | title=\"<i class='material-icons'>bookmark</i> ".__('Bookmarklets')."\">"; |
24 | 24 | |
25 | - print "<h3>" . __("Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it.") . "</h3>"; |
|
25 | + print "<h3>".__("Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it.")."</h3>"; |
|
26 | 26 | |
27 | 27 | $bm_subscribe_url = str_replace('%s', '', Pref_Feeds::subscribe_to_feed_url()); |
28 | 28 | |
@@ -31,14 +31,14 @@ discard block |
||
31 | 31 | $bm_url = htmlspecialchars("javascript:{if(confirm('$confirm_str'.replace('%s',window.location.href)))window.location.href='$bm_subscribe_url'+window.location.href}"); |
32 | 32 | |
33 | 33 | print "<p><label class='dijitButton'>"; |
34 | - print "<a href=\"$bm_url\">" . __('Subscribe in Tiny Tiny RSS'). "</a>"; |
|
34 | + print "<a href=\"$bm_url\">".__('Subscribe in Tiny Tiny RSS')."</a>"; |
|
35 | 35 | print "</label></p>"; |
36 | 36 | |
37 | - print "<h3>" . __("Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS") . "</h3>"; |
|
37 | + print "<h3>".__("Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS")."</h3>"; |
|
38 | 38 | |
39 | 39 | print "<label class='dijitButton'>"; |
40 | 40 | $bm_url = htmlspecialchars("javascript:(function(){var d=document,w=window,e=w.getSelection,k=d.getSelection,x=d.selection,s=(e?e():(k)?k():(x?x.createRange().text:0)),f='".get_self_url_prefix()."/public.php?op=sharepopup',l=d.location,e=encodeURIComponent,g=f+'&title='+((e(s))?e(s):e(document.title))+'&url='+e(l.href);function a(){if(!w.open(g,'t','toolbar=0,resizable=0,scrollbars=1,status=1,width=500,height=250')){l.href=g;}}a();})()"); |
41 | - print "<a href=\"$bm_url\">" . __('Share with Tiny Tiny RSS'). "</a>"; |
|
41 | + print "<a href=\"$bm_url\">".__('Share with Tiny Tiny RSS')."</a>"; |
|
42 | 42 | print "</label>"; |
43 | 43 | |
44 | 44 | print "<button dojoType='dijit.form.Button' class='alt-info' onclick='window.open(\"https://tt-rss.org/wiki/ShareAnything\")'> |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | } |
42 | 42 | |
43 | 43 | function get_js() { |
44 | - return file_get_contents(__DIR__ . "/init.js"); |
|
44 | + return file_get_contents(__DIR__."/init.js"); |
|
45 | 45 | } |
46 | 46 | |
47 | 47 | function showrelated() { |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | |
99 | 99 | print "</div>"; |
100 | 100 | |
101 | - print "<div style='text-align : right' class='text-muted'>" . smart_date_time(strtotime($line["updated"])) . "</div>"; |
|
101 | + print "<div style='text-align : right' class='text-muted'>".smart_date_time(strtotime($line["updated"]))."</div>"; |
|
102 | 102 | |
103 | 103 | print "</li>"; |
104 | 104 | } |
@@ -163,24 +163,24 @@ discard block |
||
163 | 163 | print_hidden("method", "save"); |
164 | 164 | print_hidden("plugin", "af_psql_trgm"); |
165 | 165 | |
166 | - print "<h2>" . __("Global settings") . "</h2>"; |
|
166 | + print "<h2>".__("Global settings")."</h2>"; |
|
167 | 167 | |
168 | 168 | print_notice("Enable for specific feeds in the feed editor."); |
169 | 169 | |
170 | 170 | print "<fieldset>"; |
171 | 171 | |
172 | - print "<label>" . __("Minimum similarity:") . "</label> "; |
|
172 | + print "<label>".__("Minimum similarity:")."</label> "; |
|
173 | 173 | print "<input dojoType=\"dijit.form.NumberSpinner\" |
174 | 174 | placeholder=\"0.75\" id='psql_trgm_similarity' |
175 | 175 | required=\"1\" name=\"similarity\" value=\"$similarity\">"; |
176 | 176 | |
177 | - print "<div dojoType='dijit.Tooltip' connectId='psql_trgm_similarity' position='below'>" . |
|
178 | - __("PostgreSQL trigram extension returns string similarity as a floating point number (0-1). Setting it too low might produce false positives, zero disables checking.") . |
|
177 | + print "<div dojoType='dijit.Tooltip' connectId='psql_trgm_similarity' position='below'>". |
|
178 | + __("PostgreSQL trigram extension returns string similarity as a floating point number (0-1). Setting it too low might produce false positives, zero disables checking."). |
|
179 | 179 | "</div>"; |
180 | 180 | |
181 | 181 | print "</fieldset><fieldset>"; |
182 | 182 | |
183 | - print "<label>" . __("Minimum title length:") . "</label> "; |
|
183 | + print "<label>".__("Minimum title length:")."</label> "; |
|
184 | 184 | print "<input dojoType=\"dijit.form.NumberSpinner\" |
185 | 185 | placeholder=\"32\" |
186 | 186 | required=\"1\" name=\"min_title_length\" value=\"$min_title_length\">"; |
@@ -189,7 +189,7 @@ discard block |
||
189 | 189 | |
190 | 190 | print "<label class='checkbox'>"; |
191 | 191 | print_checkbox("enable_globally", $enable_globally); |
192 | - print " " . __("Enable for all feeds:"); |
|
192 | + print " ".__("Enable for all feeds:"); |
|
193 | 193 | print "</label>"; |
194 | 194 | |
195 | 195 | print "</fieldset>"; |
@@ -204,14 +204,14 @@ discard block |
||
204 | 204 | $this->host->set($this, "enabled_feeds", $enabled_feeds); |
205 | 205 | |
206 | 206 | if (count($enabled_feeds) > 0) { |
207 | - print "<h3>" . __("Currently enabled for (click to edit):") . "</h3>"; |
|
207 | + print "<h3>".__("Currently enabled for (click to edit):")."</h3>"; |
|
208 | 208 | |
209 | 209 | print "<ul class=\"panel panel-scrollable list list-unstyled\">"; |
210 | 210 | foreach ($enabled_feeds as $f) { |
211 | - print "<li>" . |
|
211 | + print "<li>". |
|
212 | 212 | "<i class='material-icons'>rss_feed</i> <a href='#' |
213 | - onclick='CommonDialogs.editFeed($f)'>" . |
|
214 | - Feeds::getFeedTitle($f) . "</a></li>"; |
|
213 | + onclick='CommonDialogs.editFeed($f)'>". |
|
214 | + Feeds::getFeedTitle($f)."</a></li>"; |
|
215 | 215 | } |
216 | 216 | print "</ul>"; |
217 | 217 | } |