@@ -59,7 +59,8 @@ discard block |
||
59 | 59 | |
60 | 60 | public function getPrefixes() |
61 | 61 | { |
62 | - if (!empty($this->prefixesPsr0)) { |
|
62 | + if (!empty($this->prefixesPsr0)) |
|
63 | + { |
|
63 | 64 | return call_user_func_array('array_merge', $this->prefixesPsr0); |
64 | 65 | } |
65 | 66 | |
@@ -91,9 +92,12 @@ discard block |
||
91 | 92 | */ |
92 | 93 | public function addClassMap(array $classMap) |
93 | 94 | { |
94 | - if ($this->classMap) { |
|
95 | + if ($this->classMap) |
|
96 | + { |
|
95 | 97 | $this->classMap = array_merge($this->classMap, $classMap); |
96 | - } else { |
|
98 | + } |
|
99 | + else |
|
100 | + { |
|
97 | 101 | $this->classMap = $classMap; |
98 | 102 | } |
99 | 103 | } |
@@ -108,13 +112,17 @@ discard block |
||
108 | 112 | */ |
109 | 113 | public function add($prefix, $paths, $prepend = false) |
110 | 114 | { |
111 | - if (!$prefix) { |
|
112 | - if ($prepend) { |
|
115 | + if (!$prefix) |
|
116 | + { |
|
117 | + if ($prepend) |
|
118 | + { |
|
113 | 119 | $this->fallbackDirsPsr0 = array_merge( |
114 | 120 | (array) $paths, |
115 | 121 | $this->fallbackDirsPsr0 |
116 | 122 | ); |
117 | - } else { |
|
123 | + } |
|
124 | + else |
|
125 | + { |
|
118 | 126 | $this->fallbackDirsPsr0 = array_merge( |
119 | 127 | $this->fallbackDirsPsr0, |
120 | 128 | (array) $paths |
@@ -125,17 +133,21 @@ discard block |
||
125 | 133 | } |
126 | 134 | |
127 | 135 | $first = $prefix[0]; |
128 | - if (!isset($this->prefixesPsr0[$first][$prefix])) { |
|
136 | + if (!isset($this->prefixesPsr0[$first][$prefix])) |
|
137 | + { |
|
129 | 138 | $this->prefixesPsr0[$first][$prefix] = (array) $paths; |
130 | 139 | |
131 | 140 | return; |
132 | 141 | } |
133 | - if ($prepend) { |
|
142 | + if ($prepend) |
|
143 | + { |
|
134 | 144 | $this->prefixesPsr0[$first][$prefix] = array_merge( |
135 | 145 | (array) $paths, |
136 | 146 | $this->prefixesPsr0[$first][$prefix] |
137 | 147 | ); |
138 | - } else { |
|
148 | + } |
|
149 | + else |
|
150 | + { |
|
139 | 151 | $this->prefixesPsr0[$first][$prefix] = array_merge( |
140 | 152 | $this->prefixesPsr0[$first][$prefix], |
141 | 153 | (array) $paths |
@@ -155,34 +167,45 @@ discard block |
||
155 | 167 | */ |
156 | 168 | public function addPsr4($prefix, $paths, $prepend = false) |
157 | 169 | { |
158 | - if (!$prefix) { |
|
170 | + if (!$prefix) |
|
171 | + { |
|
159 | 172 | // Register directories for the root namespace. |
160 | - if ($prepend) { |
|
173 | + if ($prepend) |
|
174 | + { |
|
161 | 175 | $this->fallbackDirsPsr4 = array_merge( |
162 | 176 | (array) $paths, |
163 | 177 | $this->fallbackDirsPsr4 |
164 | 178 | ); |
165 | - } else { |
|
179 | + } |
|
180 | + else |
|
181 | + { |
|
166 | 182 | $this->fallbackDirsPsr4 = array_merge( |
167 | 183 | $this->fallbackDirsPsr4, |
168 | 184 | (array) $paths |
169 | 185 | ); |
170 | 186 | } |
171 | - } elseif (!isset($this->prefixDirsPsr4[$prefix])) { |
|
187 | + } |
|
188 | + elseif (!isset($this->prefixDirsPsr4[$prefix])) |
|
189 | + { |
|
172 | 190 | // Register directories for a new namespace. |
173 | 191 | $length = strlen($prefix); |
174 | - if ('\\' !== $prefix[$length - 1]) { |
|
192 | + if ('\\' !== $prefix[$length - 1]) |
|
193 | + { |
|
175 | 194 | throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator."); |
176 | 195 | } |
177 | 196 | $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length; |
178 | 197 | $this->prefixDirsPsr4[$prefix] = (array) $paths; |
179 | - } elseif ($prepend) { |
|
198 | + } |
|
199 | + elseif ($prepend) |
|
200 | + { |
|
180 | 201 | // Prepend directories for an already registered namespace. |
181 | 202 | $this->prefixDirsPsr4[$prefix] = array_merge( |
182 | 203 | (array) $paths, |
183 | 204 | $this->prefixDirsPsr4[$prefix] |
184 | 205 | ); |
185 | - } else { |
|
206 | + } |
|
207 | + else |
|
208 | + { |
|
186 | 209 | // Append directories for an already registered namespace. |
187 | 210 | $this->prefixDirsPsr4[$prefix] = array_merge( |
188 | 211 | $this->prefixDirsPsr4[$prefix], |
@@ -200,9 +223,12 @@ discard block |
||
200 | 223 | */ |
201 | 224 | public function set($prefix, $paths) |
202 | 225 | { |
203 | - if (!$prefix) { |
|
226 | + if (!$prefix) |
|
227 | + { |
|
204 | 228 | $this->fallbackDirsPsr0 = (array) $paths; |
205 | - } else { |
|
229 | + } |
|
230 | + else |
|
231 | + { |
|
206 | 232 | $this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths; |
207 | 233 | } |
208 | 234 | } |
@@ -218,11 +244,15 @@ discard block |
||
218 | 244 | */ |
219 | 245 | public function setPsr4($prefix, $paths) |
220 | 246 | { |
221 | - if (!$prefix) { |
|
247 | + if (!$prefix) |
|
248 | + { |
|
222 | 249 | $this->fallbackDirsPsr4 = (array) $paths; |
223 | - } else { |
|
250 | + } |
|
251 | + else |
|
252 | + { |
|
224 | 253 | $length = strlen($prefix); |
225 | - if ('\\' !== $prefix[$length - 1]) { |
|
254 | + if ('\\' !== $prefix[$length - 1]) |
|
255 | + { |
|
226 | 256 | throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator."); |
227 | 257 | } |
228 | 258 | $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length; |
@@ -318,7 +348,8 @@ discard block |
||
318 | 348 | */ |
319 | 349 | public function loadClass($class) |
320 | 350 | { |
321 | - if ($file = $this->findFile($class)) { |
|
351 | + if ($file = $this->findFile($class)) |
|
352 | + { |
|
322 | 353 | includeFile($file); |
323 | 354 | |
324 | 355 | return true; |
@@ -335,15 +366,19 @@ discard block |
||
335 | 366 | public function findFile($class) |
336 | 367 | { |
337 | 368 | // class map lookup |
338 | - if (isset($this->classMap[$class])) { |
|
369 | + if (isset($this->classMap[$class])) |
|
370 | + { |
|
339 | 371 | return $this->classMap[$class]; |
340 | 372 | } |
341 | - if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) { |
|
373 | + if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) |
|
374 | + { |
|
342 | 375 | return false; |
343 | 376 | } |
344 | - if (null !== $this->apcuPrefix) { |
|
377 | + if (null !== $this->apcuPrefix) |
|
378 | + { |
|
345 | 379 | $file = apcu_fetch($this->apcuPrefix.$class, $hit); |
346 | - if ($hit) { |
|
380 | + if ($hit) |
|
381 | + { |
|
347 | 382 | return $file; |
348 | 383 | } |
349 | 384 | } |
@@ -351,15 +386,18 @@ discard block |
||
351 | 386 | $file = $this->findFileWithExtension($class, '.php'); |
352 | 387 | |
353 | 388 | // Search for Hack files if we are running on HHVM |
354 | - if (false === $file && defined('HHVM_VERSION')) { |
|
389 | + if (false === $file && defined('HHVM_VERSION')) |
|
390 | + { |
|
355 | 391 | $file = $this->findFileWithExtension($class, '.hh'); |
356 | 392 | } |
357 | 393 | |
358 | - if (null !== $this->apcuPrefix) { |
|
394 | + if (null !== $this->apcuPrefix) |
|
395 | + { |
|
359 | 396 | apcu_add($this->apcuPrefix.$class, $file); |
360 | 397 | } |
361 | 398 | |
362 | - if (false === $file) { |
|
399 | + if (false === $file) |
|
400 | + { |
|
363 | 401 | // Remember that this class does not exist. |
364 | 402 | $this->missingClasses[$class] = true; |
365 | 403 | } |
@@ -373,15 +411,20 @@ discard block |
||
373 | 411 | $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext; |
374 | 412 | |
375 | 413 | $first = $class[0]; |
376 | - if (isset($this->prefixLengthsPsr4[$first])) { |
|
414 | + if (isset($this->prefixLengthsPsr4[$first])) |
|
415 | + { |
|
377 | 416 | $subPath = $class; |
378 | - while (false !== $lastPos = strrpos($subPath, '\\')) { |
|
417 | + while (false !== $lastPos = strrpos($subPath, '\\')) |
|
418 | + { |
|
379 | 419 | $subPath = substr($subPath, 0, $lastPos); |
380 | 420 | $search = $subPath . '\\'; |
381 | - if (isset($this->prefixDirsPsr4[$search])) { |
|
421 | + if (isset($this->prefixDirsPsr4[$search])) |
|
422 | + { |
|
382 | 423 | $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1); |
383 | - foreach ($this->prefixDirsPsr4[$search] as $dir) { |
|
384 | - if (file_exists($file = $dir . $pathEnd)) { |
|
424 | + foreach ($this->prefixDirsPsr4[$search] as $dir) |
|
425 | + { |
|
426 | + if (file_exists($file = $dir . $pathEnd)) |
|
427 | + { |
|
385 | 428 | return $file; |
386 | 429 | } |
387 | 430 | } |
@@ -390,27 +433,37 @@ discard block |
||
390 | 433 | } |
391 | 434 | |
392 | 435 | // PSR-4 fallback dirs |
393 | - foreach ($this->fallbackDirsPsr4 as $dir) { |
|
394 | - if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) { |
|
436 | + foreach ($this->fallbackDirsPsr4 as $dir) |
|
437 | + { |
|
438 | + if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) |
|
439 | + { |
|
395 | 440 | return $file; |
396 | 441 | } |
397 | 442 | } |
398 | 443 | |
399 | 444 | // PSR-0 lookup |
400 | - if (false !== $pos = strrpos($class, '\\')) { |
|
445 | + if (false !== $pos = strrpos($class, '\\')) |
|
446 | + { |
|
401 | 447 | // namespaced class name |
402 | 448 | $logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1) |
403 | 449 | . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR); |
404 | - } else { |
|
450 | + } |
|
451 | + else |
|
452 | + { |
|
405 | 453 | // PEAR-like class name |
406 | 454 | $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext; |
407 | 455 | } |
408 | 456 | |
409 | - if (isset($this->prefixesPsr0[$first])) { |
|
410 | - foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) { |
|
411 | - if (0 === strpos($class, $prefix)) { |
|
412 | - foreach ($dirs as $dir) { |
|
413 | - if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) { |
|
457 | + if (isset($this->prefixesPsr0[$first])) |
|
458 | + { |
|
459 | + foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) |
|
460 | + { |
|
461 | + if (0 === strpos($class, $prefix)) |
|
462 | + { |
|
463 | + foreach ($dirs as $dir) |
|
464 | + { |
|
465 | + if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) |
|
466 | + { |
|
414 | 467 | return $file; |
415 | 468 | } |
416 | 469 | } |
@@ -419,14 +472,17 @@ discard block |
||
419 | 472 | } |
420 | 473 | |
421 | 474 | // PSR-0 fallback dirs |
422 | - foreach ($this->fallbackDirsPsr0 as $dir) { |
|
423 | - if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) { |
|
475 | + foreach ($this->fallbackDirsPsr0 as $dir) |
|
476 | + { |
|
477 | + if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) |
|
478 | + { |
|
424 | 479 | return $file; |
425 | 480 | } |
426 | 481 | } |
427 | 482 | |
428 | 483 | // PSR-0 include paths. |
429 | - if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) { |
|
484 | + if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) |
|
485 | + { |
|
430 | 486 | return $file; |
431 | 487 | } |
432 | 488 |
@@ -1730,10 +1730,13 @@ |
||
1730 | 1730 | if ($result[0] === 127 // Valid Response |
1731 | 1731 | && ($result[3] & 3 || $result[3] & 5) // Listed as Suspicious + Harvester || Suspicious + Comment Spammer |
1732 | 1732 | && $result[2] >= $modSettings['badbehavior_httpbl_threat'] // Level |
1733 | - && $result[1] <= $modSettings['badbehavior_httpbl_maxage']) // Age |
|
1733 | + && $result[1] <= $modSettings['badbehavior_httpbl_maxage']) |
|
1734 | + { |
|
1735 | + // Age |
|
1734 | 1736 | { |
1735 | 1737 | return true; |
1736 | 1738 | } |
1739 | + } |
|
1737 | 1740 | } |
1738 | 1741 | |
1739 | 1742 | return false; |
@@ -1377,11 +1377,13 @@ |
||
1377 | 1377 | { |
1378 | 1378 | // If we revert to the old id-group we need to ensure it wasn't from a subscription. |
1379 | 1379 | foreach ($context['subscriptions'] as $id => $group) |
1380 | - // It was? Make them a regular member then! |
|
1380 | + { |
|
1381 | + // It was? Make them a regular member then! |
|
1381 | 1382 | { |
1382 | 1383 | if ($group['prim_group'] == $member['id_group']) |
1383 | 1384 | { |
1384 | 1385 | $member['id_group'] = 0; |
1386 | + } |
|
1385 | 1387 | } |
1386 | 1388 | } |
1387 | 1389 |
@@ -735,10 +735,12 @@ |
||
735 | 735 | } |
736 | 736 | // If this is being unapproved, and it's equal to the id_last_msg we need to find a new one! |
737 | 737 | elseif (!$approve) |
738 | - // Default to the first message and then we'll override in a bit ;) |
|
738 | + { |
|
739 | + // Default to the first message and then we'll override in a bit ;) |
|
739 | 740 | { |
740 | 741 | $topic_changes[$row['id_topic']]['id_last_msg'] = $row['id_first_msg']; |
741 | 742 | } |
743 | + } |
|
742 | 744 | |
743 | 745 | $topic_changes[$row['id_topic']]['unapproved_posts'] += $approve ? -1 : 1; |
744 | 746 | $board_changes[$row['id_board']]['unapproved_posts'] += $approve ? -1 : 1; |
@@ -306,8 +306,7 @@ |
||
306 | 306 | class_exists($modSettings['front_page']) |
307 | 307 | && in_array('validateFrontPageOptions', get_class_methods($modSettings['front_page'])) |
308 | 308 | && !$front_page::validateFrontPageOptions($this->_req->post) |
309 | - ) |
|
310 | - { |
|
309 | + ) { |
|
311 | 310 | $this->_req->post->front_page = ''; |
312 | 311 | } |
313 | 312 | } |
@@ -12,5 +12,6 @@ |
||
12 | 12 | header('Location: ' . $boardurl); |
13 | 13 | } |
14 | 14 | // Can't find it... just forget it. |
15 | -else |
|
16 | - exit; |
|
17 | 15 | \ No newline at end of file |
16 | +else { |
|
17 | + exit; |
|
18 | +} |
@@ -12,5 +12,6 @@ |
||
12 | 12 | header('Location: ' . $boardurl); |
13 | 13 | } |
14 | 14 | // Can't find it... just forget it. |
15 | -else |
|
15 | +else { |
|
16 | 16 | exit; |
17 | +} |
@@ -2,6 +2,9 @@ |
||
2 | 2 | |
3 | 3 | // Try to handle it with the upper level index.php. (it should know what to do.) |
4 | 4 | if (file_exists(dirname(dirname(__FILE__)) . '/index.php')) |
5 | +{ |
|
5 | 6 | include (dirname(dirname(__FILE__)) . '/index.php'); |
6 | -else |
|
7 | - exit; |
|
8 | 7 | \ No newline at end of file |
8 | +} |
|
9 | +else { |
|
10 | + exit; |
|
11 | +} |
@@ -2,6 +2,9 @@ |
||
2 | 2 | |
3 | 3 | // Try to handle it with the upper level index.php. (it should know what to do.) |
4 | 4 | if (file_exists(dirname(dirname(__FILE__)) . '/index.php')) |
5 | +{ |
|
5 | 6 | include (dirname(dirname(__FILE__)) . '/index.php'); |
6 | -else |
|
7 | - exit; |
|
8 | 7 | \ No newline at end of file |
8 | +} |
|
9 | +else { |
|
10 | + exit; |
|
11 | +} |