@@ -1234,7 +1234,8 @@ discard block |
||
| 1234 | 1234 | // It's important to do the numbered ones before the named ones, or messes happen. |
| 1235 | 1235 | uksort( |
| 1236 | 1236 | $substitutions, |
| 1237 | - function($a, $b) { |
|
| 1237 | + function($a, $b) |
|
| 1238 | + { |
|
| 1238 | 1239 | if (is_int($a) && is_int($b)) |
| 1239 | 1240 | return $a > $b ? 1 : ($a < $b ? -1 : 0); |
| 1240 | 1241 | elseif (is_int($a)) |
@@ -1774,8 +1775,12 @@ discard block |
||
| 1774 | 1775 | unset($mtime, $settingsFile, $settingsText); |
| 1775 | 1776 | $defined_vars = get_defined_vars(); |
| 1776 | 1777 | } |
| 1777 | - catch (Throwable $e) {} |
|
| 1778 | - catch (ErrorException $e) {} |
|
| 1778 | + catch (Throwable $e) |
|
| 1779 | + { |
|
| 1780 | +} |
|
| 1781 | + catch (ErrorException $e) |
|
| 1782 | + { |
|
| 1783 | +} |
|
| 1779 | 1784 | if (isset($e)) |
| 1780 | 1785 | return false; |
| 1781 | 1786 | |
@@ -1973,7 +1978,8 @@ discard block |
||
| 1973 | 1978 | { |
| 1974 | 1979 | list($id, $text) = $token; |
| 1975 | 1980 | |
| 1976 | - switch ($id) { |
|
| 1981 | + switch ($id) |
|
| 1982 | + { |
|
| 1977 | 1983 | case T_COMMENT: |
| 1978 | 1984 | case T_DOC_COMMENT: |
| 1979 | 1985 | end($parts); |
@@ -2310,7 +2316,8 @@ discard block |
||
| 2310 | 2316 | // Search for a working temp directory. |
| 2311 | 2317 | foreach ($temp_dir_options as $id_temp => $temp_option) |
| 2312 | 2318 | { |
| 2313 | - switch ($temp_option) { |
|
| 2319 | + switch ($temp_option) |
|
| 2320 | + { |
|
| 2314 | 2321 | case 'cachedir': |
| 2315 | 2322 | $possible_temp = rtrim($cachedir, '/'); |
| 2316 | 2323 | break; |
@@ -41,7 +41,8 @@ discard block |
||
| 41 | 41 | 'mysql' => array( |
| 42 | 42 | 'name' => 'MySQL', |
| 43 | 43 | 'version' => '5.6.0', |
| 44 | - 'version_check' => function() { |
|
| 44 | + 'version_check' => function() |
|
| 45 | + { |
|
| 45 | 46 | global $db_connection; |
| 46 | 47 | if (!function_exists('mysqli_fetch_row')) |
| 47 | 48 | return false; |
@@ -52,7 +53,8 @@ discard block |
||
| 52 | 53 | 'postgresql' => array( |
| 53 | 54 | 'name' => 'PostgreSQL', |
| 54 | 55 | 'version' => '9.6', |
| 55 | - 'version_check' => function() { |
|
| 56 | + 'version_check' => function() |
|
| 57 | + { |
|
| 56 | 58 | if (!function_exists('pg_version')) |
| 57 | 59 | return false; |
| 58 | 60 | $version = pg_version(); |
@@ -1289,7 +1289,6 @@ |
||
| 1289 | 1289 | if (!empty($modSettings['enableAllMessages']) && $topic_length < $modSettings['enableAllMessages']) |
| 1290 | 1290 | $pages .= sprintf(strtr($settings['page_index']['page'], array('{URL}' => $scripturl . '?topic=' . $row['id_topic'] . '.0;all')), '', $txt['all']); |
| 1291 | 1291 | } |
| 1292 | - |
|
| 1293 | 1292 | else |
| 1294 | 1293 | $pages = ''; |
| 1295 | 1294 | |
@@ -2214,7 +2214,6 @@ |
||
| 2214 | 2214 | $hookData['pureFunc'] = $hookData['method']; |
| 2215 | 2215 | $hookData['call'] = $modFunc; |
| 2216 | 2216 | } |
| 2217 | - |
|
| 2218 | 2217 | else |
| 2219 | 2218 | $hookData['call'] = $hookData['pureFunc'] = $modFunc; |
| 2220 | 2219 | |
@@ -280,7 +280,6 @@ discard block |
||
| 280 | 280 | $condition = 'id_member IN ({array_int:members})'; |
| 281 | 281 | $parameters['members'] = $members; |
| 282 | 282 | } |
| 283 | - |
|
| 284 | 283 | elseif ($members === null) |
| 285 | 284 | $condition = '1=1'; |
| 286 | 285 | |
@@ -383,11 +382,9 @@ discard block |
||
| 383 | 382 | $val = $val . ' END'; |
| 384 | 383 | $type = 'raw'; |
| 385 | 384 | } |
| 386 | - |
|
| 387 | 385 | else |
| 388 | 386 | $val = alert_count($members, true); |
| 389 | 387 | } |
| 390 | - |
|
| 391 | 388 | elseif ($type == 'int' && ($val === '+' || $val === '-')) |
| 392 | 389 | { |
| 393 | 390 | $val = $var . ' ' . $val . ' 1'; |
@@ -2344,12 +2341,12 @@ discard block |
||
| 2344 | 2341 | 'tag' => 'cowsay', |
| 2345 | 2342 | 'parameters' => array( |
| 2346 | 2343 | 'e' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => 'oo', 'validate' => function ($eyes) use ($smcFunc) |
| 2347 | - { |
|
| 2344 | + { |
|
| 2348 | 2345 | return $smcFunc['substr']($eyes . 'oo', 0, 2); |
| 2349 | 2346 | }, |
| 2350 | 2347 | ), |
| 2351 | 2348 | 't' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => ' ', 'validate' => function ($tongue) use ($smcFunc) |
| 2352 | - { |
|
| 2349 | + { |
|
| 2353 | 2350 | return $smcFunc['substr']($tongue . ' ', 0, 2); |
| 2354 | 2351 | }, |
| 2355 | 2352 | ), |
@@ -2711,7 +2708,8 @@ discard block |
||
| 2711 | 2708 | |
| 2712 | 2709 | foreach (array('path', 'query', 'fragment') as $part) |
| 2713 | 2710 | { |
| 2714 | - switch ($part) { |
|
| 2711 | + switch ($part) |
|
| 2712 | + { |
|
| 2715 | 2713 | case 'path': |
| 2716 | 2714 | $part_disallowed_chars = '\h\v<>' . $bracket_quote_chars . $excluded_trailing_chars . '/#&'; |
| 2717 | 2715 | $part_excluded_trailing_chars = str_replace('?', '', $excluded_trailing_chars); |
@@ -3048,7 +3046,9 @@ discard block |
||
| 3048 | 3046 | $look_for = strtolower(substr($message, $pos + 2, $pos2 - $pos - 2)); |
| 3049 | 3047 | |
| 3050 | 3048 | // A closing tag that doesn't match any open tags? Skip it. |
| 3051 | - if (!in_array($look_for, array_map(function($code) { return $code['tag']; }, $open_tags))) |
|
| 3049 | + if (!in_array($look_for, array_map(function($code) |
|
| 3050 | + { |
|
| 3051 | +return $code['tag']; }, $open_tags))) |
|
| 3052 | 3052 | continue; |
| 3053 | 3053 | |
| 3054 | 3054 | $to_close = array(); |
@@ -4588,7 +4588,6 @@ discard block |
||
| 4588 | 4588 | if (!isset($minSeed) && isset($js_file['options']['seed'])) |
| 4589 | 4589 | $minSeed = $js_file['options']['seed']; |
| 4590 | 4590 | } |
| 4591 | - |
|
| 4592 | 4591 | else |
| 4593 | 4592 | { |
| 4594 | 4593 | echo ' |
@@ -6513,7 +6512,8 @@ discard block |
||
| 6513 | 6512 | $zones[$tzkey]['tzid'] = $tzid; |
| 6514 | 6513 | $zones[$tzkey]['dst_type'] = count($tzinfo) > 1 ? 1 : ($tzinfo[0]['isdst'] ? 2 : 0); |
| 6515 | 6514 | |
| 6516 | - foreach ($tzinfo as $transition) { |
|
| 6515 | + foreach ($tzinfo as $transition) |
|
| 6516 | + { |
|
| 6517 | 6517 | $zones[$tzkey]['abbrs'][] = $transition['abbr']; |
| 6518 | 6518 | } |
| 6519 | 6519 | |
@@ -7035,7 +7035,6 @@ discard block |
||
| 7035 | 7035 | $isWritable = true; |
| 7036 | 7036 | break; |
| 7037 | 7037 | } |
| 7038 | - |
|
| 7039 | 7038 | else |
| 7040 | 7039 | @chmod($file, $val); |
| 7041 | 7040 | } |
@@ -8125,7 +8124,8 @@ discard block |
||
| 8125 | 8124 | $replaceWith = array(); |
| 8126 | 8125 | |
| 8127 | 8126 | if (!empty($matches[1])) |
| 8128 | - foreach ($matches[1] as $token) { |
|
| 8127 | + foreach ($matches[1] as $token) |
|
| 8128 | + { |
|
| 8129 | 8129 | $toFind[] = '{' . $token . '}'; |
| 8130 | 8130 | $replaceWith[] = isset($txt[$token]) ? $txt[$token] : $token; |
| 8131 | 8131 | } |
@@ -156,7 +156,6 @@ discard block |
||
| 156 | 156 | $diff = $cur_profile['date_registered'] - strtotime(smf_strftime('%Y-%m-%d', $cur_profile['date_registered'])); |
| 157 | 157 | $value = $value + $diff; |
| 158 | 158 | } |
| 159 | - |
|
| 160 | 159 | else |
| 161 | 160 | $value = $cur_profile['date_registered']; |
| 162 | 161 | |
@@ -507,7 +506,7 @@ discard block |
||
| 507 | 506 | log_error(sprintf($txt['smiley_set_dir_not_found'], $set_names[array_search($set, $context['smiley_sets'])])); |
| 508 | 507 | |
| 509 | 508 | $context['smiley_sets'] = array_filter($context['smiley_sets'], function($v) use ($set) |
| 510 | - { |
|
| 509 | + { |
|
| 511 | 510 | return $v != $set; |
| 512 | 511 | }); |
| 513 | 512 | } |
@@ -3518,7 +3517,6 @@ discard block |
||
| 3518 | 3517 | } |
| 3519 | 3518 | } |
| 3520 | 3519 | } |
| 3521 | - |
|
| 3522 | 3520 | elseif (($value == 'upload' && allowedTo('profile_upload_avatar')) || $downloadedExternalAvatar) |
| 3523 | 3521 | { |
| 3524 | 3522 | if ((isset($_FILES['attachment']['name']) && $_FILES['attachment']['name'] != '') || $downloadedExternalAvatar) |
@@ -40,7 +40,8 @@ discard block |
||
| 40 | 40 | 'mysql' => array( |
| 41 | 41 | 'name' => 'MySQL', |
| 42 | 42 | 'version' => '5.6.0', |
| 43 | - 'version_check' => function() { |
|
| 43 | + 'version_check' => function() |
|
| 44 | + { |
|
| 44 | 45 | global $db_connection; |
| 45 | 46 | if (!function_exists('mysqli_fetch_row')) |
| 46 | 47 | return false; |
@@ -56,7 +57,8 @@ discard block |
||
| 56 | 57 | return true; |
| 57 | 58 | }, |
| 58 | 59 | 'utf8_version' => '5.0.22', |
| 59 | - 'utf8_version_check' => function() { |
|
| 60 | + 'utf8_version_check' => function() |
|
| 61 | + { |
|
| 60 | 62 | global $db_connection; |
| 61 | 63 | return mysqli_get_server_info($db_connection); |
| 62 | 64 | }, |
@@ -70,7 +72,8 @@ discard block |
||
| 70 | 72 | 'postgresql' => array( |
| 71 | 73 | 'name' => 'PostgreSQL', |
| 72 | 74 | 'version' => '9.6', |
| 73 | - 'version_check' => function() { |
|
| 75 | + 'version_check' => function() |
|
| 76 | + { |
|
| 74 | 77 | global $db_connection; |
| 75 | 78 | $request = pg_query($db_connection, 'SELECT version()'); |
| 76 | 79 | list ($version) = pg_fetch_row($request); |
@@ -92,7 +95,8 @@ discard block |
||
| 92 | 95 | return false; |
| 93 | 96 | }, |
| 94 | 97 | 'utf8_version' => '8.0', |
| 95 | - 'utf8_version_check' => function (){ |
|
| 98 | + 'utf8_version_check' => function () |
|
| 99 | + { |
|
| 96 | 100 | global $db_connection; |
| 97 | 101 | $request = pg_query($db_connection, 'SELECT version()'); |
| 98 | 102 | list ($version) = pg_fetch_row($request); |
@@ -1001,7 +1005,7 @@ discard block |
||
| 1001 | 1005 | { |
| 1002 | 1006 | $row = $smcFunc['db_fetch_assoc']($result); |
| 1003 | 1007 | if ($row['standard_conforming_strings'] !== 'on') |
| 1004 | - { |
|
| 1008 | + { |
|
| 1005 | 1009 | $incontext['continue'] = 0; |
| 1006 | 1010 | $incontext['error'] = $txt['error_pg_scs']; |
| 1007 | 1011 | } |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | // Set a list of common functions. |
| 108 | 108 | $ent_list = '&(?:#' . (empty($modSettings['disableEntityCheck']) ? '\d{1,7}' : '021') . '|quot|amp|lt|gt|nbsp);'; |
| 109 | 109 | $ent_check = empty($modSettings['disableEntityCheck']) ? function($string) |
| 110 | - { |
|
| 110 | + { |
|
| 111 | 111 | $string = preg_replace_callback('~(&#(\d{1,7}|x[0-9a-fA-F]{1,6});)~', 'entity_fix__callback', (string) $string); |
| 112 | 112 | return $string; |
| 113 | 113 | } : function($string) |
@@ -2422,7 +2422,6 @@ discard block |
||
| 2422 | 2422 | loadLanguage('index+Modifications'); |
| 2423 | 2423 | $context['template_layers'] = array(); |
| 2424 | 2424 | } |
| 2425 | - |
|
| 2426 | 2425 | else |
| 2427 | 2426 | { |
| 2428 | 2427 | // Custom templates to load, or just default? |
@@ -2976,7 +2975,8 @@ discard block |
||
| 2976 | 2975 | // Take care of escaping the value for JavaScript? |
| 2977 | 2976 | if (!empty($escape)) |
| 2978 | 2977 | { |
| 2979 | - switch (gettype($value)) { |
|
| 2978 | + switch (gettype($value)) |
|
| 2979 | + { |
|
| 2980 | 2980 | // Illegal. |
| 2981 | 2981 | case 'resource': |
| 2982 | 2982 | break; |
@@ -191,8 +191,7 @@ |
||
| 191 | 191 | ) |
| 192 | 192 | // We are not previewing an attachment. |
| 193 | 193 | && !isset($_SESSION['attachments_can_preview'][$attachId]) |
| 194 | - ) |
|
| 195 | - { |
|
| 194 | + ) { |
|
| 196 | 195 | send_http_status(404, 'File Not Found'); |
| 197 | 196 | die('404 File Not Found'); |
| 198 | 197 | } |