@@ -1801,11 +1801,11 @@ |
||
| 1801 | 1801 | } |
| 1802 | 1802 | else |
| 1803 | 1803 | { |
| 1804 | - $pattern = '~^(' . implode('|', array_map(function ($val) {return preg_quote($val, '~');}, $protocols)) . ')~i'; |
|
| 1804 | + $pattern = '~^(' . implode('|', array_map(function ($val) {return preg_quote($val, '~'); }, $protocols)) . ')~i'; |
|
| 1805 | 1805 | } |
| 1806 | 1806 | |
| 1807 | 1807 | $found = false; |
| 1808 | - $url = preg_replace_callback($pattern, function($match) use (&$found) { |
|
| 1808 | + $url = preg_replace_callback($pattern, function ($match) use (&$found) { |
|
| 1809 | 1809 | $found = true; |
| 1810 | 1810 | |
| 1811 | 1811 | return strtolower($match[0]); |
@@ -65,8 +65,7 @@ |
||
| 65 | 65 | $sound_letter = substr($sound_letter, strpos($sound_letter, 'data') + 8); |
| 66 | 66 | switch ($word[$i] === 's' ? 0 : mt_rand(0, 2)) |
| 67 | 67 | { |
| 68 | - case 0: |
|
| 69 | - for ($j = 0, $n = strlen($sound_letter); $j < $n; $j++) |
|
| 68 | + case 0 : for ($j = 0, $n = strlen($sound_letter); $j < $n; $j++) |
|
| 70 | 69 | for ($k = 0, $m = round(mt_rand(15, 25) / 10); $k < $m; $k++) |
| 71 | 70 | $sound_word .= $word[$i] === 's' ? $sound_letter[$j] : chr(mt_rand(max(ord($sound_letter[$j]) - 1, 0x00), min(ord($sound_letter[$j]) + 1, 0xFF))); |
| 72 | 71 | break; |
@@ -1205,7 +1205,7 @@ |
||
| 1205 | 1205 | // If we have footnotes, add them in at the end of the message |
| 1206 | 1206 | if (!empty($fn_num)) |
| 1207 | 1207 | { |
| 1208 | - $this->message .= $this->smiley_marker . '<div class="bbc_footnotes">' . implode('', $this->fn_content) . '</div>' . $this->smiley_marker; |
|
| 1208 | + $this->message .= $this->smiley_marker . '<div class="bbc_footnotes">' . implode('', $this->fn_content) . '</div>' . $this->smiley_marker; |
|
| 1209 | 1209 | } |
| 1210 | 1210 | } |
| 1211 | 1211 | |
@@ -898,7 +898,7 @@ |
||
| 898 | 898 | |
| 899 | 899 | // Enable and disable custom fields as required. |
| 900 | 900 | $enabled = array(0); |
| 901 | - if(isset($this->_req->post->cust) && is_array($this->_req->post->cust)) { |
|
| 901 | + if (isset($this->_req->post->cust) && is_array($this->_req->post->cust)) { |
|
| 902 | 902 | foreach ($this->_req->post->cust as $id) |
| 903 | 903 | $enabled[] = (int) $id; |
| 904 | 904 | } |
@@ -54,7 +54,7 @@ |
||
| 54 | 54 | 'forumprofile' => array( |
| 55 | 55 | 'fields' => array( |
| 56 | 56 | 'avatar_choice', 'hr', |
| 57 | - 'bday1', 'usertitle','hr', |
|
| 57 | + 'bday1', 'usertitle', 'hr', |
|
| 58 | 58 | 'signature', 'hr', |
| 59 | 59 | 'karma_good', 'hr', |
| 60 | 60 | 'website_title', 'website_url', |
@@ -86,7 +86,7 @@ |
||
| 86 | 86 | $indexOptions['custom_selects'] = array_merge($indexOptions['custom_selects'], array('ml.body AS last_body', 'mf.body AS first_body')); |
| 87 | 87 | // Default: a SUBSTRING |
| 88 | 88 | elseif (!empty($indexOptions['previews'])) |
| 89 | - $indexOptions['custom_selects'] = array_merge($indexOptions['custom_selects'], array('SUBSTRING(ml.body, 1, ' . ($indexOptions['previews'] + 256) . ') AS last_body', 'SUBSTRING(mf.body, 1, ' . ($indexOptions['previews'] + 256) . ') AS first_body')); |
|
| 89 | + $indexOptions['custom_selects'] = array_merge($indexOptions['custom_selects'], array('SUBSTRING(ml.body, 1, ' . ($indexOptions['previews'] + 256) . ') AS last_body', 'SUBSTRING(mf.body, 1, ' . ($indexOptions['previews'] + 256) . ') AS first_body')); |
|
| 90 | 90 | |
| 91 | 91 | if (!empty($indexOptions['include_avatars'])) |
| 92 | 92 | { |
@@ -1144,7 +1144,7 @@ |
||
| 1144 | 1144 | // Variant icon definitions? |
| 1145 | 1145 | if (file_exists($settings['theme_dir'] . '/css/' . $context['theme_variant'] . '/icons_svg' . $context['theme_variant'] . '.css')) |
| 1146 | 1146 | { |
| 1147 | - loadCSSFile($context['theme_variant'] . '/icons_svg' . $context['theme_variant'] . '.css'); |
|
| 1147 | + loadCSSFile($context['theme_variant'] . '/icons_svg' . $context['theme_variant'] . '.css'); |
|
| 1148 | 1148 | } |
| 1149 | 1149 | |
| 1150 | 1150 | // Load a theme variant custom CSS |
@@ -377,7 +377,7 @@ |
||
| 377 | 377 | |
| 378 | 378 | // The behavior of bestfit changed in Imagick 3.0.0 and it will now scale up, we prevent that |
| 379 | 379 | $dest_width = empty($max_width) ? $src_width : ($force_resize ? $max_width : min($max_width, $src_width)); |
| 380 | - $dest_height = empty($max_height) ? $src_height : ($force_resize ? $max_height : min($max_height, $src_height)); |
|
| 380 | + $dest_height = empty($max_height) ? $src_height : ($force_resize ? $max_height : min($max_height, $src_height)); |
|
| 381 | 381 | |
| 382 | 382 | // Set jpeg image quality to 80 |
| 383 | 383 | if ($default_formats[$preferred_format] === 'jpeg') |
@@ -503,7 +503,7 @@ |
||
| 503 | 503 | '<a href="http://jqueryui.com/">JQuery UI</a> | © jQuery Foundation and other contributors | Licensed under <a href="http://opensource.org/licenses/MIT">The MIT License (MIT)</a>', |
| 504 | 504 | '<a href="https://github.com/tchwork/jsqueeze">Jsqueeze</a> © Nicolas Grekas| Licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>', |
| 505 | 505 | '<a href="https://github.com/mailcheck">MailCheck</a> | © Received Inc | Licensed under <a href="http://opensource.org/licenses/MIT">The MIT License (MIT)</a>', |
| 506 | - '<a href="https://github.com/michelf/php-markdown">PHP Markdown Lib</a> | © Michel Fortin | Licensed under <a href="https://github.com/michelf/php-markdown/blob/lib/License.md">BSD-style open source</a>', '<a href="http://www.openwall.com/phpass/">PH Pass</a> | Author: Solar Designer | Placed in the public domain</a>', |
|
| 506 | + '<a href="https://github.com/michelf/php-markdown">PHP Markdown Lib</a> | © Michel Fortin | Licensed under <a href="https://github.com/michelf/php-markdown/blob/lib/License.md">BSD-style open source</a>', '<a href="http://www.openwall.com/phpass/">PH Pass</a> | Author: Solar Designer | Placed in the public domain</a>', |
|
| 507 | 507 | '<a href="http://www.sceditor.com/">SCEditor</a> | © Sam Clarke | Licensed under <a href="http://opensource.org/licenses/MIT">The MIT License (MIT)</a>', |
| 508 | 508 | '<a href="http://sourceforge.net/projects/simplehtmldom/">Simple HTML DOM</a> | Licensed under <a href="http://opensource.org/licenses/MIT">The MIT License (MIT)</a>', |
| 509 | 509 | '<a href="http://www.simplemachines.org/">Simple Machines</a> | © Simple Machines | Licensed under <a href="http://www.simplemachines.org/about/smf/license.php">The BSD License</a>', |