@@ -369,7 +369,7 @@ |
||
369 | 369 | // And a bit more for database changes. |
370 | 370 | if ($context['uninstalling'] && !empty($context['database_changes'])) |
371 | 371 | echo ' |
372 | - makeToggle(document.getElementById(\'db_changes_div\'), ', JavaScriptEscape($txt['package_db_uninstall_details']) , ');'; |
|
372 | + makeToggle(document.getElementById(\'db_changes_div\'), ', JavaScriptEscape($txt['package_db_uninstall_details']), ');'; |
|
373 | 373 | |
374 | 374 | echo ' |
375 | 375 | </script>'; |
@@ -498,7 +498,7 @@ |
||
498 | 498 | log_error(sprintf($txt['smiley_set_dir_not_found'], $set_names[array_search($set, $context['smiley_sets'])])); |
499 | 499 | |
500 | 500 | $context['smiley_sets'] = array_filter($context['smiley_sets'], function($v) use ($set) |
501 | - { |
|
501 | + { |
|
502 | 502 | return $v != $set; |
503 | 503 | }); |
504 | 504 | } |
@@ -1813,7 +1813,7 @@ discard block |
||
1813 | 1813 | if (!empty($excluded_groups)) |
1814 | 1814 | { |
1815 | 1815 | // Make sure this is an array of integers |
1816 | - $excluded_groups = array_filter((array) $excluded_groups, function ($v) |
|
1816 | + $excluded_groups = array_filter((array) $excluded_groups, function($v) |
|
1817 | 1817 | { |
1818 | 1818 | return is_int($v) || is_string($v) && (string) intval($v) === $v; |
1819 | 1819 | }); |
@@ -2341,7 +2341,7 @@ discard block |
||
2341 | 2341 | else |
2342 | 2342 | { |
2343 | 2343 | // Just because you're paranoid doesn't mean they aren't after you. |
2344 | - $context['permissions_excluded']['bbc_html'] = array_filter((array) $context['permissions_excluded']['bbc_html'], function ($v) |
|
2344 | + $context['permissions_excluded']['bbc_html'] = array_filter((array) $context['permissions_excluded']['bbc_html'], function($v) |
|
2345 | 2345 | { |
2346 | 2346 | return is_int($v) || is_string($v) && (string) intval($v) === $v; |
2347 | 2347 | }); |
@@ -1814,7 +1814,7 @@ discard block |
||
1814 | 1814 | { |
1815 | 1815 | // Make sure this is an array of integers |
1816 | 1816 | $excluded_groups = array_filter((array) $excluded_groups, function ($v) |
1817 | - { |
|
1817 | + { |
|
1818 | 1818 | return is_int($v) || is_string($v) && (string) intval($v) === $v; |
1819 | 1819 | }); |
1820 | 1820 | |
@@ -2342,7 +2342,7 @@ discard block |
||
2342 | 2342 | { |
2343 | 2343 | // Just because you're paranoid doesn't mean they aren't after you. |
2344 | 2344 | $context['permissions_excluded']['bbc_html'] = array_filter((array) $context['permissions_excluded']['bbc_html'], function ($v) |
2345 | - { |
|
2345 | + { |
|
2346 | 2346 | return is_int($v) || is_string($v) && (string) intval($v) === $v; |
2347 | 2347 | }); |
2348 | 2348 |
@@ -741,7 +741,7 @@ |
||
741 | 741 | <div class="information">', $context['settings_message'], '</div>'; |
742 | 742 | |
743 | 743 | // Filter out any redundant separators before we start the loop |
744 | - $context['config_vars'] = array_filter($context['config_vars'], function ($v) use ($context) |
|
744 | + $context['config_vars'] = array_filter($context['config_vars'], function($v) use ($context) |
|
745 | 745 | { |
746 | 746 | static $config_vars, $prev; |
747 | 747 |
@@ -742,7 +742,7 @@ |
||
742 | 742 | |
743 | 743 | // Filter out any redundant separators before we start the loop |
744 | 744 | $context['config_vars'] = array_filter($context['config_vars'], function ($v) use ($context) |
745 | - { |
|
745 | + { |
|
746 | 746 | static $config_vars, $prev; |
747 | 747 | |
748 | 748 | $at_start = is_null($config_vars); |
@@ -1965,7 +1965,7 @@ |
||
1965 | 1965 | // Remove anything that isn't actually new from our list of files |
1966 | 1966 | foreach ($to_unset as $key => $ids) |
1967 | 1967 | { |
1968 | - if (array_reduce($ids, function ($carry, $item) { return $carry * $item; }, true) == true) |
|
1968 | + if (array_reduce($ids, function($carry, $item) { return $carry * $item; }, true) == true) |
|
1969 | 1969 | unset($smiley_files[$key]); |
1970 | 1970 | } |
1971 | 1971 |
@@ -1965,7 +1965,9 @@ |
||
1965 | 1965 | // Remove anything that isn't actually new from our list of files |
1966 | 1966 | foreach ($to_unset as $key => $ids) |
1967 | 1967 | { |
1968 | - if (array_reduce($ids, function ($carry, $item) { return $carry * $item; }, true) == true) |
|
1968 | + if (array_reduce($ids, function ($carry, $item) |
|
1969 | + { |
|
1970 | +return $carry * $item; }, true) == true) |
|
1969 | 1971 | unset($smiley_files[$key]); |
1970 | 1972 | } |
1971 | 1973 |
@@ -391,7 +391,7 @@ discard block |
||
391 | 391 | { |
392 | 392 | $val = 'CASE '; |
393 | 393 | foreach ($members as $k => $v) |
394 | - $val .= 'WHEN id_member = ' . $v . ' THEN '. alert_count($v, true) . ' '; |
|
394 | + $val .= 'WHEN id_member = ' . $v . ' THEN ' . alert_count($v, true) . ' '; |
|
395 | 395 | $val = $val . ' END'; |
396 | 396 | $type = 'raw'; |
397 | 397 | } |
@@ -1407,7 +1407,7 @@ discard block |
||
1407 | 1407 | 'type' => 'unparsed_commas_content', |
1408 | 1408 | 'test' => '\d+,\d+\]', |
1409 | 1409 | 'content' => '<a href="$1" target="_blank" rel="noopener">$1</a>', |
1410 | - 'validate' => function (&$tag, &$data, $disabled) |
|
1410 | + 'validate' => function(&$tag, &$data, $disabled) |
|
1411 | 1411 | { |
1412 | 1412 | $scheme = parse_url($data[0], PHP_URL_SCHEME); |
1413 | 1413 | if (empty($scheme)) |
@@ -1969,7 +1969,7 @@ discard block |
||
1969 | 1969 | $codes[] = array( |
1970 | 1970 | 'tag' => 'cowsay', |
1971 | 1971 | 'parameters' => array( |
1972 | - 'e' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => 'oo', 'validate' => function ($eyes) use ($smcFunc) |
|
1972 | + 'e' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => 'oo', 'validate' => function($eyes) use ($smcFunc) |
|
1973 | 1973 | { |
1974 | 1974 | static $css_added; |
1975 | 1975 | |
@@ -1986,7 +1986,7 @@ discard block |
||
1986 | 1986 | return $smcFunc['substr']($eyes . 'oo', 0, 2); |
1987 | 1987 | }, |
1988 | 1988 | ), |
1989 | - 't' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => ' ', 'validate' => function ($tongue) use ($smcFunc) |
|
1989 | + 't' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => ' ', 'validate' => function($tongue) use ($smcFunc) |
|
1990 | 1990 | { |
1991 | 1991 | return $smcFunc['substr']($tongue . ' ', 0, 2); |
1992 | 1992 | }, |
@@ -5382,15 +5382,15 @@ discard block |
||
5382 | 5382 | |
5383 | 5383 | // UTF-8 occurences of MS special characters |
5384 | 5384 | $findchars_utf8 = array( |
5385 | - "\xe2\x80\x9a", // single low-9 quotation mark |
|
5386 | - "\xe2\x80\x9e", // double low-9 quotation mark |
|
5387 | - "\xe2\x80\xa6", // horizontal ellipsis |
|
5388 | - "\xe2\x80\x98", // left single curly quote |
|
5389 | - "\xe2\x80\x99", // right single curly quote |
|
5390 | - "\xe2\x80\x9c", // left double curly quote |
|
5391 | - "\xe2\x80\x9d", // right double curly quote |
|
5392 | - "\xe2\x80\x93", // en dash |
|
5393 | - "\xe2\x80\x94", // em dash |
|
5385 | + "\xe2\x80\x9a", // single low-9 quotation mark |
|
5386 | + "\xe2\x80\x9e", // double low-9 quotation mark |
|
5387 | + "\xe2\x80\xa6", // horizontal ellipsis |
|
5388 | + "\xe2\x80\x98", // left single curly quote |
|
5389 | + "\xe2\x80\x99", // right single curly quote |
|
5390 | + "\xe2\x80\x9c", // left double curly quote |
|
5391 | + "\xe2\x80\x9d", // right double curly quote |
|
5392 | + "\xe2\x80\x93", // en dash |
|
5393 | + "\xe2\x80\x94", // em dash |
|
5394 | 5394 | ); |
5395 | 5395 | |
5396 | 5396 | // windows 1252 / iso equivalents |
@@ -5408,15 +5408,15 @@ discard block |
||
5408 | 5408 | |
5409 | 5409 | // safe replacements |
5410 | 5410 | $replacechars = array( |
5411 | - ',', // ‚ |
|
5412 | - ',,', // „ |
|
5413 | - '...', // … |
|
5414 | - "'", // ‘ |
|
5415 | - "'", // ’ |
|
5416 | - '"', // “ |
|
5417 | - '"', // ” |
|
5418 | - '-', // – |
|
5419 | - '--', // — |
|
5411 | + ',', // ‚ |
|
5412 | + ',,', // „ |
|
5413 | + '...', // … |
|
5414 | + "'", // ‘ |
|
5415 | + "'", // ’ |
|
5416 | + '"', // “ |
|
5417 | + '"', // ” |
|
5418 | + '-', // – |
|
5419 | + '--', // — |
|
5420 | 5420 | ); |
5421 | 5421 | |
5422 | 5422 | if ($context['utf8']) |
@@ -6584,7 +6584,7 @@ discard block |
||
6584 | 6584 | EXISTS ( |
6585 | 6585 | SELECT bpv.id_board |
6586 | 6586 | FROM ' . $db_prefix . 'board_permissions_view AS bpv |
6587 | - WHERE bpv.id_group IN ('. implode(',', $groups) .') |
|
6587 | + WHERE bpv.id_group IN ('. implode(',', $groups) . ') |
|
6588 | 6588 | AND bpv.deny = 0 |
6589 | 6589 | AND bpv.id_board = b.id_board |
6590 | 6590 | )'; |
@@ -6594,7 +6594,7 @@ discard block |
||
6594 | 6594 | AND NOT EXISTS ( |
6595 | 6595 | SELECT bpv.id_board |
6596 | 6596 | FROM ' . $db_prefix . 'board_permissions_view AS bpv |
6597 | - WHERE bpv.id_group IN ( '. implode(',', $groups) .') |
|
6597 | + WHERE bpv.id_group IN ( '. implode(',', $groups) . ') |
|
6598 | 6598 | AND bpv.deny = 1 |
6599 | 6599 | AND bpv.id_board = b.id_board |
6600 | 6600 | )'; |
@@ -6854,8 +6854,8 @@ discard block |
||
6854 | 6854 | $i = 0; |
6855 | 6855 | while (empty($done)) |
6856 | 6856 | { |
6857 | - if (strpos($format, '{'. --$i . '}') !== false) |
|
6858 | - $replacements['{'. $i . '}'] = array_pop($list); |
|
6857 | + if (strpos($format, '{' . --$i . '}') !== false) |
|
6858 | + $replacements['{' . $i . '}'] = array_pop($list); |
|
6859 | 6859 | else |
6860 | 6860 | $done = true; |
6861 | 6861 | } |
@@ -6865,8 +6865,8 @@ discard block |
||
6865 | 6865 | $i = 0; |
6866 | 6866 | while (empty($done)) |
6867 | 6867 | { |
6868 | - if (strpos($format, '{'. ++$i . '}') !== false) |
|
6869 | - $replacements['{'. $i . '}'] = array_shift($list); |
|
6868 | + if (strpos($format, '{' . ++$i . '}') !== false) |
|
6869 | + $replacements['{' . $i . '}'] = array_shift($list); |
|
6870 | 6870 | else |
6871 | 6871 | $done = true; |
6872 | 6872 | } |
@@ -302,7 +302,6 @@ discard block |
||
302 | 302 | $condition = 'id_member IN ({array_int:members})'; |
303 | 303 | $parameters['members'] = $members; |
304 | 304 | } |
305 | - |
|
306 | 305 | elseif ($members === null) |
307 | 306 | $condition = '1=1'; |
308 | 307 | |
@@ -1970,7 +1969,7 @@ discard block |
||
1970 | 1969 | 'tag' => 'cowsay', |
1971 | 1970 | 'parameters' => array( |
1972 | 1971 | 'e' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => 'oo', 'validate' => function ($eyes) use ($smcFunc) |
1973 | - { |
|
1972 | + { |
|
1974 | 1973 | static $css_added; |
1975 | 1974 | |
1976 | 1975 | if (empty($css_added)) |
@@ -1987,7 +1986,7 @@ discard block |
||
1987 | 1986 | }, |
1988 | 1987 | ), |
1989 | 1988 | 't' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => ' ', 'validate' => function ($tongue) use ($smcFunc) |
1990 | - { |
|
1989 | + { |
|
1991 | 1990 | return $smcFunc['substr']($tongue . ' ', 0, 2); |
1992 | 1991 | }, |
1993 | 1992 | ), |
@@ -3088,7 +3087,7 @@ discard block |
||
3088 | 3087 | |
3089 | 3088 | // Replace away! |
3090 | 3089 | $message = preg_replace_callback($smileyPregSearch, function($matches) use ($smileyPregReplacements) |
3091 | - { |
|
3090 | + { |
|
3092 | 3091 | return $smileyPregReplacements[$matches[1]]; |
3093 | 3092 | }, $message); |
3094 | 3093 | } |
@@ -3874,7 +3873,6 @@ discard block |
||
3874 | 3873 | if (!isset($minSeed) && isset($js_file['options']['seed'])) |
3875 | 3874 | $minSeed = $js_file['options']['seed']; |
3876 | 3875 | } |
3877 | - |
|
3878 | 3876 | else |
3879 | 3877 | echo ' |
3880 | 3878 | <script src="', $js_file['fileUrl'], isset($file['options']['seed']) ? $file['options']['seed'] : '', '"', !empty($js_file['options']['async']) ? ' async' : '', !empty($js_file['options']['defer']) ? ' defer' : '', '></script>'; |
@@ -6029,7 +6027,6 @@ discard block |
||
6029 | 6027 | $isWritable = true; |
6030 | 6028 | break; |
6031 | 6029 | } |
6032 | - |
|
6033 | 6030 | else |
6034 | 6031 | @chmod($file, $val); |
6035 | 6032 | } |
@@ -1254,7 +1254,6 @@ |
||
1254 | 1254 | |
1255 | 1255 | return array($charset, $string, 'base64'); |
1256 | 1256 | } |
1257 | - |
|
1258 | 1257 | else |
1259 | 1258 | return array($charset, $string, '7bit'); |
1260 | 1259 | } |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | // Set a list of common functions. |
83 | 83 | $ent_list = '&(?:#' . (empty($modSettings['disableEntityCheck']) ? '\d{1,7}' : '021') . '|quot|amp|lt|gt|nbsp);'; |
84 | 84 | $ent_check = empty($modSettings['disableEntityCheck']) ? function($string) |
85 | - { |
|
85 | + { |
|
86 | 86 | $string = preg_replace_callback('~(&#(\d{1,7}|x[0-9a-fA-F]{1,6});)~', 'entity_fix__callback', $string); |
87 | 87 | return $string; |
88 | 88 | } : function($string) |
@@ -2131,7 +2131,6 @@ discard block |
||
2131 | 2131 | loadLanguage('index+Modifications'); |
2132 | 2132 | $context['template_layers'] = array(); |
2133 | 2133 | } |
2134 | - |
|
2135 | 2134 | else |
2136 | 2135 | { |
2137 | 2136 | // Custom templates to load, or just default? |
@@ -2509,14 +2508,12 @@ discard block |
||
2509 | 2508 | $fileUrl = $settings['default_theme_url'] . '/css/' . $fileName; |
2510 | 2509 | $filePath = $settings['default_theme_dir'] . '/css/' . $fileName; |
2511 | 2510 | } |
2512 | - |
|
2513 | 2511 | else |
2514 | 2512 | { |
2515 | 2513 | $fileUrl = false; |
2516 | 2514 | $filePath = false; |
2517 | 2515 | } |
2518 | 2516 | } |
2519 | - |
|
2520 | 2517 | else |
2521 | 2518 | { |
2522 | 2519 | $fileUrl = $settings[$themeRef . '_url'] . '/css/' . $fileName; |
@@ -2623,14 +2620,12 @@ discard block |
||
2623 | 2620 | $fileUrl = $settings['default_theme_url'] . '/scripts/' . $fileName; |
2624 | 2621 | $filePath = $settings['default_theme_dir'] . '/scripts/' . $fileName; |
2625 | 2622 | } |
2626 | - |
|
2627 | 2623 | else |
2628 | 2624 | { |
2629 | 2625 | $fileUrl = false; |
2630 | 2626 | $filePath = false; |
2631 | 2627 | } |
2632 | 2628 | } |
2633 | - |
|
2634 | 2629 | else |
2635 | 2630 | { |
2636 | 2631 | $fileUrl = $settings[$themeRef . '_url'] . '/scripts/' . $fileName; |