@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -declare(strict_types = 1); |
|
3 | +declare(strict_types=1); |
|
4 | 4 | |
5 | 5 | /** |
6 | 6 | * Saito - The Threaded Web Forum |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | 'shouts', |
55 | 55 | ]; |
56 | 56 | foreach ($tables as $table) { |
57 | - $connection->execute('DROP TABLE IF EXISTS ' . $table . ';'); |
|
57 | + $connection->execute('DROP TABLE IF EXISTS '.$table.';'); |
|
58 | 58 | } |
59 | 59 | |
60 | 60 | // Tell the fixture manager that all tables are gone. |
@@ -1,12 +1,12 @@ |
||
1 | 1 | #!/usr/bin/php -q |
2 | 2 | <?php |
3 | 3 | // Check platform requirements |
4 | -require dirname(__DIR__) . '/config/requirements.php'; |
|
5 | -require dirname(__DIR__) . '/vendor/autoload.php'; |
|
4 | +require dirname(__DIR__).'/config/requirements.php'; |
|
5 | +require dirname(__DIR__).'/vendor/autoload.php'; |
|
6 | 6 | |
7 | 7 | use App\Application; |
8 | 8 | use Cake\Console\CommandRunner; |
9 | 9 | |
10 | 10 | // Build the runner with an application and root executable name. |
11 | -$runner = new CommandRunner(new Application(dirname(__DIR__) . '/config'), 'cake'); |
|
11 | +$runner = new CommandRunner(new Application(dirname(__DIR__).'/config'), 'cake'); |
|
12 | 12 | exit($runner->run($argv)); |
@@ -18,8 +18,8 @@ discard block |
||
18 | 18 | { |
19 | 19 | // compare to includes/functions.inc.php generate_pw_hash() mlf 2.3 |
20 | 20 | $salt = self::_generateRandomString(10); |
21 | - $saltedHash = sha1($password . $salt); |
|
22 | - $hashWithSalt = $saltedHash . $salt; |
|
21 | + $saltedHash = sha1($password.$salt); |
|
22 | + $hashWithSalt = $saltedHash.$salt; |
|
23 | 23 | |
24 | 24 | return $hashWithSalt; |
25 | 25 | } |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | // compare to includes/functions.inc.php is_pw_correct() mlf 2.3 |
50 | 50 | $saltedHash = substr($hash, 0, 40); |
51 | 51 | $salt = substr($hash, 40, 10); |
52 | - if (sha1($password . $salt) == $saltedHash) : |
|
52 | + if (sha1($password.$salt) == $saltedHash) : |
|
53 | 53 | $out = true; |
54 | 54 | endif; |
55 | 55 |
@@ -49,12 +49,12 @@ discard block |
||
49 | 49 | if ($lastAction !== 'add') { |
50 | 50 | $session = $this->request->getSession(); |
51 | 51 | if ($session->read('paginator.lastPage')) { |
52 | - $params[] = 'page=' . $session->read('paginator.lastPage'); |
|
52 | + $params[] = 'page='.$session->read('paginator.lastPage'); |
|
53 | 53 | } |
54 | 54 | } |
55 | - $params[] = 'jump=' . $tid; |
|
55 | + $params[] = 'jump='.$tid; |
|
56 | 56 | |
57 | - return '/?' . implode('&', $params); |
|
57 | + return '/?'.implode('&', $params); |
|
58 | 58 | } |
59 | 59 | |
60 | 60 | /** |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | $id = $posting->get('id'); |
71 | 71 | $webroot = $this->request->getAttribute('webroot'); |
72 | 72 | $url = "{$webroot}entries/view/{$id}"; |
73 | - $link = "<a href=\"{$url}\" class=\"{$options['class']}\">" . $this->getSubject($posting) . '</a>'; |
|
73 | + $link = "<a href=\"{$url}\" class=\"{$options['class']}\">".$this->getSubject($posting).'</a>'; |
|
74 | 74 | |
75 | 75 | return $link; |
76 | 76 | } |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | */ |
126 | 126 | public function views(BasicPostingInterface $posting) |
127 | 127 | { |
128 | - return __('views_headline') . ': ' . $posting->get('views'); |
|
128 | + return __('views_headline').': '.$posting->get('views'); |
|
129 | 129 | } |
130 | 130 | |
131 | 131 | /** |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | { |
142 | 142 | $options += [ |
143 | 143 | 'lineCache' => $this->_View->get('LineCache'), |
144 | - 'maxThreadDepthIndent' => (int)Configure::read( |
|
144 | + 'maxThreadDepthIndent' => (int) Configure::read( |
|
145 | 145 | 'Saito.Settings.thread_depth_indent' |
146 | 146 | ), |
147 | 147 | 'renderer' => 'thread', |
@@ -184,10 +184,10 @@ discard block |
||
184 | 184 | { |
185 | 185 | $out = ''; |
186 | 186 | if ($entry->isPinned()) { |
187 | - $out .= '<i class="fa fa-thumb-tack" title="' . __('fixed') . '"></i> '; |
|
187 | + $out .= '<i class="fa fa-thumb-tack" title="'.__('fixed').'"></i> '; |
|
188 | 188 | } |
189 | 189 | // anchor for inserting solve-icon via FE-JS |
190 | - $out .= '<span class="solves ' . $entry->get('id') . '">'; |
|
190 | + $out .= '<span class="solves '.$entry->get('id').'">'; |
|
191 | 191 | if ($entry->get('solves')) { |
192 | 192 | $out .= $this->solvedBadge(); |
193 | 193 | } |
@@ -211,8 +211,8 @@ discard block |
||
211 | 211 | */ |
212 | 212 | public function solvedBadge() |
213 | 213 | { |
214 | - return '<i class="fa fa-badge-solves solves-isSolved" title="' . |
|
215 | - __('Helpful entry') . '"></i>'; |
|
214 | + return '<i class="fa fa-badge-solves solves-isSolved" title="'. |
|
215 | + __('Helpful entry').'"></i>'; |
|
216 | 216 | } |
217 | 217 | |
218 | 218 | /** |
@@ -224,7 +224,7 @@ discard block |
||
224 | 224 | */ |
225 | 225 | public function getSubject(BasicPostingInterface $posting) |
226 | 226 | { |
227 | - return \h($posting->get('subject')) . ($posting->isNt() ? ' n/t' : ''); |
|
227 | + return \h($posting->get('subject')).($posting->isNt() ? ' n/t' : ''); |
|
228 | 228 | } |
229 | 229 | |
230 | 230 | /** |
@@ -30,6 +30,6 @@ |
||
30 | 30 | */ |
31 | 31 | public static function tagId() |
32 | 32 | { |
33 | - return 'id' . static::$_tagId++; |
|
33 | + return 'id'.static::$_tagId++; |
|
34 | 34 | } |
35 | 35 | } |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | $filename = "{$basename}-{$xSize}.png"; |
95 | 95 | |
96 | 96 | $url = $this->Url->assetUrl( |
97 | - $this->theme . '.' . Configure::read('App.imageBaseUrl'), |
|
97 | + $this->theme.'.'.Configure::read('App.imageBaseUrl'), |
|
98 | 98 | ['fullBase' => true] |
99 | 99 | ); |
100 | 100 | $url = "{$url}{$filename}"; |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | { |
147 | 147 | $html = "<i class=\"saito-icon fa fa-{$icon}\"></i>"; |
148 | 148 | if (!empty($text)) { |
149 | - $html .= ' <span class="saito-icon-text">' . $text . '</span>'; |
|
149 | + $html .= ' <span class="saito-icon-text">'.$text.'</span>'; |
|
150 | 150 | } |
151 | 151 | |
152 | 152 | return $html; |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | public function dropdownMenuButton(array $menuItems, array $options = []) |
163 | 163 | { |
164 | 164 | $options += ['class' => 'btn btn-primary']; |
165 | - $options['class'] = $options['class'] . ' dropdown-toggle'; |
|
165 | + $options['class'] = $options['class'].' dropdown-toggle'; |
|
166 | 166 | $menu = []; |
167 | 167 | foreach ($menuItems as $menuItem) { |
168 | 168 | if ($menuItem === 'divider') { |
@@ -255,7 +255,7 @@ discard block |
||
255 | 255 | $contentArray += ['first' => '', 'middle' => '', 'last' => '']; |
256 | 256 | $out = ''; |
257 | 257 | foreach (['first', 'middle', 'last'] as $key) { |
258 | - $out .= '<div class="' . $key . '">'; |
|
258 | + $out .= '<div class="'.$key.'">'; |
|
259 | 259 | $out .= $options['escape'] ? h($contentArray[$key]) : $contentArray[$key]; |
260 | 260 | $out .= '</div>'; |
261 | 261 | } |
@@ -78,12 +78,12 @@ discard block |
||
78 | 78 | $timeDiffToUtc = $timeInTimezone->getOffset() / 3600; |
79 | 79 | |
80 | 80 | if ($timeDiffToUtc > 0) { |
81 | - $timeDiffToUtc = '+' . $timeDiffToUtc; |
|
81 | + $timeDiffToUtc = '+'.$timeDiffToUtc; |
|
82 | 82 | } |
83 | 83 | |
84 | - $tz = $timeZoneTitle . ' – ' . $timeInTimezone->format('H:i'); |
|
84 | + $tz = $timeZoneTitle.' – '.$timeInTimezone->format('H:i'); |
|
85 | 85 | if ($timeDiffToUtc !== 0) { |
86 | - $tz .= ' (' . $timeDiffToUtc . ')'; |
|
86 | + $tz .= ' ('.$timeDiffToUtc.')'; |
|
87 | 87 | } |
88 | 88 | |
89 | 89 | $options[$groupTitle][$timeZoneTitle] = $tz; |
@@ -145,7 +145,7 @@ discard block |
||
145 | 145 | $time = strftime("%H:%M", $timestamp); |
146 | 146 | } elseif ($timestamp > ($this->_today - 64800)) { |
147 | 147 | // yesterday but in the last 18 hours |
148 | - $time = __('yesterday') . ' ' . strftime("%H:%M", $timestamp); |
|
148 | + $time = __('yesterday').' '.strftime("%H:%M", $timestamp); |
|
149 | 149 | } else { |
150 | 150 | // yesterday and 18 hours and older |
151 | 151 | $time = strftime("%d.%m.%Y", $timestamp); |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -declare(strict_types = 1); |
|
3 | +declare(strict_types=1); |
|
4 | 4 | |
5 | 5 | namespace App\Controller\Component; |
6 | 6 | |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | |
46 | 46 | $ctrler = $controller->request->getParam('controller'); |
47 | 47 | $action = $controller->request->getParam('action'); |
48 | - $key = lcfirst($ctrler) . '/' . $action; |
|
48 | + $key = lcfirst($ctrler).'/'.$action; |
|
49 | 49 | $page = __d('page_titles', $key); |
50 | 50 | if ($key === $page) { |
51 | 51 | $page = ''; |
@@ -22,11 +22,11 @@ |
||
22 | 22 | if (!is_numeric($value)) { |
23 | 23 | return false; |
24 | 24 | } |
25 | - $value = (int)$value; |
|
25 | + $value = (int) $value; |
|
26 | 26 | |
27 | - $key = $table . $value; |
|
27 | + $key = $table.$value; |
|
28 | 28 | |
29 | - return static::rememberStatic($key, function () use ($value, $table) { |
|
29 | + return static::rememberStatic($key, function() use ($value, $table) { |
|
30 | 30 | $Table = TableRegistry::get($table); |
31 | 31 | |
32 | 32 | return $Table->exists(['id' => $value]); |