@@ -315,18 +315,18 @@ discard block |
||
| 315 | 315 | switch (strtoupper($cmd)) {
|
| 316 | 316 | case '$BEGINBLOCK': |
| 317 | 317 | if (!$this->processBeginBlockCmd($parms, $cmdTPosBegin, $cmdTPosEnd)) { |
| 318 | - return false; |
|
| 319 | - } |
|
| 318 | + return false; |
|
| 319 | + } |
|
| 320 | 320 | break; |
| 321 | 321 | case '$ENDBLOCK': |
| 322 | 322 | if (!$this->processEndBlockCmd($parms, $cmdTPosBegin, $cmdTPosEnd)) { |
| 323 | - return false; |
|
| 324 | - } |
|
| 323 | + return false; |
|
| 324 | + } |
|
| 325 | 325 | break; |
| 326 | 326 | case '$INCLUDE': |
| 327 | 327 | if (!$this->processincludeCmd($parms, $cmdTPosBegin, $cmdTPosEnd)) { |
| 328 | - return false; |
|
| 329 | - } |
|
| 328 | + return false; |
|
| 329 | + } |
|
| 330 | 330 | $resumeFromStart = true; |
| 331 | 331 | break; |
| 332 | 332 | default: |
@@ -848,8 +848,8 @@ discard block |
||
| 848 | 848 | switch ($this->outputMode) {
|
| 849 | 849 | case 0: // output to PHP output stream |
| 850 | 850 | if (!print($s)) { |
| 851 | - $this->outputError = true; |
|
| 852 | - } |
|
| 851 | + $this->outputError = true; |
|
| 852 | + } |
|
| 853 | 853 | break; |
| 854 | 854 | case 1: // output to file |
| 855 | 855 | $rc = fwrite($this->outputFileHandle, $s); |
@@ -72,8 +72,7 @@ discard block |
||
| 72 | 72 | try { |
| 73 | 73 | $pdo->query('SELECT 1 FROM ttrss_feeds'); |
| 74 | 74 | // reached this point => table found, assume db is complete |
| 75 | -} |
|
| 76 | -catch (PDOException $e) { |
|
| 75 | +} catch (PDOException $e) { |
|
| 77 | 76 | echo 'Database table not found, applying schema... ' . PHP_EOL; |
| 78 | 77 | $schema = file_get_contents('schema/ttrss_schema_' . $config['DB_TYPE'] . '.sql'); |
| 79 | 78 | $schema = preg_replace('/--(.*?);/', '', $schema); |
@@ -128,8 +127,7 @@ discard block |
||
| 128 | 127 | try { |
| 129 | 128 | dbconnect($config); |
| 130 | 129 | return true; |
| 131 | - } |
|
| 132 | - catch (PDOException $e) { |
|
| 130 | + } catch (PDOException $e) { |
|
| 133 | 131 | return false; |
| 134 | 132 | } |
| 135 | 133 | } |
@@ -15,7 +15,9 @@ |
||
| 15 | 15 | $filename = substr($filename, 0, strpos($filename, "?")); |
| 16 | 16 | } |
| 17 | 17 | $timestamp = filemtime(BASEPATH.DS.'public'.DS.'js'.DS.$filename); |
| 18 | - if ($query) $timestamp .= "&$query"; |
|
| 18 | + if ($query) { |
|
| 19 | + $timestamp .= "&$query"; |
|
| 20 | + } |
|
| 19 | 21 | |
| 20 | 22 | return "<script type=\"text/javascript\" charset=\"utf-8\" src=\"/js/$filename?$timestamp\"></script>\n"; |
| 21 | 23 | } |
@@ -264,7 +264,7 @@ |
||
| 264 | 264 | */ |
| 265 | 265 | function javascript_tag($filename) |
| 266 | 266 | { |
| 267 | - user_error(__FUNCTION__.' is deprecated', E_USER_DEPRECATED); |
|
| 267 | + user_error(__FUNCTION__.' is deprecated', E_USER_DEPRECATED); |
|
| 268 | 268 | } |
| 269 | 269 | |
| 270 | 270 | function format_warning($msg, $id = "") { |