@@ -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 | } |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | 'version' => Configure::read('Saito.v'), |
62 | 62 | 'settings' => [ |
63 | 63 | 'autoPageReload' => (isset($View->viewVars['autoPageReload']) ? $View->viewVars['autoPageReload'] : 0), |
64 | - 'editPeriod' => (int)Configure::read( |
|
64 | + 'editPeriod' => (int) Configure::read( |
|
65 | 65 | 'Saito.Settings.edit_period' |
66 | 66 | ), |
67 | 67 | 'language' => Configure::read('Saito.language'), |
@@ -75,9 +75,9 @@ discard block |
||
75 | 75 | 'quote_symbol' => $settings['quote_symbol'], |
76 | 76 | 'subject_maxlength' => $settings['subject_maxlength'], |
77 | 77 | 'upload_max_img_size' => $settings['upload_max_img_size'] * 1024, |
78 | - 'upload_max_number_of_uploads' => (int)$settings['upload_max_number_of_uploads'], |
|
78 | + 'upload_max_number_of_uploads' => (int) $settings['upload_max_number_of_uploads'], |
|
79 | 79 | 'theme' => $View->getTheme(), |
80 | - 'apiroot' => $View->request->getAttribute('webroot') . 'api/v2/', |
|
80 | + 'apiroot' => $View->request->getAttribute('webroot').'api/v2/', |
|
81 | 81 | 'webroot' => $View->request->getAttribute('webroot') |
82 | 82 | ] |
83 | 83 | ], |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | 'csrf' => $this->_getCsrf($View) |
90 | 90 | ], |
91 | 91 | 'currentUser' => [ |
92 | - 'id' => (int)$CurrentUser->get('id'), |
|
92 | + 'id' => (int) $CurrentUser->get('id'), |
|
93 | 93 | 'username' => $CurrentUser->get('username'), |
94 | 94 | 'user_show_inline' => $CurrentUser->get('inline_view_on_click') || false, |
95 | 95 | 'user_show_thread_collapsed' => $CurrentUser->get('user_show_thread_collapsed') || false |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | 'afterViewInit' => [] |
101 | 101 | ] |
102 | 102 | ]; |
103 | - $out = 'var SaitoApp = ' . json_encode($js); |
|
103 | + $out = 'var SaitoApp = '.json_encode($js); |
|
104 | 104 | $out .= '; SaitoApp.timeAppStart = new Date().getTime();'; |
105 | 105 | |
106 | 106 | return $out; |
@@ -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 |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | $defaults = ['return' => 'html', 'embed' => true, 'multimedia' => true, 'wrap' => true]; |
163 | 163 | $options += $defaults; |
164 | 164 | |
165 | - $cacheId = md5(serialize($options) . $string); |
|
165 | + $cacheId = md5(serialize($options).$string); |
|
166 | 166 | if (isset($this->_parserCache[$cacheId])) { |
167 | 167 | $html = $this->_parserCache[$cacheId]; |
168 | 168 | } else { |
@@ -170,7 +170,7 @@ discard block |
||
170 | 170 | $this->_parserCache[$cacheId] = $html; |
171 | 171 | } |
172 | 172 | if ($options['return'] === 'html' && $options['wrap']) { |
173 | - $html = '<div class="richtext">' . $html . '</div>'; |
|
173 | + $html = '<div class="richtext">'.$html.'</div>'; |
|
174 | 174 | } |
175 | 175 | Stopwatch::stop('ParseHelper::parse()'); |
176 | 176 |
@@ -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); |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | } |
73 | 73 | } |
74 | 74 | |
75 | - return '<style type="text/css">' . implode(" ", $styles) . '</style>'; |
|
75 | + return '<style type="text/css">'.implode(" ", $styles).'</style>'; |
|
76 | 76 | } |
77 | 77 | |
78 | 78 | /** |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | $link = $url; |
126 | 126 | |
127 | 127 | if (substr($link, 0, 4) == 'www.') { |
128 | - $link = 'http://' . $link; |
|
128 | + $link = 'http://'.$link; |
|
129 | 129 | } |
130 | 130 | if (substr($link, 0, 4) == 'http') { |
131 | 131 | $text = '<i class="fa fa-home fa-lg"></i>'; |
@@ -160,7 +160,7 @@ discard block |
||
160 | 160 | $html = $name; |
161 | 161 | } elseif ($link || ($link instanceof ForumsUserInterface && $link->isLoggedIn()) |
162 | 162 | ) { |
163 | - return $this->Html->link($name, '/users/view/' . $id, $options); |
|
163 | + return $this->Html->link($name, '/users/view/'.$id, $options); |
|
164 | 164 | } else { |
165 | 165 | $html = $name; |
166 | 166 | } |
@@ -180,7 +180,7 @@ discard block |
||
180 | 180 | */ |
181 | 181 | public function getAvatar($user, array $options = []) |
182 | 182 | { |
183 | - $getAvatar = function () use ($user, $options) { |
|
183 | + $getAvatar = function() use ($user, $options) { |
|
184 | 184 | Stopwatch::start('UserHelper::getAvatar()'); |
185 | 185 | $defaults = [ |
186 | 186 | 'class' => 'avatar-image', |
@@ -206,7 +206,7 @@ discard block |
||
206 | 206 | $imgUri = (new Identicon)->getImageDataUri($name, $hdpi); |
207 | 207 | } |
208 | 208 | |
209 | - $style = "background-image: url({$imgUri});" . $options['style']; |
|
209 | + $style = "background-image: url({$imgUri});".$options['style']; |
|
210 | 210 | |
211 | 211 | $html = $this->Html->tag( |
212 | 212 | $options['tag'], |
@@ -227,7 +227,7 @@ discard block |
||
227 | 227 | }; |
228 | 228 | |
229 | 229 | $name = $user->get('username'); |
230 | - $hash = 'avatar.' . md5($name . serialize($options)); |
|
230 | + $hash = 'avatar.'.md5($name.serialize($options)); |
|
231 | 231 | |
232 | 232 | return $this->remember($hash, $getAvatar); |
233 | 233 | } |
@@ -68,9 +68,9 @@ |
||
68 | 68 | $jsonApiErrors = ['errors' => []]; |
69 | 69 | foreach ($errors as $field => $error) { |
70 | 70 | $out = [ |
71 | - 'meta' => ['field' => '#' . $this->_domId($field)], |
|
71 | + 'meta' => ['field' => '#'.$this->_domId($field)], |
|
72 | 72 | 'status' => '400', |
73 | - 'title' => __d('nondynamic', $field) . ": " . __d('nondynamic', current($error)), |
|
73 | + 'title' => __d('nondynamic', $field).": ".__d('nondynamic', current($error)), |
|
74 | 74 | ]; |
75 | 75 | |
76 | 76 | $jsonApiErrors['errors'][] = $out; |
@@ -216,10 +216,10 @@ |
||
216 | 216 | return; |
217 | 217 | } |
218 | 218 | |
219 | - $check = function ($locale) { |
|
220 | - $l10nViewPath = $this->viewBuilder()->getTemplatePath() . DS . $locale; |
|
221 | - $l10nViewFile = $l10nViewPath . DS . $this->viewBuilder()->getName() . '.ctp'; |
|
222 | - if (!file_exists(APP . 'Template' . DS . $l10nViewFile)) { |
|
219 | + $check = function($locale) { |
|
220 | + $l10nViewPath = $this->viewBuilder()->getTemplatePath().DS.$locale; |
|
221 | + $l10nViewFile = $l10nViewPath.DS.$this->viewBuilder()->getName().'.ctp'; |
|
222 | + if (!file_exists(APP.'Template'.DS.$l10nViewFile)) { |
|
223 | 223 | return false; |
224 | 224 | } |
225 | 225 |
@@ -230,7 +230,7 @@ discard block |
||
230 | 230 | } |
231 | 231 | $code = $this->request->getQuery('c'); |
232 | 232 | try { |
233 | - $activated = $this->Users->activate((int)$id, $code); |
|
233 | + $activated = $this->Users->activate((int) $id, $code); |
|
234 | 234 | } catch (\Exception $e) { |
235 | 235 | $activated = false; |
236 | 236 | } |
@@ -288,7 +288,7 @@ discard block |
||
288 | 288 | public function ignore() |
289 | 289 | { |
290 | 290 | $this->request->allowMethod('POST'); |
291 | - $blockedId = (int)$this->request->getData('id'); |
|
291 | + $blockedId = (int) $this->request->getData('id'); |
|
292 | 292 | $this->_ignore($blockedId, true); |
293 | 293 | } |
294 | 294 | |
@@ -300,7 +300,7 @@ discard block |
||
300 | 300 | public function unignore() |
301 | 301 | { |
302 | 302 | $this->request->allowMethod('POST'); |
303 | - $blockedId = (int)$this->request->getData('id'); |
|
303 | + $blockedId = (int) $this->request->getData('id'); |
|
304 | 304 | $this->_ignore($blockedId, false); |
305 | 305 | } |
306 | 306 | |
@@ -314,7 +314,7 @@ discard block |
||
314 | 314 | protected function _ignore($blockedId, $set) |
315 | 315 | { |
316 | 316 | $userId = $this->CurrentUser->getId(); |
317 | - if ((int)$userId === (int)$blockedId) { |
|
317 | + if ((int) $userId === (int) $blockedId) { |
|
318 | 318 | throw new BadRequestException(); |
319 | 319 | } |
320 | 320 | if ($set) { |
@@ -375,7 +375,7 @@ discard block |
||
375 | 375 | $user = $this->Users->find() |
376 | 376 | ->contain( |
377 | 377 | [ |
378 | - 'UserBlocks' => function ($q) { |
|
378 | + 'UserBlocks' => function($q) { |
|
379 | 379 | return $q->find('assocUsers'); |
380 | 380 | }, |
381 | 381 | 'UserOnline' |
@@ -536,7 +536,7 @@ discard block |
||
536 | 536 | throw new BadRequestException; |
537 | 537 | } |
538 | 538 | |
539 | - $id = (int)$this->request->getData('lockUserId'); |
|
539 | + $id = (int) $this->request->getData('lockUserId'); |
|
540 | 540 | if (!$this->Users->exists($id)) { |
541 | 541 | throw new NotFoundException('User does not exist.', 1524298280); |
542 | 542 | } |
@@ -550,7 +550,7 @@ discard block |
||
550 | 550 | $this->Flash->set($message, ['element' => 'error']); |
551 | 551 | } else { |
552 | 552 | try { |
553 | - $duration = (int)$this->request->getData('lockPeriod'); |
|
553 | + $duration = (int) $this->request->getData('lockPeriod'); |
|
554 | 554 | $status = $this->Users->UserBlocks->block( |
555 | 555 | new ManualBlocker, |
556 | 556 | $id, |
@@ -678,7 +678,7 @@ discard block |
||
678 | 678 | $allowed = $this->Slidetabs->getAvailable(); |
679 | 679 | $order = array_filter( |
680 | 680 | $order, |
681 | - function ($item) use ($allowed) { |
|
681 | + function($item) use ($allowed) { |
|
682 | 682 | return in_array($item, $allowed); |
683 | 683 | } |
684 | 684 | ); |