@@ -59,8 +59,9 @@ discard block |
||
59 | 59 | * @version 2.1 Beta 4 |
60 | 60 | */ |
61 | 61 | |
62 | -if (!defined('SMF')) |
|
62 | +if (!defined('SMF')) { |
|
63 | 63 | die('No direct access...'); |
64 | +} |
|
64 | 65 | |
65 | 66 | /** |
66 | 67 | * This is the main dispatcher. Sets up all the available sub-actions, all the tabs and selects |
@@ -111,10 +112,11 @@ discard block |
||
111 | 112 | $settings_not_writable = !is_writable($boarddir . '/Settings.php'); |
112 | 113 | $settings_backup_fail = !@is_writable($boarddir . '/Settings_bak.php') || !@copy($boarddir . '/Settings.php', $boarddir . '/Settings_bak.php'); |
113 | 114 | |
114 | - if ($settings_not_writable) |
|
115 | - $context['settings_message'] = '<div class="centertext"><strong>' . $txt['settings_not_writable'] . '</strong></div><br>'; |
|
116 | - elseif ($settings_backup_fail) |
|
117 | - $context['settings_message'] = '<div class="centertext"><strong>' . $txt['admin_backup_fail'] . '</strong></div><br>'; |
|
115 | + if ($settings_not_writable) { |
|
116 | + $context['settings_message'] = '<div class="centertext"><strong>' . $txt['settings_not_writable'] . '</strong></div><br>'; |
|
117 | + } elseif ($settings_backup_fail) { |
|
118 | + $context['settings_message'] = '<div class="centertext"><strong>' . $txt['admin_backup_fail'] . '</strong></div><br>'; |
|
119 | + } |
|
118 | 120 | |
119 | 121 | $context['settings_not_writable'] = $settings_not_writable; |
120 | 122 | |
@@ -142,10 +144,11 @@ discard block |
||
142 | 144 | |
143 | 145 | // If no cert, force_ssl must remain 0 |
144 | 146 | require_once($sourcedir . '/Subs.php'); |
145 | - if (!ssl_cert_found($boardurl) && empty($modSettings['force_ssl'])) |
|
146 | - $disable_force_ssl = true; |
|
147 | - else |
|
148 | - $disable_force_ssl = false; |
|
147 | + if (!ssl_cert_found($boardurl) && empty($modSettings['force_ssl'])) { |
|
148 | + $disable_force_ssl = true; |
|
149 | + } else { |
|
150 | + $disable_force_ssl = false; |
|
151 | + } |
|
149 | 152 | |
150 | 153 | /* If you're writing a mod, it's a bad idea to add things here.... |
151 | 154 | For each option: |
@@ -174,8 +177,9 @@ discard block |
||
174 | 177 | |
175 | 178 | call_integration_hook('integrate_general_settings', array(&$config_vars)); |
176 | 179 | |
177 | - if ($return_config) |
|
178 | - return $config_vars; |
|
180 | + if ($return_config) { |
|
181 | + return $config_vars; |
|
182 | + } |
|
179 | 183 | |
180 | 184 | // Setup the template stuff. |
181 | 185 | $context['post_url'] = $scripturl . '?action=admin;area=serversettings;sa=general;save'; |
@@ -192,16 +196,18 @@ discard block |
||
192 | 196 | $registerSMStats = registerSMStats(); |
193 | 197 | |
194 | 198 | // Failed to register, disable it again. |
195 | - if (empty($registerSMStats)) |
|
196 | - $_POST['enable_sm_stats'] = 0; |
|
199 | + if (empty($registerSMStats)) { |
|
200 | + $_POST['enable_sm_stats'] = 0; |
|
201 | + } |
|
197 | 202 | } |
198 | 203 | |
199 | 204 | // Ensure all URLs are aligned with the new force_ssl setting |
200 | 205 | // Treat unset like 0 |
201 | - if (isset($_POST['force_ssl'])) |
|
202 | - AlignURLsWithSSLSetting($_POST['force_ssl']); |
|
203 | - else |
|
204 | - AlignURLsWithSSLSetting(0); |
|
206 | + if (isset($_POST['force_ssl'])) { |
|
207 | + AlignURLsWithSSLSetting($_POST['force_ssl']); |
|
208 | + } else { |
|
209 | + AlignURLsWithSSLSetting(0); |
|
210 | + } |
|
205 | 211 | |
206 | 212 | saveSettings($config_vars); |
207 | 213 | $_SESSION['adm-save'] = true; |
@@ -254,10 +260,11 @@ discard block |
||
254 | 260 | require_once($sourcedir . '/Subs-Admin.php'); |
255 | 261 | |
256 | 262 | // Check $boardurl |
257 | - if (!empty($new_force_ssl)) |
|
258 | - $newval = strtr($boardurl, array('http://' => 'https://')); |
|
259 | - else |
|
260 | - $newval = strtr($boardurl, array('https://' => 'http://')); |
|
263 | + if (!empty($new_force_ssl)) { |
|
264 | + $newval = strtr($boardurl, array('http://' => 'https://')); |
|
265 | + } else { |
|
266 | + $newval = strtr($boardurl, array('https://' => 'http://')); |
|
267 | + } |
|
261 | 268 | updateSettingsFile(array('boardurl' => '\'' . addslashes($newval) . '\'')); |
262 | 269 | |
263 | 270 | $new_settings = array(); |
@@ -265,20 +272,22 @@ discard block |
||
265 | 272 | // Check $smileys_url, but only if it points to a subfolder of $boardurl |
266 | 273 | if (BoardurlMatch($modSettings['smileys_url'])) |
267 | 274 | { |
268 | - if (!empty($new_force_ssl)) |
|
269 | - $newval = strtr($modSettings['smileys_url'], array('http://' => 'https://')); |
|
270 | - else |
|
271 | - $newval = strtr($modSettings['smileys_url'], array('https://' => 'http://')); |
|
275 | + if (!empty($new_force_ssl)) { |
|
276 | + $newval = strtr($modSettings['smileys_url'], array('http://' => 'https://')); |
|
277 | + } else { |
|
278 | + $newval = strtr($modSettings['smileys_url'], array('https://' => 'http://')); |
|
279 | + } |
|
272 | 280 | $new_settings['smileys_url'] = $newval; |
273 | 281 | } |
274 | 282 | |
275 | 283 | // Check $avatar_url, but only if it points to a subfolder of $boardurl |
276 | 284 | if (BoardurlMatch($modSettings['avatar_url'])) |
277 | 285 | { |
278 | - if (!empty($new_force_ssl)) |
|
279 | - $newval = strtr($modSettings['avatar_url'], array('http://' => 'https://')); |
|
280 | - else |
|
281 | - $newval = strtr($modSettings['avatar_url'], array('https://' => 'http://')); |
|
286 | + if (!empty($new_force_ssl)) { |
|
287 | + $newval = strtr($modSettings['avatar_url'], array('http://' => 'https://')); |
|
288 | + } else { |
|
289 | + $newval = strtr($modSettings['avatar_url'], array('https://' => 'http://')); |
|
290 | + } |
|
282 | 291 | $new_settings['avatar_url'] = $newval; |
283 | 292 | } |
284 | 293 | |
@@ -286,16 +295,18 @@ discard block |
||
286 | 295 | // This one had been optional in the past, make sure it is set first |
287 | 296 | if (isset($modSettings['custom_avatar_url']) && BoardurlMatch($modSettings['custom_avatar_url'])) |
288 | 297 | { |
289 | - if (!empty($new_force_ssl)) |
|
290 | - $newval = strtr($modSettings['custom_avatar_url'], array('http://' => 'https://')); |
|
291 | - else |
|
292 | - $newval = strtr($modSettings['custom_avatar_url'], array('https://' => 'http://')); |
|
298 | + if (!empty($new_force_ssl)) { |
|
299 | + $newval = strtr($modSettings['custom_avatar_url'], array('http://' => 'https://')); |
|
300 | + } else { |
|
301 | + $newval = strtr($modSettings['custom_avatar_url'], array('https://' => 'http://')); |
|
302 | + } |
|
293 | 303 | $new_settings['custom_avatar_url'] = $newval; |
294 | 304 | } |
295 | 305 | |
296 | 306 | // Save updates to the settings table |
297 | - if (!empty($new_settings)) |
|
298 | - updateSettings($new_settings, true); |
|
307 | + if (!empty($new_settings)) { |
|
308 | + updateSettings($new_settings, true); |
|
309 | + } |
|
299 | 310 | |
300 | 311 | // Now we move onto the themes. |
301 | 312 | // First, get a list of theme URLs... |
@@ -316,10 +327,11 @@ discard block |
||
316 | 327 | // First check to see if it points to a subfolder of $boardurl |
317 | 328 | if (BoardurlMatch($row['value'])) |
318 | 329 | { |
319 | - if (!empty($new_force_ssl)) |
|
320 | - $newval = strtr($row['value'], array('http://' => 'https://')); |
|
321 | - else |
|
322 | - $newval = strtr($row['value'], array('https://' => 'http://')); |
|
330 | + if (!empty($new_force_ssl)) { |
|
331 | + $newval = strtr($row['value'], array('http://' => 'https://')); |
|
332 | + } else { |
|
333 | + $newval = strtr($row['value'], array('https://' => 'http://')); |
|
334 | + } |
|
323 | 335 | $smcFunc['db_query']('', ' |
324 | 336 | UPDATE {db_prefix}themes |
325 | 337 | SET value = {string:theme_val} |
@@ -359,11 +371,12 @@ discard block |
||
359 | 371 | |
360 | 372 | // If leftmost portion of path matches boardurl, return true |
361 | 373 | $result = strpos($urlpath, $boardurlpath); |
362 | - if ($result === false || $result != 0) |
|
363 | - return false; |
|
364 | - else |
|
365 | - return true; |
|
366 | -} |
|
374 | + if ($result === false || $result != 0) { |
|
375 | + return false; |
|
376 | + } else { |
|
377 | + return true; |
|
378 | + } |
|
379 | + } |
|
367 | 380 | |
368 | 381 | /** |
369 | 382 | * Basic database and paths settings - database name, host, etc. |
@@ -402,8 +415,9 @@ discard block |
||
402 | 415 | $request = $smcFunc['db_query']('', 'SELECT cfgname FROM pg_ts_config', array()); |
403 | 416 | $fts_language = array(); |
404 | 417 | |
405 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
406 | - $fts_language[$row['cfgname']] = $row['cfgname']; |
|
418 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
419 | + $fts_language[$row['cfgname']] = $row['cfgname']; |
|
420 | + } |
|
407 | 421 | |
408 | 422 | $config_vars = array_merge ($config_vars, array( |
409 | 423 | '', |
@@ -415,20 +429,22 @@ discard block |
||
415 | 429 | |
416 | 430 | call_integration_hook('integrate_database_settings', array(&$config_vars)); |
417 | 431 | |
418 | - if ($return_config) |
|
419 | - return $config_vars; |
|
432 | + if ($return_config) { |
|
433 | + return $config_vars; |
|
434 | + } |
|
420 | 435 | |
421 | 436 | // Setup the template stuff. |
422 | 437 | $context['post_url'] = $scripturl . '?action=admin;area=serversettings;sa=database;save'; |
423 | 438 | $context['settings_title'] = $txt['database_settings']; |
424 | 439 | $context['save_disabled'] = $context['settings_not_writable']; |
425 | 440 | |
426 | - if (!$smcFunc['db_allow_persistent']()) |
|
427 | - addInlineJavaScript(' |
|
441 | + if (!$smcFunc['db_allow_persistent']()) { |
|
442 | + addInlineJavaScript(' |
|
428 | 443 | $(function() |
429 | 444 | { |
430 | 445 | $("#db_persist").prop("disabled", true); |
431 | 446 | });', true); |
447 | + } |
|
432 | 448 | |
433 | 449 | // Saving settings? |
434 | 450 | if (isset($_REQUEST['save'])) |
@@ -498,13 +514,15 @@ discard block |
||
498 | 514 | hideGlobalCookies(); |
499 | 515 | });', true); |
500 | 516 | |
501 | - if (empty($user_settings['tfa_secret'])) |
|
502 | - addInlineJavaScript(''); |
|
517 | + if (empty($user_settings['tfa_secret'])) { |
|
518 | + addInlineJavaScript(''); |
|
519 | + } |
|
503 | 520 | |
504 | 521 | call_integration_hook('integrate_cookie_settings', array(&$config_vars)); |
505 | 522 | |
506 | - if ($return_config) |
|
507 | - return $config_vars; |
|
523 | + if ($return_config) { |
|
524 | + return $config_vars; |
|
525 | + } |
|
508 | 526 | |
509 | 527 | $context['post_url'] = $scripturl . '?action=admin;area=serversettings;sa=cookie;save'; |
510 | 528 | $context['settings_title'] = $txt['cookies_sessions_settings']; |
@@ -515,14 +533,17 @@ discard block |
||
515 | 533 | call_integration_hook('integrate_save_cookie_settings'); |
516 | 534 | |
517 | 535 | // Local and global do not play nicely together. |
518 | - if (!empty($_POST['localCookies']) && empty($_POST['globalCookies'])) |
|
519 | - unset ($_POST['globalCookies']); |
|
536 | + if (!empty($_POST['localCookies']) && empty($_POST['globalCookies'])) { |
|
537 | + unset ($_POST['globalCookies']); |
|
538 | + } |
|
520 | 539 | |
521 | - if (empty($modSettings['localCookies']) != empty($_POST['localCookies']) || empty($modSettings['globalCookies']) != empty($_POST['globalCookies'])) |
|
522 | - $scope_changed = true; |
|
540 | + if (empty($modSettings['localCookies']) != empty($_POST['localCookies']) || empty($modSettings['globalCookies']) != empty($_POST['globalCookies'])) { |
|
541 | + $scope_changed = true; |
|
542 | + } |
|
523 | 543 | |
524 | - if (!empty($_POST['globalCookiesDomain']) && strpos($boardurl, $_POST['globalCookiesDomain']) === false) |
|
525 | - fatal_lang_error('invalid_cookie_domain', false); |
|
544 | + if (!empty($_POST['globalCookiesDomain']) && strpos($boardurl, $_POST['globalCookiesDomain']) === false) { |
|
545 | + fatal_lang_error('invalid_cookie_domain', false); |
|
546 | + } |
|
526 | 547 | |
527 | 548 | saveSettings($config_vars); |
528 | 549 | |
@@ -605,8 +626,9 @@ discard block |
||
605 | 626 | |
606 | 627 | call_integration_hook('integrate_general_security_settings', array(&$config_vars)); |
607 | 628 | |
608 | - if ($return_config) |
|
609 | - return $config_vars; |
|
629 | + if ($return_config) { |
|
630 | + return $config_vars; |
|
631 | + } |
|
610 | 632 | |
611 | 633 | // Saving? |
612 | 634 | if (isset($_GET['save'])) |
@@ -645,8 +667,7 @@ discard block |
||
645 | 667 | $txt['cache_settings_message'] = $txt['detected_no_caching']; |
646 | 668 | $cache_level = array($txt['cache_off']); |
647 | 669 | $detected['none'] = $txt['cache_off']; |
648 | - } |
|
649 | - else |
|
670 | + } else |
|
650 | 671 | { |
651 | 672 | $txt['cache_settings_message'] = sprintf($txt['detected_accelerators'], implode(', ', $detected)); |
652 | 673 | $cache_level = array($txt['cache_off'], $txt['cache_level1'], $txt['cache_level2'], $txt['cache_level3']); |
@@ -683,8 +704,9 @@ discard block |
||
683 | 704 | } |
684 | 705 | } |
685 | 706 | } |
686 | - if ($return_config) |
|
687 | - return $config_vars; |
|
707 | + if ($return_config) { |
|
708 | + return $config_vars; |
|
709 | + } |
|
688 | 710 | |
689 | 711 | // Saving again? |
690 | 712 | if (isset($_GET['save'])) |
@@ -712,8 +734,9 @@ discard block |
||
712 | 734 | $context['save_disabled'] = $context['settings_not_writable']; |
713 | 735 | |
714 | 736 | // Decide what message to show. |
715 | - if (!$context['save_disabled']) |
|
716 | - $context['settings_message'] = $txt['caching_information']; |
|
737 | + if (!$context['save_disabled']) { |
|
738 | + $context['settings_message'] = $txt['caching_information']; |
|
739 | + } |
|
717 | 740 | |
718 | 741 | // Prepare the template. |
719 | 742 | prepareServerSettingsContext($config_vars); |
@@ -736,24 +759,25 @@ discard block |
||
736 | 759 | if (DIRECTORY_SEPARATOR === '\\') |
737 | 760 | { |
738 | 761 | $context['settings_message'] = $txt['loadavg_disabled_windows']; |
739 | - if (isset($_GET['save'])) |
|
740 | - $_SESSION['adm-save'] = $txt['loadavg_disabled_windows']; |
|
741 | - } |
|
742 | - elseif (stripos(PHP_OS, 'darwin') === 0) |
|
762 | + if (isset($_GET['save'])) { |
|
763 | + $_SESSION['adm-save'] = $txt['loadavg_disabled_windows']; |
|
764 | + } |
|
765 | + } elseif (stripos(PHP_OS, 'darwin') === 0) |
|
743 | 766 | { |
744 | 767 | $context['settings_message'] = $txt['loadavg_disabled_osx']; |
745 | - if (isset($_GET['save'])) |
|
746 | - $_SESSION['adm-save'] = $txt['loadavg_disabled_osx']; |
|
747 | - } |
|
748 | - else |
|
768 | + if (isset($_GET['save'])) { |
|
769 | + $_SESSION['adm-save'] = $txt['loadavg_disabled_osx']; |
|
770 | + } |
|
771 | + } else |
|
749 | 772 | { |
750 | 773 | $modSettings['load_average'] = @file_get_contents('/proc/loadavg'); |
751 | - if (!empty($modSettings['load_average']) && preg_match('~^([^ ]+?) ([^ ]+?) ([^ ]+)~', $modSettings['load_average'], $matches) !== 0) |
|
752 | - $modSettings['load_average'] = (float) $matches[1]; |
|
753 | - elseif (($modSettings['load_average'] = @`uptime`) !== null && preg_match('~load averages?: (\d+\.\d+), (\d+\.\d+), (\d+\.\d+)~i', $modSettings['load_average'], $matches) !== 0) |
|
754 | - $modSettings['load_average'] = (float) $matches[1]; |
|
755 | - else |
|
756 | - unset($modSettings['load_average']); |
|
774 | + if (!empty($modSettings['load_average']) && preg_match('~^([^ ]+?) ([^ ]+?) ([^ ]+)~', $modSettings['load_average'], $matches) !== 0) { |
|
775 | + $modSettings['load_average'] = (float) $matches[1]; |
|
776 | + } elseif (($modSettings['load_average'] = @`uptime`) !== null && preg_match('~load averages?: (\d+\.\d+), (\d+\.\d+), (\d+\.\d+)~i', $modSettings['load_average'], $matches) !== 0) { |
|
777 | + $modSettings['load_average'] = (float) $matches[1]; |
|
778 | + } else { |
|
779 | + unset($modSettings['load_average']); |
|
780 | + } |
|
757 | 781 | |
758 | 782 | if (!empty($modSettings['load_average']) || (isset($modSettings['load_average']) && $modSettings['load_average'] === 0.0)) |
759 | 783 | { |
@@ -789,8 +813,9 @@ discard block |
||
789 | 813 | |
790 | 814 | call_integration_hook('integrate_loadavg_settings', array(&$config_vars)); |
791 | 815 | |
792 | - if ($return_config) |
|
793 | - return $config_vars; |
|
816 | + if ($return_config) { |
|
817 | + return $config_vars; |
|
818 | + } |
|
794 | 819 | |
795 | 820 | $context['post_url'] = $scripturl . '?action=admin;area=serversettings;sa=loads;save'; |
796 | 821 | $context['settings_title'] = $txt['load_balancing_settings']; |
@@ -801,24 +826,27 @@ discard block |
||
801 | 826 | // Stupidity is not allowed. |
802 | 827 | foreach ($_POST as $key => $value) |
803 | 828 | { |
804 | - if (strpos($key, 'loadavg') === 0 || $key === 'loadavg_enable' || !in_array($key, array_keys($default_values))) |
|
805 | - continue; |
|
806 | - else |
|
807 | - $_POST[$key] = (float) $value; |
|
808 | - |
|
809 | - if ($key == 'loadavg_auto_opt' && $value <= 1) |
|
810 | - $_POST['loadavg_auto_opt'] = 1.0; |
|
811 | - elseif ($key == 'loadavg_forum' && $value < 10) |
|
812 | - $_POST['loadavg_forum'] = 10.0; |
|
813 | - elseif ($value < 2) |
|
814 | - $_POST[$key] = 2.0; |
|
829 | + if (strpos($key, 'loadavg') === 0 || $key === 'loadavg_enable' || !in_array($key, array_keys($default_values))) { |
|
830 | + continue; |
|
831 | + } else { |
|
832 | + $_POST[$key] = (float) $value; |
|
833 | + } |
|
834 | + |
|
835 | + if ($key == 'loadavg_auto_opt' && $value <= 1) { |
|
836 | + $_POST['loadavg_auto_opt'] = 1.0; |
|
837 | + } elseif ($key == 'loadavg_forum' && $value < 10) { |
|
838 | + $_POST['loadavg_forum'] = 10.0; |
|
839 | + } elseif ($value < 2) { |
|
840 | + $_POST[$key] = 2.0; |
|
841 | + } |
|
815 | 842 | } |
816 | 843 | |
817 | 844 | call_integration_hook('integrate_save_loadavg_settings'); |
818 | 845 | |
819 | 846 | saveDBSettings($config_vars); |
820 | - if (!isset($_SESSION['adm-save'])) |
|
821 | - $_SESSION['adm-save'] = true; |
|
847 | + if (!isset($_SESSION['adm-save'])) { |
|
848 | + $_SESSION['adm-save'] = true; |
|
849 | + } |
|
822 | 850 | redirectexit('action=admin;area=serversettings;sa=loads;' . $context['session_var'] . '=' . $context['session_id']); |
823 | 851 | } |
824 | 852 | |
@@ -854,10 +882,11 @@ discard block |
||
854 | 882 | |
855 | 883 | if (isset($_SESSION['adm-save'])) |
856 | 884 | { |
857 | - if ($_SESSION['adm-save'] === true) |
|
858 | - $context['saved_successful'] = true; |
|
859 | - else |
|
860 | - $context['saved_failed'] = $_SESSION['adm-save']; |
|
885 | + if ($_SESSION['adm-save'] === true) { |
|
886 | + $context['saved_successful'] = true; |
|
887 | + } else { |
|
888 | + $context['saved_failed'] = $_SESSION['adm-save']; |
|
889 | + } |
|
861 | 890 | |
862 | 891 | unset($_SESSION['adm-save']); |
863 | 892 | } |
@@ -865,9 +894,9 @@ discard block |
||
865 | 894 | $context['config_vars'] = array(); |
866 | 895 | foreach ($config_vars as $identifier => $config_var) |
867 | 896 | { |
868 | - if (!is_array($config_var) || !isset($config_var[1])) |
|
869 | - $context['config_vars'][] = $config_var; |
|
870 | - else |
|
897 | + if (!is_array($config_var) || !isset($config_var[1])) { |
|
898 | + $context['config_vars'][] = $config_var; |
|
899 | + } else |
|
871 | 900 | { |
872 | 901 | $varname = $config_var[0]; |
873 | 902 | global $$varname; |
@@ -902,16 +931,19 @@ discard block |
||
902 | 931 | if ($config_var[3] == 'int' || $config_var[3] == 'float') |
903 | 932 | { |
904 | 933 | // Default to a min of 0 if one isn't set |
905 | - if (isset($config_var['min'])) |
|
906 | - $context['config_vars'][$config_var[0]]['min'] = $config_var['min']; |
|
907 | - else |
|
908 | - $context['config_vars'][$config_var[0]]['min'] = 0; |
|
934 | + if (isset($config_var['min'])) { |
|
935 | + $context['config_vars'][$config_var[0]]['min'] = $config_var['min']; |
|
936 | + } else { |
|
937 | + $context['config_vars'][$config_var[0]]['min'] = 0; |
|
938 | + } |
|
909 | 939 | |
910 | - if (isset($config_var['max'])) |
|
911 | - $context['config_vars'][$config_var[0]]['max'] = $config_var['max']; |
|
940 | + if (isset($config_var['max'])) { |
|
941 | + $context['config_vars'][$config_var[0]]['max'] = $config_var['max']; |
|
942 | + } |
|
912 | 943 | |
913 | - if (isset($config_var['step'])) |
|
914 | - $context['config_vars'][$config_var[0]]['step'] = $config_var['step']; |
|
944 | + if (isset($config_var['step'])) { |
|
945 | + $context['config_vars'][$config_var[0]]['step'] = $config_var['step']; |
|
946 | + } |
|
915 | 947 | } |
916 | 948 | |
917 | 949 | // If this is a select box handle any data. |
@@ -919,12 +951,13 @@ discard block |
||
919 | 951 | { |
920 | 952 | // If it's associative |
921 | 953 | $config_values = array_values($config_var[4]); |
922 | - if (isset($config_values[0]) && is_array($config_values[0])) |
|
923 | - $context['config_vars'][$config_var[0]]['data'] = $config_var[4]; |
|
924 | - else |
|
954 | + if (isset($config_values[0]) && is_array($config_values[0])) { |
|
955 | + $context['config_vars'][$config_var[0]]['data'] = $config_var[4]; |
|
956 | + } else |
|
925 | 957 | { |
926 | - foreach ($config_var[4] as $key => $item) |
|
927 | - $context['config_vars'][$config_var[0]]['data'][] = array($key, $item); |
|
958 | + foreach ($config_var[4] as $key => $item) { |
|
959 | + $context['config_vars'][$config_var[0]]['data'][] = array($key, $item); |
|
960 | + } |
|
928 | 961 | } |
929 | 962 | } |
930 | 963 | } |
@@ -949,10 +982,11 @@ discard block |
||
949 | 982 | |
950 | 983 | if (isset($_SESSION['adm-save'])) |
951 | 984 | { |
952 | - if ($_SESSION['adm-save'] === true) |
|
953 | - $context['saved_successful'] = true; |
|
954 | - else |
|
955 | - $context['saved_failed'] = $_SESSION['adm-save']; |
|
985 | + if ($_SESSION['adm-save'] === true) { |
|
986 | + $context['saved_successful'] = true; |
|
987 | + } else { |
|
988 | + $context['saved_failed'] = $_SESSION['adm-save']; |
|
989 | + } |
|
956 | 990 | |
957 | 991 | unset($_SESSION['adm-save']); |
958 | 992 | } |
@@ -964,26 +998,30 @@ discard block |
||
964 | 998 | foreach ($config_vars as $config_var) |
965 | 999 | { |
966 | 1000 | // HR? |
967 | - if (!is_array($config_var)) |
|
968 | - $context['config_vars'][] = $config_var; |
|
969 | - else |
|
1001 | + if (!is_array($config_var)) { |
|
1002 | + $context['config_vars'][] = $config_var; |
|
1003 | + } else |
|
970 | 1004 | { |
971 | 1005 | // If it has no name it doesn't have any purpose! |
972 | - if (empty($config_var[1])) |
|
973 | - continue; |
|
1006 | + if (empty($config_var[1])) { |
|
1007 | + continue; |
|
1008 | + } |
|
974 | 1009 | |
975 | 1010 | // Special case for inline permissions |
976 | - if ($config_var[0] == 'permissions' && allowedTo('manage_permissions')) |
|
977 | - $inlinePermissions[] = $config_var[1]; |
|
978 | - elseif ($config_var[0] == 'permissions') |
|
979 | - continue; |
|
1011 | + if ($config_var[0] == 'permissions' && allowedTo('manage_permissions')) { |
|
1012 | + $inlinePermissions[] = $config_var[1]; |
|
1013 | + } elseif ($config_var[0] == 'permissions') { |
|
1014 | + continue; |
|
1015 | + } |
|
980 | 1016 | |
981 | - if ($config_var[0] == 'boards') |
|
982 | - $board_list = true; |
|
1017 | + if ($config_var[0] == 'boards') { |
|
1018 | + $board_list = true; |
|
1019 | + } |
|
983 | 1020 | |
984 | 1021 | // Are we showing the BBC selection box? |
985 | - if ($config_var[0] == 'bbc') |
|
986 | - $bbcChoice[] = $config_var[1]; |
|
1022 | + if ($config_var[0] == 'bbc') { |
|
1023 | + $bbcChoice[] = $config_var[1]; |
|
1024 | + } |
|
987 | 1025 | |
988 | 1026 | // We need to do some parsing of the value before we pass it in. |
989 | 1027 | if (isset($modSettings[$config_var[1]])) |
@@ -1002,8 +1040,7 @@ discard block |
||
1002 | 1040 | default: |
1003 | 1041 | $value = $smcFunc['htmlspecialchars']($modSettings[$config_var[1]]); |
1004 | 1042 | } |
1005 | - } |
|
1006 | - else |
|
1043 | + } else |
|
1007 | 1044 | { |
1008 | 1045 | // Darn, it's empty. What type is expected? |
1009 | 1046 | switch ($config_var[0]) |
@@ -1043,16 +1080,19 @@ discard block |
||
1043 | 1080 | if ($config_var[0] == 'int' || $config_var[0] == 'float') |
1044 | 1081 | { |
1045 | 1082 | // Default to a min of 0 if one isn't set |
1046 | - if (isset($config_var['min'])) |
|
1047 | - $context['config_vars'][$config_var[1]]['min'] = $config_var['min']; |
|
1048 | - else |
|
1049 | - $context['config_vars'][$config_var[1]]['min'] = 0; |
|
1083 | + if (isset($config_var['min'])) { |
|
1084 | + $context['config_vars'][$config_var[1]]['min'] = $config_var['min']; |
|
1085 | + } else { |
|
1086 | + $context['config_vars'][$config_var[1]]['min'] = 0; |
|
1087 | + } |
|
1050 | 1088 | |
1051 | - if (isset($config_var['max'])) |
|
1052 | - $context['config_vars'][$config_var[1]]['max'] = $config_var['max']; |
|
1089 | + if (isset($config_var['max'])) { |
|
1090 | + $context['config_vars'][$config_var[1]]['max'] = $config_var['max']; |
|
1091 | + } |
|
1053 | 1092 | |
1054 | - if (isset($config_var['step'])) |
|
1055 | - $context['config_vars'][$config_var[1]]['step'] = $config_var['step']; |
|
1093 | + if (isset($config_var['step'])) { |
|
1094 | + $context['config_vars'][$config_var[1]]['step'] = $config_var['step']; |
|
1095 | + } |
|
1056 | 1096 | } |
1057 | 1097 | |
1058 | 1098 | // If this is a select box handle any data. |
@@ -1066,12 +1106,13 @@ discard block |
||
1066 | 1106 | } |
1067 | 1107 | |
1068 | 1108 | // If it's associative |
1069 | - if (isset($config_var[2][0]) && is_array($config_var[2][0])) |
|
1070 | - $context['config_vars'][$config_var[1]]['data'] = $config_var[2]; |
|
1071 | - else |
|
1109 | + if (isset($config_var[2][0]) && is_array($config_var[2][0])) { |
|
1110 | + $context['config_vars'][$config_var[1]]['data'] = $config_var[2]; |
|
1111 | + } else |
|
1072 | 1112 | { |
1073 | - foreach ($config_var[2] as $key => $item) |
|
1074 | - $context['config_vars'][$config_var[1]]['data'][] = array($key, $item); |
|
1113 | + foreach ($config_var[2] as $key => $item) { |
|
1114 | + $context['config_vars'][$config_var[1]]['data'][] = array($key, $item); |
|
1115 | + } |
|
1075 | 1116 | } |
1076 | 1117 | } |
1077 | 1118 | |
@@ -1080,17 +1121,19 @@ discard block |
||
1080 | 1121 | { |
1081 | 1122 | if (!is_numeric($k)) |
1082 | 1123 | { |
1083 | - if (substr($k, 0, 2) == 'on') |
|
1084 | - $context['config_vars'][$config_var[1]]['javascript'] .= ' ' . $k . '="' . $v . '"'; |
|
1085 | - else |
|
1086 | - $context['config_vars'][$config_var[1]][$k] = $v; |
|
1124 | + if (substr($k, 0, 2) == 'on') { |
|
1125 | + $context['config_vars'][$config_var[1]]['javascript'] .= ' ' . $k . '="' . $v . '"'; |
|
1126 | + } else { |
|
1127 | + $context['config_vars'][$config_var[1]][$k] = $v; |
|
1128 | + } |
|
1087 | 1129 | } |
1088 | 1130 | |
1089 | 1131 | // See if there are any other labels that might fit? |
1090 | - if (isset($txt['setting_' . $config_var[1]])) |
|
1091 | - $context['config_vars'][$config_var[1]]['label'] = $txt['setting_' . $config_var[1]]; |
|
1092 | - elseif (isset($txt['groups_' . $config_var[1]])) |
|
1093 | - $context['config_vars'][$config_var[1]]['label'] = $txt['groups_' . $config_var[1]]; |
|
1132 | + if (isset($txt['setting_' . $config_var[1]])) { |
|
1133 | + $context['config_vars'][$config_var[1]]['label'] = $txt['setting_' . $config_var[1]]; |
|
1134 | + } elseif (isset($txt['groups_' . $config_var[1]])) { |
|
1135 | + $context['config_vars'][$config_var[1]]['label'] = $txt['groups_' . $config_var[1]]; |
|
1136 | + } |
|
1094 | 1137 | } |
1095 | 1138 | |
1096 | 1139 | // Set the subtext in case it's part of the label. |
@@ -1123,8 +1166,9 @@ discard block |
||
1123 | 1166 | // What are the options, eh? |
1124 | 1167 | $temp = parse_bbc(false); |
1125 | 1168 | $bbcTags = array(); |
1126 | - foreach ($temp as $tag) |
|
1127 | - $bbcTags[] = $tag['tag']; |
|
1169 | + foreach ($temp as $tag) { |
|
1170 | + $bbcTags[] = $tag['tag']; |
|
1171 | + } |
|
1128 | 1172 | |
1129 | 1173 | $bbcTags = array_unique($bbcTags); |
1130 | 1174 | $totalTags = count($bbcTags); |
@@ -1139,8 +1183,9 @@ discard block |
||
1139 | 1183 | $col = 0; $i = 0; |
1140 | 1184 | foreach ($bbcTags as $tag) |
1141 | 1185 | { |
1142 | - if ($i % $tagsPerColumn == 0 && $i != 0) |
|
1143 | - $col++; |
|
1186 | + if ($i % $tagsPerColumn == 0 && $i != 0) { |
|
1187 | + $col++; |
|
1188 | + } |
|
1144 | 1189 | |
1145 | 1190 | $context['bbc_columns'][$col][] = array( |
1146 | 1191 | 'tag' => $tag, |
@@ -1183,18 +1228,21 @@ discard block |
||
1183 | 1228 | validateToken('admin-ssc'); |
1184 | 1229 | |
1185 | 1230 | // Fix the darn stupid cookiename! (more may not be allowed, but these for sure!) |
1186 | - if (isset($_POST['cookiename'])) |
|
1187 | - $_POST['cookiename'] = preg_replace('~[,;\s\.$]+~' . ($context['utf8'] ? 'u' : ''), '', $_POST['cookiename']); |
|
1231 | + if (isset($_POST['cookiename'])) { |
|
1232 | + $_POST['cookiename'] = preg_replace('~[,;\s\.$]+~' . ($context['utf8'] ? 'u' : ''), '', $_POST['cookiename']); |
|
1233 | + } |
|
1188 | 1234 | |
1189 | 1235 | // Fix the forum's URL if necessary. |
1190 | 1236 | if (isset($_POST['boardurl'])) |
1191 | 1237 | { |
1192 | - if (substr($_POST['boardurl'], -10) == '/index.php') |
|
1193 | - $_POST['boardurl'] = substr($_POST['boardurl'], 0, -10); |
|
1194 | - elseif (substr($_POST['boardurl'], -1) == '/') |
|
1195 | - $_POST['boardurl'] = substr($_POST['boardurl'], 0, -1); |
|
1196 | - if (substr($_POST['boardurl'], 0, 7) != 'http://' && substr($_POST['boardurl'], 0, 7) != 'file://' && substr($_POST['boardurl'], 0, 8) != 'https://') |
|
1197 | - $_POST['boardurl'] = 'http://' . $_POST['boardurl']; |
|
1238 | + if (substr($_POST['boardurl'], -10) == '/index.php') { |
|
1239 | + $_POST['boardurl'] = substr($_POST['boardurl'], 0, -10); |
|
1240 | + } elseif (substr($_POST['boardurl'], -1) == '/') { |
|
1241 | + $_POST['boardurl'] = substr($_POST['boardurl'], 0, -1); |
|
1242 | + } |
|
1243 | + if (substr($_POST['boardurl'], 0, 7) != 'http://' && substr($_POST['boardurl'], 0, 7) != 'file://' && substr($_POST['boardurl'], 0, 8) != 'https://') { |
|
1244 | + $_POST['boardurl'] = 'http://' . $_POST['boardurl']; |
|
1245 | + } |
|
1198 | 1246 | } |
1199 | 1247 | |
1200 | 1248 | // Any passwords? |
@@ -1229,21 +1277,21 @@ discard block |
||
1229 | 1277 | // Figure out which config vars we're saving here... |
1230 | 1278 | foreach ($config_vars as $var) |
1231 | 1279 | { |
1232 | - if (!is_array($var) || $var[2] != 'file' || (!in_array($var[0], $config_bools) && !isset($_POST[$var[0]]))) |
|
1233 | - continue; |
|
1280 | + if (!is_array($var) || $var[2] != 'file' || (!in_array($var[0], $config_bools) && !isset($_POST[$var[0]]))) { |
|
1281 | + continue; |
|
1282 | + } |
|
1234 | 1283 | |
1235 | 1284 | $config_var = $var[0]; |
1236 | 1285 | |
1237 | 1286 | if (in_array($config_var, $config_passwords)) |
1238 | 1287 | { |
1239 | - if (isset($_POST[$config_var][1]) && $_POST[$config_var][0] == $_POST[$config_var][1]) |
|
1240 | - $new_settings[$config_var] = '\'' . addcslashes($_POST[$config_var][0], '\'\\') . '\''; |
|
1241 | - } |
|
1242 | - elseif (in_array($config_var, $config_strs)) |
|
1288 | + if (isset($_POST[$config_var][1]) && $_POST[$config_var][0] == $_POST[$config_var][1]) { |
|
1289 | + $new_settings[$config_var] = '\'' . addcslashes($_POST[$config_var][0], '\'\\') . '\''; |
|
1290 | + } |
|
1291 | + } elseif (in_array($config_var, $config_strs)) |
|
1243 | 1292 | { |
1244 | 1293 | $new_settings[$config_var] = '\'' . addcslashes($_POST[$config_var], '\'\\') . '\''; |
1245 | - } |
|
1246 | - elseif (in_array($config_var, $config_ints)) |
|
1294 | + } elseif (in_array($config_var, $config_ints)) |
|
1247 | 1295 | { |
1248 | 1296 | $new_settings[$config_var] = (int) $_POST[$config_var]; |
1249 | 1297 | |
@@ -1252,17 +1300,17 @@ discard block |
||
1252 | 1300 | $new_settings[$config_var] = max($min, $new_settings[$config_var]); |
1253 | 1301 | |
1254 | 1302 | // Is there a max value for this as well? |
1255 | - if (isset($var['max'])) |
|
1256 | - $new_settings[$config_var] = min($var['max'], $new_settings[$config_var]); |
|
1257 | - } |
|
1258 | - elseif (in_array($config_var, $config_bools)) |
|
1303 | + if (isset($var['max'])) { |
|
1304 | + $new_settings[$config_var] = min($var['max'], $new_settings[$config_var]); |
|
1305 | + } |
|
1306 | + } elseif (in_array($config_var, $config_bools)) |
|
1259 | 1307 | { |
1260 | - if (!empty($_POST[$config_var])) |
|
1261 | - $new_settings[$config_var] = '1'; |
|
1262 | - else |
|
1263 | - $new_settings[$config_var] = '0'; |
|
1264 | - } |
|
1265 | - else |
|
1308 | + if (!empty($_POST[$config_var])) { |
|
1309 | + $new_settings[$config_var] = '1'; |
|
1310 | + } else { |
|
1311 | + $new_settings[$config_var] = '0'; |
|
1312 | + } |
|
1313 | + } else |
|
1266 | 1314 | { |
1267 | 1315 | // This shouldn't happen, but it might... |
1268 | 1316 | fatal_error('Unknown config_var \'' . $config_var . '\''); |
@@ -1278,30 +1326,35 @@ discard block |
||
1278 | 1326 | foreach ($config_vars as $config_var) |
1279 | 1327 | { |
1280 | 1328 | // We just saved the file-based settings, so skip their definitions. |
1281 | - if (!is_array($config_var) || $config_var[2] == 'file') |
|
1282 | - continue; |
|
1329 | + if (!is_array($config_var) || $config_var[2] == 'file') { |
|
1330 | + continue; |
|
1331 | + } |
|
1283 | 1332 | |
1284 | 1333 | $new_setting = array($config_var[3], $config_var[0]); |
1285 | 1334 | |
1286 | 1335 | // Select options need carried over, too. |
1287 | - if (isset($config_var[4])) |
|
1288 | - $new_setting[] = $config_var[4]; |
|
1336 | + if (isset($config_var[4])) { |
|
1337 | + $new_setting[] = $config_var[4]; |
|
1338 | + } |
|
1289 | 1339 | |
1290 | 1340 | // Include min and max if necessary |
1291 | - if (isset($config_var['min'])) |
|
1292 | - $new_setting['min'] = $config_var['min']; |
|
1341 | + if (isset($config_var['min'])) { |
|
1342 | + $new_setting['min'] = $config_var['min']; |
|
1343 | + } |
|
1293 | 1344 | |
1294 | - if (isset($config_var['max'])) |
|
1295 | - $new_setting['max'] = $config_var['max']; |
|
1345 | + if (isset($config_var['max'])) { |
|
1346 | + $new_setting['max'] = $config_var['max']; |
|
1347 | + } |
|
1296 | 1348 | |
1297 | 1349 | // Rewrite the definition a bit. |
1298 | 1350 | $new_settings[] = $new_setting; |
1299 | 1351 | } |
1300 | 1352 | |
1301 | 1353 | // Save the new database-based settings, if any. |
1302 | - if (!empty($new_settings)) |
|
1303 | - saveDBSettings($new_settings); |
|
1304 | -} |
|
1354 | + if (!empty($new_settings)) { |
|
1355 | + saveDBSettings($new_settings); |
|
1356 | + } |
|
1357 | + } |
|
1305 | 1358 | |
1306 | 1359 | /** |
1307 | 1360 | * Helper function for saving database settings. |
@@ -1319,22 +1372,25 @@ discard block |
||
1319 | 1372 | $inlinePermissions = array(); |
1320 | 1373 | foreach ($config_vars as $var) |
1321 | 1374 | { |
1322 | - if (!isset($var[1]) || (!isset($_POST[$var[1]]) && $var[0] != 'check' && $var[0] != 'permissions' && $var[0] != 'boards' && ($var[0] != 'bbc' || !isset($_POST[$var[1] . '_enabledTags'])))) |
|
1323 | - continue; |
|
1375 | + if (!isset($var[1]) || (!isset($_POST[$var[1]]) && $var[0] != 'check' && $var[0] != 'permissions' && $var[0] != 'boards' && ($var[0] != 'bbc' || !isset($_POST[$var[1] . '_enabledTags'])))) { |
|
1376 | + continue; |
|
1377 | + } |
|
1324 | 1378 | |
1325 | 1379 | // Checkboxes! |
1326 | - elseif ($var[0] == 'check') |
|
1327 | - $setArray[$var[1]] = !empty($_POST[$var[1]]) ? '1' : '0'; |
|
1380 | + elseif ($var[0] == 'check') { |
|
1381 | + $setArray[$var[1]] = !empty($_POST[$var[1]]) ? '1' : '0'; |
|
1382 | + } |
|
1328 | 1383 | // Select boxes! |
1329 | - elseif ($var[0] == 'select' && in_array($_POST[$var[1]], array_keys($var[2]))) |
|
1330 | - $setArray[$var[1]] = $_POST[$var[1]]; |
|
1331 | - elseif ($var[0] == 'select' && !empty($var['multiple']) && array_intersect($_POST[$var[1]], array_keys($var[2])) != array()) |
|
1384 | + elseif ($var[0] == 'select' && in_array($_POST[$var[1]], array_keys($var[2]))) { |
|
1385 | + $setArray[$var[1]] = $_POST[$var[1]]; |
|
1386 | + } elseif ($var[0] == 'select' && !empty($var['multiple']) && array_intersect($_POST[$var[1]], array_keys($var[2])) != array()) |
|
1332 | 1387 | { |
1333 | 1388 | // For security purposes we validate this line by line. |
1334 | 1389 | $lOptions = array(); |
1335 | - foreach ($_POST[$var[1]] as $invar) |
|
1336 | - if (in_array($invar, array_keys($var[2]))) |
|
1390 | + foreach ($_POST[$var[1]] as $invar) { |
|
1391 | + if (in_array($invar, array_keys($var[2]))) |
|
1337 | 1392 | $lOptions[] = $invar; |
1393 | + } |
|
1338 | 1394 | |
1339 | 1395 | $setArray[$var[1]] = $smcFunc['json_encode']($lOptions); |
1340 | 1396 | } |
@@ -1348,18 +1404,20 @@ discard block |
||
1348 | 1404 | $request = $smcFunc['db_query']('', ' |
1349 | 1405 | SELECT id_board |
1350 | 1406 | FROM {db_prefix}boards'); |
1351 | - while ($row = $smcFunc['db_fetch_row']($request)) |
|
1352 | - $board_list[$row[0]] = true; |
|
1407 | + while ($row = $smcFunc['db_fetch_row']($request)) { |
|
1408 | + $board_list[$row[0]] = true; |
|
1409 | + } |
|
1353 | 1410 | |
1354 | 1411 | $smcFunc['db_free_result']($request); |
1355 | 1412 | } |
1356 | 1413 | |
1357 | 1414 | $lOptions = array(); |
1358 | 1415 | |
1359 | - if (!empty($_POST[$var[1]])) |
|
1360 | - foreach ($_POST[$var[1]] as $invar => $dummy) |
|
1416 | + if (!empty($_POST[$var[1]])) { |
|
1417 | + foreach ($_POST[$var[1]] as $invar => $dummy) |
|
1361 | 1418 | if (isset($board_list[$invar])) |
1362 | 1419 | $lOptions[] = $invar; |
1420 | + } |
|
1363 | 1421 | |
1364 | 1422 | $setArray[$var[1]] = !empty($lOptions) ? implode(',', $lOptions) : ''; |
1365 | 1423 | } |
@@ -1373,8 +1431,9 @@ discard block |
||
1373 | 1431 | $setArray[$var[1]] = max($min, $setArray[$var[1]]); |
1374 | 1432 | |
1375 | 1433 | // Do we have a max value for this as well? |
1376 | - if (isset($var['max'])) |
|
1377 | - $setArray[$var[1]] = min($var['max'], $setArray[$var[1]]); |
|
1434 | + if (isset($var['max'])) { |
|
1435 | + $setArray[$var[1]] = min($var['max'], $setArray[$var[1]]); |
|
1436 | + } |
|
1378 | 1437 | } |
1379 | 1438 | // Floating point! |
1380 | 1439 | elseif ($var[0] == 'float') |
@@ -1386,39 +1445,46 @@ discard block |
||
1386 | 1445 | $setArray[$var[1]] = max($min, $setArray[$var[1]]); |
1387 | 1446 | |
1388 | 1447 | // Do we have a max value for this as well? |
1389 | - if (isset($var['max'])) |
|
1390 | - $setArray[$var[1]] = min($var['max'], $setArray[$var[1]]); |
|
1448 | + if (isset($var['max'])) { |
|
1449 | + $setArray[$var[1]] = min($var['max'], $setArray[$var[1]]); |
|
1450 | + } |
|
1391 | 1451 | } |
1392 | 1452 | // Text! |
1393 | - elseif (in_array($var[0], array('text', 'large_text', 'color', 'date', 'datetime', 'datetime-local', 'email', 'month', 'time'))) |
|
1394 | - $setArray[$var[1]] = $_POST[$var[1]]; |
|
1453 | + elseif (in_array($var[0], array('text', 'large_text', 'color', 'date', 'datetime', 'datetime-local', 'email', 'month', 'time'))) { |
|
1454 | + $setArray[$var[1]] = $_POST[$var[1]]; |
|
1455 | + } |
|
1395 | 1456 | // Passwords! |
1396 | 1457 | elseif ($var[0] == 'password') |
1397 | 1458 | { |
1398 | - if (isset($_POST[$var[1]][1]) && $_POST[$var[1]][0] == $_POST[$var[1]][1]) |
|
1399 | - $setArray[$var[1]] = $_POST[$var[1]][0]; |
|
1459 | + if (isset($_POST[$var[1]][1]) && $_POST[$var[1]][0] == $_POST[$var[1]][1]) { |
|
1460 | + $setArray[$var[1]] = $_POST[$var[1]][0]; |
|
1461 | + } |
|
1400 | 1462 | } |
1401 | 1463 | // BBC. |
1402 | 1464 | elseif ($var[0] == 'bbc') |
1403 | 1465 | { |
1404 | 1466 | $bbcTags = array(); |
1405 | - foreach (parse_bbc(false) as $tag) |
|
1406 | - $bbcTags[] = $tag['tag']; |
|
1467 | + foreach (parse_bbc(false) as $tag) { |
|
1468 | + $bbcTags[] = $tag['tag']; |
|
1469 | + } |
|
1407 | 1470 | |
1408 | - if (!isset($_POST[$var[1] . '_enabledTags'])) |
|
1409 | - $_POST[$var[1] . '_enabledTags'] = array(); |
|
1410 | - elseif (!is_array($_POST[$var[1] . '_enabledTags'])) |
|
1411 | - $_POST[$var[1] . '_enabledTags'] = array($_POST[$var[1] . '_enabledTags']); |
|
1471 | + if (!isset($_POST[$var[1] . '_enabledTags'])) { |
|
1472 | + $_POST[$var[1] . '_enabledTags'] = array(); |
|
1473 | + } elseif (!is_array($_POST[$var[1] . '_enabledTags'])) { |
|
1474 | + $_POST[$var[1] . '_enabledTags'] = array($_POST[$var[1] . '_enabledTags']); |
|
1475 | + } |
|
1412 | 1476 | |
1413 | 1477 | $setArray[$var[1]] = implode(',', array_diff($bbcTags, $_POST[$var[1] . '_enabledTags'])); |
1414 | 1478 | } |
1415 | 1479 | // Permissions? |
1416 | - elseif ($var[0] == 'permissions') |
|
1417 | - $inlinePermissions[] = $var[1]; |
|
1480 | + elseif ($var[0] == 'permissions') { |
|
1481 | + $inlinePermissions[] = $var[1]; |
|
1482 | + } |
|
1418 | 1483 | } |
1419 | 1484 | |
1420 | - if (!empty($setArray)) |
|
1421 | - updateSettings($setArray); |
|
1485 | + if (!empty($setArray)) { |
|
1486 | + updateSettings($setArray); |
|
1487 | + } |
|
1422 | 1488 | |
1423 | 1489 | // If we have inline permissions we need to save them. |
1424 | 1490 | if (!empty($inlinePermissions) && allowedTo('manage_permissions')) |
@@ -1455,18 +1521,21 @@ discard block |
||
1455 | 1521 | // put all of it into an array |
1456 | 1522 | foreach ($info_lines as $line) |
1457 | 1523 | { |
1458 | - if (preg_match('~(' . $remove . ')~', $line)) |
|
1459 | - continue; |
|
1524 | + if (preg_match('~(' . $remove . ')~', $line)) { |
|
1525 | + continue; |
|
1526 | + } |
|
1460 | 1527 | |
1461 | 1528 | // new category? |
1462 | - if (strpos($line, '<h2>') !== false) |
|
1463 | - $category = preg_match('~<h2>(.*)</h2>~', $line, $title) ? $category = $title[1] : $category; |
|
1529 | + if (strpos($line, '<h2>') !== false) { |
|
1530 | + $category = preg_match('~<h2>(.*)</h2>~', $line, $title) ? $category = $title[1] : $category; |
|
1531 | + } |
|
1464 | 1532 | |
1465 | 1533 | // load it as setting => value or the old setting local master |
1466 | - if (preg_match('~<tr><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td></tr>~', $line, $val)) |
|
1467 | - $pinfo[$category][$val[1]] = $val[2]; |
|
1468 | - elseif (preg_match('~<tr><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td></tr>~', $line, $val)) |
|
1469 | - $pinfo[$category][$val[1]] = array($txt['phpinfo_localsettings'] => $val[2], $txt['phpinfo_defaultsettings'] => $val[3]); |
|
1534 | + if (preg_match('~<tr><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td></tr>~', $line, $val)) { |
|
1535 | + $pinfo[$category][$val[1]] = $val[2]; |
|
1536 | + } elseif (preg_match('~<tr><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td></tr>~', $line, $val)) { |
|
1537 | + $pinfo[$category][$val[1]] = array($txt['phpinfo_localsettings'] => $val[2], $txt['phpinfo_defaultsettings'] => $val[3]); |
|
1538 | + } |
|
1470 | 1539 | } |
1471 | 1540 | |
1472 | 1541 | // load it in to context and display it |
@@ -1501,8 +1570,9 @@ discard block |
||
1501 | 1570 | $testAPI = new $cache_class_name(); |
1502 | 1571 | |
1503 | 1572 | // No Support? NEXT! |
1504 | - if (!$testAPI->isSupported(true)) |
|
1505 | - continue; |
|
1573 | + if (!$testAPI->isSupported(true)) { |
|
1574 | + continue; |
|
1575 | + } |
|
1506 | 1576 | |
1507 | 1577 | $apis[$tryCache] = isset($txt[$tryCache . '_cache']) ? $txt[$tryCache . '_cache'] : $tryCache; |
1508 | 1578 | } |
@@ -1527,8 +1597,9 @@ discard block |
||
1527 | 1597 | global $modSettings, $boardurl, $smcFunc; |
1528 | 1598 | |
1529 | 1599 | // Already have a key? Can't register again. |
1530 | - if (!empty($modSettings['sm_stats_key'])) |
|
1531 | - return true; |
|
1600 | + if (!empty($modSettings['sm_stats_key'])) { |
|
1601 | + return true; |
|
1602 | + } |
|
1532 | 1603 | |
1533 | 1604 | $fp = @fsockopen('www.simplemachines.org', 80, $errno, $errstr); |
1534 | 1605 | if ($fp) |
@@ -1539,8 +1610,9 @@ discard block |
||
1539 | 1610 | fwrite($fp, $out); |
1540 | 1611 | |
1541 | 1612 | $return_data = ''; |
1542 | - while (!feof($fp)) |
|
1543 | - $return_data .= fgets($fp, 128); |
|
1613 | + while (!feof($fp)) { |
|
1614 | + $return_data .= fgets($fp, 128); |
|
1615 | + } |
|
1544 | 1616 | |
1545 | 1617 | fclose($fp); |
1546 | 1618 |
@@ -14,8 +14,9 @@ discard block |
||
14 | 14 | * @version 2.1 Beta 4 |
15 | 15 | */ |
16 | 16 | |
17 | -if (!defined('SMF')) |
|
17 | +if (!defined('SMF')) { |
|
18 | 18 | die('No direct access...'); |
19 | +} |
|
19 | 20 | |
20 | 21 | /** |
21 | 22 | * Check if the current directory is still valid or not. |
@@ -28,22 +29,24 @@ discard block |
||
28 | 29 | global $smcFunc, $boarddir, $modSettings, $context; |
29 | 30 | |
30 | 31 | // Not pretty, but since we don't want folders created for every post. It'll do unless a better solution can be found. |
31 | - if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'admin') |
|
32 | - $doit = true; |
|
33 | - elseif (empty($modSettings['automanage_attachments'])) |
|
34 | - return; |
|
35 | - elseif (!isset($_FILES)) |
|
36 | - return; |
|
37 | - elseif (isset($_FILES['attachment'])) |
|
38 | - foreach ($_FILES['attachment']['tmp_name'] as $dummy) |
|
32 | + if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'admin') { |
|
33 | + $doit = true; |
|
34 | + } elseif (empty($modSettings['automanage_attachments'])) { |
|
35 | + return; |
|
36 | + } elseif (!isset($_FILES)) { |
|
37 | + return; |
|
38 | + } elseif (isset($_FILES['attachment'])) { |
|
39 | + foreach ($_FILES['attachment']['tmp_name'] as $dummy) |
|
39 | 40 | if (!empty($dummy)) |
40 | 41 | { |
41 | 42 | $doit = true; |
43 | + } |
|
42 | 44 | break; |
43 | 45 | } |
44 | 46 | |
45 | - if (!isset($doit)) |
|
46 | - return; |
|
47 | + if (!isset($doit)) { |
|
48 | + return; |
|
49 | + } |
|
47 | 50 | |
48 | 51 | $year = date('Y'); |
49 | 52 | $month = date('m'); |
@@ -54,21 +57,25 @@ discard block |
||
54 | 57 | |
55 | 58 | if (!empty($modSettings['attachment_basedirectories']) && !empty($modSettings['use_subdirectories_for_attachments'])) |
56 | 59 | { |
57 | - if (!is_array($modSettings['attachment_basedirectories'])) |
|
58 | - $modSettings['attachment_basedirectories'] = $smcFunc['json_decode']($modSettings['attachment_basedirectories'], true); |
|
60 | + if (!is_array($modSettings['attachment_basedirectories'])) { |
|
61 | + $modSettings['attachment_basedirectories'] = $smcFunc['json_decode']($modSettings['attachment_basedirectories'], true); |
|
62 | + } |
|
59 | 63 | $base_dir = array_search($modSettings['basedirectory_for_attachments'], $modSettings['attachment_basedirectories']); |
64 | + } else { |
|
65 | + $base_dir = 0; |
|
60 | 66 | } |
61 | - else |
|
62 | - $base_dir = 0; |
|
63 | 67 | |
64 | 68 | if ($modSettings['automanage_attachments'] == 1) |
65 | 69 | { |
66 | - if (!isset($modSettings['last_attachments_directory'])) |
|
67 | - $modSettings['last_attachments_directory'] = array(); |
|
68 | - if (!is_array($modSettings['last_attachments_directory'])) |
|
69 | - $modSettings['last_attachments_directory'] = $smcFunc['json_decode']($modSettings['last_attachments_directory'], true); |
|
70 | - if (!isset($modSettings['last_attachments_directory'][$base_dir])) |
|
71 | - $modSettings['last_attachments_directory'][$base_dir] = 0; |
|
70 | + if (!isset($modSettings['last_attachments_directory'])) { |
|
71 | + $modSettings['last_attachments_directory'] = array(); |
|
72 | + } |
|
73 | + if (!is_array($modSettings['last_attachments_directory'])) { |
|
74 | + $modSettings['last_attachments_directory'] = $smcFunc['json_decode']($modSettings['last_attachments_directory'], true); |
|
75 | + } |
|
76 | + if (!isset($modSettings['last_attachments_directory'][$base_dir])) { |
|
77 | + $modSettings['last_attachments_directory'][$base_dir] = 0; |
|
78 | + } |
|
72 | 79 | } |
73 | 80 | |
74 | 81 | $basedirectory = (!empty($modSettings['use_subdirectories_for_attachments']) ? ($modSettings['basedirectory_for_attachments']) : $boarddir); |
@@ -97,12 +104,14 @@ discard block |
||
97 | 104 | $updir = ''; |
98 | 105 | } |
99 | 106 | |
100 | - if (!is_array($modSettings['attachmentUploadDir'])) |
|
101 | - $modSettings['attachmentUploadDir'] = $smcFunc['json_decode']($modSettings['attachmentUploadDir'], true); |
|
102 | - if (!in_array($updir, $modSettings['attachmentUploadDir']) && !empty($updir)) |
|
103 | - $outputCreation = automanage_attachments_create_directory($updir); |
|
104 | - elseif (in_array($updir, $modSettings['attachmentUploadDir'])) |
|
105 | - $outputCreation = true; |
|
107 | + if (!is_array($modSettings['attachmentUploadDir'])) { |
|
108 | + $modSettings['attachmentUploadDir'] = $smcFunc['json_decode']($modSettings['attachmentUploadDir'], true); |
|
109 | + } |
|
110 | + if (!in_array($updir, $modSettings['attachmentUploadDir']) && !empty($updir)) { |
|
111 | + $outputCreation = automanage_attachments_create_directory($updir); |
|
112 | + } elseif (in_array($updir, $modSettings['attachmentUploadDir'])) { |
|
113 | + $outputCreation = true; |
|
114 | + } |
|
106 | 115 | |
107 | 116 | if ($outputCreation) |
108 | 117 | { |
@@ -139,8 +148,9 @@ discard block |
||
139 | 148 | $count = count($tree); |
140 | 149 | |
141 | 150 | $directory = attachments_init_dir($tree, $count); |
142 | - if ($directory === false) |
|
143 | - return false; |
|
151 | + if ($directory === false) { |
|
152 | + return false; |
|
153 | + } |
|
144 | 154 | } |
145 | 155 | |
146 | 156 | $directory .= DIRECTORY_SEPARATOR . array_shift($tree); |
@@ -168,8 +178,9 @@ discard block |
||
168 | 178 | } |
169 | 179 | |
170 | 180 | // Everything seems fine...let's create the .htaccess |
171 | - if (!file_exists($directory . DIRECTORY_SEPARATOR . '.htaccess')) |
|
172 | - secureDirectory($updir, true); |
|
181 | + if (!file_exists($directory . DIRECTORY_SEPARATOR . '.htaccess')) { |
|
182 | + secureDirectory($updir, true); |
|
183 | + } |
|
173 | 184 | |
174 | 185 | $sep = (DIRECTORY_SEPARATOR === '\\') ? '\/' : DIRECTORY_SEPARATOR; |
175 | 186 | $updir = rtrim($updir, $sep); |
@@ -201,8 +212,9 @@ discard block |
||
201 | 212 | { |
202 | 213 | global $smcFunc, $modSettings, $boarddir; |
203 | 214 | |
204 | - if (!isset($modSettings['automanage_attachments']) || (!empty($modSettings['automanage_attachments']) && $modSettings['automanage_attachments'] != 1)) |
|
205 | - return; |
|
215 | + if (!isset($modSettings['automanage_attachments']) || (!empty($modSettings['automanage_attachments']) && $modSettings['automanage_attachments'] != 1)) { |
|
216 | + return; |
|
217 | + } |
|
206 | 218 | |
207 | 219 | $basedirectory = !empty($modSettings['use_subdirectories_for_attachments']) ? $modSettings['basedirectory_for_attachments'] : $boarddir; |
208 | 220 | // Just to be sure: I don't want directory separators at the end |
@@ -214,13 +226,14 @@ discard block |
||
214 | 226 | { |
215 | 227 | $base_dir = array_search($modSettings['basedirectory_for_attachments'], $modSettings['attachment_basedirectories']); |
216 | 228 | $base_dir = !empty($modSettings['automanage_attachments']) ? $base_dir : 0; |
229 | + } else { |
|
230 | + $base_dir = 0; |
|
217 | 231 | } |
218 | - else |
|
219 | - $base_dir = 0; |
|
220 | 232 | |
221 | 233 | // Get the last attachment directory for that base directory |
222 | - if (empty($modSettings['last_attachments_directory'][$base_dir])) |
|
223 | - $modSettings['last_attachments_directory'][$base_dir] = 0; |
|
234 | + if (empty($modSettings['last_attachments_directory'][$base_dir])) { |
|
235 | + $modSettings['last_attachments_directory'][$base_dir] = 0; |
|
236 | + } |
|
224 | 237 | // And increment it. |
225 | 238 | $modSettings['last_attachments_directory'][$base_dir]++; |
226 | 239 | |
@@ -235,10 +248,10 @@ discard block |
||
235 | 248 | $modSettings['last_attachments_directory'] = $smcFunc['json_decode']($modSettings['last_attachments_directory'], true); |
236 | 249 | |
237 | 250 | return true; |
251 | + } else { |
|
252 | + return false; |
|
253 | + } |
|
238 | 254 | } |
239 | - else |
|
240 | - return false; |
|
241 | -} |
|
242 | 255 | |
243 | 256 | /** |
244 | 257 | * Split a path into a list of all directories and subdirectories |
@@ -256,12 +269,13 @@ discard block |
||
256 | 269 | * in Windows we need to explode for both \ and / |
257 | 270 | * while in linux should be safe to explode only for / (aka DIRECTORY_SEPARATOR) |
258 | 271 | */ |
259 | - if (DIRECTORY_SEPARATOR === '\\') |
|
260 | - $tree = preg_split('#[\\\/]#', $directory); |
|
261 | - else |
|
272 | + if (DIRECTORY_SEPARATOR === '\\') { |
|
273 | + $tree = preg_split('#[\\\/]#', $directory); |
|
274 | + } else |
|
262 | 275 | { |
263 | - if (substr($directory, 0, 1) != DIRECTORY_SEPARATOR) |
|
264 | - return false; |
|
276 | + if (substr($directory, 0, 1) != DIRECTORY_SEPARATOR) { |
|
277 | + return false; |
|
278 | + } |
|
265 | 279 | |
266 | 280 | $tree = explode(DIRECTORY_SEPARATOR, trim($directory, DIRECTORY_SEPARATOR)); |
267 | 281 | } |
@@ -285,10 +299,11 @@ discard block |
||
285 | 299 | //Better be sure that the first part of the path is actually a drive letter... |
286 | 300 | //...even if, I should check this in the admin page...isn't it? |
287 | 301 | //...NHAAA Let's leave space for users' complains! :P |
288 | - if (preg_match('/^[a-z]:$/i', $tree[0])) |
|
289 | - $directory = array_shift($tree); |
|
290 | - else |
|
291 | - return false; |
|
302 | + if (preg_match('/^[a-z]:$/i', $tree[0])) { |
|
303 | + $directory = array_shift($tree); |
|
304 | + } else { |
|
305 | + return false; |
|
306 | + } |
|
292 | 307 | |
293 | 308 | $count--; |
294 | 309 | } |
@@ -303,18 +318,20 @@ discard block |
||
303 | 318 | global $context, $modSettings, $smcFunc, $txt, $user_info; |
304 | 319 | |
305 | 320 | // Make sure we're uploading to the right place. |
306 | - if (!empty($modSettings['automanage_attachments'])) |
|
307 | - automanage_attachments_check_directory(); |
|
321 | + if (!empty($modSettings['automanage_attachments'])) { |
|
322 | + automanage_attachments_check_directory(); |
|
323 | + } |
|
308 | 324 | |
309 | - if (!is_array($modSettings['attachmentUploadDir'])) |
|
310 | - $modSettings['attachmentUploadDir'] = $smcFunc['json_decode']($modSettings['attachmentUploadDir'], true); |
|
325 | + if (!is_array($modSettings['attachmentUploadDir'])) { |
|
326 | + $modSettings['attachmentUploadDir'] = $smcFunc['json_decode']($modSettings['attachmentUploadDir'], true); |
|
327 | + } |
|
311 | 328 | |
312 | 329 | $context['attach_dir'] = $modSettings['attachmentUploadDir'][$modSettings['currentAttachmentUploadDir']]; |
313 | 330 | |
314 | 331 | // Is the attachments folder actualy there? |
315 | - if (!empty($context['dir_creation_error'])) |
|
316 | - $initial_error = $context['dir_creation_error']; |
|
317 | - elseif (!is_dir($context['attach_dir'])) |
|
332 | + if (!empty($context['dir_creation_error'])) { |
|
333 | + $initial_error = $context['dir_creation_error']; |
|
334 | + } elseif (!is_dir($context['attach_dir'])) |
|
318 | 335 | { |
319 | 336 | $initial_error = 'attach_folder_warning'; |
320 | 337 | log_error(sprintf($txt['attach_folder_admin_warning'], $context['attach_dir']), 'critical'); |
@@ -337,12 +354,12 @@ discard block |
||
337 | 354 | ); |
338 | 355 | list ($context['attachments']['quantity'], $context['attachments']['total_size']) = $smcFunc['db_fetch_row']($request); |
339 | 356 | $smcFunc['db_free_result']($request); |
340 | - } |
|
341 | - else |
|
342 | - $context['attachments'] = array( |
|
357 | + } else { |
|
358 | + $context['attachments'] = array( |
|
343 | 359 | 'quantity' => 0, |
344 | 360 | 'total_size' => 0, |
345 | 361 | ); |
362 | + } |
|
346 | 363 | } |
347 | 364 | |
348 | 365 | // Hmm. There are still files in session. |
@@ -352,39 +369,44 @@ discard block |
||
352 | 369 | // Let's try to keep them. But... |
353 | 370 | $ignore_temp = true; |
354 | 371 | // If new files are being added. We can't ignore those |
355 | - foreach ($_FILES['attachment']['tmp_name'] as $dummy) |
|
356 | - if (!empty($dummy)) |
|
372 | + foreach ($_FILES['attachment']['tmp_name'] as $dummy) { |
|
373 | + if (!empty($dummy)) |
|
357 | 374 | { |
358 | 375 | $ignore_temp = false; |
376 | + } |
|
359 | 377 | break; |
360 | 378 | } |
361 | 379 | |
362 | 380 | // Need to make space for the new files. So, bye bye. |
363 | 381 | if (!$ignore_temp) |
364 | 382 | { |
365 | - foreach ($_SESSION['temp_attachments'] as $attachID => $attachment) |
|
366 | - if (strpos($attachID, 'post_tmp_' . $user_info['id']) !== false) |
|
383 | + foreach ($_SESSION['temp_attachments'] as $attachID => $attachment) { |
|
384 | + if (strpos($attachID, 'post_tmp_' . $user_info['id']) !== false) |
|
367 | 385 | unlink($attachment['tmp_name']); |
386 | + } |
|
368 | 387 | |
369 | 388 | $context['we_are_history'] = $txt['error_temp_attachments_flushed']; |
370 | 389 | $_SESSION['temp_attachments'] = array(); |
371 | 390 | } |
372 | 391 | } |
373 | 392 | |
374 | - if (!isset($_FILES['attachment']['name'])) |
|
375 | - $_FILES['attachment']['tmp_name'] = array(); |
|
393 | + if (!isset($_FILES['attachment']['name'])) { |
|
394 | + $_FILES['attachment']['tmp_name'] = array(); |
|
395 | + } |
|
376 | 396 | |
377 | - if (!isset($_SESSION['temp_attachments'])) |
|
378 | - $_SESSION['temp_attachments'] = array(); |
|
397 | + if (!isset($_SESSION['temp_attachments'])) { |
|
398 | + $_SESSION['temp_attachments'] = array(); |
|
399 | + } |
|
379 | 400 | |
380 | 401 | // Remember where we are at. If it's anywhere at all. |
381 | - if (!$ignore_temp) |
|
382 | - $_SESSION['temp_attachments']['post'] = array( |
|
402 | + if (!$ignore_temp) { |
|
403 | + $_SESSION['temp_attachments']['post'] = array( |
|
383 | 404 | 'msg' => !empty($_REQUEST['msg']) ? $_REQUEST['msg'] : 0, |
384 | 405 | 'last_msg' => !empty($_REQUEST['last_msg']) ? $_REQUEST['last_msg'] : 0, |
385 | 406 | 'topic' => !empty($topic) ? $topic : 0, |
386 | 407 | 'board' => !empty($board) ? $board : 0, |
387 | 408 | ); |
409 | + } |
|
388 | 410 | |
389 | 411 | // If we have an initial error, lets just display it. |
390 | 412 | if (!empty($initial_error)) |
@@ -392,9 +414,10 @@ discard block |
||
392 | 414 | $_SESSION['temp_attachments']['initial_error'] = $initial_error; |
393 | 415 | |
394 | 416 | // And delete the files 'cos they ain't going nowhere. |
395 | - foreach ($_FILES['attachment']['tmp_name'] as $n => $dummy) |
|
396 | - if (file_exists($_FILES['attachment']['tmp_name'][$n])) |
|
417 | + foreach ($_FILES['attachment']['tmp_name'] as $n => $dummy) { |
|
418 | + if (file_exists($_FILES['attachment']['tmp_name'][$n])) |
|
397 | 419 | unlink($_FILES['attachment']['tmp_name'][$n]); |
420 | + } |
|
398 | 421 | |
399 | 422 | $_FILES['attachment']['tmp_name'] = array(); |
400 | 423 | } |
@@ -402,21 +425,24 @@ discard block |
||
402 | 425 | // Loop through $_FILES['attachment'] array and move each file to the current attachments folder. |
403 | 426 | foreach ($_FILES['attachment']['tmp_name'] as $n => $dummy) |
404 | 427 | { |
405 | - if ($_FILES['attachment']['name'][$n] == '') |
|
406 | - continue; |
|
428 | + if ($_FILES['attachment']['name'][$n] == '') { |
|
429 | + continue; |
|
430 | + } |
|
407 | 431 | |
408 | 432 | // First, let's first check for PHP upload errors. |
409 | 433 | $errors = array(); |
410 | 434 | if (!empty($_FILES['attachment']['error'][$n])) |
411 | 435 | { |
412 | - if ($_FILES['attachment']['error'][$n] == 2) |
|
413 | - $errors[] = array('file_too_big', array($modSettings['attachmentSizeLimit'])); |
|
414 | - elseif ($_FILES['attachment']['error'][$n] == 6) |
|
415 | - log_error($_FILES['attachment']['name'][$n] . ': ' . $txt['php_upload_error_6'], 'critical'); |
|
416 | - else |
|
417 | - log_error($_FILES['attachment']['name'][$n] . ': ' . $txt['php_upload_error_' . $_FILES['attachment']['error'][$n]]); |
|
418 | - if (empty($errors)) |
|
419 | - $errors[] = 'attach_php_error'; |
|
436 | + if ($_FILES['attachment']['error'][$n] == 2) { |
|
437 | + $errors[] = array('file_too_big', array($modSettings['attachmentSizeLimit'])); |
|
438 | + } elseif ($_FILES['attachment']['error'][$n] == 6) { |
|
439 | + log_error($_FILES['attachment']['name'][$n] . ': ' . $txt['php_upload_error_6'], 'critical'); |
|
440 | + } else { |
|
441 | + log_error($_FILES['attachment']['name'][$n] . ': ' . $txt['php_upload_error_' . $_FILES['attachment']['error'][$n]]); |
|
442 | + } |
|
443 | + if (empty($errors)) { |
|
444 | + $errors[] = 'attach_php_error'; |
|
445 | + } |
|
420 | 446 | } |
421 | 447 | |
422 | 448 | // Try to move and rename the file before doing any more checks on it. |
@@ -426,8 +452,9 @@ discard block |
||
426 | 452 | { |
427 | 453 | // The reported MIME type of the attachment might not be reliable. |
428 | 454 | // Fortunately, PHP 5.3+ lets us easily verify the real MIME type. |
429 | - if (function_exists('mime_content_type')) |
|
430 | - $_FILES['attachment']['type'][$n] = mime_content_type($_FILES['attachment']['tmp_name'][$n]); |
|
455 | + if (function_exists('mime_content_type')) { |
|
456 | + $_FILES['attachment']['type'][$n] = mime_content_type($_FILES['attachment']['tmp_name'][$n]); |
|
457 | + } |
|
431 | 458 | |
432 | 459 | $_SESSION['temp_attachments'][$attachID] = array( |
433 | 460 | 'name' => $smcFunc['htmlspecialchars'](basename($_FILES['attachment']['name'][$n])), |
@@ -439,16 +466,16 @@ discard block |
||
439 | 466 | ); |
440 | 467 | |
441 | 468 | // Move the file to the attachments folder with a temp name for now. |
442 | - if (@move_uploaded_file($_FILES['attachment']['tmp_name'][$n], $destName)) |
|
443 | - smf_chmod($destName, 0644); |
|
444 | - else |
|
469 | + if (@move_uploaded_file($_FILES['attachment']['tmp_name'][$n], $destName)) { |
|
470 | + smf_chmod($destName, 0644); |
|
471 | + } else |
|
445 | 472 | { |
446 | 473 | $_SESSION['temp_attachments'][$attachID]['errors'][] = 'attach_timeout'; |
447 | - if (file_exists($_FILES['attachment']['tmp_name'][$n])) |
|
448 | - unlink($_FILES['attachment']['tmp_name'][$n]); |
|
474 | + if (file_exists($_FILES['attachment']['tmp_name'][$n])) { |
|
475 | + unlink($_FILES['attachment']['tmp_name'][$n]); |
|
476 | + } |
|
449 | 477 | } |
450 | - } |
|
451 | - else |
|
478 | + } else |
|
452 | 479 | { |
453 | 480 | $_SESSION['temp_attachments'][$attachID] = array( |
454 | 481 | 'name' => $smcFunc['htmlspecialchars'](basename($_FILES['attachment']['name'][$n])), |
@@ -456,12 +483,14 @@ discard block |
||
456 | 483 | 'errors' => $errors, |
457 | 484 | ); |
458 | 485 | |
459 | - if (file_exists($_FILES['attachment']['tmp_name'][$n])) |
|
460 | - unlink($_FILES['attachment']['tmp_name'][$n]); |
|
486 | + if (file_exists($_FILES['attachment']['tmp_name'][$n])) { |
|
487 | + unlink($_FILES['attachment']['tmp_name'][$n]); |
|
488 | + } |
|
461 | 489 | } |
462 | 490 | // If there's no errors to this point. We still do need to apply some additional checks before we are finished. |
463 | - if (empty($_SESSION['temp_attachments'][$attachID]['errors'])) |
|
464 | - attachmentChecks($attachID); |
|
491 | + if (empty($_SESSION['temp_attachments'][$attachID]['errors'])) { |
|
492 | + attachmentChecks($attachID); |
|
493 | + } |
|
465 | 494 | } |
466 | 495 | // Mod authors, finally a hook to hang an alternate attachment upload system upon |
467 | 496 | // Upload to the current attachment folder with the file name $attachID or 'post_tmp_' . $user_info['id'] . '_' . md5(mt_rand()) |
@@ -488,21 +517,20 @@ discard block |
||
488 | 517 | global $modSettings, $context, $sourcedir, $smcFunc; |
489 | 518 | |
490 | 519 | // No data or missing data .... Not necessarily needed, but in case a mod author missed something. |
491 | - if (empty($_SESSION['temp_attachments'][$attachID])) |
|
492 | - $error = '$_SESSION[\'temp_attachments\'][$attachID]'; |
|
493 | - |
|
494 | - elseif (empty($attachID)) |
|
495 | - $error = '$attachID'; |
|
496 | - |
|
497 | - elseif (empty($context['attachments'])) |
|
498 | - $error = '$context[\'attachments\']'; |
|
499 | - |
|
500 | - elseif (empty($context['attach_dir'])) |
|
501 | - $error = '$context[\'attach_dir\']'; |
|
520 | + if (empty($_SESSION['temp_attachments'][$attachID])) { |
|
521 | + $error = '$_SESSION[\'temp_attachments\'][$attachID]'; |
|
522 | + } elseif (empty($attachID)) { |
|
523 | + $error = '$attachID'; |
|
524 | + } elseif (empty($context['attachments'])) { |
|
525 | + $error = '$context[\'attachments\']'; |
|
526 | + } elseif (empty($context['attach_dir'])) { |
|
527 | + $error = '$context[\'attach_dir\']'; |
|
528 | + } |
|
502 | 529 | |
503 | 530 | // Let's get their attention. |
504 | - if (!empty($error)) |
|
505 | - fatal_lang_error('attach_check_nag', 'debug', array($error)); |
|
531 | + if (!empty($error)) { |
|
532 | + fatal_lang_error('attach_check_nag', 'debug', array($error)); |
|
533 | + } |
|
506 | 534 | |
507 | 535 | // Just in case this slipped by the first checks, we stop it here and now |
508 | 536 | if ($_SESSION['temp_attachments'][$attachID]['size'] == 0) |
@@ -531,8 +559,9 @@ discard block |
||
531 | 559 | $size = @getimagesize($_SESSION['temp_attachments'][$attachID]['tmp_name']); |
532 | 560 | if (!(empty($size)) && ($size[2] != $old_format)) |
533 | 561 | { |
534 | - if (isset($context['valid_image_types'][$size[2]])) |
|
535 | - $_SESSION['temp_attachments'][$attachID]['type'] = 'image/' . $context['valid_image_types'][$size[2]]; |
|
562 | + if (isset($context['valid_image_types'][$size[2]])) { |
|
563 | + $_SESSION['temp_attachments'][$attachID]['type'] = 'image/' . $context['valid_image_types'][$size[2]]; |
|
564 | + } |
|
536 | 565 | } |
537 | 566 | } |
538 | 567 | } |
@@ -586,42 +615,48 @@ discard block |
||
586 | 615 | // Or, let the user know that it ain't gonna happen. |
587 | 616 | else |
588 | 617 | { |
589 | - if (isset($context['dir_creation_error'])) |
|
590 | - $_SESSION['temp_attachments'][$attachID]['errors'][] = $context['dir_creation_error']; |
|
591 | - else |
|
592 | - $_SESSION['temp_attachments'][$attachID]['errors'][] = 'ran_out_of_space'; |
|
618 | + if (isset($context['dir_creation_error'])) { |
|
619 | + $_SESSION['temp_attachments'][$attachID]['errors'][] = $context['dir_creation_error']; |
|
620 | + } else { |
|
621 | + $_SESSION['temp_attachments'][$attachID]['errors'][] = 'ran_out_of_space'; |
|
622 | + } |
|
593 | 623 | } |
624 | + } else { |
|
625 | + $_SESSION['temp_attachments'][$attachID]['errors'][] = 'ran_out_of_space'; |
|
594 | 626 | } |
595 | - else |
|
596 | - $_SESSION['temp_attachments'][$attachID]['errors'][] = 'ran_out_of_space'; |
|
597 | 627 | } |
598 | 628 | } |
599 | 629 | |
600 | 630 | // Is the file too big? |
601 | 631 | $context['attachments']['total_size'] += $_SESSION['temp_attachments'][$attachID]['size']; |
602 | - if (!empty($modSettings['attachmentSizeLimit']) && $_SESSION['temp_attachments'][$attachID]['size'] > $modSettings['attachmentSizeLimit'] * 1024) |
|
603 | - $_SESSION['temp_attachments'][$attachID]['errors'][] = array('file_too_big', array(comma_format($modSettings['attachmentSizeLimit'], 0))); |
|
632 | + if (!empty($modSettings['attachmentSizeLimit']) && $_SESSION['temp_attachments'][$attachID]['size'] > $modSettings['attachmentSizeLimit'] * 1024) { |
|
633 | + $_SESSION['temp_attachments'][$attachID]['errors'][] = array('file_too_big', array(comma_format($modSettings['attachmentSizeLimit'], 0))); |
|
634 | + } |
|
604 | 635 | |
605 | 636 | // Check the total upload size for this post... |
606 | - if (!empty($modSettings['attachmentPostLimit']) && $context['attachments']['total_size'] > $modSettings['attachmentPostLimit'] * 1024) |
|
607 | - $_SESSION['temp_attachments'][$attachID]['errors'][] = array('attach_max_total_file_size', array(comma_format($modSettings['attachmentPostLimit'], 0), comma_format($modSettings['attachmentPostLimit'] - (($context['attachments']['total_size'] - $_SESSION['temp_attachments'][$attachID]['size']) / 1024), 0))); |
|
637 | + if (!empty($modSettings['attachmentPostLimit']) && $context['attachments']['total_size'] > $modSettings['attachmentPostLimit'] * 1024) { |
|
638 | + $_SESSION['temp_attachments'][$attachID]['errors'][] = array('attach_max_total_file_size', array(comma_format($modSettings['attachmentPostLimit'], 0), comma_format($modSettings['attachmentPostLimit'] - (($context['attachments']['total_size'] - $_SESSION['temp_attachments'][$attachID]['size']) / 1024), 0))); |
|
639 | + } |
|
608 | 640 | |
609 | 641 | // Have we reached the maximum number of files we are allowed? |
610 | 642 | $context['attachments']['quantity']++; |
611 | 643 | |
612 | 644 | // Set a max limit if none exists |
613 | - if (empty($modSettings['attachmentNumPerPostLimit']) && $context['attachments']['quantity'] >= 50) |
|
614 | - $modSettings['attachmentNumPerPostLimit'] = 50; |
|
645 | + if (empty($modSettings['attachmentNumPerPostLimit']) && $context['attachments']['quantity'] >= 50) { |
|
646 | + $modSettings['attachmentNumPerPostLimit'] = 50; |
|
647 | + } |
|
615 | 648 | |
616 | - if (!empty($modSettings['attachmentNumPerPostLimit']) && $context['attachments']['quantity'] > $modSettings['attachmentNumPerPostLimit']) |
|
617 | - $_SESSION['temp_attachments'][$attachID]['errors'][] = array('attachments_limit_per_post', array($modSettings['attachmentNumPerPostLimit'])); |
|
649 | + if (!empty($modSettings['attachmentNumPerPostLimit']) && $context['attachments']['quantity'] > $modSettings['attachmentNumPerPostLimit']) { |
|
650 | + $_SESSION['temp_attachments'][$attachID]['errors'][] = array('attachments_limit_per_post', array($modSettings['attachmentNumPerPostLimit'])); |
|
651 | + } |
|
618 | 652 | |
619 | 653 | // File extension check |
620 | 654 | if (!empty($modSettings['attachmentCheckExtensions'])) |
621 | 655 | { |
622 | 656 | $allowed = explode(',', strtolower($modSettings['attachmentExtensions'])); |
623 | - foreach ($allowed as $k => $dummy) |
|
624 | - $allowed[$k] = trim($dummy); |
|
657 | + foreach ($allowed as $k => $dummy) { |
|
658 | + $allowed[$k] = trim($dummy); |
|
659 | + } |
|
625 | 660 | |
626 | 661 | if (!in_array(strtolower(substr(strrchr($_SESSION['temp_attachments'][$attachID]['name'], '.'), 1)), $allowed)) |
627 | 662 | { |
@@ -633,10 +668,12 @@ discard block |
||
633 | 668 | // Undo the math if there's an error |
634 | 669 | if (!empty($_SESSION['temp_attachments'][$attachID]['errors'])) |
635 | 670 | { |
636 | - if (isset($context['dir_size'])) |
|
637 | - $context['dir_size'] -= $_SESSION['temp_attachments'][$attachID]['size']; |
|
638 | - if (isset($context['dir_files'])) |
|
639 | - $context['dir_files']--; |
|
671 | + if (isset($context['dir_size'])) { |
|
672 | + $context['dir_size'] -= $_SESSION['temp_attachments'][$attachID]['size']; |
|
673 | + } |
|
674 | + if (isset($context['dir_files'])) { |
|
675 | + $context['dir_files']--; |
|
676 | + } |
|
640 | 677 | $context['attachments']['total_size'] -= $_SESSION['temp_attachments'][$attachID]['size']; |
641 | 678 | $context['attachments']['quantity']--; |
642 | 679 | return false; |
@@ -668,12 +705,14 @@ discard block |
||
668 | 705 | if (empty($attachmentOptions['mime_type']) && $attachmentOptions['width']) |
669 | 706 | { |
670 | 707 | // Got a proper mime type? |
671 | - if (!empty($size['mime'])) |
|
672 | - $attachmentOptions['mime_type'] = $size['mime']; |
|
708 | + if (!empty($size['mime'])) { |
|
709 | + $attachmentOptions['mime_type'] = $size['mime']; |
|
710 | + } |
|
673 | 711 | |
674 | 712 | // Otherwise a valid one? |
675 | - elseif (isset($context['valid_image_types'][$size[2]])) |
|
676 | - $attachmentOptions['mime_type'] = 'image/' . $context['valid_image_types'][$size[2]]; |
|
713 | + elseif (isset($context['valid_image_types'][$size[2]])) { |
|
714 | + $attachmentOptions['mime_type'] = 'image/' . $context['valid_image_types'][$size[2]]; |
|
715 | + } |
|
677 | 716 | } |
678 | 717 | |
679 | 718 | // It is possible we might have a MIME type that isn't actually an image but still have a size. |
@@ -685,15 +724,17 @@ discard block |
||
685 | 724 | } |
686 | 725 | |
687 | 726 | // Get the hash if no hash has been given yet. |
688 | - if (empty($attachmentOptions['file_hash'])) |
|
689 | - $attachmentOptions['file_hash'] = getAttachmentFilename($attachmentOptions['name'], false, null, true); |
|
727 | + if (empty($attachmentOptions['file_hash'])) { |
|
728 | + $attachmentOptions['file_hash'] = getAttachmentFilename($attachmentOptions['name'], false, null, true); |
|
729 | + } |
|
690 | 730 | |
691 | 731 | // Assuming no-one set the extension let's take a look at it. |
692 | 732 | if (empty($attachmentOptions['fileext'])) |
693 | 733 | { |
694 | 734 | $attachmentOptions['fileext'] = strtolower(strrpos($attachmentOptions['name'], '.') !== false ? substr($attachmentOptions['name'], strrpos($attachmentOptions['name'], '.') + 1) : ''); |
695 | - if (strlen($attachmentOptions['fileext']) > 8 || '.' . $attachmentOptions['fileext'] == $attachmentOptions['name']) |
|
696 | - $attachmentOptions['fileext'] = ''; |
|
735 | + if (strlen($attachmentOptions['fileext']) > 8 || '.' . $attachmentOptions['fileext'] == $attachmentOptions['name']) { |
|
736 | + $attachmentOptions['fileext'] = ''; |
|
737 | + } |
|
697 | 738 | } |
698 | 739 | |
699 | 740 | // Last chance to change stuff! |
@@ -702,8 +743,9 @@ discard block |
||
702 | 743 | // Make sure the folder is valid... |
703 | 744 | $tmp = is_array($modSettings['attachmentUploadDir']) ? $modSettings['attachmentUploadDir'] : $smcFunc['json_decode']($modSettings['attachmentUploadDir'], true); |
704 | 745 | $folders = array_keys($tmp); |
705 | - if (empty($attachmentOptions['id_folder']) || !in_array($attachmentOptions['id_folder'], $folders)) |
|
706 | - $attachmentOptions['id_folder'] = $modSettings['currentAttachmentUploadDir']; |
|
746 | + if (empty($attachmentOptions['id_folder']) || !in_array($attachmentOptions['id_folder'], $folders)) { |
|
747 | + $attachmentOptions['id_folder'] = $modSettings['currentAttachmentUploadDir']; |
|
748 | + } |
|
707 | 749 | |
708 | 750 | $attachmentOptions['id'] = $smcFunc['db_insert']('', |
709 | 751 | '{db_prefix}attachments', |
@@ -734,8 +776,8 @@ discard block |
||
734 | 776 | rename($attachmentOptions['tmp_name'], $attachmentOptions['destination']); |
735 | 777 | |
736 | 778 | // If it's not approved then add to the approval queue. |
737 | - if (!$attachmentOptions['approved']) |
|
738 | - $smcFunc['db_insert']('', |
|
779 | + if (!$attachmentOptions['approved']) { |
|
780 | + $smcFunc['db_insert']('', |
|
739 | 781 | '{db_prefix}approval_queue', |
740 | 782 | array( |
741 | 783 | 'id_attach' => 'int', 'id_msg' => 'int', |
@@ -745,9 +787,11 @@ discard block |
||
745 | 787 | ), |
746 | 788 | array() |
747 | 789 | ); |
790 | + } |
|
748 | 791 | |
749 | - if (empty($modSettings['attachmentThumbnails']) || (empty($attachmentOptions['width']) && empty($attachmentOptions['height']))) |
|
750 | - return true; |
|
792 | + if (empty($modSettings['attachmentThumbnails']) || (empty($attachmentOptions['width']) && empty($attachmentOptions['height']))) { |
|
793 | + return true; |
|
794 | + } |
|
751 | 795 | |
752 | 796 | // Like thumbnails, do we? |
753 | 797 | if (!empty($modSettings['attachmentThumbWidth']) && !empty($modSettings['attachmentThumbHeight']) && ($attachmentOptions['width'] > $modSettings['attachmentThumbWidth'] || $attachmentOptions['height'] > $modSettings['attachmentThumbHeight'])) |
@@ -758,13 +802,15 @@ discard block |
||
758 | 802 | $size = @getimagesize($attachmentOptions['destination'] . '_thumb'); |
759 | 803 | list ($thumb_width, $thumb_height) = $size; |
760 | 804 | |
761 | - if (!empty($size['mime'])) |
|
762 | - $thumb_mime = $size['mime']; |
|
763 | - elseif (isset($context['valid_image_types'][$size[2]])) |
|
764 | - $thumb_mime = 'image/' . $context['valid_image_types'][$size[2]]; |
|
805 | + if (!empty($size['mime'])) { |
|
806 | + $thumb_mime = $size['mime']; |
|
807 | + } elseif (isset($context['valid_image_types'][$size[2]])) { |
|
808 | + $thumb_mime = 'image/' . $context['valid_image_types'][$size[2]]; |
|
809 | + } |
|
765 | 810 | // Lord only knows how this happened... |
766 | - else |
|
767 | - $thumb_mime = ''; |
|
811 | + else { |
|
812 | + $thumb_mime = ''; |
|
813 | + } |
|
768 | 814 | |
769 | 815 | $thumb_filename = $attachmentOptions['name'] . '_thumb'; |
770 | 816 | $thumb_size = filesize($attachmentOptions['destination'] . '_thumb'); |
@@ -844,15 +890,17 @@ discard block |
||
844 | 890 | global $smcFunc; |
845 | 891 | |
846 | 892 | // Oh, come on! |
847 | - if (empty($attachIDs) || empty($msgID)) |
|
848 | - return false; |
|
893 | + if (empty($attachIDs) || empty($msgID)) { |
|
894 | + return false; |
|
895 | + } |
|
849 | 896 | |
850 | 897 | // "I see what is right and approve, but I do what is wrong." |
851 | 898 | call_integration_hook('integrate_assign_attachments', array(&$attachIDs, &$msgID)); |
852 | 899 | |
853 | 900 | // One last check |
854 | - if (empty($attachIDs)) |
|
855 | - return false; |
|
901 | + if (empty($attachIDs)) { |
|
902 | + return false; |
|
903 | + } |
|
856 | 904 | |
857 | 905 | // Perform. |
858 | 906 | $smcFunc['db_query']('', ' |
@@ -880,8 +928,9 @@ discard block |
||
880 | 928 | global $board, $modSettings, $context, $scripturl, $smcFunc; |
881 | 929 | |
882 | 930 | // Meh... |
883 | - if (empty($attachID)) |
|
884 | - return 'attachments_no_data_loaded'; |
|
931 | + if (empty($attachID)) { |
|
932 | + return 'attachments_no_data_loaded'; |
|
933 | + } |
|
885 | 934 | |
886 | 935 | // Make it easy. |
887 | 936 | $msgID = !empty($_REQUEST['msg']) ? (int) $_REQUEST['msg'] : 0; |
@@ -890,20 +939,23 @@ discard block |
||
890 | 939 | $externalParse = call_integration_hook('integrate_pre_parseAttachBBC', array($attachID, $msgID)); |
891 | 940 | |
892 | 941 | // "I am innocent of the blood of this just person: see ye to it." |
893 | - if (!empty($externalParse) && (is_string($externalParse) || is_array($externalParse))) |
|
894 | - return $externalParse; |
|
942 | + if (!empty($externalParse) && (is_string($externalParse) || is_array($externalParse))) { |
|
943 | + return $externalParse; |
|
944 | + } |
|
895 | 945 | |
896 | 946 | //Are attachments enable? |
897 | - if (empty($modSettings['attachmentEnable'])) |
|
898 | - return 'attachments_not_enable'; |
|
947 | + if (empty($modSettings['attachmentEnable'])) { |
|
948 | + return 'attachments_not_enable'; |
|
949 | + } |
|
899 | 950 | |
900 | 951 | // Previewing much? no msg ID has been set yet. |
901 | 952 | if (!empty($context['preview_message'])) |
902 | 953 | { |
903 | 954 | $allAttachments = getAttachsByMsg(0); |
904 | 955 | |
905 | - if (empty($allAttachments[0][$attachID])) |
|
906 | - return 'attachments_no_data_loaded'; |
|
956 | + if (empty($allAttachments[0][$attachID])) { |
|
957 | + return 'attachments_no_data_loaded'; |
|
958 | + } |
|
907 | 959 | |
908 | 960 | $attachLoaded = loadAttachmentContext(0, $allAttachments); |
909 | 961 | |
@@ -915,57 +967,66 @@ discard block |
||
915 | 967 | $attachContext['link'] = '<a href="' . $scripturl . '?action=dlattach;attach=' . $attachID . ';type=preview' . (empty($attachContext['is_image']) ? ';file' : '') . '">' . $smcFunc['htmlspecialchars']($attachContext['name']) . '</a>'; |
916 | 968 | |
917 | 969 | // Fix the thumbnail too, if the image has one. |
918 | - if (!empty($attachContext['thumbnail']) && !empty($attachContext['thumbnail']['has_thumb'])) |
|
919 | - $attachContext['thumbnail']['href'] = $scripturl . '?action=dlattach;attach=' . $attachContext['thumbnail']['id'] . ';image;type=preview'; |
|
970 | + if (!empty($attachContext['thumbnail']) && !empty($attachContext['thumbnail']['has_thumb'])) { |
|
971 | + $attachContext['thumbnail']['href'] = $scripturl . '?action=dlattach;attach=' . $attachContext['thumbnail']['id'] . ';image;type=preview'; |
|
972 | + } |
|
920 | 973 | |
921 | 974 | return $attachContext; |
922 | 975 | } |
923 | 976 | |
924 | 977 | // There is always the chance someone else has already done our dirty work... |
925 | 978 | // If so, all pertinent checks were already done. Hopefully... |
926 | - if (!empty($context['current_attachments']) && !empty($context['current_attachments'][$attachID])) |
|
927 | - return $context['current_attachments'][$attachID]; |
|
979 | + if (!empty($context['current_attachments']) && !empty($context['current_attachments'][$attachID])) { |
|
980 | + return $context['current_attachments'][$attachID]; |
|
981 | + } |
|
928 | 982 | |
929 | 983 | // If we are lucky enough to be in $board's scope then check it! |
930 | - if (!empty($board) && !allowedTo('view_attachments', $board)) |
|
931 | - return 'attachments_not_allowed_to_see'; |
|
984 | + if (!empty($board) && !allowedTo('view_attachments', $board)) { |
|
985 | + return 'attachments_not_allowed_to_see'; |
|
986 | + } |
|
932 | 987 | |
933 | 988 | // Get the message info associated with this particular attach ID. |
934 | 989 | $attachInfo = getAttachMsgInfo($attachID); |
935 | 990 | |
936 | 991 | // There is always the chance this attachment no longer exists or isn't associated to a message anymore... |
937 | - if (empty($attachInfo) || empty($attachInfo['msg'])) |
|
938 | - return 'attachments_no_msg_associated'; |
|
992 | + if (empty($attachInfo) || empty($attachInfo['msg'])) { |
|
993 | + return 'attachments_no_msg_associated'; |
|
994 | + } |
|
939 | 995 | |
940 | 996 | // Hold it! got the info now check if you can see this attachment. |
941 | - if (!allowedTo('view_attachments', $attachInfo['board'])) |
|
942 | - return 'attachments_not_allowed_to_see'; |
|
997 | + if (!allowedTo('view_attachments', $attachInfo['board'])) { |
|
998 | + return 'attachments_not_allowed_to_see'; |
|
999 | + } |
|
943 | 1000 | |
944 | 1001 | $allAttachments = getAttachsByMsg($attachInfo['msg']); |
945 | 1002 | $attachContext = $allAttachments[$attachInfo['msg']][$attachID]; |
946 | 1003 | |
947 | 1004 | // No point in keep going further. |
948 | - if (!allowedTo('view_attachments', $attachContext['board'])) |
|
949 | - return 'attachments_not_allowed_to_see'; |
|
1005 | + if (!allowedTo('view_attachments', $attachContext['board'])) { |
|
1006 | + return 'attachments_not_allowed_to_see'; |
|
1007 | + } |
|
950 | 1008 | |
951 | 1009 | // Load this particular attach's context. |
952 | - if (!empty($attachContext)) |
|
953 | - $attachLoaded = loadAttachmentContext($attachContext['id_msg'], $allAttachments); |
|
1010 | + if (!empty($attachContext)) { |
|
1011 | + $attachLoaded = loadAttachmentContext($attachContext['id_msg'], $allAttachments); |
|
1012 | + } |
|
954 | 1013 | |
955 | 1014 | // One last check, you know, gotta be paranoid... |
956 | - else |
|
957 | - return 'attachments_no_data_loaded'; |
|
1015 | + else { |
|
1016 | + return 'attachments_no_data_loaded'; |
|
1017 | + } |
|
958 | 1018 | |
959 | 1019 | // This is the last "if" I promise! |
960 | - if (empty($attachLoaded)) |
|
961 | - return 'attachments_no_data_loaded'; |
|
962 | - |
|
963 | - else |
|
964 | - $attachContext = $attachLoaded[$attachID]; |
|
1020 | + if (empty($attachLoaded)) { |
|
1021 | + return 'attachments_no_data_loaded'; |
|
1022 | + } else { |
|
1023 | + $attachContext = $attachLoaded[$attachID]; |
|
1024 | + } |
|
965 | 1025 | |
966 | 1026 | // You may or may not want to show this under the post. |
967 | - if (!empty($modSettings['dont_show_attach_under_post']) && !isset($context['show_attach_under_post'][$attachID])) |
|
968 | - $context['show_attach_under_post'][$attachID] = $attachID; |
|
1027 | + if (!empty($modSettings['dont_show_attach_under_post']) && !isset($context['show_attach_under_post'][$attachID])) { |
|
1028 | + $context['show_attach_under_post'][$attachID] = $attachID; |
|
1029 | + } |
|
969 | 1030 | |
970 | 1031 | // Last minute changes? |
971 | 1032 | call_integration_hook('integrate_post_parseAttachBBC', array(&$attachContext)); |
@@ -985,8 +1046,9 @@ discard block |
||
985 | 1046 | { |
986 | 1047 | global $smcFunc, $modSettings; |
987 | 1048 | |
988 | - if (empty($attachIDs)) |
|
989 | - return array(); |
|
1049 | + if (empty($attachIDs)) { |
|
1050 | + return array(); |
|
1051 | + } |
|
990 | 1052 | |
991 | 1053 | $return = array(); |
992 | 1054 | |
@@ -1002,11 +1064,12 @@ discard block |
||
1002 | 1064 | ) |
1003 | 1065 | ); |
1004 | 1066 | |
1005 | - if ($smcFunc['db_num_rows']($request) != 1) |
|
1006 | - return array(); |
|
1067 | + if ($smcFunc['db_num_rows']($request) != 1) { |
|
1068 | + return array(); |
|
1069 | + } |
|
1007 | 1070 | |
1008 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
1009 | - $return[$row['id_attach']] = array( |
|
1071 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
1072 | + $return[$row['id_attach']] = array( |
|
1010 | 1073 | 'name' => $smcFunc['htmlspecialchars']($row['filename']), |
1011 | 1074 | 'size' => $row['size'], |
1012 | 1075 | 'attachID' => $row['id_attach'], |
@@ -1015,6 +1078,7 @@ discard block |
||
1015 | 1078 | 'mime_type' => $row['mime_type'], |
1016 | 1079 | 'thumb' => $row['id_thumb'], |
1017 | 1080 | ); |
1081 | + } |
|
1018 | 1082 | $smcFunc['db_free_result']($request); |
1019 | 1083 | |
1020 | 1084 | return $return; |
@@ -1031,8 +1095,9 @@ discard block |
||
1031 | 1095 | { |
1032 | 1096 | global $smcFunc; |
1033 | 1097 | |
1034 | - if (empty($attachID)) |
|
1035 | - return array(); |
|
1098 | + if (empty($attachID)) { |
|
1099 | + return array(); |
|
1100 | + } |
|
1036 | 1101 | |
1037 | 1102 | $request = $smcFunc['db_query']('', ' |
1038 | 1103 | SELECT a.id_msg AS msg, m.id_topic AS topic, m.id_board AS board |
@@ -1045,8 +1110,9 @@ discard block |
||
1045 | 1110 | ) |
1046 | 1111 | ); |
1047 | 1112 | |
1048 | - if ($smcFunc['db_num_rows']($request) != 1) |
|
1049 | - return array(); |
|
1113 | + if ($smcFunc['db_num_rows']($request) != 1) { |
|
1114 | + return array(); |
|
1115 | + } |
|
1050 | 1116 | |
1051 | 1117 | $row = $smcFunc['db_fetch_assoc']($request); |
1052 | 1118 | $smcFunc['db_free_result']($request); |
@@ -1087,8 +1153,9 @@ discard block |
||
1087 | 1153 | $temp = array(); |
1088 | 1154 | while ($row = $smcFunc['db_fetch_assoc']($request)) |
1089 | 1155 | { |
1090 | - if (!$row['approved'] && $modSettings['postmod_active'] && !allowedTo('approve_posts') && (!isset($all_posters[$row['id_msg']]) || $all_posters[$row['id_msg']] != $user_info['id'])) |
|
1091 | - continue; |
|
1156 | + if (!$row['approved'] && $modSettings['postmod_active'] && !allowedTo('approve_posts') && (!isset($all_posters[$row['id_msg']]) || $all_posters[$row['id_msg']] != $user_info['id'])) { |
|
1157 | + continue; |
|
1158 | + } |
|
1092 | 1159 | |
1093 | 1160 | $temp[$row['id_attach']] = $row; |
1094 | 1161 | } |
@@ -1117,8 +1184,9 @@ discard block |
||
1117 | 1184 | { |
1118 | 1185 | global $modSettings, $txt, $scripturl, $sourcedir, $smcFunc; |
1119 | 1186 | |
1120 | - if (empty($attachments) || empty($attachments[$id_msg])) |
|
1121 | - return array(); |
|
1187 | + if (empty($attachments) || empty($attachments[$id_msg])) { |
|
1188 | + return array(); |
|
1189 | + } |
|
1122 | 1190 | |
1123 | 1191 | // Set up the attachment info - based on code by Meriadoc. |
1124 | 1192 | $attachmentData = array(); |
@@ -1142,11 +1210,13 @@ discard block |
||
1142 | 1210 | ); |
1143 | 1211 | |
1144 | 1212 | // If something is unapproved we'll note it so we can sort them. |
1145 | - if (!$attachment['approved']) |
|
1146 | - $have_unapproved = true; |
|
1213 | + if (!$attachment['approved']) { |
|
1214 | + $have_unapproved = true; |
|
1215 | + } |
|
1147 | 1216 | |
1148 | - if (!$attachmentData[$i]['is_image']) |
|
1149 | - continue; |
|
1217 | + if (!$attachmentData[$i]['is_image']) { |
|
1218 | + continue; |
|
1219 | + } |
|
1150 | 1220 | |
1151 | 1221 | $attachmentData[$i]['real_width'] = $attachment['width']; |
1152 | 1222 | $attachmentData[$i]['width'] = $attachment['width']; |
@@ -1167,11 +1237,11 @@ discard block |
||
1167 | 1237 | // So what folder are we putting this image in? |
1168 | 1238 | if (!empty($modSettings['currentAttachmentUploadDir'])) |
1169 | 1239 | { |
1170 | - if (!is_array($modSettings['attachmentUploadDir'])) |
|
1171 | - $modSettings['attachmentUploadDir'] = $smcFunc['json_decode']($modSettings['attachmentUploadDir'], true); |
|
1240 | + if (!is_array($modSettings['attachmentUploadDir'])) { |
|
1241 | + $modSettings['attachmentUploadDir'] = $smcFunc['json_decode']($modSettings['attachmentUploadDir'], true); |
|
1242 | + } |
|
1172 | 1243 | $id_folder_thumb = $modSettings['currentAttachmentUploadDir']; |
1173 | - } |
|
1174 | - else |
|
1244 | + } else |
|
1175 | 1245 | { |
1176 | 1246 | $id_folder_thumb = 1; |
1177 | 1247 | } |
@@ -1185,10 +1255,11 @@ discard block |
||
1185 | 1255 | $thumb_ext = isset($context['valid_image_types'][$size[2]]) ? $context['valid_image_types'][$size[2]] : ''; |
1186 | 1256 | |
1187 | 1257 | // Figure out the mime type. |
1188 | - if (!empty($size['mime'])) |
|
1189 | - $thumb_mime = $size['mime']; |
|
1190 | - else |
|
1191 | - $thumb_mime = 'image/' . $thumb_ext; |
|
1258 | + if (!empty($size['mime'])) { |
|
1259 | + $thumb_mime = $size['mime']; |
|
1260 | + } else { |
|
1261 | + $thumb_mime = 'image/' . $thumb_ext; |
|
1262 | + } |
|
1192 | 1263 | |
1193 | 1264 | $thumb_filename = $attachment['filename'] . '_thumb'; |
1194 | 1265 | $thumb_hash = getAttachmentFilename($thumb_filename, false, null, true); |
@@ -1236,11 +1307,12 @@ discard block |
||
1236 | 1307 | } |
1237 | 1308 | } |
1238 | 1309 | |
1239 | - if (!empty($attachment['id_thumb'])) |
|
1240 | - $attachmentData[$i]['thumbnail'] = array( |
|
1310 | + if (!empty($attachment['id_thumb'])) { |
|
1311 | + $attachmentData[$i]['thumbnail'] = array( |
|
1241 | 1312 | 'id' => $attachment['id_thumb'], |
1242 | 1313 | 'href' => $scripturl . '?action=dlattach;topic=' . $attachment['topic'] . '.0;attach=' . $attachment['id_thumb'] . ';image', |
1243 | 1314 | ); |
1315 | + } |
|
1244 | 1316 | $attachmentData[$i]['thumbnail']['has_thumb'] = !empty($attachment['id_thumb']); |
1245 | 1317 | |
1246 | 1318 | // If thumbnails are disabled, check the maximum size of the image. |
@@ -1250,30 +1322,31 @@ discard block |
||
1250 | 1322 | { |
1251 | 1323 | $attachmentData[$i]['width'] = $modSettings['max_image_width']; |
1252 | 1324 | $attachmentData[$i]['height'] = floor($attachment['height'] * $modSettings['max_image_width'] / $attachment['width']); |
1253 | - } |
|
1254 | - elseif (!empty($modSettings['max_image_width'])) |
|
1325 | + } elseif (!empty($modSettings['max_image_width'])) |
|
1255 | 1326 | { |
1256 | 1327 | $attachmentData[$i]['width'] = floor($attachment['width'] * $modSettings['max_image_height'] / $attachment['height']); |
1257 | 1328 | $attachmentData[$i]['height'] = $modSettings['max_image_height']; |
1258 | 1329 | } |
1259 | - } |
|
1260 | - elseif ($attachmentData[$i]['thumbnail']['has_thumb']) |
|
1330 | + } elseif ($attachmentData[$i]['thumbnail']['has_thumb']) |
|
1261 | 1331 | { |
1262 | 1332 | // If the image is too large to show inline, make it a popup. |
1263 | - if (((!empty($modSettings['max_image_width']) && $attachmentData[$i]['real_width'] > $modSettings['max_image_width']) || (!empty($modSettings['max_image_height']) && $attachmentData[$i]['real_height'] > $modSettings['max_image_height']))) |
|
1264 | - $attachmentData[$i]['thumbnail']['javascript'] = 'return reqWin(\'' . $attachmentData[$i]['href'] . ';image\', ' . ($attachment['width'] + 20) . ', ' . ($attachment['height'] + 20) . ', true);'; |
|
1265 | - else |
|
1266 | - $attachmentData[$i]['thumbnail']['javascript'] = 'return expandThumb(' . $attachment['id_attach'] . ');'; |
|
1333 | + if (((!empty($modSettings['max_image_width']) && $attachmentData[$i]['real_width'] > $modSettings['max_image_width']) || (!empty($modSettings['max_image_height']) && $attachmentData[$i]['real_height'] > $modSettings['max_image_height']))) { |
|
1334 | + $attachmentData[$i]['thumbnail']['javascript'] = 'return reqWin(\'' . $attachmentData[$i]['href'] . ';image\', ' . ($attachment['width'] + 20) . ', ' . ($attachment['height'] + 20) . ', true);'; |
|
1335 | + } else { |
|
1336 | + $attachmentData[$i]['thumbnail']['javascript'] = 'return expandThumb(' . $attachment['id_attach'] . ');'; |
|
1337 | + } |
|
1267 | 1338 | } |
1268 | 1339 | |
1269 | - if (!$attachmentData[$i]['thumbnail']['has_thumb']) |
|
1270 | - $attachmentData[$i]['downloads']++; |
|
1340 | + if (!$attachmentData[$i]['thumbnail']['has_thumb']) { |
|
1341 | + $attachmentData[$i]['downloads']++; |
|
1342 | + } |
|
1271 | 1343 | } |
1272 | 1344 | } |
1273 | 1345 | |
1274 | 1346 | // Do we need to instigate a sort? |
1275 | - if ($have_unapproved) |
|
1276 | - usort($attachmentData, 'approved_attach_sort'); |
|
1347 | + if ($have_unapproved) { |
|
1348 | + usort($attachmentData, 'approved_attach_sort'); |
|
1349 | + } |
|
1277 | 1350 | |
1278 | 1351 | return $attachmentData; |
1279 | 1352 | } |
@@ -13,8 +13,9 @@ discard block |
||
13 | 13 | * @version 2.1 Beta 4 |
14 | 14 | */ |
15 | 15 | |
16 | -if (!defined('SMF')) |
|
16 | +if (!defined('SMF')) { |
|
17 | 17 | die('No direct access...'); |
18 | +} |
|
18 | 19 | |
19 | 20 | /** |
20 | 21 | * Update some basic statistics. |
@@ -122,10 +123,11 @@ discard block |
||
122 | 123 | $smcFunc['db_free_result']($result); |
123 | 124 | |
124 | 125 | // Add this to the number of unapproved members |
125 | - if (!empty($changes['unapprovedMembers'])) |
|
126 | - $changes['unapprovedMembers'] += $coppa_approvals; |
|
127 | - else |
|
128 | - $changes['unapprovedMembers'] = $coppa_approvals; |
|
126 | + if (!empty($changes['unapprovedMembers'])) { |
|
127 | + $changes['unapprovedMembers'] += $coppa_approvals; |
|
128 | + } else { |
|
129 | + $changes['unapprovedMembers'] = $coppa_approvals; |
|
130 | + } |
|
129 | 131 | } |
130 | 132 | } |
131 | 133 | } |
@@ -133,9 +135,9 @@ discard block |
||
133 | 135 | break; |
134 | 136 | |
135 | 137 | case 'message': |
136 | - if ($parameter1 === true && $parameter2 !== null) |
|
137 | - updateSettings(array('totalMessages' => true, 'maxMsgID' => $parameter2), true); |
|
138 | - else |
|
138 | + if ($parameter1 === true && $parameter2 !== null) { |
|
139 | + updateSettings(array('totalMessages' => true, 'maxMsgID' => $parameter2), true); |
|
140 | + } else |
|
139 | 141 | { |
140 | 142 | // SUM and MAX on a smaller table is better for InnoDB tables. |
141 | 143 | $result = $smcFunc['db_query']('', ' |
@@ -175,24 +177,25 @@ discard block |
||
175 | 177 | $parameter2 = text2words($parameter2); |
176 | 178 | |
177 | 179 | $inserts = array(); |
178 | - foreach ($parameter2 as $word) |
|
179 | - $inserts[] = array($word, $parameter1); |
|
180 | + foreach ($parameter2 as $word) { |
|
181 | + $inserts[] = array($word, $parameter1); |
|
182 | + } |
|
180 | 183 | |
181 | - if (!empty($inserts)) |
|
182 | - $smcFunc['db_insert']('ignore', |
|
184 | + if (!empty($inserts)) { |
|
185 | + $smcFunc['db_insert']('ignore', |
|
183 | 186 | '{db_prefix}log_search_subjects', |
184 | 187 | array('word' => 'string', 'id_topic' => 'int'), |
185 | 188 | $inserts, |
186 | 189 | array('word', 'id_topic') |
187 | 190 | ); |
191 | + } |
|
188 | 192 | } |
189 | 193 | break; |
190 | 194 | |
191 | 195 | case 'topic': |
192 | - if ($parameter1 === true) |
|
193 | - updateSettings(array('totalTopics' => true), true); |
|
194 | - |
|
195 | - else |
|
196 | + if ($parameter1 === true) { |
|
197 | + updateSettings(array('totalTopics' => true), true); |
|
198 | + } else |
|
196 | 199 | { |
197 | 200 | // Get the number of topics - a SUM is better for InnoDB tables. |
198 | 201 | // We also ignore the recycle bin here because there will probably be a bunch of one-post topics there. |
@@ -213,8 +216,9 @@ discard block |
||
213 | 216 | |
214 | 217 | case 'postgroups': |
215 | 218 | // Parameter two is the updated columns: we should check to see if we base groups off any of these. |
216 | - if ($parameter2 !== null && !in_array('posts', $parameter2)) |
|
217 | - return; |
|
219 | + if ($parameter2 !== null && !in_array('posts', $parameter2)) { |
|
220 | + return; |
|
221 | + } |
|
218 | 222 | |
219 | 223 | $postgroups = cache_get_data('updateStats:postgroups', 360); |
220 | 224 | if ($postgroups == null || $parameter1 == null) |
@@ -229,8 +233,9 @@ discard block |
||
229 | 233 | ) |
230 | 234 | ); |
231 | 235 | $postgroups = array(); |
232 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
233 | - $postgroups[$row['id_group']] = $row['min_posts']; |
|
236 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
237 | + $postgroups[$row['id_group']] = $row['min_posts']; |
|
238 | + } |
|
234 | 239 | |
235 | 240 | $smcFunc['db_free_result']($request); |
236 | 241 | |
@@ -241,8 +246,9 @@ discard block |
||
241 | 246 | } |
242 | 247 | |
243 | 248 | // Oh great, they've screwed their post groups. |
244 | - if (empty($postgroups)) |
|
245 | - return; |
|
249 | + if (empty($postgroups)) { |
|
250 | + return; |
|
251 | + } |
|
246 | 252 | |
247 | 253 | // Set all membergroups from most posts to least posts. |
248 | 254 | $conditions = ''; |
@@ -301,12 +307,9 @@ discard block |
||
301 | 307 | { |
302 | 308 | $condition = 'id_member IN ({array_int:members})'; |
303 | 309 | $parameters['members'] = $members; |
304 | - } |
|
305 | - |
|
306 | - elseif ($members === null) |
|
307 | - $condition = '1=1'; |
|
308 | - |
|
309 | - else |
|
310 | + } elseif ($members === null) { |
|
311 | + $condition = '1=1'; |
|
312 | + } else |
|
310 | 313 | { |
311 | 314 | $condition = 'id_member = {int:member}'; |
312 | 315 | $parameters['member'] = $members; |
@@ -346,9 +349,9 @@ discard block |
||
346 | 349 | if (count($vars_to_integrate) != 0) |
347 | 350 | { |
348 | 351 | // Fetch a list of member_names if necessary |
349 | - if ((!is_array($members) && $members === $user_info['id']) || (is_array($members) && count($members) == 1 && in_array($user_info['id'], $members))) |
|
350 | - $member_names = array($user_info['username']); |
|
351 | - else |
|
352 | + if ((!is_array($members) && $members === $user_info['id']) || (is_array($members) && count($members) == 1 && in_array($user_info['id'], $members))) { |
|
353 | + $member_names = array($user_info['username']); |
|
354 | + } else |
|
352 | 355 | { |
353 | 356 | $member_names = array(); |
354 | 357 | $request = $smcFunc['db_query']('', ' |
@@ -357,14 +360,16 @@ discard block |
||
357 | 360 | WHERE ' . $condition, |
358 | 361 | $parameters |
359 | 362 | ); |
360 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
361 | - $member_names[] = $row['member_name']; |
|
363 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
364 | + $member_names[] = $row['member_name']; |
|
365 | + } |
|
362 | 366 | $smcFunc['db_free_result']($request); |
363 | 367 | } |
364 | 368 | |
365 | - if (!empty($member_names)) |
|
366 | - foreach ($vars_to_integrate as $var) |
|
369 | + if (!empty($member_names)) { |
|
370 | + foreach ($vars_to_integrate as $var) |
|
367 | 371 | call_integration_hook('integrate_change_member_data', array($member_names, $var, &$data[$var], &$knownInts, &$knownFloats)); |
372 | + } |
|
368 | 373 | } |
369 | 374 | } |
370 | 375 | |
@@ -372,16 +377,17 @@ discard block |
||
372 | 377 | foreach ($data as $var => $val) |
373 | 378 | { |
374 | 379 | $type = 'string'; |
375 | - if (in_array($var, $knownInts)) |
|
376 | - $type = 'int'; |
|
377 | - elseif (in_array($var, $knownFloats)) |
|
378 | - $type = 'float'; |
|
379 | - elseif ($var == 'birthdate') |
|
380 | - $type = 'date'; |
|
381 | - elseif ($var == 'member_ip') |
|
382 | - $type = 'inet'; |
|
383 | - elseif ($var == 'member_ip2') |
|
384 | - $type = 'inet'; |
|
380 | + if (in_array($var, $knownInts)) { |
|
381 | + $type = 'int'; |
|
382 | + } elseif (in_array($var, $knownFloats)) { |
|
383 | + $type = 'float'; |
|
384 | + } elseif ($var == 'birthdate') { |
|
385 | + $type = 'date'; |
|
386 | + } elseif ($var == 'member_ip') { |
|
387 | + $type = 'inet'; |
|
388 | + } elseif ($var == 'member_ip2') { |
|
389 | + $type = 'inet'; |
|
390 | + } |
|
385 | 391 | |
386 | 392 | // Doing an increment? |
387 | 393 | if ($var == 'alerts' && ($val === '+' || $val === '-')) |
@@ -390,18 +396,17 @@ discard block |
||
390 | 396 | if (is_array($members)) |
391 | 397 | { |
392 | 398 | $val = 'CASE '; |
393 | - foreach ($members as $k => $v) |
|
394 | - $val .= 'WHEN id_member = ' . $v . ' THEN '. count(fetch_alerts($v, false, 0, array(), false)) . ' '; |
|
399 | + foreach ($members as $k => $v) { |
|
400 | + $val .= 'WHEN id_member = ' . $v . ' THEN '. count(fetch_alerts($v, false, 0, array(), false)) . ' '; |
|
401 | + } |
|
395 | 402 | $val = $val . ' END'; |
396 | 403 | $type = 'raw'; |
397 | - } |
|
398 | - else |
|
404 | + } else |
|
399 | 405 | { |
400 | 406 | $blub = fetch_alerts($members, false, 0, array(), false); |
401 | 407 | $val = count($blub); |
402 | 408 | } |
403 | - } |
|
404 | - else if ($type == 'int' && ($val === '+' || $val === '-')) |
|
409 | + } else if ($type == 'int' && ($val === '+' || $val === '-')) |
|
405 | 410 | { |
406 | 411 | $val = $var . ' ' . $val . ' 1'; |
407 | 412 | $type = 'raw'; |
@@ -412,8 +417,9 @@ discard block |
||
412 | 417 | { |
413 | 418 | if (preg_match('~^' . $var . ' (\+ |- |\+ -)([\d]+)~', $val, $match)) |
414 | 419 | { |
415 | - if ($match[1] != '+ ') |
|
416 | - $val = 'CASE WHEN ' . $var . ' <= ' . abs($match[2]) . ' THEN 0 ELSE ' . $val . ' END'; |
|
420 | + if ($match[1] != '+ ') { |
|
421 | + $val = 'CASE WHEN ' . $var . ' <= ' . abs($match[2]) . ' THEN 0 ELSE ' . $val . ' END'; |
|
422 | + } |
|
417 | 423 | $type = 'raw'; |
418 | 424 | } |
419 | 425 | } |
@@ -434,8 +440,9 @@ discard block |
||
434 | 440 | // Clear any caching? |
435 | 441 | if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2 && !empty($members)) |
436 | 442 | { |
437 | - if (!is_array($members)) |
|
438 | - $members = array($members); |
|
443 | + if (!is_array($members)) { |
|
444 | + $members = array($members); |
|
445 | + } |
|
439 | 446 | |
440 | 447 | foreach ($members as $member) |
441 | 448 | { |
@@ -468,29 +475,32 @@ discard block |
||
468 | 475 | { |
469 | 476 | global $modSettings, $smcFunc; |
470 | 477 | |
471 | - if (empty($changeArray) || !is_array($changeArray)) |
|
472 | - return; |
|
478 | + if (empty($changeArray) || !is_array($changeArray)) { |
|
479 | + return; |
|
480 | + } |
|
473 | 481 | |
474 | 482 | $toRemove = array(); |
475 | 483 | |
476 | 484 | // Go check if there is any setting to be removed. |
477 | - foreach ($changeArray as $k => $v) |
|
478 | - if ($v === null) |
|
485 | + foreach ($changeArray as $k => $v) { |
|
486 | + if ($v === null) |
|
479 | 487 | { |
480 | 488 | // Found some, remove them from the original array and add them to ours. |
481 | 489 | unset($changeArray[$k]); |
490 | + } |
|
482 | 491 | $toRemove[] = $k; |
483 | 492 | } |
484 | 493 | |
485 | 494 | // Proceed with the deletion. |
486 | - if (!empty($toRemove)) |
|
487 | - $smcFunc['db_query']('', ' |
|
495 | + if (!empty($toRemove)) { |
|
496 | + $smcFunc['db_query']('', ' |
|
488 | 497 | DELETE FROM {db_prefix}settings |
489 | 498 | WHERE variable IN ({array_string:remove})', |
490 | 499 | array( |
491 | 500 | 'remove' => $toRemove, |
492 | 501 | ) |
493 | 502 | ); |
503 | + } |
|
494 | 504 | |
495 | 505 | // In some cases, this may be better and faster, but for large sets we don't want so many UPDATEs. |
496 | 506 | if ($update) |
@@ -519,19 +529,22 @@ discard block |
||
519 | 529 | foreach ($changeArray as $variable => $value) |
520 | 530 | { |
521 | 531 | // Don't bother if it's already like that ;). |
522 | - if (isset($modSettings[$variable]) && $modSettings[$variable] == $value) |
|
523 | - continue; |
|
532 | + if (isset($modSettings[$variable]) && $modSettings[$variable] == $value) { |
|
533 | + continue; |
|
534 | + } |
|
524 | 535 | // If the variable isn't set, but would only be set to nothing'ness, then don't bother setting it. |
525 | - elseif (!isset($modSettings[$variable]) && empty($value)) |
|
526 | - continue; |
|
536 | + elseif (!isset($modSettings[$variable]) && empty($value)) { |
|
537 | + continue; |
|
538 | + } |
|
527 | 539 | |
528 | 540 | $replaceArray[] = array($variable, $value); |
529 | 541 | |
530 | 542 | $modSettings[$variable] = $value; |
531 | 543 | } |
532 | 544 | |
533 | - if (empty($replaceArray)) |
|
534 | - return; |
|
545 | + if (empty($replaceArray)) { |
|
546 | + return; |
|
547 | + } |
|
535 | 548 | |
536 | 549 | $smcFunc['db_insert']('replace', |
537 | 550 | '{db_prefix}settings', |
@@ -577,14 +590,17 @@ discard block |
||
577 | 590 | $start_invalid = $start < 0; |
578 | 591 | |
579 | 592 | // Make sure $start is a proper variable - not less than 0. |
580 | - if ($start_invalid) |
|
581 | - $start = 0; |
|
593 | + if ($start_invalid) { |
|
594 | + $start = 0; |
|
595 | + } |
|
582 | 596 | // Not greater than the upper bound. |
583 | - elseif ($start >= $max_value) |
|
584 | - $start = max(0, (int) $max_value - (((int) $max_value % (int) $num_per_page) == 0 ? $num_per_page : ((int) $max_value % (int) $num_per_page))); |
|
597 | + elseif ($start >= $max_value) { |
|
598 | + $start = max(0, (int) $max_value - (((int) $max_value % (int) $num_per_page) == 0 ? $num_per_page : ((int) $max_value % (int) $num_per_page))); |
|
599 | + } |
|
585 | 600 | // And it has to be a multiple of $num_per_page! |
586 | - else |
|
587 | - $start = max(0, (int) $start - ((int) $start % (int) $num_per_page)); |
|
601 | + else { |
|
602 | + $start = max(0, (int) $start - ((int) $start % (int) $num_per_page)); |
|
603 | + } |
|
588 | 604 | |
589 | 605 | $context['current_page'] = $start / $num_per_page; |
590 | 606 | |
@@ -614,77 +630,87 @@ discard block |
||
614 | 630 | |
615 | 631 | // Show all the pages. |
616 | 632 | $display_page = 1; |
617 | - for ($counter = 0; $counter < $max_value; $counter += $num_per_page) |
|
618 | - $pageindex .= $start == $counter && !$start_invalid ? sprintf($settings['page_index']['current_page'], $display_page++) : sprintf($base_link, $counter, $display_page++); |
|
633 | + for ($counter = 0; $counter < $max_value; $counter += $num_per_page) { |
|
634 | + $pageindex .= $start == $counter && !$start_invalid ? sprintf($settings['page_index']['current_page'], $display_page++) : sprintf($base_link, $counter, $display_page++); |
|
635 | + } |
|
619 | 636 | |
620 | 637 | // Show the right arrow. |
621 | 638 | $display_page = ($start + $num_per_page) > $max_value ? $max_value : ($start + $num_per_page); |
622 | - if ($start != $counter - $max_value && !$start_invalid) |
|
623 | - $pageindex .= $display_page > $counter - $num_per_page ? ' ' : sprintf($base_link, $display_page, $settings['page_index']['next_page']); |
|
624 | - } |
|
625 | - else |
|
639 | + if ($start != $counter - $max_value && !$start_invalid) { |
|
640 | + $pageindex .= $display_page > $counter - $num_per_page ? ' ' : sprintf($base_link, $display_page, $settings['page_index']['next_page']); |
|
641 | + } |
|
642 | + } else |
|
626 | 643 | { |
627 | 644 | // If they didn't enter an odd value, pretend they did. |
628 | 645 | $PageContiguous = (int) ($modSettings['compactTopicPagesContiguous'] - ($modSettings['compactTopicPagesContiguous'] % 2)) / 2; |
629 | 646 | |
630 | 647 | // Show the "prev page" link. (>prev page< 1 ... 6 7 [8] 9 10 ... 15 next page) |
631 | - if (!empty($start) && $show_prevnext) |
|
632 | - $pageindex .= sprintf($base_link, $start - $num_per_page, $settings['page_index']['previous_page']); |
|
633 | - else |
|
634 | - $pageindex .= ''; |
|
648 | + if (!empty($start) && $show_prevnext) { |
|
649 | + $pageindex .= sprintf($base_link, $start - $num_per_page, $settings['page_index']['previous_page']); |
|
650 | + } else { |
|
651 | + $pageindex .= ''; |
|
652 | + } |
|
635 | 653 | |
636 | 654 | // Show the first page. (prev page >1< ... 6 7 [8] 9 10 ... 15) |
637 | - if ($start > $num_per_page * $PageContiguous) |
|
638 | - $pageindex .= sprintf($base_link, 0, '1'); |
|
655 | + if ($start > $num_per_page * $PageContiguous) { |
|
656 | + $pageindex .= sprintf($base_link, 0, '1'); |
|
657 | + } |
|
639 | 658 | |
640 | 659 | // Show the ... after the first page. (prev page 1 >...< 6 7 [8] 9 10 ... 15 next page) |
641 | - if ($start > $num_per_page * ($PageContiguous + 1)) |
|
642 | - $pageindex .= strtr($settings['page_index']['expand_pages'], array( |
|
660 | + if ($start > $num_per_page * ($PageContiguous + 1)) { |
|
661 | + $pageindex .= strtr($settings['page_index']['expand_pages'], array( |
|
643 | 662 | '{LINK}' => JavaScriptEscape($smcFunc['htmlspecialchars']($base_link)), |
644 | 663 | '{FIRST_PAGE}' => $num_per_page, |
645 | 664 | '{LAST_PAGE}' => $start - $num_per_page * $PageContiguous, |
646 | 665 | '{PER_PAGE}' => $num_per_page, |
647 | 666 | )); |
667 | + } |
|
648 | 668 | |
649 | 669 | // Show the pages before the current one. (prev page 1 ... >6 7< [8] 9 10 ... 15 next page) |
650 | - for ($nCont = $PageContiguous; $nCont >= 1; $nCont--) |
|
651 | - if ($start >= $num_per_page * $nCont) |
|
670 | + for ($nCont = $PageContiguous; $nCont >= 1; $nCont--) { |
|
671 | + if ($start >= $num_per_page * $nCont) |
|
652 | 672 | { |
653 | 673 | $tmpStart = $start - $num_per_page * $nCont; |
674 | + } |
|
654 | 675 | $pageindex .= sprintf($base_link, $tmpStart, $tmpStart / $num_per_page + 1); |
655 | 676 | } |
656 | 677 | |
657 | 678 | // Show the current page. (prev page 1 ... 6 7 >[8]< 9 10 ... 15 next page) |
658 | - if (!$start_invalid) |
|
659 | - $pageindex .= sprintf($settings['page_index']['current_page'], $start / $num_per_page + 1); |
|
660 | - else |
|
661 | - $pageindex .= sprintf($base_link, $start, $start / $num_per_page + 1); |
|
679 | + if (!$start_invalid) { |
|
680 | + $pageindex .= sprintf($settings['page_index']['current_page'], $start / $num_per_page + 1); |
|
681 | + } else { |
|
682 | + $pageindex .= sprintf($base_link, $start, $start / $num_per_page + 1); |
|
683 | + } |
|
662 | 684 | |
663 | 685 | // Show the pages after the current one... (prev page 1 ... 6 7 [8] >9 10< ... 15 next page) |
664 | 686 | $tmpMaxPages = (int) (($max_value - 1) / $num_per_page) * $num_per_page; |
665 | - for ($nCont = 1; $nCont <= $PageContiguous; $nCont++) |
|
666 | - if ($start + $num_per_page * $nCont <= $tmpMaxPages) |
|
687 | + for ($nCont = 1; $nCont <= $PageContiguous; $nCont++) { |
|
688 | + if ($start + $num_per_page * $nCont <= $tmpMaxPages) |
|
667 | 689 | { |
668 | 690 | $tmpStart = $start + $num_per_page * $nCont; |
691 | + } |
|
669 | 692 | $pageindex .= sprintf($base_link, $tmpStart, $tmpStart / $num_per_page + 1); |
670 | 693 | } |
671 | 694 | |
672 | 695 | // Show the '...' part near the end. (prev page 1 ... 6 7 [8] 9 10 >...< 15 next page) |
673 | - if ($start + $num_per_page * ($PageContiguous + 1) < $tmpMaxPages) |
|
674 | - $pageindex .= strtr($settings['page_index']['expand_pages'], array( |
|
696 | + if ($start + $num_per_page * ($PageContiguous + 1) < $tmpMaxPages) { |
|
697 | + $pageindex .= strtr($settings['page_index']['expand_pages'], array( |
|
675 | 698 | '{LINK}' => JavaScriptEscape($smcFunc['htmlspecialchars']($base_link)), |
676 | 699 | '{FIRST_PAGE}' => $start + $num_per_page * ($PageContiguous + 1), |
677 | 700 | '{LAST_PAGE}' => $tmpMaxPages, |
678 | 701 | '{PER_PAGE}' => $num_per_page, |
679 | 702 | )); |
703 | + } |
|
680 | 704 | |
681 | 705 | // Show the last number in the list. (prev page 1 ... 6 7 [8] 9 10 ... >15< next page) |
682 | - if ($start + $num_per_page * $PageContiguous < $tmpMaxPages) |
|
683 | - $pageindex .= sprintf($base_link, $tmpMaxPages, $tmpMaxPages / $num_per_page + 1); |
|
706 | + if ($start + $num_per_page * $PageContiguous < $tmpMaxPages) { |
|
707 | + $pageindex .= sprintf($base_link, $tmpMaxPages, $tmpMaxPages / $num_per_page + 1); |
|
708 | + } |
|
684 | 709 | |
685 | 710 | // Show the "next page" link. (prev page 1 ... 6 7 [8] 9 10 ... 15 >next page<) |
686 | - if ($start != $tmpMaxPages && $show_prevnext) |
|
687 | - $pageindex .= sprintf($base_link, $start + $num_per_page, $settings['page_index']['next_page']); |
|
711 | + if ($start != $tmpMaxPages && $show_prevnext) { |
|
712 | + $pageindex .= sprintf($base_link, $start + $num_per_page, $settings['page_index']['next_page']); |
|
713 | + } |
|
688 | 714 | } |
689 | 715 | $pageindex .= $settings['page_index']['extra_after']; |
690 | 716 | |
@@ -710,8 +736,9 @@ discard block |
||
710 | 736 | if ($decimal_separator === null) |
711 | 737 | { |
712 | 738 | // Not set for whatever reason? |
713 | - if (empty($txt['number_format']) || preg_match('~^1([^\d]*)?234([^\d]*)(0*?)$~', $txt['number_format'], $matches) != 1) |
|
714 | - return $number; |
|
739 | + if (empty($txt['number_format']) || preg_match('~^1([^\d]*)?234([^\d]*)(0*?)$~', $txt['number_format'], $matches) != 1) { |
|
740 | + return $number; |
|
741 | + } |
|
715 | 742 | |
716 | 743 | // Cache these each load... |
717 | 744 | $thousands_separator = $matches[1]; |
@@ -752,17 +779,20 @@ discard block |
||
752 | 779 | $user_info['time_format'] = !empty($user_info['time_format']) ? $user_info['time_format'] : (!empty($modSettings['time_format']) ? $modSettings['time_format'] : '%F %H:%M'); |
753 | 780 | |
754 | 781 | // Offset the time. |
755 | - if (!$offset_type) |
|
756 | - $time = $log_time + ($user_info['time_offset'] + $modSettings['time_offset']) * 3600; |
|
782 | + if (!$offset_type) { |
|
783 | + $time = $log_time + ($user_info['time_offset'] + $modSettings['time_offset']) * 3600; |
|
784 | + } |
|
757 | 785 | // Just the forum offset? |
758 | - elseif ($offset_type == 'forum') |
|
759 | - $time = $log_time + $modSettings['time_offset'] * 3600; |
|
760 | - else |
|
761 | - $time = $log_time; |
|
786 | + elseif ($offset_type == 'forum') { |
|
787 | + $time = $log_time + $modSettings['time_offset'] * 3600; |
|
788 | + } else { |
|
789 | + $time = $log_time; |
|
790 | + } |
|
762 | 791 | |
763 | 792 | // We can't have a negative date (on Windows, at least.) |
764 | - if ($log_time < 0) |
|
765 | - $log_time = 0; |
|
793 | + if ($log_time < 0) { |
|
794 | + $log_time = 0; |
|
795 | + } |
|
766 | 796 | |
767 | 797 | // Today and Yesterday? |
768 | 798 | if ($modSettings['todayMod'] >= 1 && $show_today === true) |
@@ -779,24 +809,27 @@ discard block |
||
779 | 809 | { |
780 | 810 | $h = strpos($user_info['time_format'], '%l') === false ? '%I' : '%l'; |
781 | 811 | $today_fmt = $h . ':%M' . $s . ' %p'; |
812 | + } else { |
|
813 | + $today_fmt = '%H:%M' . $s; |
|
782 | 814 | } |
783 | - else |
|
784 | - $today_fmt = '%H:%M' . $s; |
|
785 | 815 | |
786 | 816 | // Same day of the year, same year.... Today! |
787 | - if ($then['yday'] == $now['yday'] && $then['year'] == $now['year']) |
|
788 | - return $txt['today'] . timeformat($log_time, $today_fmt, $offset_type); |
|
817 | + if ($then['yday'] == $now['yday'] && $then['year'] == $now['year']) { |
|
818 | + return $txt['today'] . timeformat($log_time, $today_fmt, $offset_type); |
|
819 | + } |
|
789 | 820 | |
790 | 821 | // Day-of-year is one less and same year, or it's the first of the year and that's the last of the year... |
791 | - if ($modSettings['todayMod'] == '2' && (($then['yday'] == $now['yday'] - 1 && $then['year'] == $now['year']) || ($now['yday'] == 0 && $then['year'] == $now['year'] - 1) && $then['mon'] == 12 && $then['mday'] == 31)) |
|
792 | - return $txt['yesterday'] . timeformat($log_time, $today_fmt, $offset_type); |
|
822 | + if ($modSettings['todayMod'] == '2' && (($then['yday'] == $now['yday'] - 1 && $then['year'] == $now['year']) || ($now['yday'] == 0 && $then['year'] == $now['year'] - 1) && $then['mon'] == 12 && $then['mday'] == 31)) { |
|
823 | + return $txt['yesterday'] . timeformat($log_time, $today_fmt, $offset_type); |
|
824 | + } |
|
793 | 825 | } |
794 | 826 | |
795 | 827 | $str = !is_bool($show_today) ? $show_today : $user_info['time_format']; |
796 | 828 | |
797 | 829 | // Use the cached formats if available |
798 | - if (is_null($finalizedFormats)) |
|
799 | - $finalizedFormats = (array) cache_get_data('timeformatstrings', 86400); |
|
830 | + if (is_null($finalizedFormats)) { |
|
831 | + $finalizedFormats = (array) cache_get_data('timeformatstrings', 86400); |
|
832 | + } |
|
800 | 833 | |
801 | 834 | // Make a supported version for this format if we don't already have one |
802 | 835 | if (empty($finalizedFormats[$str])) |
@@ -825,8 +858,9 @@ discard block |
||
825 | 858 | ); |
826 | 859 | |
827 | 860 | // No need to do this part again if we already did it once |
828 | - if (is_null($unsupportedFormats)) |
|
829 | - $unsupportedFormats = (array) cache_get_data('unsupportedtimeformats', 86400); |
|
861 | + if (is_null($unsupportedFormats)) { |
|
862 | + $unsupportedFormats = (array) cache_get_data('unsupportedtimeformats', 86400); |
|
863 | + } |
|
830 | 864 | if (empty($unsupportedFormats)) |
831 | 865 | { |
832 | 866 | foreach($strftimeFormatSubstitutions as $format => $substitution) |
@@ -842,20 +876,23 @@ discard block |
||
842 | 876 | |
843 | 877 | // Windows will return false for unsupported formats |
844 | 878 | // Other operating systems return the format string as a literal |
845 | - if ($value === false || $value === $format) |
|
846 | - $unsupportedFormats[] = $format; |
|
879 | + if ($value === false || $value === $format) { |
|
880 | + $unsupportedFormats[] = $format; |
|
881 | + } |
|
847 | 882 | } |
848 | 883 | cache_put_data('unsupportedtimeformats', $unsupportedFormats, 86400); |
849 | 884 | } |
850 | 885 | |
851 | 886 | // Windows needs extra help if $timeformat contains something completely invalid, e.g. '%Q' |
852 | - if (DIRECTORY_SEPARATOR === '\\') |
|
853 | - $timeformat = preg_replace('~%(?!' . implode('|', array_keys($strftimeFormatSubstitutions)) . ')~', '%', $timeformat); |
|
887 | + if (DIRECTORY_SEPARATOR === '\\') { |
|
888 | + $timeformat = preg_replace('~%(?!' . implode('|', array_keys($strftimeFormatSubstitutions)) . ')~', '%', $timeformat); |
|
889 | + } |
|
854 | 890 | |
855 | 891 | // Substitute unsupported formats with supported ones |
856 | - if (!empty($unsupportedFormats)) |
|
857 | - while (preg_match('~%(' . implode('|', $unsupportedFormats) . ')~', $timeformat, $matches)) |
|
892 | + if (!empty($unsupportedFormats)) { |
|
893 | + while (preg_match('~%(' . implode('|', $unsupportedFormats) . ')~', $timeformat, $matches)) |
|
858 | 894 | $timeformat = str_replace($matches[0], $strftimeFormatSubstitutions[$matches[1]], $timeformat); |
895 | + } |
|
859 | 896 | |
860 | 897 | // Remember this so we don't need to do it again |
861 | 898 | $finalizedFormats[$str] = $timeformat; |
@@ -864,33 +901,39 @@ discard block |
||
864 | 901 | |
865 | 902 | $str = $finalizedFormats[$str]; |
866 | 903 | |
867 | - if (!isset($locale_cache)) |
|
868 | - $locale_cache = setlocale(LC_TIME, $txt['lang_locale'] . !empty($modSettings['global_character_set']) ? '.' . $modSettings['global_character_set'] : ''); |
|
904 | + if (!isset($locale_cache)) { |
|
905 | + $locale_cache = setlocale(LC_TIME, $txt['lang_locale'] . !empty($modSettings['global_character_set']) ? '.' . $modSettings['global_character_set'] : ''); |
|
906 | + } |
|
869 | 907 | |
870 | 908 | if ($locale_cache !== false) |
871 | 909 | { |
872 | 910 | // Check if another process changed the locale |
873 | - if ($process_safe === true && setlocale(LC_TIME, '0') != $locale_cache) |
|
874 | - setlocale(LC_TIME, $txt['lang_locale'] . !empty($modSettings['global_character_set']) ? '.' . $modSettings['global_character_set'] : ''); |
|
911 | + if ($process_safe === true && setlocale(LC_TIME, '0') != $locale_cache) { |
|
912 | + setlocale(LC_TIME, $txt['lang_locale'] . !empty($modSettings['global_character_set']) ? '.' . $modSettings['global_character_set'] : ''); |
|
913 | + } |
|
875 | 914 | |
876 | - if (!isset($non_twelve_hour)) |
|
877 | - $non_twelve_hour = trim(strftime('%p')) === ''; |
|
878 | - if ($non_twelve_hour && strpos($str, '%p') !== false) |
|
879 | - $str = str_replace('%p', (strftime('%H', $time) < 12 ? $txt['time_am'] : $txt['time_pm']), $str); |
|
915 | + if (!isset($non_twelve_hour)) { |
|
916 | + $non_twelve_hour = trim(strftime('%p')) === ''; |
|
917 | + } |
|
918 | + if ($non_twelve_hour && strpos($str, '%p') !== false) { |
|
919 | + $str = str_replace('%p', (strftime('%H', $time) < 12 ? $txt['time_am'] : $txt['time_pm']), $str); |
|
920 | + } |
|
880 | 921 | |
881 | - foreach (array('%a', '%A', '%b', '%B') as $token) |
|
882 | - if (strpos($str, $token) !== false) |
|
922 | + foreach (array('%a', '%A', '%b', '%B') as $token) { |
|
923 | + if (strpos($str, $token) !== false) |
|
883 | 924 | $str = str_replace($token, strftime($token, $time), $str); |
884 | - } |
|
885 | - else |
|
925 | + } |
|
926 | + } else |
|
886 | 927 | { |
887 | 928 | // Do-it-yourself time localization. Fun. |
888 | - foreach (array('%a' => 'days_short', '%A' => 'days', '%b' => 'months_short', '%B' => 'months') as $token => $text_label) |
|
889 | - if (strpos($str, $token) !== false) |
|
929 | + foreach (array('%a' => 'days_short', '%A' => 'days', '%b' => 'months_short', '%B' => 'months') as $token => $text_label) { |
|
930 | + if (strpos($str, $token) !== false) |
|
890 | 931 | $str = str_replace($token, $txt[$text_label][(int) strftime($token === '%a' || $token === '%A' ? '%w' : '%m', $time)], $str); |
932 | + } |
|
891 | 933 | |
892 | - if (strpos($str, '%p') !== false) |
|
893 | - $str = str_replace('%p', (strftime('%H', $time) < 12 ? $txt['time_am'] : $txt['time_pm']), $str); |
|
934 | + if (strpos($str, '%p') !== false) { |
|
935 | + $str = str_replace('%p', (strftime('%H', $time) < 12 ? $txt['time_am'] : $txt['time_pm']), $str); |
|
936 | + } |
|
894 | 937 | } |
895 | 938 | |
896 | 939 | // Format the time and then restore any literal percent characters |
@@ -912,16 +955,19 @@ discard block |
||
912 | 955 | static $translation = array(); |
913 | 956 | |
914 | 957 | // Determine the character set... Default to UTF-8 |
915 | - if (empty($context['character_set'])) |
|
916 | - $charset = 'UTF-8'; |
|
958 | + if (empty($context['character_set'])) { |
|
959 | + $charset = 'UTF-8'; |
|
960 | + } |
|
917 | 961 | // Use ISO-8859-1 in place of non-supported ISO-8859 charsets... |
918 | - elseif (strpos($context['character_set'], 'ISO-8859-') !== false && !in_array($context['character_set'], array('ISO-8859-5', 'ISO-8859-15'))) |
|
919 | - $charset = 'ISO-8859-1'; |
|
920 | - else |
|
921 | - $charset = $context['character_set']; |
|
962 | + elseif (strpos($context['character_set'], 'ISO-8859-') !== false && !in_array($context['character_set'], array('ISO-8859-5', 'ISO-8859-15'))) { |
|
963 | + $charset = 'ISO-8859-1'; |
|
964 | + } else { |
|
965 | + $charset = $context['character_set']; |
|
966 | + } |
|
922 | 967 | |
923 | - if (empty($translation)) |
|
924 | - $translation = array_flip(get_html_translation_table(HTML_SPECIALCHARS, ENT_QUOTES, $charset)) + array(''' => '\'', ''' => '\'', ' ' => ' '); |
|
968 | + if (empty($translation)) { |
|
969 | + $translation = array_flip(get_html_translation_table(HTML_SPECIALCHARS, ENT_QUOTES, $charset)) + array(''' => '\'', ''' => '\'', ' ' => ' '); |
|
970 | + } |
|
925 | 971 | |
926 | 972 | return strtr($string, $translation); |
927 | 973 | } |
@@ -943,8 +989,9 @@ discard block |
||
943 | 989 | global $smcFunc; |
944 | 990 | |
945 | 991 | // It was already short enough! |
946 | - if ($smcFunc['strlen']($subject) <= $len) |
|
947 | - return $subject; |
|
992 | + if ($smcFunc['strlen']($subject) <= $len) { |
|
993 | + return $subject; |
|
994 | + } |
|
948 | 995 | |
949 | 996 | // Shorten it by the length it was too long, and strip off junk from the end. |
950 | 997 | return $smcFunc['substr']($subject, 0, $len) . '...'; |
@@ -963,10 +1010,11 @@ discard block |
||
963 | 1010 | { |
964 | 1011 | global $user_info, $modSettings; |
965 | 1012 | |
966 | - if ($timestamp === null) |
|
967 | - $timestamp = time(); |
|
968 | - elseif ($timestamp == 0) |
|
969 | - return 0; |
|
1013 | + if ($timestamp === null) { |
|
1014 | + $timestamp = time(); |
|
1015 | + } elseif ($timestamp == 0) { |
|
1016 | + return 0; |
|
1017 | + } |
|
970 | 1018 | |
971 | 1019 | return $timestamp + ($modSettings['time_offset'] + ($use_user_offset ? $user_info['time_offset'] : 0)) * 3600; |
972 | 1020 | } |
@@ -995,8 +1043,9 @@ discard block |
||
995 | 1043 | $array[$i] = $array[$j]; |
996 | 1044 | $array[$j] = $temp; |
997 | 1045 | |
998 | - for ($i = 1; $p[$i] == 0; $i++) |
|
999 | - $p[$i] = 1; |
|
1046 | + for ($i = 1; $p[$i] == 0; $i++) { |
|
1047 | + $p[$i] = 1; |
|
1048 | + } |
|
1000 | 1049 | |
1001 | 1050 | $orders[] = $array; |
1002 | 1051 | } |
@@ -1028,12 +1077,14 @@ discard block |
||
1028 | 1077 | static $disabled; |
1029 | 1078 | |
1030 | 1079 | // Don't waste cycles |
1031 | - if ($message === '') |
|
1032 | - return ''; |
|
1080 | + if ($message === '') { |
|
1081 | + return ''; |
|
1082 | + } |
|
1033 | 1083 | |
1034 | 1084 | // Just in case it wasn't determined yet whether UTF-8 is enabled. |
1035 | - if (!isset($context['utf8'])) |
|
1036 | - $context['utf8'] = (empty($modSettings['global_character_set']) ? $txt['lang_character_set'] : $modSettings['global_character_set']) === 'UTF-8'; |
|
1085 | + if (!isset($context['utf8'])) { |
|
1086 | + $context['utf8'] = (empty($modSettings['global_character_set']) ? $txt['lang_character_set'] : $modSettings['global_character_set']) === 'UTF-8'; |
|
1087 | + } |
|
1037 | 1088 | |
1038 | 1089 | // Clean up any cut/paste issues we may have |
1039 | 1090 | $message = sanitizeMSCutPaste($message); |
@@ -1045,13 +1096,15 @@ discard block |
||
1045 | 1096 | return $message; |
1046 | 1097 | } |
1047 | 1098 | |
1048 | - if ($smileys !== null && ($smileys == '1' || $smileys == '0')) |
|
1049 | - $smileys = (bool) $smileys; |
|
1099 | + if ($smileys !== null && ($smileys == '1' || $smileys == '0')) { |
|
1100 | + $smileys = (bool) $smileys; |
|
1101 | + } |
|
1050 | 1102 | |
1051 | 1103 | if (empty($modSettings['enableBBC']) && $message !== false) |
1052 | 1104 | { |
1053 | - if ($smileys === true) |
|
1054 | - parsesmileys($message); |
|
1105 | + if ($smileys === true) { |
|
1106 | + parsesmileys($message); |
|
1107 | + } |
|
1055 | 1108 | |
1056 | 1109 | return $message; |
1057 | 1110 | } |
@@ -1064,8 +1117,9 @@ discard block |
||
1064 | 1117 | } |
1065 | 1118 | |
1066 | 1119 | // Ensure $modSettings['tld_regex'] contains a valid regex for the autolinker |
1067 | - if (!empty($modSettings['autoLinkUrls'])) |
|
1068 | - set_tld_regex(); |
|
1120 | + if (!empty($modSettings['autoLinkUrls'])) { |
|
1121 | + set_tld_regex(); |
|
1122 | + } |
|
1069 | 1123 | |
1070 | 1124 | // Allow mods access before entering the main parse_bbc loop |
1071 | 1125 | call_integration_hook('integrate_pre_parsebbc', array(&$message, &$smileys, &$cache_id, &$parse_tags)); |
@@ -1079,8 +1133,9 @@ discard block |
||
1079 | 1133 | |
1080 | 1134 | $temp = explode(',', strtolower($modSettings['disabledBBC'])); |
1081 | 1135 | |
1082 | - foreach ($temp as $tag) |
|
1083 | - $disabled[trim($tag)] = true; |
|
1136 | + foreach ($temp as $tag) { |
|
1137 | + $disabled[trim($tag)] = true; |
|
1138 | + } |
|
1084 | 1139 | } |
1085 | 1140 | |
1086 | 1141 | // The YouTube bbc needs this for its origin parameter |
@@ -1214,8 +1269,9 @@ discard block |
||
1214 | 1269 | $returnContext = ''; |
1215 | 1270 | |
1216 | 1271 | // BBC or the entire attachments feature is disabled |
1217 | - if (empty($modSettings['attachmentEnable']) || !empty($disabled['attach'])) |
|
1218 | - return $data; |
|
1272 | + if (empty($modSettings['attachmentEnable']) || !empty($disabled['attach'])) { |
|
1273 | + return $data; |
|
1274 | + } |
|
1219 | 1275 | |
1220 | 1276 | // Save the attach ID. |
1221 | 1277 | $attachID = $data; |
@@ -1226,8 +1282,9 @@ discard block |
||
1226 | 1282 | $currentAttachment = parseAttachBBC($attachID); |
1227 | 1283 | |
1228 | 1284 | // parseAttachBBC will return a string ($txt key) rather than dying with a fatal_error. Up to you to decide what to do. |
1229 | - if (is_string($currentAttachment)) |
|
1230 | - return $data = !empty($txt[$currentAttachment]) ? $txt[$currentAttachment] : $currentAttachment; |
|
1285 | + if (is_string($currentAttachment)) { |
|
1286 | + return $data = !empty($txt[$currentAttachment]) ? $txt[$currentAttachment] : $currentAttachment; |
|
1287 | + } |
|
1231 | 1288 | |
1232 | 1289 | if (!empty($currentAttachment['is_image'])) |
1233 | 1290 | { |
@@ -1243,15 +1300,17 @@ discard block |
||
1243 | 1300 | $height = ' height="' . $currentAttachment['height'] . '"'; |
1244 | 1301 | } |
1245 | 1302 | |
1246 | - if ($currentAttachment['thumbnail']['has_thumb'] && empty($params['{width}']) && empty($params['{height}'])) |
|
1247 | - $returnContext .= '<a href="'. $currentAttachment['href']. ';image" id="link_'. $currentAttachment['id']. '" onclick="'. $currentAttachment['thumbnail']['javascript']. '"><img src="'. $currentAttachment['thumbnail']['href']. '"' . $alt . $title . ' id="thumb_'. $currentAttachment['id']. '" class="atc_img"></a>'; |
|
1248 | - else |
|
1249 | - $returnContext .= '<img src="' . $currentAttachment['href'] . ';image"' . $alt . $title . $width . $height . ' class="bbc_img"/>'; |
|
1303 | + if ($currentAttachment['thumbnail']['has_thumb'] && empty($params['{width}']) && empty($params['{height}'])) { |
|
1304 | + $returnContext .= '<a href="'. $currentAttachment['href']. ';image" id="link_'. $currentAttachment['id']. '" onclick="'. $currentAttachment['thumbnail']['javascript']. '"><img src="'. $currentAttachment['thumbnail']['href']. '"' . $alt . $title . ' id="thumb_'. $currentAttachment['id']. '" class="atc_img"></a>'; |
|
1305 | + } else { |
|
1306 | + $returnContext .= '<img src="' . $currentAttachment['href'] . ';image"' . $alt . $title . $width . $height . ' class="bbc_img"/>'; |
|
1307 | + } |
|
1250 | 1308 | } |
1251 | 1309 | |
1252 | 1310 | // No image. Show a link. |
1253 | - else |
|
1254 | - $returnContext .= $currentAttachment['link']; |
|
1311 | + else { |
|
1312 | + $returnContext .= $currentAttachment['link']; |
|
1313 | + } |
|
1255 | 1314 | |
1256 | 1315 | // Gotta append what we just did. |
1257 | 1316 | $data = $returnContext; |
@@ -1305,8 +1364,9 @@ discard block |
||
1305 | 1364 | for ($php_i = 0, $php_n = count($php_parts); $php_i < $php_n; $php_i++) |
1306 | 1365 | { |
1307 | 1366 | // Do PHP code coloring? |
1308 | - if ($php_parts[$php_i] != '<?php') |
|
1309 | - continue; |
|
1367 | + if ($php_parts[$php_i] != '<?php') { |
|
1368 | + continue; |
|
1369 | + } |
|
1310 | 1370 | |
1311 | 1371 | $php_string = ''; |
1312 | 1372 | while ($php_i + 1 < count($php_parts) && $php_parts[$php_i] != '?>') |
@@ -1322,8 +1382,9 @@ discard block |
||
1322 | 1382 | $data = str_replace("\t", "<span style=\"white-space: pre;\">\t</span>", $data); |
1323 | 1383 | |
1324 | 1384 | // Recent Opera bug requiring temporary fix. &nsbp; is needed before </code> to avoid broken selection. |
1325 | - if (!empty($context['browser']['is_opera'])) |
|
1326 | - $data .= ' '; |
|
1385 | + if (!empty($context['browser']['is_opera'])) { |
|
1386 | + $data .= ' '; |
|
1387 | + } |
|
1327 | 1388 | } |
1328 | 1389 | }, |
1329 | 1390 | 'block_level' => true, |
@@ -1342,8 +1403,9 @@ discard block |
||
1342 | 1403 | for ($php_i = 0, $php_n = count($php_parts); $php_i < $php_n; $php_i++) |
1343 | 1404 | { |
1344 | 1405 | // Do PHP code coloring? |
1345 | - if ($php_parts[$php_i] != '<?php') |
|
1346 | - continue; |
|
1406 | + if ($php_parts[$php_i] != '<?php') { |
|
1407 | + continue; |
|
1408 | + } |
|
1347 | 1409 | |
1348 | 1410 | $php_string = ''; |
1349 | 1411 | while ($php_i + 1 < count($php_parts) && $php_parts[$php_i] != '?>') |
@@ -1359,8 +1421,9 @@ discard block |
||
1359 | 1421 | $data[0] = str_replace("\t", "<span style=\"white-space: pre;\">\t</span>", $data[0]); |
1360 | 1422 | |
1361 | 1423 | // Recent Opera bug requiring temporary fix. &nsbp; is needed before </code> to avoid broken selection. |
1362 | - if (!empty($context['browser']['is_opera'])) |
|
1363 | - $data[0] .= ' '; |
|
1424 | + if (!empty($context['browser']['is_opera'])) { |
|
1425 | + $data[0] .= ' '; |
|
1426 | + } |
|
1364 | 1427 | } |
1365 | 1428 | }, |
1366 | 1429 | 'block_level' => true, |
@@ -1401,10 +1464,11 @@ discard block |
||
1401 | 1464 | { |
1402 | 1465 | $class = 'class="bbc_float float' . (strpos($data, 'left') === 0 ? 'left' : 'right') . '"'; |
1403 | 1466 | |
1404 | - if (preg_match('~\bmax=(\d+(?:%|px|em|rem|ex|pt|pc|ch|vw|vh|vmin|vmax|cm|mm|in)?)~', $data, $matches)) |
|
1405 | - $css = ' style="max-width:' . $matches[1] . (is_numeric($matches[1]) ? 'px' : '') . '"'; |
|
1406 | - else |
|
1407 | - $css = ''; |
|
1467 | + if (preg_match('~\bmax=(\d+(?:%|px|em|rem|ex|pt|pc|ch|vw|vh|vmin|vmax|cm|mm|in)?)~', $data, $matches)) { |
|
1468 | + $css = ' style="max-width:' . $matches[1] . (is_numeric($matches[1]) ? 'px' : '') . '"'; |
|
1469 | + } else { |
|
1470 | + $css = ''; |
|
1471 | + } |
|
1408 | 1472 | |
1409 | 1473 | $data = $class . $css; |
1410 | 1474 | }, |
@@ -1419,8 +1483,9 @@ discard block |
||
1419 | 1483 | { |
1420 | 1484 | $data = strtr($data, array('<br />' => '')); |
1421 | 1485 | |
1422 | - if (strpos($data, 'ftp://') !== 0 && strpos($data, 'ftps://') !== 0) |
|
1423 | - $data = 'ftp://' . $data; |
|
1486 | + if (strpos($data, 'ftp://') !== 0 && strpos($data, 'ftps://') !== 0) { |
|
1487 | + $data = 'ftp://' . $data; |
|
1488 | + } |
|
1424 | 1489 | }, |
1425 | 1490 | ), |
1426 | 1491 | array( |
@@ -1430,8 +1495,9 @@ discard block |
||
1430 | 1495 | 'after' => '</a>', |
1431 | 1496 | 'validate' => function(&$tag, &$data, $disabled) |
1432 | 1497 | { |
1433 | - if (strpos($data, 'ftp://') !== 0 && strpos($data, 'ftps://') !== 0) |
|
1434 | - $data = 'ftp://' . $data; |
|
1498 | + if (strpos($data, 'ftp://') !== 0 && strpos($data, 'ftps://') !== 0) { |
|
1499 | + $data = 'ftp://' . $data; |
|
1500 | + } |
|
1435 | 1501 | }, |
1436 | 1502 | 'disallow_children' => array('email', 'ftp', 'url', 'iurl'), |
1437 | 1503 | 'disabled_after' => ' ($1)', |
@@ -1491,17 +1557,20 @@ discard block |
||
1491 | 1557 | $scheme = parse_url($data, PHP_URL_SCHEME); |
1492 | 1558 | if ($image_proxy_enabled) |
1493 | 1559 | { |
1494 | - if (!empty($user_info['possibly_robot'])) |
|
1495 | - return; |
|
1560 | + if (!empty($user_info['possibly_robot'])) { |
|
1561 | + return; |
|
1562 | + } |
|
1496 | 1563 | |
1497 | - if (empty($scheme)) |
|
1498 | - $data = 'http://' . ltrim($data, ':/'); |
|
1564 | + if (empty($scheme)) { |
|
1565 | + $data = 'http://' . ltrim($data, ':/'); |
|
1566 | + } |
|
1499 | 1567 | |
1500 | - if ($scheme != 'https') |
|
1501 | - $data = get_proxied_url($data); |
|
1568 | + if ($scheme != 'https') { |
|
1569 | + $data = get_proxied_url($data); |
|
1570 | + } |
|
1571 | + } elseif (empty($scheme)) { |
|
1572 | + $data = '//' . ltrim($data, ':/'); |
|
1502 | 1573 | } |
1503 | - elseif (empty($scheme)) |
|
1504 | - $data = '//' . ltrim($data, ':/'); |
|
1505 | 1574 | }, |
1506 | 1575 | 'disabled_content' => '($1)', |
1507 | 1576 | ), |
@@ -1517,17 +1586,20 @@ discard block |
||
1517 | 1586 | $scheme = parse_url($data, PHP_URL_SCHEME); |
1518 | 1587 | if ($image_proxy_enabled) |
1519 | 1588 | { |
1520 | - if (!empty($user_info['possibly_robot'])) |
|
1521 | - return; |
|
1589 | + if (!empty($user_info['possibly_robot'])) { |
|
1590 | + return; |
|
1591 | + } |
|
1522 | 1592 | |
1523 | - if (empty($scheme)) |
|
1524 | - $data = 'http://' . ltrim($data, ':/'); |
|
1593 | + if (empty($scheme)) { |
|
1594 | + $data = 'http://' . ltrim($data, ':/'); |
|
1595 | + } |
|
1525 | 1596 | |
1526 | - if ($scheme != 'https') |
|
1527 | - $data = get_proxied_url($data); |
|
1597 | + if ($scheme != 'https') { |
|
1598 | + $data = get_proxied_url($data); |
|
1599 | + } |
|
1600 | + } elseif (empty($scheme)) { |
|
1601 | + $data = '//' . ltrim($data, ':/'); |
|
1528 | 1602 | } |
1529 | - elseif (empty($scheme)) |
|
1530 | - $data = '//' . ltrim($data, ':/'); |
|
1531 | 1603 | }, |
1532 | 1604 | 'disabled_content' => '($1)', |
1533 | 1605 | ), |
@@ -1539,8 +1611,9 @@ discard block |
||
1539 | 1611 | { |
1540 | 1612 | $data = strtr($data, array('<br>' => '')); |
1541 | 1613 | $scheme = parse_url($data, PHP_URL_SCHEME); |
1542 | - if (empty($scheme)) |
|
1543 | - $data = '//' . ltrim($data, ':/'); |
|
1614 | + if (empty($scheme)) { |
|
1615 | + $data = '//' . ltrim($data, ':/'); |
|
1616 | + } |
|
1544 | 1617 | }, |
1545 | 1618 | ), |
1546 | 1619 | array( |
@@ -1551,13 +1624,14 @@ discard block |
||
1551 | 1624 | 'after' => '</a>', |
1552 | 1625 | 'validate' => function (&$tag, &$data, $disabled) |
1553 | 1626 | { |
1554 | - if (substr($data, 0, 1) == '#') |
|
1555 | - $data = '#post_' . substr($data, 1); |
|
1556 | - else |
|
1627 | + if (substr($data, 0, 1) == '#') { |
|
1628 | + $data = '#post_' . substr($data, 1); |
|
1629 | + } else |
|
1557 | 1630 | { |
1558 | 1631 | $scheme = parse_url($data, PHP_URL_SCHEME); |
1559 | - if (empty($scheme)) |
|
1560 | - $data = '//' . ltrim($data, ':/'); |
|
1632 | + if (empty($scheme)) { |
|
1633 | + $data = '//' . ltrim($data, ':/'); |
|
1634 | + } |
|
1561 | 1635 | } |
1562 | 1636 | }, |
1563 | 1637 | 'disallow_children' => array('email', 'ftp', 'url', 'iurl'), |
@@ -1648,8 +1722,9 @@ discard block |
||
1648 | 1722 | { |
1649 | 1723 | $add_begin = substr(trim($data), 0, 5) != '<?'; |
1650 | 1724 | $data = highlight_php_code($add_begin ? '<?php ' . $data . '?>' : $data); |
1651 | - if ($add_begin) |
|
1652 | - $data = preg_replace(array('~^(.+?)<\?.{0,40}?php(?: |\s)~', '~\?>((?:</(font|span)>)*)$~'), '$1', $data, 2); |
|
1725 | + if ($add_begin) { |
|
1726 | + $data = preg_replace(array('~^(.+?)<\?.{0,40}?php(?: |\s)~', '~\?>((?:</(font|span)>)*)$~'), '$1', $data, 2); |
|
1727 | + } |
|
1653 | 1728 | } |
1654 | 1729 | }, |
1655 | 1730 | 'block_level' => false, |
@@ -1741,20 +1816,17 @@ discard block |
||
1741 | 1816 | 'validate' => function(&$tag, &$data, $disabled) |
1742 | 1817 | { |
1743 | 1818 | |
1744 | - if ($data[1] == 'top' || (is_numeric($data[1]) && $data[1] < 50)) |
|
1745 | - $data[1] = '0 -2px 1px'; |
|
1746 | - |
|
1747 | - elseif ($data[1] == 'right' || (is_numeric($data[1]) && $data[1] < 100)) |
|
1748 | - $data[1] = '2px 0 1px'; |
|
1749 | - |
|
1750 | - elseif ($data[1] == 'bottom' || (is_numeric($data[1]) && $data[1] < 190)) |
|
1751 | - $data[1] = '0 2px 1px'; |
|
1752 | - |
|
1753 | - elseif ($data[1] == 'left' || (is_numeric($data[1]) && $data[1] < 280)) |
|
1754 | - $data[1] = '-2px 0 1px'; |
|
1755 | - |
|
1756 | - else |
|
1757 | - $data[1] = '1px 1px 1px'; |
|
1819 | + if ($data[1] == 'top' || (is_numeric($data[1]) && $data[1] < 50)) { |
|
1820 | + $data[1] = '0 -2px 1px'; |
|
1821 | + } elseif ($data[1] == 'right' || (is_numeric($data[1]) && $data[1] < 100)) { |
|
1822 | + $data[1] = '2px 0 1px'; |
|
1823 | + } elseif ($data[1] == 'bottom' || (is_numeric($data[1]) && $data[1] < 190)) { |
|
1824 | + $data[1] = '0 2px 1px'; |
|
1825 | + } elseif ($data[1] == 'left' || (is_numeric($data[1]) && $data[1] < 280)) { |
|
1826 | + $data[1] = '-2px 0 1px'; |
|
1827 | + } else { |
|
1828 | + $data[1] = '1px 1px 1px'; |
|
1829 | + } |
|
1758 | 1830 | }, |
1759 | 1831 | ), |
1760 | 1832 | array( |
@@ -1810,10 +1882,11 @@ discard block |
||
1810 | 1882 | 'content' => '$1', |
1811 | 1883 | 'validate' => function (&$tag, &$data, $disabled) |
1812 | 1884 | { |
1813 | - if (is_numeric($data)) |
|
1814 | - $data = timeformat($data); |
|
1815 | - else |
|
1816 | - $tag['content'] = '[time]$1[/time]'; |
|
1885 | + if (is_numeric($data)) { |
|
1886 | + $data = timeformat($data); |
|
1887 | + } else { |
|
1888 | + $tag['content'] = '[time]$1[/time]'; |
|
1889 | + } |
|
1817 | 1890 | }, |
1818 | 1891 | ), |
1819 | 1892 | array( |
@@ -1845,8 +1918,9 @@ discard block |
||
1845 | 1918 | { |
1846 | 1919 | $data = strtr($data, array('<br>' => '')); |
1847 | 1920 | $scheme = parse_url($data, PHP_URL_SCHEME); |
1848 | - if (empty($scheme)) |
|
1849 | - $data = '//' . ltrim($data, ':/'); |
|
1921 | + if (empty($scheme)) { |
|
1922 | + $data = '//' . ltrim($data, ':/'); |
|
1923 | + } |
|
1850 | 1924 | }, |
1851 | 1925 | ), |
1852 | 1926 | array( |
@@ -1858,8 +1932,9 @@ discard block |
||
1858 | 1932 | 'validate' => function (&$tag, &$data, $disabled) |
1859 | 1933 | { |
1860 | 1934 | $scheme = parse_url($data, PHP_URL_SCHEME); |
1861 | - if (empty($scheme)) |
|
1862 | - $data = '//' . ltrim($data, ':/'); |
|
1935 | + if (empty($scheme)) { |
|
1936 | + $data = '//' . ltrim($data, ':/'); |
|
1937 | + } |
|
1863 | 1938 | }, |
1864 | 1939 | 'disallow_children' => array('email', 'ftp', 'url', 'iurl'), |
1865 | 1940 | 'disabled_after' => ' ($1)', |
@@ -1886,12 +1961,13 @@ discard block |
||
1886 | 1961 | ); |
1887 | 1962 | |
1888 | 1963 | // Handle legacy bbc codes. |
1889 | - foreach ($context['legacy_bbc'] as $bbc) |
|
1890 | - $codes[] = array( |
|
1964 | + foreach ($context['legacy_bbc'] as $bbc) { |
|
1965 | + $codes[] = array( |
|
1891 | 1966 | 'tag' => $bbc, |
1892 | 1967 | 'before' => '', |
1893 | 1968 | 'after' => '', |
1894 | 1969 | ); |
1970 | + } |
|
1895 | 1971 | |
1896 | 1972 | // Let mods add new BBC without hassle. |
1897 | 1973 | call_integration_hook('integrate_bbc_codes', array(&$codes, &$no_autolink_tags)); |
@@ -1899,8 +1975,9 @@ discard block |
||
1899 | 1975 | // This is mainly for the bbc manager, so it's easy to add tags above. Custom BBC should be added above this line. |
1900 | 1976 | if ($message === false) |
1901 | 1977 | { |
1902 | - if (isset($temp_bbc)) |
|
1903 | - $bbc_codes = $temp_bbc; |
|
1978 | + if (isset($temp_bbc)) { |
|
1979 | + $bbc_codes = $temp_bbc; |
|
1980 | + } |
|
1904 | 1981 | usort($codes, function ($a, $b) { |
1905 | 1982 | return strcmp($a['tag'], $b['tag']); |
1906 | 1983 | }); |
@@ -1920,8 +1997,9 @@ discard block |
||
1920 | 1997 | ); |
1921 | 1998 | if (!isset($disabled['li']) && !isset($disabled['list'])) |
1922 | 1999 | { |
1923 | - foreach ($itemcodes as $c => $dummy) |
|
1924 | - $bbc_codes[$c] = array(); |
|
2000 | + foreach ($itemcodes as $c => $dummy) { |
|
2001 | + $bbc_codes[$c] = array(); |
|
2002 | + } |
|
1925 | 2003 | } |
1926 | 2004 | |
1927 | 2005 | // Shhhh! |
@@ -1942,12 +2020,14 @@ discard block |
||
1942 | 2020 | foreach ($codes as $code) |
1943 | 2021 | { |
1944 | 2022 | // Make it easier to process parameters later |
1945 | - if (!empty($code['parameters'])) |
|
1946 | - ksort($code['parameters'], SORT_STRING); |
|
2023 | + if (!empty($code['parameters'])) { |
|
2024 | + ksort($code['parameters'], SORT_STRING); |
|
2025 | + } |
|
1947 | 2026 | |
1948 | 2027 | // If we are not doing every tag only do ones we are interested in. |
1949 | - if (empty($parse_tags) || in_array($code['tag'], $parse_tags)) |
|
1950 | - $bbc_codes[substr($code['tag'], 0, 1)][] = $code; |
|
2028 | + if (empty($parse_tags) || in_array($code['tag'], $parse_tags)) { |
|
2029 | + $bbc_codes[substr($code['tag'], 0, 1)][] = $code; |
|
2030 | + } |
|
1951 | 2031 | } |
1952 | 2032 | $codes = null; |
1953 | 2033 | } |
@@ -1958,8 +2038,9 @@ discard block |
||
1958 | 2038 | // It's likely this will change if the message is modified. |
1959 | 2039 | $cache_key = 'parse:' . $cache_id . '-' . md5(md5($message) . '-' . $smileys . (empty($disabled) ? '' : implode(',', array_keys($disabled))) . $smcFunc['json_encode']($context['browser']) . $txt['lang_locale'] . $user_info['time_offset'] . $user_info['time_format']); |
1960 | 2040 | |
1961 | - if (($temp = cache_get_data($cache_key, 240)) != null) |
|
1962 | - return $temp; |
|
2041 | + if (($temp = cache_get_data($cache_key, 240)) != null) { |
|
2042 | + return $temp; |
|
2043 | + } |
|
1963 | 2044 | |
1964 | 2045 | $cache_t = microtime(true); |
1965 | 2046 | } |
@@ -1991,8 +2072,9 @@ discard block |
||
1991 | 2072 | $disabled['flash'] = true; |
1992 | 2073 | |
1993 | 2074 | // @todo Change maybe? |
1994 | - if (!isset($_GET['images'])) |
|
1995 | - $disabled['img'] = true; |
|
2075 | + if (!isset($_GET['images'])) { |
|
2076 | + $disabled['img'] = true; |
|
2077 | + } |
|
1996 | 2078 | |
1997 | 2079 | // @todo Interface/setting to add more? |
1998 | 2080 | } |
@@ -2003,8 +2085,9 @@ discard block |
||
2003 | 2085 | $alltags = array(); |
2004 | 2086 | foreach ($bbc_codes as $section) |
2005 | 2087 | { |
2006 | - foreach ($section as $code) |
|
2007 | - $alltags[] = $code['tag']; |
|
2088 | + foreach ($section as $code) { |
|
2089 | + $alltags[] = $code['tag']; |
|
2090 | + } |
|
2008 | 2091 | } |
2009 | 2092 | $alltags_regex = '\b' . implode("\b|\b", array_unique($alltags)) . '\b'; |
2010 | 2093 | |
@@ -2016,8 +2099,9 @@ discard block |
||
2016 | 2099 | $pos = isset($matches[0][1]) ? $matches[0][1] : false; |
2017 | 2100 | |
2018 | 2101 | // Failsafe. |
2019 | - if ($pos === false || $last_pos > $pos) |
|
2020 | - $pos = strlen($message) + 1; |
|
2102 | + if ($pos === false || $last_pos > $pos) { |
|
2103 | + $pos = strlen($message) + 1; |
|
2104 | + } |
|
2021 | 2105 | |
2022 | 2106 | // Can't have a one letter smiley, URL, or email! (sorry.) |
2023 | 2107 | if ($last_pos < $pos - 1) |
@@ -2035,8 +2119,9 @@ discard block |
||
2035 | 2119 | |
2036 | 2120 | // <br> should be empty. |
2037 | 2121 | $empty_tags = array('br', 'hr'); |
2038 | - foreach ($empty_tags as $tag) |
|
2039 | - $data = str_replace(array('<' . $tag . '>', '<' . $tag . '/>', '<' . $tag . ' />'), '<' . $tag . '>', $data); |
|
2122 | + foreach ($empty_tags as $tag) { |
|
2123 | + $data = str_replace(array('<' . $tag . '>', '<' . $tag . '/>', '<' . $tag . ' />'), '<' . $tag . '>', $data); |
|
2124 | + } |
|
2040 | 2125 | |
2041 | 2126 | // b, u, i, s, pre... basic tags. |
2042 | 2127 | $closable_tags = array('b', 'u', 'i', 's', 'em', 'ins', 'del', 'pre', 'blockquote', 'strong'); |
@@ -2045,8 +2130,9 @@ discard block |
||
2045 | 2130 | $diff = substr_count($data, '<' . $tag . '>') - substr_count($data, '</' . $tag . '>'); |
2046 | 2131 | $data = strtr($data, array('<' . $tag . '>' => '<' . $tag . '>', '</' . $tag . '>' => '</' . $tag . '>')); |
2047 | 2132 | |
2048 | - if ($diff > 0) |
|
2049 | - $data = substr($data, 0, -1) . str_repeat('</' . $tag . '>', $diff) . substr($data, -1); |
|
2133 | + if ($diff > 0) { |
|
2134 | + $data = substr($data, 0, -1) . str_repeat('</' . $tag . '>', $diff) . substr($data, -1); |
|
2135 | + } |
|
2050 | 2136 | } |
2051 | 2137 | |
2052 | 2138 | // Do <img ...> - with security... action= -> action-. |
@@ -2059,8 +2145,9 @@ discard block |
||
2059 | 2145 | $alt = empty($matches[3][$match]) ? '' : ' alt=' . preg_replace('~^"|"$~', '', $matches[3][$match]); |
2060 | 2146 | |
2061 | 2147 | // Remove action= from the URL - no funny business, now. |
2062 | - if (preg_match('~action(=|%3d)(?!dlattach)~i', $imgtag) != 0) |
|
2063 | - $imgtag = preg_replace('~action(?:=|%3d)(?!dlattach)~i', 'action-', $imgtag); |
|
2148 | + if (preg_match('~action(=|%3d)(?!dlattach)~i', $imgtag) != 0) { |
|
2149 | + $imgtag = preg_replace('~action(?:=|%3d)(?!dlattach)~i', 'action-', $imgtag); |
|
2150 | + } |
|
2064 | 2151 | |
2065 | 2152 | $replaces[$matches[0][$match]] = '[img' . $alt . ']' . $imgtag . '[/img]'; |
2066 | 2153 | } |
@@ -2075,16 +2162,18 @@ discard block |
||
2075 | 2162 | $no_autolink_area = false; |
2076 | 2163 | if (!empty($open_tags)) |
2077 | 2164 | { |
2078 | - foreach ($open_tags as $open_tag) |
|
2079 | - if (in_array($open_tag['tag'], $no_autolink_tags)) |
|
2165 | + foreach ($open_tags as $open_tag) { |
|
2166 | + if (in_array($open_tag['tag'], $no_autolink_tags)) |
|
2080 | 2167 | $no_autolink_area = true; |
2168 | + } |
|
2081 | 2169 | } |
2082 | 2170 | |
2083 | 2171 | // Don't go backwards. |
2084 | 2172 | // @todo Don't think is the real solution.... |
2085 | 2173 | $lastAutoPos = isset($lastAutoPos) ? $lastAutoPos : 0; |
2086 | - if ($pos < $lastAutoPos) |
|
2087 | - $no_autolink_area = true; |
|
2174 | + if ($pos < $lastAutoPos) { |
|
2175 | + $no_autolink_area = true; |
|
2176 | + } |
|
2088 | 2177 | $lastAutoPos = $pos; |
2089 | 2178 | |
2090 | 2179 | if (!$no_autolink_area) |
@@ -2189,29 +2278,33 @@ discard block |
||
2189 | 2278 | $url = array_shift($matches); |
2190 | 2279 | |
2191 | 2280 | // If this isn't a clean URL, bail out |
2192 | - if ($url != sanitize_iri($url)) |
|
2193 | - return $url; |
|
2281 | + if ($url != sanitize_iri($url)) { |
|
2282 | + return $url; |
|
2283 | + } |
|
2194 | 2284 | |
2195 | 2285 | $scheme = parse_url($url, PHP_URL_SCHEME); |
2196 | 2286 | |
2197 | 2287 | if ($scheme == 'mailto') |
2198 | 2288 | { |
2199 | 2289 | $email_address = str_replace('mailto:', '', $url); |
2200 | - if (!isset($disabled['email']) && filter_var($email_address, FILTER_VALIDATE_EMAIL) !== false) |
|
2201 | - return '[email=' . $email_address . ']' . $url . '[/email]'; |
|
2202 | - else |
|
2203 | - return $url; |
|
2290 | + if (!isset($disabled['email']) && filter_var($email_address, FILTER_VALIDATE_EMAIL) !== false) { |
|
2291 | + return '[email=' . $email_address . ']' . $url . '[/email]'; |
|
2292 | + } else { |
|
2293 | + return $url; |
|
2294 | + } |
|
2204 | 2295 | } |
2205 | 2296 | |
2206 | 2297 | // Are we linking a schemeless URL or naked domain name (e.g. "example.com")? |
2207 | - if (empty($scheme)) |
|
2208 | - $fullUrl = '//' . ltrim($url, ':/'); |
|
2209 | - else |
|
2210 | - $fullUrl = $url; |
|
2298 | + if (empty($scheme)) { |
|
2299 | + $fullUrl = '//' . ltrim($url, ':/'); |
|
2300 | + } else { |
|
2301 | + $fullUrl = $url; |
|
2302 | + } |
|
2211 | 2303 | |
2212 | 2304 | // Make sure that $fullUrl really is valid |
2213 | - if (validate_iri((strpos($fullUrl, '//') === 0 ? 'http:' : '' ) . $fullUrl) === false) |
|
2214 | - return $url; |
|
2305 | + if (validate_iri((strpos($fullUrl, '//') === 0 ? 'http:' : '' ) . $fullUrl) === false) { |
|
2306 | + return $url; |
|
2307 | + } |
|
2215 | 2308 | |
2216 | 2309 | return '[url="' . str_replace(array('[', ']'), array('[', ']'), $fullUrl) . '"]' . $url . '[/url]'; |
2217 | 2310 | }, $data); |
@@ -2260,22 +2353,25 @@ discard block |
||
2260 | 2353 | } |
2261 | 2354 | |
2262 | 2355 | // Are we there yet? Are we there yet? |
2263 | - if ($pos >= strlen($message) - 1) |
|
2264 | - break; |
|
2356 | + if ($pos >= strlen($message) - 1) { |
|
2357 | + break; |
|
2358 | + } |
|
2265 | 2359 | |
2266 | 2360 | $tags = strtolower($message[$pos + 1]); |
2267 | 2361 | |
2268 | 2362 | if ($tags == '/' && !empty($open_tags)) |
2269 | 2363 | { |
2270 | 2364 | $pos2 = strpos($message, ']', $pos + 1); |
2271 | - if ($pos2 == $pos + 2) |
|
2272 | - continue; |
|
2365 | + if ($pos2 == $pos + 2) { |
|
2366 | + continue; |
|
2367 | + } |
|
2273 | 2368 | |
2274 | 2369 | $look_for = strtolower(substr($message, $pos + 2, $pos2 - $pos - 2)); |
2275 | 2370 | |
2276 | 2371 | // A closing tag that doesn't match any open tags? Skip it. |
2277 | - if (!in_array($look_for, array_map(function($code){return $code['tag'];}, $open_tags))) |
|
2278 | - continue; |
|
2372 | + if (!in_array($look_for, array_map(function($code){return $code['tag'];}, $open_tags))) { |
|
2373 | + continue; |
|
2374 | + } |
|
2279 | 2375 | |
2280 | 2376 | $to_close = array(); |
2281 | 2377 | $block_level = null; |
@@ -2283,8 +2379,9 @@ discard block |
||
2283 | 2379 | do |
2284 | 2380 | { |
2285 | 2381 | $tag = array_pop($open_tags); |
2286 | - if (!$tag) |
|
2287 | - break; |
|
2382 | + if (!$tag) { |
|
2383 | + break; |
|
2384 | + } |
|
2288 | 2385 | |
2289 | 2386 | if (!empty($tag['block_level'])) |
2290 | 2387 | { |
@@ -2298,10 +2395,11 @@ discard block |
||
2298 | 2395 | // The idea is, if we are LOOKING for a block level tag, we can close them on the way. |
2299 | 2396 | if (strlen($look_for) > 0 && isset($bbc_codes[$look_for[0]])) |
2300 | 2397 | { |
2301 | - foreach ($bbc_codes[$look_for[0]] as $temp) |
|
2302 | - if ($temp['tag'] == $look_for) |
|
2398 | + foreach ($bbc_codes[$look_for[0]] as $temp) { |
|
2399 | + if ($temp['tag'] == $look_for) |
|
2303 | 2400 | { |
2304 | 2401 | $block_level = !empty($temp['block_level']); |
2402 | + } |
|
2305 | 2403 | break; |
2306 | 2404 | } |
2307 | 2405 | } |
@@ -2323,15 +2421,15 @@ discard block |
||
2323 | 2421 | { |
2324 | 2422 | $open_tags = $to_close; |
2325 | 2423 | continue; |
2326 | - } |
|
2327 | - elseif (!empty($to_close) && $tag['tag'] != $look_for) |
|
2424 | + } elseif (!empty($to_close) && $tag['tag'] != $look_for) |
|
2328 | 2425 | { |
2329 | 2426 | if ($block_level === null && isset($look_for[0], $bbc_codes[$look_for[0]])) |
2330 | 2427 | { |
2331 | - foreach ($bbc_codes[$look_for[0]] as $temp) |
|
2332 | - if ($temp['tag'] == $look_for) |
|
2428 | + foreach ($bbc_codes[$look_for[0]] as $temp) { |
|
2429 | + if ($temp['tag'] == $look_for) |
|
2333 | 2430 | { |
2334 | 2431 | $block_level = !empty($temp['block_level']); |
2432 | + } |
|
2335 | 2433 | break; |
2336 | 2434 | } |
2337 | 2435 | } |
@@ -2339,8 +2437,9 @@ discard block |
||
2339 | 2437 | // We're not looking for a block level tag (or maybe even a tag that exists...) |
2340 | 2438 | if (!$block_level) |
2341 | 2439 | { |
2342 | - foreach ($to_close as $tag) |
|
2343 | - array_push($open_tags, $tag); |
|
2440 | + foreach ($to_close as $tag) { |
|
2441 | + array_push($open_tags, $tag); |
|
2442 | + } |
|
2344 | 2443 | continue; |
2345 | 2444 | } |
2346 | 2445 | } |
@@ -2353,14 +2452,17 @@ discard block |
||
2353 | 2452 | |
2354 | 2453 | // See the comment at the end of the big loop - just eating whitespace ;). |
2355 | 2454 | $whitespace_regex = ''; |
2356 | - if (!empty($tag['block_level'])) |
|
2357 | - $whitespace_regex .= '( |\s)*(<br>)?'; |
|
2455 | + if (!empty($tag['block_level'])) { |
|
2456 | + $whitespace_regex .= '( |\s)*(<br>)?'; |
|
2457 | + } |
|
2358 | 2458 | // Trim one line of whitespace after unnested tags, but all of it after nested ones |
2359 | - if (!empty($tag['trim']) && $tag['trim'] != 'inside') |
|
2360 | - $whitespace_regex .= empty($tag['require_parents']) ? '( |\s)*' : '(<br>| |\s)*'; |
|
2459 | + if (!empty($tag['trim']) && $tag['trim'] != 'inside') { |
|
2460 | + $whitespace_regex .= empty($tag['require_parents']) ? '( |\s)*' : '(<br>| |\s)*'; |
|
2461 | + } |
|
2361 | 2462 | |
2362 | - if (!empty($whitespace_regex) && preg_match('~' . $whitespace_regex . '~', substr($message, $pos), $matches) != 0) |
|
2363 | - $message = substr($message, 0, $pos) . substr($message, $pos + strlen($matches[0])); |
|
2463 | + if (!empty($whitespace_regex) && preg_match('~' . $whitespace_regex . '~', substr($message, $pos), $matches) != 0) { |
|
2464 | + $message = substr($message, 0, $pos) . substr($message, $pos + strlen($matches[0])); |
|
2465 | + } |
|
2364 | 2466 | } |
2365 | 2467 | |
2366 | 2468 | if (!empty($to_close)) |
@@ -2373,8 +2475,9 @@ discard block |
||
2373 | 2475 | } |
2374 | 2476 | |
2375 | 2477 | // No tags for this character, so just keep going (fastest possible course.) |
2376 | - if (!isset($bbc_codes[$tags])) |
|
2377 | - continue; |
|
2478 | + if (!isset($bbc_codes[$tags])) { |
|
2479 | + continue; |
|
2480 | + } |
|
2378 | 2481 | |
2379 | 2482 | $inside = empty($open_tags) ? null : $open_tags[count($open_tags) - 1]; |
2380 | 2483 | $tag = null; |
@@ -2383,48 +2486,57 @@ discard block |
||
2383 | 2486 | $pt_strlen = strlen($possible['tag']); |
2384 | 2487 | |
2385 | 2488 | // Not a match? |
2386 | - if (strtolower(substr($message, $pos + 1, $pt_strlen)) != $possible['tag']) |
|
2387 | - continue; |
|
2489 | + if (strtolower(substr($message, $pos + 1, $pt_strlen)) != $possible['tag']) { |
|
2490 | + continue; |
|
2491 | + } |
|
2388 | 2492 | |
2389 | 2493 | $next_c = isset($message[$pos + 1 + $pt_strlen]) ? $message[$pos + 1 + $pt_strlen] : ''; |
2390 | 2494 | |
2391 | 2495 | // A tag is the last char maybe |
2392 | - if ($next_c == '') |
|
2393 | - break; |
|
2496 | + if ($next_c == '') { |
|
2497 | + break; |
|
2498 | + } |
|
2394 | 2499 | |
2395 | 2500 | // A test validation? |
2396 | - if (isset($possible['test']) && preg_match('~^' . $possible['test'] . '~', substr($message, $pos + 1 + $pt_strlen + 1)) === 0) |
|
2397 | - continue; |
|
2501 | + if (isset($possible['test']) && preg_match('~^' . $possible['test'] . '~', substr($message, $pos + 1 + $pt_strlen + 1)) === 0) { |
|
2502 | + continue; |
|
2503 | + } |
|
2398 | 2504 | // Do we want parameters? |
2399 | 2505 | elseif (!empty($possible['parameters'])) |
2400 | 2506 | { |
2401 | - if ($next_c != ' ') |
|
2402 | - continue; |
|
2403 | - } |
|
2404 | - elseif (isset($possible['type'])) |
|
2507 | + if ($next_c != ' ') { |
|
2508 | + continue; |
|
2509 | + } |
|
2510 | + } elseif (isset($possible['type'])) |
|
2405 | 2511 | { |
2406 | 2512 | // Do we need an equal sign? |
2407 | - if (in_array($possible['type'], array('unparsed_equals', 'unparsed_commas', 'unparsed_commas_content', 'unparsed_equals_content', 'parsed_equals')) && $next_c != '=') |
|
2408 | - continue; |
|
2513 | + if (in_array($possible['type'], array('unparsed_equals', 'unparsed_commas', 'unparsed_commas_content', 'unparsed_equals_content', 'parsed_equals')) && $next_c != '=') { |
|
2514 | + continue; |
|
2515 | + } |
|
2409 | 2516 | // Maybe we just want a /... |
2410 | - if ($possible['type'] == 'closed' && $next_c != ']' && substr($message, $pos + 1 + $pt_strlen, 2) != '/]' && substr($message, $pos + 1 + $pt_strlen, 3) != ' /]') |
|
2411 | - continue; |
|
2517 | + if ($possible['type'] == 'closed' && $next_c != ']' && substr($message, $pos + 1 + $pt_strlen, 2) != '/]' && substr($message, $pos + 1 + $pt_strlen, 3) != ' /]') { |
|
2518 | + continue; |
|
2519 | + } |
|
2412 | 2520 | // An immediate ]? |
2413 | - if ($possible['type'] == 'unparsed_content' && $next_c != ']') |
|
2414 | - continue; |
|
2521 | + if ($possible['type'] == 'unparsed_content' && $next_c != ']') { |
|
2522 | + continue; |
|
2523 | + } |
|
2415 | 2524 | } |
2416 | 2525 | // No type means 'parsed_content', which demands an immediate ] without parameters! |
2417 | - elseif ($next_c != ']') |
|
2418 | - continue; |
|
2526 | + elseif ($next_c != ']') { |
|
2527 | + continue; |
|
2528 | + } |
|
2419 | 2529 | |
2420 | 2530 | // Check allowed tree? |
2421 | - if (isset($possible['require_parents']) && ($inside === null || !in_array($inside['tag'], $possible['require_parents']))) |
|
2422 | - continue; |
|
2423 | - elseif (isset($inside['require_children']) && !in_array($possible['tag'], $inside['require_children'])) |
|
2424 | - continue; |
|
2531 | + if (isset($possible['require_parents']) && ($inside === null || !in_array($inside['tag'], $possible['require_parents']))) { |
|
2532 | + continue; |
|
2533 | + } elseif (isset($inside['require_children']) && !in_array($possible['tag'], $inside['require_children'])) { |
|
2534 | + continue; |
|
2535 | + } |
|
2425 | 2536 | // If this is in the list of disallowed child tags, don't parse it. |
2426 | - elseif (isset($inside['disallow_children']) && in_array($possible['tag'], $inside['disallow_children'])) |
|
2427 | - continue; |
|
2537 | + elseif (isset($inside['disallow_children']) && in_array($possible['tag'], $inside['disallow_children'])) { |
|
2538 | + continue; |
|
2539 | + } |
|
2428 | 2540 | |
2429 | 2541 | $pos1 = $pos + 1 + $pt_strlen + 1; |
2430 | 2542 | |
@@ -2436,8 +2548,9 @@ discard block |
||
2436 | 2548 | foreach ($open_tags as $open_quote) |
2437 | 2549 | { |
2438 | 2550 | // Every parent quote this quote has flips the styling |
2439 | - if ($open_quote['tag'] == 'quote') |
|
2440 | - $quote_alt = !$quote_alt; |
|
2551 | + if ($open_quote['tag'] == 'quote') { |
|
2552 | + $quote_alt = !$quote_alt; |
|
2553 | + } |
|
2441 | 2554 | } |
2442 | 2555 | // Add a class to the quote to style alternating blockquotes |
2443 | 2556 | $possible['before'] = strtr($possible['before'], array('<blockquote>' => '<blockquote class="bbc_' . ($quote_alt ? 'alternate' : 'standard') . '_quote">')); |
@@ -2448,8 +2561,9 @@ discard block |
||
2448 | 2561 | { |
2449 | 2562 | // Build a regular expression for each parameter for the current tag. |
2450 | 2563 | $preg = array(); |
2451 | - foreach ($possible['parameters'] as $p => $info) |
|
2452 | - $preg[] = '(\s+' . $p . '=' . (empty($info['quoted']) ? '' : '"') . (isset($info['match']) ? $info['match'] : '(.+?)') . (empty($info['quoted']) ? '' : '"') . '\s*)' . (empty($info['optional']) ? '' : '?'); |
|
2564 | + foreach ($possible['parameters'] as $p => $info) { |
|
2565 | + $preg[] = '(\s+' . $p . '=' . (empty($info['quoted']) ? '' : '"') . (isset($info['match']) ? $info['match'] : '(.+?)') . (empty($info['quoted']) ? '' : '"') . '\s*)' . (empty($info['optional']) ? '' : '?'); |
|
2566 | + } |
|
2453 | 2567 | |
2454 | 2568 | // Extract the string that potentially holds our parameters. |
2455 | 2569 | $blob = preg_split('~\[/?(?:' . $alltags_regex . ')~i', substr($message, $pos)); |
@@ -2468,24 +2582,27 @@ discard block |
||
2468 | 2582 | |
2469 | 2583 | $match = preg_match('~^' . implode('', $preg) . '$~i', implode(' ', $given_params), $matches) !== 0; |
2470 | 2584 | |
2471 | - if ($match) |
|
2472 | - $blob_counter = count($blobs) + 1; |
|
2585 | + if ($match) { |
|
2586 | + $blob_counter = count($blobs) + 1; |
|
2587 | + } |
|
2473 | 2588 | } |
2474 | 2589 | |
2475 | 2590 | // Didn't match our parameter list, try the next possible. |
2476 | - if (!$match) |
|
2477 | - continue; |
|
2591 | + if (!$match) { |
|
2592 | + continue; |
|
2593 | + } |
|
2478 | 2594 | |
2479 | 2595 | $params = array(); |
2480 | 2596 | for ($i = 1, $n = count($matches); $i < $n; $i += 2) |
2481 | 2597 | { |
2482 | 2598 | $key = strtok(ltrim($matches[$i]), '='); |
2483 | - if (isset($possible['parameters'][$key]['value'])) |
|
2484 | - $params['{' . $key . '}'] = strtr($possible['parameters'][$key]['value'], array('$1' => $matches[$i + 1])); |
|
2485 | - elseif (isset($possible['parameters'][$key]['validate'])) |
|
2486 | - $params['{' . $key . '}'] = $possible['parameters'][$key]['validate']($matches[$i + 1]); |
|
2487 | - else |
|
2488 | - $params['{' . $key . '}'] = $matches[$i + 1]; |
|
2599 | + if (isset($possible['parameters'][$key]['value'])) { |
|
2600 | + $params['{' . $key . '}'] = strtr($possible['parameters'][$key]['value'], array('$1' => $matches[$i + 1])); |
|
2601 | + } elseif (isset($possible['parameters'][$key]['validate'])) { |
|
2602 | + $params['{' . $key . '}'] = $possible['parameters'][$key]['validate']($matches[$i + 1]); |
|
2603 | + } else { |
|
2604 | + $params['{' . $key . '}'] = $matches[$i + 1]; |
|
2605 | + } |
|
2489 | 2606 | |
2490 | 2607 | // Just to make sure: replace any $ or { so they can't interpolate wrongly. |
2491 | 2608 | $params['{' . $key . '}'] = strtr($params['{' . $key . '}'], array('$' => '$', '{' => '{')); |
@@ -2493,23 +2610,26 @@ discard block |
||
2493 | 2610 | |
2494 | 2611 | foreach ($possible['parameters'] as $p => $info) |
2495 | 2612 | { |
2496 | - if (!isset($params['{' . $p . '}'])) |
|
2497 | - $params['{' . $p . '}'] = ''; |
|
2613 | + if (!isset($params['{' . $p . '}'])) { |
|
2614 | + $params['{' . $p . '}'] = ''; |
|
2615 | + } |
|
2498 | 2616 | } |
2499 | 2617 | |
2500 | 2618 | $tag = $possible; |
2501 | 2619 | |
2502 | 2620 | // Put the parameters into the string. |
2503 | - if (isset($tag['before'])) |
|
2504 | - $tag['before'] = strtr($tag['before'], $params); |
|
2505 | - if (isset($tag['after'])) |
|
2506 | - $tag['after'] = strtr($tag['after'], $params); |
|
2507 | - if (isset($tag['content'])) |
|
2508 | - $tag['content'] = strtr($tag['content'], $params); |
|
2621 | + if (isset($tag['before'])) { |
|
2622 | + $tag['before'] = strtr($tag['before'], $params); |
|
2623 | + } |
|
2624 | + if (isset($tag['after'])) { |
|
2625 | + $tag['after'] = strtr($tag['after'], $params); |
|
2626 | + } |
|
2627 | + if (isset($tag['content'])) { |
|
2628 | + $tag['content'] = strtr($tag['content'], $params); |
|
2629 | + } |
|
2509 | 2630 | |
2510 | 2631 | $pos1 += strlen($given_param_string); |
2511 | - } |
|
2512 | - else |
|
2632 | + } else |
|
2513 | 2633 | { |
2514 | 2634 | $tag = $possible; |
2515 | 2635 | $params = array(); |
@@ -2520,8 +2640,9 @@ discard block |
||
2520 | 2640 | // Item codes are complicated buggers... they are implicit [li]s and can make [list]s! |
2521 | 2641 | if ($smileys !== false && $tag === null && isset($itemcodes[$message[$pos + 1]]) && $message[$pos + 2] == ']' && !isset($disabled['list']) && !isset($disabled['li'])) |
2522 | 2642 | { |
2523 | - if ($message[$pos + 1] == '0' && !in_array($message[$pos - 1], array(';', ' ', "\t", "\n", '>'))) |
|
2524 | - continue; |
|
2643 | + if ($message[$pos + 1] == '0' && !in_array($message[$pos - 1], array(';', ' ', "\t", "\n", '>'))) { |
|
2644 | + continue; |
|
2645 | + } |
|
2525 | 2646 | |
2526 | 2647 | $tag = $itemcodes[$message[$pos + 1]]; |
2527 | 2648 | |
@@ -2542,9 +2663,9 @@ discard block |
||
2542 | 2663 | { |
2543 | 2664 | array_pop($open_tags); |
2544 | 2665 | $code = '</li>'; |
2666 | + } else { |
|
2667 | + $code = ''; |
|
2545 | 2668 | } |
2546 | - else |
|
2547 | - $code = ''; |
|
2548 | 2669 | |
2549 | 2670 | // Now we open a new tag. |
2550 | 2671 | $open_tags[] = array( |
@@ -2591,12 +2712,14 @@ discard block |
||
2591 | 2712 | } |
2592 | 2713 | |
2593 | 2714 | // No tag? Keep looking, then. Silly people using brackets without actual tags. |
2594 | - if ($tag === null) |
|
2595 | - continue; |
|
2715 | + if ($tag === null) { |
|
2716 | + continue; |
|
2717 | + } |
|
2596 | 2718 | |
2597 | 2719 | // Propagate the list to the child (so wrapping the disallowed tag won't work either.) |
2598 | - if (isset($inside['disallow_children'])) |
|
2599 | - $tag['disallow_children'] = isset($tag['disallow_children']) ? array_unique(array_merge($tag['disallow_children'], $inside['disallow_children'])) : $inside['disallow_children']; |
|
2720 | + if (isset($inside['disallow_children'])) { |
|
2721 | + $tag['disallow_children'] = isset($tag['disallow_children']) ? array_unique(array_merge($tag['disallow_children'], $inside['disallow_children'])) : $inside['disallow_children']; |
|
2722 | + } |
|
2600 | 2723 | |
2601 | 2724 | // Is this tag disabled? |
2602 | 2725 | if (isset($disabled[$tag['tag']])) |
@@ -2606,14 +2729,13 @@ discard block |
||
2606 | 2729 | $tag['before'] = !empty($tag['block_level']) ? '<div>' : ''; |
2607 | 2730 | $tag['after'] = !empty($tag['block_level']) ? '</div>' : ''; |
2608 | 2731 | $tag['content'] = isset($tag['type']) && $tag['type'] == 'closed' ? '' : (!empty($tag['block_level']) ? '<div>$1</div>' : '$1'); |
2609 | - } |
|
2610 | - elseif (isset($tag['disabled_before']) || isset($tag['disabled_after'])) |
|
2732 | + } elseif (isset($tag['disabled_before']) || isset($tag['disabled_after'])) |
|
2611 | 2733 | { |
2612 | 2734 | $tag['before'] = isset($tag['disabled_before']) ? $tag['disabled_before'] : (!empty($tag['block_level']) ? '<div>' : ''); |
2613 | 2735 | $tag['after'] = isset($tag['disabled_after']) ? $tag['disabled_after'] : (!empty($tag['block_level']) ? '</div>' : ''); |
2736 | + } else { |
|
2737 | + $tag['content'] = $tag['disabled_content']; |
|
2614 | 2738 | } |
2615 | - else |
|
2616 | - $tag['content'] = $tag['disabled_content']; |
|
2617 | 2739 | } |
2618 | 2740 | |
2619 | 2741 | // we use this a lot |
@@ -2623,8 +2745,9 @@ discard block |
||
2623 | 2745 | if (!empty($tag['block_level']) && $tag['tag'] != 'html' && empty($inside['block_level'])) |
2624 | 2746 | { |
2625 | 2747 | $n = count($open_tags) - 1; |
2626 | - while (empty($open_tags[$n]['block_level']) && $n >= 0) |
|
2627 | - $n--; |
|
2748 | + while (empty($open_tags[$n]['block_level']) && $n >= 0) { |
|
2749 | + $n--; |
|
2750 | + } |
|
2628 | 2751 | |
2629 | 2752 | // Close all the non block level tags so this tag isn't surrounded by them. |
2630 | 2753 | for ($i = count($open_tags) - 1; $i > $n; $i--) |
@@ -2636,12 +2759,15 @@ discard block |
||
2636 | 2759 | |
2637 | 2760 | // Trim or eat trailing stuff... see comment at the end of the big loop. |
2638 | 2761 | $whitespace_regex = ''; |
2639 | - if (!empty($tag['block_level'])) |
|
2640 | - $whitespace_regex .= '( |\s)*(<br>)?'; |
|
2641 | - if (!empty($tag['trim']) && $tag['trim'] != 'inside') |
|
2642 | - $whitespace_regex .= empty($tag['require_parents']) ? '( |\s)*' : '(<br>| |\s)*'; |
|
2643 | - if (!empty($whitespace_regex) && preg_match('~' . $whitespace_regex . '~', substr($message, $pos), $matches) != 0) |
|
2644 | - $message = substr($message, 0, $pos) . substr($message, $pos + strlen($matches[0])); |
|
2762 | + if (!empty($tag['block_level'])) { |
|
2763 | + $whitespace_regex .= '( |\s)*(<br>)?'; |
|
2764 | + } |
|
2765 | + if (!empty($tag['trim']) && $tag['trim'] != 'inside') { |
|
2766 | + $whitespace_regex .= empty($tag['require_parents']) ? '( |\s)*' : '(<br>| |\s)*'; |
|
2767 | + } |
|
2768 | + if (!empty($whitespace_regex) && preg_match('~' . $whitespace_regex . '~', substr($message, $pos), $matches) != 0) { |
|
2769 | + $message = substr($message, 0, $pos) . substr($message, $pos + strlen($matches[0])); |
|
2770 | + } |
|
2645 | 2771 | |
2646 | 2772 | array_pop($open_tags); |
2647 | 2773 | } |
@@ -2662,16 +2788,19 @@ discard block |
||
2662 | 2788 | elseif ($tag['type'] == 'unparsed_content') |
2663 | 2789 | { |
2664 | 2790 | $pos2 = stripos($message, '[/' . substr($message, $pos + 1, $tag_strlen) . ']', $pos1); |
2665 | - if ($pos2 === false) |
|
2666 | - continue; |
|
2791 | + if ($pos2 === false) { |
|
2792 | + continue; |
|
2793 | + } |
|
2667 | 2794 | |
2668 | 2795 | $data = substr($message, $pos1, $pos2 - $pos1); |
2669 | 2796 | |
2670 | - if (!empty($tag['block_level']) && substr($data, 0, 4) == '<br>') |
|
2671 | - $data = substr($data, 4); |
|
2797 | + if (!empty($tag['block_level']) && substr($data, 0, 4) == '<br>') { |
|
2798 | + $data = substr($data, 4); |
|
2799 | + } |
|
2672 | 2800 | |
2673 | - if (isset($tag['validate'])) |
|
2674 | - $tag['validate']($tag, $data, $disabled, $params); |
|
2801 | + if (isset($tag['validate'])) { |
|
2802 | + $tag['validate']($tag, $data, $disabled, $params); |
|
2803 | + } |
|
2675 | 2804 | |
2676 | 2805 | $code = strtr($tag['content'], array('$1' => $data)); |
2677 | 2806 | $message = substr($message, 0, $pos) . "\n" . $code . "\n" . substr($message, $pos2 + 3 + $tag_strlen); |
@@ -2686,34 +2815,40 @@ discard block |
||
2686 | 2815 | if (isset($tag['quoted'])) |
2687 | 2816 | { |
2688 | 2817 | $quoted = substr($message, $pos1, 6) == '"'; |
2689 | - if ($tag['quoted'] != 'optional' && !$quoted) |
|
2690 | - continue; |
|
2818 | + if ($tag['quoted'] != 'optional' && !$quoted) { |
|
2819 | + continue; |
|
2820 | + } |
|
2691 | 2821 | |
2692 | - if ($quoted) |
|
2693 | - $pos1 += 6; |
|
2822 | + if ($quoted) { |
|
2823 | + $pos1 += 6; |
|
2824 | + } |
|
2825 | + } else { |
|
2826 | + $quoted = false; |
|
2694 | 2827 | } |
2695 | - else |
|
2696 | - $quoted = false; |
|
2697 | 2828 | |
2698 | 2829 | $pos2 = strpos($message, $quoted == false ? ']' : '"]', $pos1); |
2699 | - if ($pos2 === false) |
|
2700 | - continue; |
|
2830 | + if ($pos2 === false) { |
|
2831 | + continue; |
|
2832 | + } |
|
2701 | 2833 | |
2702 | 2834 | $pos3 = stripos($message, '[/' . substr($message, $pos + 1, $tag_strlen) . ']', $pos2); |
2703 | - if ($pos3 === false) |
|
2704 | - continue; |
|
2835 | + if ($pos3 === false) { |
|
2836 | + continue; |
|
2837 | + } |
|
2705 | 2838 | |
2706 | 2839 | $data = array( |
2707 | 2840 | substr($message, $pos2 + ($quoted == false ? 1 : 7), $pos3 - ($pos2 + ($quoted == false ? 1 : 7))), |
2708 | 2841 | substr($message, $pos1, $pos2 - $pos1) |
2709 | 2842 | ); |
2710 | 2843 | |
2711 | - if (!empty($tag['block_level']) && substr($data[0], 0, 4) == '<br>') |
|
2712 | - $data[0] = substr($data[0], 4); |
|
2844 | + if (!empty($tag['block_level']) && substr($data[0], 0, 4) == '<br>') { |
|
2845 | + $data[0] = substr($data[0], 4); |
|
2846 | + } |
|
2713 | 2847 | |
2714 | 2848 | // Validation for my parking, please! |
2715 | - if (isset($tag['validate'])) |
|
2716 | - $tag['validate']($tag, $data, $disabled, $params); |
|
2849 | + if (isset($tag['validate'])) { |
|
2850 | + $tag['validate']($tag, $data, $disabled, $params); |
|
2851 | + } |
|
2717 | 2852 | |
2718 | 2853 | $code = strtr($tag['content'], array('$1' => $data[0], '$2' => $data[1])); |
2719 | 2854 | $message = substr($message, 0, $pos) . "\n" . $code . "\n" . substr($message, $pos3 + 3 + $tag_strlen); |
@@ -2730,23 +2865,27 @@ discard block |
||
2730 | 2865 | elseif ($tag['type'] == 'unparsed_commas_content') |
2731 | 2866 | { |
2732 | 2867 | $pos2 = strpos($message, ']', $pos1); |
2733 | - if ($pos2 === false) |
|
2734 | - continue; |
|
2868 | + if ($pos2 === false) { |
|
2869 | + continue; |
|
2870 | + } |
|
2735 | 2871 | |
2736 | 2872 | $pos3 = stripos($message, '[/' . substr($message, $pos + 1, $tag_strlen) . ']', $pos2); |
2737 | - if ($pos3 === false) |
|
2738 | - continue; |
|
2873 | + if ($pos3 === false) { |
|
2874 | + continue; |
|
2875 | + } |
|
2739 | 2876 | |
2740 | 2877 | // We want $1 to be the content, and the rest to be csv. |
2741 | 2878 | $data = explode(',', ',' . substr($message, $pos1, $pos2 - $pos1)); |
2742 | 2879 | $data[0] = substr($message, $pos2 + 1, $pos3 - $pos2 - 1); |
2743 | 2880 | |
2744 | - if (isset($tag['validate'])) |
|
2745 | - $tag['validate']($tag, $data, $disabled, $params); |
|
2881 | + if (isset($tag['validate'])) { |
|
2882 | + $tag['validate']($tag, $data, $disabled, $params); |
|
2883 | + } |
|
2746 | 2884 | |
2747 | 2885 | $code = $tag['content']; |
2748 | - foreach ($data as $k => $d) |
|
2749 | - $code = strtr($code, array('$' . ($k + 1) => trim($d))); |
|
2886 | + foreach ($data as $k => $d) { |
|
2887 | + $code = strtr($code, array('$' . ($k + 1) => trim($d))); |
|
2888 | + } |
|
2750 | 2889 | $message = substr($message, 0, $pos) . "\n" . $code . "\n" . substr($message, $pos3 + 3 + $tag_strlen); |
2751 | 2890 | $pos += strlen($code) - 1 + 2; |
2752 | 2891 | } |
@@ -2754,24 +2893,28 @@ discard block |
||
2754 | 2893 | elseif ($tag['type'] == 'unparsed_commas') |
2755 | 2894 | { |
2756 | 2895 | $pos2 = strpos($message, ']', $pos1); |
2757 | - if ($pos2 === false) |
|
2758 | - continue; |
|
2896 | + if ($pos2 === false) { |
|
2897 | + continue; |
|
2898 | + } |
|
2759 | 2899 | |
2760 | 2900 | $data = explode(',', substr($message, $pos1, $pos2 - $pos1)); |
2761 | 2901 | |
2762 | - if (isset($tag['validate'])) |
|
2763 | - $tag['validate']($tag, $data, $disabled, $params); |
|
2902 | + if (isset($tag['validate'])) { |
|
2903 | + $tag['validate']($tag, $data, $disabled, $params); |
|
2904 | + } |
|
2764 | 2905 | |
2765 | 2906 | // Fix after, for disabled code mainly. |
2766 | - foreach ($data as $k => $d) |
|
2767 | - $tag['after'] = strtr($tag['after'], array('$' . ($k + 1) => trim($d))); |
|
2907 | + foreach ($data as $k => $d) { |
|
2908 | + $tag['after'] = strtr($tag['after'], array('$' . ($k + 1) => trim($d))); |
|
2909 | + } |
|
2768 | 2910 | |
2769 | 2911 | $open_tags[] = $tag; |
2770 | 2912 | |
2771 | 2913 | // Replace them out, $1, $2, $3, $4, etc. |
2772 | 2914 | $code = $tag['before']; |
2773 | - foreach ($data as $k => $d) |
|
2774 | - $code = strtr($code, array('$' . ($k + 1) => trim($d))); |
|
2915 | + foreach ($data as $k => $d) { |
|
2916 | + $code = strtr($code, array('$' . ($k + 1) => trim($d))); |
|
2917 | + } |
|
2775 | 2918 | $message = substr($message, 0, $pos) . "\n" . $code . "\n" . substr($message, $pos2 + 1); |
2776 | 2919 | $pos += strlen($code) - 1 + 2; |
2777 | 2920 | } |
@@ -2782,28 +2925,33 @@ discard block |
||
2782 | 2925 | if (isset($tag['quoted'])) |
2783 | 2926 | { |
2784 | 2927 | $quoted = substr($message, $pos1, 6) == '"'; |
2785 | - if ($tag['quoted'] != 'optional' && !$quoted) |
|
2786 | - continue; |
|
2928 | + if ($tag['quoted'] != 'optional' && !$quoted) { |
|
2929 | + continue; |
|
2930 | + } |
|
2787 | 2931 | |
2788 | - if ($quoted) |
|
2789 | - $pos1 += 6; |
|
2932 | + if ($quoted) { |
|
2933 | + $pos1 += 6; |
|
2934 | + } |
|
2935 | + } else { |
|
2936 | + $quoted = false; |
|
2790 | 2937 | } |
2791 | - else |
|
2792 | - $quoted = false; |
|
2793 | 2938 | |
2794 | 2939 | $pos2 = strpos($message, $quoted == false ? ']' : '"]', $pos1); |
2795 | - if ($pos2 === false) |
|
2796 | - continue; |
|
2940 | + if ($pos2 === false) { |
|
2941 | + continue; |
|
2942 | + } |
|
2797 | 2943 | |
2798 | 2944 | $data = substr($message, $pos1, $pos2 - $pos1); |
2799 | 2945 | |
2800 | 2946 | // Validation for my parking, please! |
2801 | - if (isset($tag['validate'])) |
|
2802 | - $tag['validate']($tag, $data, $disabled, $params); |
|
2947 | + if (isset($tag['validate'])) { |
|
2948 | + $tag['validate']($tag, $data, $disabled, $params); |
|
2949 | + } |
|
2803 | 2950 | |
2804 | 2951 | // For parsed content, we must recurse to avoid security problems. |
2805 | - if ($tag['type'] != 'unparsed_equals') |
|
2806 | - $data = parse_bbc($data, !empty($tag['parsed_tags_allowed']) ? false : true, '', !empty($tag['parsed_tags_allowed']) ? $tag['parsed_tags_allowed'] : array()); |
|
2952 | + if ($tag['type'] != 'unparsed_equals') { |
|
2953 | + $data = parse_bbc($data, !empty($tag['parsed_tags_allowed']) ? false : true, '', !empty($tag['parsed_tags_allowed']) ? $tag['parsed_tags_allowed'] : array()); |
|
2954 | + } |
|
2807 | 2955 | |
2808 | 2956 | $tag['after'] = strtr($tag['after'], array('$1' => $data)); |
2809 | 2957 | |
@@ -2815,34 +2963,40 @@ discard block |
||
2815 | 2963 | } |
2816 | 2964 | |
2817 | 2965 | // If this is block level, eat any breaks after it. |
2818 | - if (!empty($tag['block_level']) && substr($message, $pos + 1, 4) == '<br>') |
|
2819 | - $message = substr($message, 0, $pos + 1) . substr($message, $pos + 5); |
|
2966 | + if (!empty($tag['block_level']) && substr($message, $pos + 1, 4) == '<br>') { |
|
2967 | + $message = substr($message, 0, $pos + 1) . substr($message, $pos + 5); |
|
2968 | + } |
|
2820 | 2969 | |
2821 | 2970 | // Are we trimming outside this tag? |
2822 | - if (!empty($tag['trim']) && $tag['trim'] != 'outside' && preg_match('~(<br>| |\s)*~', substr($message, $pos + 1), $matches) != 0) |
|
2823 | - $message = substr($message, 0, $pos + 1) . substr($message, $pos + 1 + strlen($matches[0])); |
|
2971 | + if (!empty($tag['trim']) && $tag['trim'] != 'outside' && preg_match('~(<br>| |\s)*~', substr($message, $pos + 1), $matches) != 0) { |
|
2972 | + $message = substr($message, 0, $pos + 1) . substr($message, $pos + 1 + strlen($matches[0])); |
|
2973 | + } |
|
2824 | 2974 | } |
2825 | 2975 | |
2826 | 2976 | // Close any remaining tags. |
2827 | - while ($tag = array_pop($open_tags)) |
|
2828 | - $message .= "\n" . $tag['after'] . "\n"; |
|
2977 | + while ($tag = array_pop($open_tags)) { |
|
2978 | + $message .= "\n" . $tag['after'] . "\n"; |
|
2979 | + } |
|
2829 | 2980 | |
2830 | 2981 | // Parse the smileys within the parts where it can be done safely. |
2831 | 2982 | if ($smileys === true) |
2832 | 2983 | { |
2833 | 2984 | $message_parts = explode("\n", $message); |
2834 | - for ($i = 0, $n = count($message_parts); $i < $n; $i += 2) |
|
2835 | - parsesmileys($message_parts[$i]); |
|
2985 | + for ($i = 0, $n = count($message_parts); $i < $n; $i += 2) { |
|
2986 | + parsesmileys($message_parts[$i]); |
|
2987 | + } |
|
2836 | 2988 | |
2837 | 2989 | $message = implode('', $message_parts); |
2838 | 2990 | } |
2839 | 2991 | |
2840 | 2992 | // No smileys, just get rid of the markers. |
2841 | - else |
|
2842 | - $message = strtr($message, array("\n" => '')); |
|
2993 | + else { |
|
2994 | + $message = strtr($message, array("\n" => '')); |
|
2995 | + } |
|
2843 | 2996 | |
2844 | - if ($message !== '' && $message[0] === ' ') |
|
2845 | - $message = ' ' . substr($message, 1); |
|
2997 | + if ($message !== '' && $message[0] === ' ') { |
|
2998 | + $message = ' ' . substr($message, 1); |
|
2999 | + } |
|
2846 | 3000 | |
2847 | 3001 | // Cleanup whitespace. |
2848 | 3002 | $message = strtr($message, array(' ' => ' ', "\r" => '', "\n" => '<br>', '<br> ' => '<br> ', ' ' => "\n")); |
@@ -2851,15 +3005,16 @@ discard block |
||
2851 | 3005 | call_integration_hook('integrate_post_parsebbc', array(&$message, &$smileys, &$cache_id, &$parse_tags)); |
2852 | 3006 | |
2853 | 3007 | // Cache the output if it took some time... |
2854 | - if (isset($cache_key, $cache_t) && microtime(true) - $cache_t > 0.05) |
|
2855 | - cache_put_data($cache_key, $message, 240); |
|
3008 | + if (isset($cache_key, $cache_t) && microtime(true) - $cache_t > 0.05) { |
|
3009 | + cache_put_data($cache_key, $message, 240); |
|
3010 | + } |
|
2856 | 3011 | |
2857 | 3012 | // If this was a force parse revert if needed. |
2858 | 3013 | if (!empty($parse_tags)) |
2859 | 3014 | { |
2860 | - if (empty($temp_bbc)) |
|
2861 | - $bbc_codes = array(); |
|
2862 | - else |
|
3015 | + if (empty($temp_bbc)) { |
|
3016 | + $bbc_codes = array(); |
|
3017 | + } else |
|
2863 | 3018 | { |
2864 | 3019 | $bbc_codes = $temp_bbc; |
2865 | 3020 | unset($temp_bbc); |
@@ -2886,8 +3041,9 @@ discard block |
||
2886 | 3041 | static $smileyPregSearch = null, $smileyPregReplacements = array(); |
2887 | 3042 | |
2888 | 3043 | // No smiley set at all?! |
2889 | - if ($user_info['smiley_set'] == 'none' || trim($message) == '') |
|
2890 | - return; |
|
3044 | + if ($user_info['smiley_set'] == 'none' || trim($message) == '') { |
|
3045 | + return; |
|
3046 | + } |
|
2891 | 3047 | |
2892 | 3048 | // Maybe a mod wants to implement an alternative method (e.g. emojis instead of images) |
2893 | 3049 | call_integration_hook('integrate_smileys', array(&$smileyPregSearch, &$smileyPregReplacements)); |
@@ -2901,8 +3057,7 @@ discard block |
||
2901 | 3057 | $smileysfrom = array('>:D', ':D', '::)', '>:(', ':))', ':)', ';)', ';D', ':(', ':o', '8)', ':P', '???', ':-[', ':-X', ':-*', ':\'(', ':-\\', '^-^', 'O0', 'C:-)', 'O:-)'); |
2902 | 3058 | $smileysto = array('evil', 'cheesy', 'rolleyes', 'angry', 'laugh', 'smiley', 'wink', 'grin', 'sad', 'shocked', 'cool', 'tongue', 'huh', 'embarrassed', 'lipsrsealed', 'kiss', 'cry', 'undecided', 'azn', 'afro', 'police', 'angel'); |
2903 | 3059 | $smileysdescs = array('', $txt['icon_cheesy'], $txt['icon_rolleyes'], $txt['icon_angry'], '', $txt['icon_smiley'], $txt['icon_wink'], $txt['icon_grin'], $txt['icon_sad'], $txt['icon_shocked'], $txt['icon_cool'], $txt['icon_tongue'], $txt['icon_huh'], $txt['icon_embarrassed'], $txt['icon_lips'], $txt['icon_kiss'], $txt['icon_cry'], $txt['icon_undecided'], '', '', '', ''); |
2904 | - } |
|
2905 | - else |
|
3060 | + } else |
|
2906 | 3061 | { |
2907 | 3062 | // Load the smileys in reverse order by length so they don't get parsed wrong. |
2908 | 3063 | if (($temp = cache_get_data('parsing_smileys', 480)) == null) |
@@ -2926,18 +3081,20 @@ discard block |
||
2926 | 3081 | $smcFunc['db_free_result']($result); |
2927 | 3082 | |
2928 | 3083 | cache_put_data('parsing_smileys', array($smileysfrom, $smileysto, $smileysdescs), 480); |
3084 | + } else { |
|
3085 | + list ($smileysfrom, $smileysto, $smileysdescs) = $temp; |
|
2929 | 3086 | } |
2930 | - else |
|
2931 | - list ($smileysfrom, $smileysto, $smileysdescs) = $temp; |
|
2932 | 3087 | } |
2933 | 3088 | |
2934 | 3089 | // Set proper extensions; do this post caching so cache doesn't become extension-specific |
2935 | - foreach($smileysto AS $ix=>$file) |
|
2936 | - // Need to use the default if user selection is disabled |
|
3090 | + foreach($smileysto AS $ix=>$file) { |
|
3091 | + // Need to use the default if user selection is disabled |
|
2937 | 3092 | if (empty($modSettings['smiley_sets_enable'])) |
2938 | 3093 | $smileysto[$ix] = $file . $context['user']['smiley_set_default_ext']; |
2939 | - else |
|
2940 | - $smileysto[$ix] = $file . $user_info['smiley_set_ext']; |
|
3094 | + } |
|
3095 | + else { |
|
3096 | + $smileysto[$ix] = $file . $user_info['smiley_set_ext']; |
|
3097 | + } |
|
2941 | 3098 | |
2942 | 3099 | // The non-breaking-space is a complex thing... |
2943 | 3100 | $non_breaking_space = $context['utf8'] ? '\x{A0}' : '\xA0'; |
@@ -3022,12 +3179,14 @@ discard block |
||
3022 | 3179 | global $boardurl, $image_proxy_enabled, $image_proxy_secret; |
3023 | 3180 | |
3024 | 3181 | // Only use the proxy if enabled and necessary |
3025 | - if (empty($image_proxy_enabled) || parse_url($url, PHP_URL_SCHEME) === 'https') |
|
3026 | - return $url; |
|
3182 | + if (empty($image_proxy_enabled) || parse_url($url, PHP_URL_SCHEME) === 'https') { |
|
3183 | + return $url; |
|
3184 | + } |
|
3027 | 3185 | |
3028 | 3186 | // We don't need to proxy our own resources |
3029 | - if (strpos(strtr($url, array('http://' => 'https://')), strtr($boardurl, array('http://' => 'https://'))) === 0) |
|
3030 | - return strtr($url, array('http://' => 'https://')); |
|
3187 | + if (strpos(strtr($url, array('http://' => 'https://')), strtr($boardurl, array('http://' => 'https://'))) === 0) { |
|
3188 | + return strtr($url, array('http://' => 'https://')); |
|
3189 | + } |
|
3031 | 3190 | |
3032 | 3191 | // By default, use SMF's own image proxy script |
3033 | 3192 | $proxied_url = strtr($boardurl, array('http://' => 'https://')) . '/proxy.php?request=' . urlencode($url) . '&hash=' . md5($url . $image_proxy_secret); |
@@ -3052,35 +3211,41 @@ discard block |
||
3052 | 3211 | global $scripturl, $context, $modSettings, $db_show_debug, $db_cache; |
3053 | 3212 | |
3054 | 3213 | // In case we have mail to send, better do that - as obExit doesn't always quite make it... |
3055 | - if (!empty($context['flush_mail'])) |
|
3056 | - // @todo this relies on 'flush_mail' being only set in AddMailQueue itself... :\ |
|
3214 | + if (!empty($context['flush_mail'])) { |
|
3215 | + // @todo this relies on 'flush_mail' being only set in AddMailQueue itself... :\ |
|
3057 | 3216 | AddMailQueue(true); |
3217 | + } |
|
3058 | 3218 | |
3059 | 3219 | $add = preg_match('~^(ftp|http)[s]?://~', $setLocation) == 0 && substr($setLocation, 0, 6) != 'about:'; |
3060 | 3220 | |
3061 | - if ($add) |
|
3062 | - $setLocation = $scripturl . ($setLocation != '' ? '?' . $setLocation : ''); |
|
3221 | + if ($add) { |
|
3222 | + $setLocation = $scripturl . ($setLocation != '' ? '?' . $setLocation : ''); |
|
3223 | + } |
|
3063 | 3224 | |
3064 | 3225 | // Put the session ID in. |
3065 | - if (defined('SID') && SID != '') |
|
3066 | - $setLocation = preg_replace('/^' . preg_quote($scripturl, '/') . '(?!\?' . preg_quote(SID, '/') . ')\\??/', $scripturl . '?' . SID . ';', $setLocation); |
|
3226 | + if (defined('SID') && SID != '') { |
|
3227 | + $setLocation = preg_replace('/^' . preg_quote($scripturl, '/') . '(?!\?' . preg_quote(SID, '/') . ')\\??/', $scripturl . '?' . SID . ';', $setLocation); |
|
3228 | + } |
|
3067 | 3229 | // Keep that debug in their for template debugging! |
3068 | - elseif (isset($_GET['debug'])) |
|
3069 | - $setLocation = preg_replace('/^' . preg_quote($scripturl, '/') . '\\??/', $scripturl . '?debug;', $setLocation); |
|
3230 | + elseif (isset($_GET['debug'])) { |
|
3231 | + $setLocation = preg_replace('/^' . preg_quote($scripturl, '/') . '\\??/', $scripturl . '?debug;', $setLocation); |
|
3232 | + } |
|
3070 | 3233 | |
3071 | 3234 | if (!empty($modSettings['queryless_urls']) && (empty($context['server']['is_cgi']) || ini_get('cgi.fix_pathinfo') == 1 || @get_cfg_var('cgi.fix_pathinfo') == 1) && (!empty($context['server']['is_apache']) || !empty($context['server']['is_lighttpd']) || !empty($context['server']['is_litespeed']))) |
3072 | 3235 | { |
3073 | - if (defined('SID') && SID != '') |
|
3074 | - $setLocation = preg_replace_callback('~^' . preg_quote($scripturl, '~') . '\?(?:' . SID . '(?:;|&|&))((?:board|topic)=[^#]+?)(#[^"]*?)?$~', |
|
3236 | + if (defined('SID') && SID != '') { |
|
3237 | + $setLocation = preg_replace_callback('~^' . preg_quote($scripturl, '~') . '\?(?:' . SID . '(?:;|&|&))((?:board|topic)=[^#]+?)(#[^"]*?)?$~', |
|
3075 | 3238 | function ($m) use ($scripturl) |
3076 | 3239 | { |
3077 | 3240 | return $scripturl . '/' . strtr("$m[1]", '&;=', '//,') . '.html?' . SID. (isset($m[2]) ? "$m[2]" : ""); |
3241 | + } |
|
3078 | 3242 | }, $setLocation); |
3079 | - else |
|
3080 | - $setLocation = preg_replace_callback('~^' . preg_quote($scripturl, '~') . '\?((?:board|topic)=[^#"]+?)(#[^"]*?)?$~', |
|
3243 | + else { |
|
3244 | + $setLocation = preg_replace_callback('~^' . preg_quote($scripturl, '~') . '\?((?:board|topic)=[^#"]+?)(#[^"]*?)?$~', |
|
3081 | 3245 | function ($m) use ($scripturl) |
3082 | 3246 | { |
3083 | 3247 | return $scripturl . '/' . strtr("$m[1]", '&;=', '//,') . '.html' . (isset($m[2]) ? "$m[2]" : ""); |
3248 | + } |
|
3084 | 3249 | }, $setLocation); |
3085 | 3250 | } |
3086 | 3251 | |
@@ -3091,8 +3256,9 @@ discard block |
||
3091 | 3256 | header('location: ' . str_replace(' ', '%20', $setLocation), true, $permanent ? 301 : 302); |
3092 | 3257 | |
3093 | 3258 | // Debugging. |
3094 | - if (isset($db_show_debug) && $db_show_debug === true) |
|
3095 | - $_SESSION['debug_redirect'] = $db_cache; |
|
3259 | + if (isset($db_show_debug) && $db_show_debug === true) { |
|
3260 | + $_SESSION['debug_redirect'] = $db_cache; |
|
3261 | + } |
|
3096 | 3262 | |
3097 | 3263 | obExit(false); |
3098 | 3264 | } |
@@ -3111,51 +3277,60 @@ discard block |
||
3111 | 3277 | |
3112 | 3278 | // Attempt to prevent a recursive loop. |
3113 | 3279 | ++$level; |
3114 | - if ($level > 1 && !$from_fatal_error && !$has_fatal_error) |
|
3115 | - exit; |
|
3116 | - if ($from_fatal_error) |
|
3117 | - $has_fatal_error = true; |
|
3280 | + if ($level > 1 && !$from_fatal_error && !$has_fatal_error) { |
|
3281 | + exit; |
|
3282 | + } |
|
3283 | + if ($from_fatal_error) { |
|
3284 | + $has_fatal_error = true; |
|
3285 | + } |
|
3118 | 3286 | |
3119 | 3287 | // Clear out the stat cache. |
3120 | 3288 | trackStats(); |
3121 | 3289 | |
3122 | 3290 | // If we have mail to send, send it. |
3123 | - if (!empty($context['flush_mail'])) |
|
3124 | - // @todo this relies on 'flush_mail' being only set in AddMailQueue itself... :\ |
|
3291 | + if (!empty($context['flush_mail'])) { |
|
3292 | + // @todo this relies on 'flush_mail' being only set in AddMailQueue itself... :\ |
|
3125 | 3293 | AddMailQueue(true); |
3294 | + } |
|
3126 | 3295 | |
3127 | 3296 | $do_header = $header === null ? !$header_done : $header; |
3128 | - if ($do_footer === null) |
|
3129 | - $do_footer = $do_header; |
|
3297 | + if ($do_footer === null) { |
|
3298 | + $do_footer = $do_header; |
|
3299 | + } |
|
3130 | 3300 | |
3131 | 3301 | // Has the template/header been done yet? |
3132 | 3302 | if ($do_header) |
3133 | 3303 | { |
3134 | 3304 | // Was the page title set last minute? Also update the HTML safe one. |
3135 | - if (!empty($context['page_title']) && empty($context['page_title_html_safe'])) |
|
3136 | - $context['page_title_html_safe'] = $smcFunc['htmlspecialchars'](un_htmlspecialchars($context['page_title'])) . (!empty($context['current_page']) ? ' - ' . $txt['page'] . ' ' . ($context['current_page'] + 1) : ''); |
|
3305 | + if (!empty($context['page_title']) && empty($context['page_title_html_safe'])) { |
|
3306 | + $context['page_title_html_safe'] = $smcFunc['htmlspecialchars'](un_htmlspecialchars($context['page_title'])) . (!empty($context['current_page']) ? ' - ' . $txt['page'] . ' ' . ($context['current_page'] + 1) : ''); |
|
3307 | + } |
|
3137 | 3308 | |
3138 | 3309 | // Start up the session URL fixer. |
3139 | 3310 | ob_start('ob_sessrewrite'); |
3140 | 3311 | |
3141 | - if (!empty($settings['output_buffers']) && is_string($settings['output_buffers'])) |
|
3142 | - $buffers = explode(',', $settings['output_buffers']); |
|
3143 | - elseif (!empty($settings['output_buffers'])) |
|
3144 | - $buffers = $settings['output_buffers']; |
|
3145 | - else |
|
3146 | - $buffers = array(); |
|
3312 | + if (!empty($settings['output_buffers']) && is_string($settings['output_buffers'])) { |
|
3313 | + $buffers = explode(',', $settings['output_buffers']); |
|
3314 | + } elseif (!empty($settings['output_buffers'])) { |
|
3315 | + $buffers = $settings['output_buffers']; |
|
3316 | + } else { |
|
3317 | + $buffers = array(); |
|
3318 | + } |
|
3147 | 3319 | |
3148 | - if (isset($modSettings['integrate_buffer'])) |
|
3149 | - $buffers = array_merge(explode(',', $modSettings['integrate_buffer']), $buffers); |
|
3320 | + if (isset($modSettings['integrate_buffer'])) { |
|
3321 | + $buffers = array_merge(explode(',', $modSettings['integrate_buffer']), $buffers); |
|
3322 | + } |
|
3150 | 3323 | |
3151 | - if (!empty($buffers)) |
|
3152 | - foreach ($buffers as $function) |
|
3324 | + if (!empty($buffers)) { |
|
3325 | + foreach ($buffers as $function) |
|
3153 | 3326 | { |
3154 | 3327 | $call = call_helper($function, true); |
3328 | + } |
|
3155 | 3329 | |
3156 | 3330 | // Is it valid? |
3157 | - if (!empty($call)) |
|
3158 | - ob_start($call); |
|
3331 | + if (!empty($call)) { |
|
3332 | + ob_start($call); |
|
3333 | + } |
|
3159 | 3334 | } |
3160 | 3335 | |
3161 | 3336 | // Display the screen in the logical order. |
@@ -3167,8 +3342,9 @@ discard block |
||
3167 | 3342 | loadSubTemplate(isset($context['sub_template']) ? $context['sub_template'] : 'main'); |
3168 | 3343 | |
3169 | 3344 | // Anything special to put out? |
3170 | - if (!empty($context['insert_after_template']) && !isset($_REQUEST['xml'])) |
|
3171 | - echo $context['insert_after_template']; |
|
3345 | + if (!empty($context['insert_after_template']) && !isset($_REQUEST['xml'])) { |
|
3346 | + echo $context['insert_after_template']; |
|
3347 | + } |
|
3172 | 3348 | |
3173 | 3349 | // Just so we don't get caught in an endless loop of errors from the footer... |
3174 | 3350 | if (!$footer_done) |
@@ -3177,14 +3353,16 @@ discard block |
||
3177 | 3353 | template_footer(); |
3178 | 3354 | |
3179 | 3355 | // (since this is just debugging... it's okay that it's after </html>.) |
3180 | - if (!isset($_REQUEST['xml'])) |
|
3181 | - displayDebug(); |
|
3356 | + if (!isset($_REQUEST['xml'])) { |
|
3357 | + displayDebug(); |
|
3358 | + } |
|
3182 | 3359 | } |
3183 | 3360 | } |
3184 | 3361 | |
3185 | 3362 | // Remember this URL in case someone doesn't like sending HTTP_REFERER. |
3186 | - if (strpos($_SERVER['REQUEST_URL'], 'action=dlattach') === false && strpos($_SERVER['REQUEST_URL'], 'action=viewsmfile') === false) |
|
3187 | - $_SESSION['old_url'] = $_SERVER['REQUEST_URL']; |
|
3363 | + if (strpos($_SERVER['REQUEST_URL'], 'action=dlattach') === false && strpos($_SERVER['REQUEST_URL'], 'action=viewsmfile') === false) { |
|
3364 | + $_SESSION['old_url'] = $_SERVER['REQUEST_URL']; |
|
3365 | + } |
|
3188 | 3366 | |
3189 | 3367 | // For session check verification.... don't switch browsers... |
3190 | 3368 | $_SESSION['USER_AGENT'] = empty($_SERVER['HTTP_USER_AGENT']) ? '' : $_SERVER['HTTP_USER_AGENT']; |
@@ -3193,9 +3371,10 @@ discard block |
||
3193 | 3371 | call_integration_hook('integrate_exit', array($do_footer)); |
3194 | 3372 | |
3195 | 3373 | // Don't exit if we're coming from index.php; that will pass through normally. |
3196 | - if (!$from_index) |
|
3197 | - exit; |
|
3198 | -} |
|
3374 | + if (!$from_index) { |
|
3375 | + exit; |
|
3376 | + } |
|
3377 | + } |
|
3199 | 3378 | |
3200 | 3379 | /** |
3201 | 3380 | * Get the size of a specified image with better error handling. |
@@ -3214,8 +3393,9 @@ discard block |
||
3214 | 3393 | $url = str_replace(' ', '%20', $url); |
3215 | 3394 | |
3216 | 3395 | // Can we pull this from the cache... please please? |
3217 | - if (($temp = cache_get_data('url_image_size-' . md5($url), 240)) !== null) |
|
3218 | - return $temp; |
|
3396 | + if (($temp = cache_get_data('url_image_size-' . md5($url), 240)) !== null) { |
|
3397 | + return $temp; |
|
3398 | + } |
|
3219 | 3399 | $t = microtime(true); |
3220 | 3400 | |
3221 | 3401 | // Get the host to pester... |
@@ -3225,12 +3405,10 @@ discard block |
||
3225 | 3405 | if ($url == '' || $url == 'http://' || $url == 'https://') |
3226 | 3406 | { |
3227 | 3407 | return false; |
3228 | - } |
|
3229 | - elseif (!isset($match[1])) |
|
3408 | + } elseif (!isset($match[1])) |
|
3230 | 3409 | { |
3231 | 3410 | $size = @getimagesize($url); |
3232 | - } |
|
3233 | - else |
|
3411 | + } else |
|
3234 | 3412 | { |
3235 | 3413 | // Try to connect to the server... give it half a second. |
3236 | 3414 | $temp = 0; |
@@ -3267,12 +3445,14 @@ discard block |
||
3267 | 3445 | } |
3268 | 3446 | |
3269 | 3447 | // If we didn't get it, we failed. |
3270 | - if (!isset($size)) |
|
3271 | - $size = false; |
|
3448 | + if (!isset($size)) { |
|
3449 | + $size = false; |
|
3450 | + } |
|
3272 | 3451 | |
3273 | 3452 | // If this took a long time, we may never have to do it again, but then again we might... |
3274 | - if (microtime(true) - $t > 0.8) |
|
3275 | - cache_put_data('url_image_size-' . md5($url), $size, 240); |
|
3453 | + if (microtime(true) - $t > 0.8) { |
|
3454 | + cache_put_data('url_image_size-' . md5($url), $size, 240); |
|
3455 | + } |
|
3276 | 3456 | |
3277 | 3457 | // Didn't work. |
3278 | 3458 | return $size; |
@@ -3290,8 +3470,9 @@ discard block |
||
3290 | 3470 | |
3291 | 3471 | // Under SSI this function can be called more then once. That can cause some problems. |
3292 | 3472 | // So only run the function once unless we are forced to run it again. |
3293 | - if ($loaded && !$forceload) |
|
3294 | - return; |
|
3473 | + if ($loaded && !$forceload) { |
|
3474 | + return; |
|
3475 | + } |
|
3295 | 3476 | |
3296 | 3477 | $loaded = true; |
3297 | 3478 | |
@@ -3303,14 +3484,16 @@ discard block |
||
3303 | 3484 | $context['news_lines'] = array_filter(explode("\n", str_replace("\r", '', trim(addslashes($modSettings['news']))))); |
3304 | 3485 | for ($i = 0, $n = count($context['news_lines']); $i < $n; $i++) |
3305 | 3486 | { |
3306 | - if (trim($context['news_lines'][$i]) == '') |
|
3307 | - continue; |
|
3487 | + if (trim($context['news_lines'][$i]) == '') { |
|
3488 | + continue; |
|
3489 | + } |
|
3308 | 3490 | |
3309 | 3491 | // Clean it up for presentation ;). |
3310 | 3492 | $context['news_lines'][$i] = parse_bbc(stripslashes(trim($context['news_lines'][$i])), true, 'news' . $i); |
3311 | 3493 | } |
3312 | - if (!empty($context['news_lines'])) |
|
3313 | - $context['random_news_line'] = $context['news_lines'][mt_rand(0, count($context['news_lines']) - 1)]; |
|
3494 | + if (!empty($context['news_lines'])) { |
|
3495 | + $context['random_news_line'] = $context['news_lines'][mt_rand(0, count($context['news_lines']) - 1)]; |
|
3496 | + } |
|
3314 | 3497 | |
3315 | 3498 | if (!$user_info['is_guest']) |
3316 | 3499 | { |
@@ -3319,40 +3502,48 @@ discard block |
||
3319 | 3502 | $context['user']['alerts'] = &$user_info['alerts']; |
3320 | 3503 | |
3321 | 3504 | // Personal message popup... |
3322 | - if ($user_info['unread_messages'] > (isset($_SESSION['unread_messages']) ? $_SESSION['unread_messages'] : 0)) |
|
3323 | - $context['user']['popup_messages'] = true; |
|
3324 | - else |
|
3325 | - $context['user']['popup_messages'] = false; |
|
3505 | + if ($user_info['unread_messages'] > (isset($_SESSION['unread_messages']) ? $_SESSION['unread_messages'] : 0)) { |
|
3506 | + $context['user']['popup_messages'] = true; |
|
3507 | + } else { |
|
3508 | + $context['user']['popup_messages'] = false; |
|
3509 | + } |
|
3326 | 3510 | $_SESSION['unread_messages'] = $user_info['unread_messages']; |
3327 | 3511 | |
3328 | - if (allowedTo('moderate_forum')) |
|
3329 | - $context['unapproved_members'] = !empty($modSettings['unapprovedMembers']) ? $modSettings['unapprovedMembers'] : 0; |
|
3512 | + if (allowedTo('moderate_forum')) { |
|
3513 | + $context['unapproved_members'] = !empty($modSettings['unapprovedMembers']) ? $modSettings['unapprovedMembers'] : 0; |
|
3514 | + } |
|
3330 | 3515 | |
3331 | 3516 | $context['user']['avatar'] = array(); |
3332 | 3517 | |
3333 | 3518 | // Check for gravatar first since we might be forcing them... |
3334 | 3519 | if (($modSettings['gravatarEnabled'] && substr($user_info['avatar']['url'], 0, 11) == 'gravatar://') || !empty($modSettings['gravatarOverride'])) |
3335 | 3520 | { |
3336 | - if (!empty($modSettings['gravatarAllowExtraEmail']) && stristr($user_info['avatar']['url'], 'gravatar://') && strlen($user_info['avatar']['url']) > 11) |
|
3337 | - $context['user']['avatar']['href'] = get_gravatar_url($smcFunc['substr']($user_info['avatar']['url'], 11)); |
|
3338 | - else |
|
3339 | - $context['user']['avatar']['href'] = get_gravatar_url($user_info['email']); |
|
3521 | + if (!empty($modSettings['gravatarAllowExtraEmail']) && stristr($user_info['avatar']['url'], 'gravatar://') && strlen($user_info['avatar']['url']) > 11) { |
|
3522 | + $context['user']['avatar']['href'] = get_gravatar_url($smcFunc['substr']($user_info['avatar']['url'], 11)); |
|
3523 | + } else { |
|
3524 | + $context['user']['avatar']['href'] = get_gravatar_url($user_info['email']); |
|
3525 | + } |
|
3340 | 3526 | } |
3341 | 3527 | // Uploaded? |
3342 | - elseif ($user_info['avatar']['url'] == '' && !empty($user_info['avatar']['id_attach'])) |
|
3343 | - $context['user']['avatar']['href'] = $user_info['avatar']['custom_dir'] ? $modSettings['custom_avatar_url'] . '/' . $user_info['avatar']['filename'] : $scripturl . '?action=dlattach;attach=' . $user_info['avatar']['id_attach'] . ';type=avatar'; |
|
3528 | + elseif ($user_info['avatar']['url'] == '' && !empty($user_info['avatar']['id_attach'])) { |
|
3529 | + $context['user']['avatar']['href'] = $user_info['avatar']['custom_dir'] ? $modSettings['custom_avatar_url'] . '/' . $user_info['avatar']['filename'] : $scripturl . '?action=dlattach;attach=' . $user_info['avatar']['id_attach'] . ';type=avatar'; |
|
3530 | + } |
|
3344 | 3531 | // Full URL? |
3345 | - elseif (strpos($user_info['avatar']['url'], 'http://') === 0 || strpos($user_info['avatar']['url'], 'https://') === 0) |
|
3346 | - $context['user']['avatar']['href'] = $user_info['avatar']['url']; |
|
3532 | + elseif (strpos($user_info['avatar']['url'], 'http://') === 0 || strpos($user_info['avatar']['url'], 'https://') === 0) { |
|
3533 | + $context['user']['avatar']['href'] = $user_info['avatar']['url']; |
|
3534 | + } |
|
3347 | 3535 | // Otherwise we assume it's server stored. |
3348 | - elseif ($user_info['avatar']['url'] != '') |
|
3349 | - $context['user']['avatar']['href'] = $modSettings['avatar_url'] . '/' . $smcFunc['htmlspecialchars']($user_info['avatar']['url']); |
|
3536 | + elseif ($user_info['avatar']['url'] != '') { |
|
3537 | + $context['user']['avatar']['href'] = $modSettings['avatar_url'] . '/' . $smcFunc['htmlspecialchars']($user_info['avatar']['url']); |
|
3538 | + } |
|
3350 | 3539 | // No avatar at all? Fine, we have a big fat default avatar ;) |
3351 | - else |
|
3352 | - $context['user']['avatar']['href'] = $modSettings['avatar_url'] . '/default.png'; |
|
3540 | + else { |
|
3541 | + $context['user']['avatar']['href'] = $modSettings['avatar_url'] . '/default.png'; |
|
3542 | + } |
|
3353 | 3543 | |
3354 | - if (!empty($context['user']['avatar'])) |
|
3355 | - $context['user']['avatar']['image'] = '<img src="' . $context['user']['avatar']['href'] . '" alt="" class="avatar">'; |
|
3544 | + if (!empty($context['user']['avatar'])) { |
|
3545 | + $context['user']['avatar']['image'] = '<img src="' . $context['user']['avatar']['href'] . '" alt="" class="avatar">'; |
|
3546 | + } |
|
3356 | 3547 | |
3357 | 3548 | // Figure out how long they've been logged in. |
3358 | 3549 | $context['user']['total_time_logged_in'] = array( |
@@ -3360,8 +3551,7 @@ discard block |
||
3360 | 3551 | 'hours' => floor(($user_info['total_time_logged_in'] % 86400) / 3600), |
3361 | 3552 | 'minutes' => floor(($user_info['total_time_logged_in'] % 3600) / 60) |
3362 | 3553 | ); |
3363 | - } |
|
3364 | - else |
|
3554 | + } else |
|
3365 | 3555 | { |
3366 | 3556 | $context['user']['messages'] = 0; |
3367 | 3557 | $context['user']['unread_messages'] = 0; |
@@ -3369,12 +3559,14 @@ discard block |
||
3369 | 3559 | $context['user']['total_time_logged_in'] = array('days' => 0, 'hours' => 0, 'minutes' => 0); |
3370 | 3560 | $context['user']['popup_messages'] = false; |
3371 | 3561 | |
3372 | - if (!empty($modSettings['registration_method']) && $modSettings['registration_method'] == 1) |
|
3373 | - $txt['welcome_guest'] .= $txt['welcome_guest_activate']; |
|
3562 | + if (!empty($modSettings['registration_method']) && $modSettings['registration_method'] == 1) { |
|
3563 | + $txt['welcome_guest'] .= $txt['welcome_guest_activate']; |
|
3564 | + } |
|
3374 | 3565 | |
3375 | 3566 | // If we've upgraded recently, go easy on the passwords. |
3376 | - if (!empty($modSettings['disableHashTime']) && ($modSettings['disableHashTime'] == 1 || time() < $modSettings['disableHashTime'])) |
|
3377 | - $context['disable_login_hashing'] = true; |
|
3567 | + if (!empty($modSettings['disableHashTime']) && ($modSettings['disableHashTime'] == 1 || time() < $modSettings['disableHashTime'])) { |
|
3568 | + $context['disable_login_hashing'] = true; |
|
3569 | + } |
|
3378 | 3570 | } |
3379 | 3571 | |
3380 | 3572 | // Setup the main menu items. |
@@ -3387,8 +3579,8 @@ discard block |
||
3387 | 3579 | $context['show_pm_popup'] = $context['user']['popup_messages'] && !empty($options['popup_messages']) && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'pm'); |
3388 | 3580 | |
3389 | 3581 | // 2.1+: Add the PM popup here instead. Theme authors can still override it simply by editing/removing the 'fPmPopup' in the array. |
3390 | - if ($context['show_pm_popup']) |
|
3391 | - addInlineJavaScript(' |
|
3582 | + if ($context['show_pm_popup']) { |
|
3583 | + addInlineJavaScript(' |
|
3392 | 3584 | jQuery(document).ready(function($) { |
3393 | 3585 | new smc_Popup({ |
3394 | 3586 | heading: ' . JavaScriptEscape($txt['show_personal_messages_heading']) . ', |
@@ -3396,24 +3588,28 @@ discard block |
||
3396 | 3588 | icon_class: \'generic_icons mail_new\' |
3397 | 3589 | }); |
3398 | 3590 | });'); |
3591 | + } |
|
3399 | 3592 | |
3400 | 3593 | // Add a generic "Are you sure?" confirmation message. |
3401 | 3594 | addInlineJavaScript(' |
3402 | 3595 | var smf_you_sure =' . JavaScriptEscape($txt['quickmod_confirm']) .';'); |
3403 | 3596 | |
3404 | 3597 | // Now add the capping code for avatars. |
3405 | - if (!empty($modSettings['avatar_max_width_external']) && !empty($modSettings['avatar_max_height_external']) && !empty($modSettings['avatar_action_too_large']) && $modSettings['avatar_action_too_large'] == 'option_css_resize') |
|
3406 | - addInlineCss(' |
|
3598 | + if (!empty($modSettings['avatar_max_width_external']) && !empty($modSettings['avatar_max_height_external']) && !empty($modSettings['avatar_action_too_large']) && $modSettings['avatar_action_too_large'] == 'option_css_resize') { |
|
3599 | + addInlineCss(' |
|
3407 | 3600 | img.avatar { max-width: ' . $modSettings['avatar_max_width_external'] . 'px; max-height: ' . $modSettings['avatar_max_height_external'] . 'px; }'); |
3601 | + } |
|
3408 | 3602 | |
3409 | 3603 | // Add max image limits |
3410 | - if (!empty($modSettings['max_image_width'])) |
|
3411 | - addInlineCss(' |
|
3604 | + if (!empty($modSettings['max_image_width'])) { |
|
3605 | + addInlineCss(' |
|
3412 | 3606 | .postarea .bbc_img { max-width: ' . $modSettings['max_image_width'] . 'px; }'); |
3607 | + } |
|
3413 | 3608 | |
3414 | - if (!empty($modSettings['max_image_height'])) |
|
3415 | - addInlineCss(' |
|
3609 | + if (!empty($modSettings['max_image_height'])) { |
|
3610 | + addInlineCss(' |
|
3416 | 3611 | .postarea .bbc_img { max-height: ' . $modSettings['max_image_height'] . 'px; }'); |
3612 | + } |
|
3417 | 3613 | |
3418 | 3614 | // This looks weird, but it's because BoardIndex.php references the variable. |
3419 | 3615 | $context['common_stats']['latest_member'] = array( |
@@ -3430,11 +3626,13 @@ discard block |
||
3430 | 3626 | ); |
3431 | 3627 | $context['common_stats']['boardindex_total_posts'] = sprintf($txt['boardindex_total_posts'], $context['common_stats']['total_posts'], $context['common_stats']['total_topics'], $context['common_stats']['total_members']); |
3432 | 3628 | |
3433 | - if (empty($settings['theme_version'])) |
|
3434 | - addJavaScriptVar('smf_scripturl', $scripturl); |
|
3629 | + if (empty($settings['theme_version'])) { |
|
3630 | + addJavaScriptVar('smf_scripturl', $scripturl); |
|
3631 | + } |
|
3435 | 3632 | |
3436 | - if (!isset($context['page_title'])) |
|
3437 | - $context['page_title'] = ''; |
|
3633 | + if (!isset($context['page_title'])) { |
|
3634 | + $context['page_title'] = ''; |
|
3635 | + } |
|
3438 | 3636 | |
3439 | 3637 | // Set some specific vars. |
3440 | 3638 | $context['page_title_html_safe'] = $smcFunc['htmlspecialchars'](un_htmlspecialchars($context['page_title'])) . (!empty($context['current_page']) ? ' - ' . $txt['page'] . ' ' . ($context['current_page'] + 1) : ''); |
@@ -3444,21 +3642,23 @@ discard block |
||
3444 | 3642 | $context['meta_tags'][] = array('property' => 'og:site_name', 'content' => $context['forum_name']); |
3445 | 3643 | $context['meta_tags'][] = array('property' => 'og:title', 'content' => $context['page_title_html_safe']); |
3446 | 3644 | |
3447 | - if (!empty($context['meta_keywords'])) |
|
3448 | - $context['meta_tags'][] = array('name' => 'keywords', 'content' => $context['meta_keywords']); |
|
3645 | + if (!empty($context['meta_keywords'])) { |
|
3646 | + $context['meta_tags'][] = array('name' => 'keywords', 'content' => $context['meta_keywords']); |
|
3647 | + } |
|
3449 | 3648 | |
3450 | - if (!empty($context['canonical_url'])) |
|
3451 | - $context['meta_tags'][] = array('property' => 'og:url', 'content' => $context['canonical_url']); |
|
3649 | + if (!empty($context['canonical_url'])) { |
|
3650 | + $context['meta_tags'][] = array('property' => 'og:url', 'content' => $context['canonical_url']); |
|
3651 | + } |
|
3452 | 3652 | |
3453 | - if (!empty($settings['og_image'])) |
|
3454 | - $context['meta_tags'][] = array('property' => 'og:image', 'content' => $settings['og_image']); |
|
3653 | + if (!empty($settings['og_image'])) { |
|
3654 | + $context['meta_tags'][] = array('property' => 'og:image', 'content' => $settings['og_image']); |
|
3655 | + } |
|
3455 | 3656 | |
3456 | 3657 | if (!empty($context['meta_description'])) |
3457 | 3658 | { |
3458 | 3659 | $context['meta_tags'][] = array('property' => 'og:description', 'content' => $context['meta_description']); |
3459 | 3660 | $context['meta_tags'][] = array('name' => 'description', 'content' => $context['meta_description']); |
3460 | - } |
|
3461 | - else |
|
3661 | + } else |
|
3462 | 3662 | { |
3463 | 3663 | $context['meta_tags'][] = array('property' => 'og:description', 'content' => $context['page_title_html_safe']); |
3464 | 3664 | $context['meta_tags'][] = array('name' => 'description', 'content' => $context['page_title_html_safe']); |
@@ -3483,8 +3683,9 @@ discard block |
||
3483 | 3683 | $memory_needed = memoryReturnBytes($needed); |
3484 | 3684 | |
3485 | 3685 | // should we account for how much is currently being used? |
3486 | - if ($in_use) |
|
3487 | - $memory_needed += function_exists('memory_get_usage') ? memory_get_usage() : (2 * 1048576); |
|
3686 | + if ($in_use) { |
|
3687 | + $memory_needed += function_exists('memory_get_usage') ? memory_get_usage() : (2 * 1048576); |
|
3688 | + } |
|
3488 | 3689 | |
3489 | 3690 | // if more is needed, request it |
3490 | 3691 | if ($memory_current < $memory_needed) |
@@ -3507,8 +3708,9 @@ discard block |
||
3507 | 3708 | */ |
3508 | 3709 | function memoryReturnBytes($val) |
3509 | 3710 | { |
3510 | - if (is_integer($val)) |
|
3511 | - return $val; |
|
3711 | + if (is_integer($val)) { |
|
3712 | + return $val; |
|
3713 | + } |
|
3512 | 3714 | |
3513 | 3715 | // Separate the number from the designator |
3514 | 3716 | $val = trim($val); |
@@ -3544,10 +3746,11 @@ discard block |
||
3544 | 3746 | header('last-modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); |
3545 | 3747 | |
3546 | 3748 | // Are we debugging the template/html content? |
3547 | - if (!isset($_REQUEST['xml']) && isset($_GET['debug']) && !isBrowser('ie')) |
|
3548 | - header('content-type: application/xhtml+xml'); |
|
3549 | - elseif (!isset($_REQUEST['xml'])) |
|
3550 | - header('content-type: text/html; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set'])); |
|
3749 | + if (!isset($_REQUEST['xml']) && isset($_GET['debug']) && !isBrowser('ie')) { |
|
3750 | + header('content-type: application/xhtml+xml'); |
|
3751 | + } elseif (!isset($_REQUEST['xml'])) { |
|
3752 | + header('content-type: text/html; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set'])); |
|
3753 | + } |
|
3551 | 3754 | } |
3552 | 3755 | |
3553 | 3756 | header('content-type: text/' . (isset($_REQUEST['xml']) ? 'xml' : 'html') . '; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set'])); |
@@ -3556,8 +3759,9 @@ discard block |
||
3556 | 3759 | if ($context['in_maintenance'] && $context['user']['is_admin']) |
3557 | 3760 | { |
3558 | 3761 | $position = array_search('body', $context['template_layers']); |
3559 | - if ($position === false) |
|
3560 | - $position = array_search('main', $context['template_layers']); |
|
3762 | + if ($position === false) { |
|
3763 | + $position = array_search('main', $context['template_layers']); |
|
3764 | + } |
|
3561 | 3765 | |
3562 | 3766 | if ($position !== false) |
3563 | 3767 | { |
@@ -3585,23 +3789,25 @@ discard block |
||
3585 | 3789 | |
3586 | 3790 | foreach ($securityFiles as $i => $securityFile) |
3587 | 3791 | { |
3588 | - if (!file_exists($boarddir . '/' . $securityFile)) |
|
3589 | - unset($securityFiles[$i]); |
|
3792 | + if (!file_exists($boarddir . '/' . $securityFile)) { |
|
3793 | + unset($securityFiles[$i]); |
|
3794 | + } |
|
3590 | 3795 | } |
3591 | 3796 | |
3592 | 3797 | // We are already checking so many files...just few more doesn't make any difference! :P |
3593 | - if (!empty($modSettings['currentAttachmentUploadDir'])) |
|
3594 | - $path = $modSettings['attachmentUploadDir'][$modSettings['currentAttachmentUploadDir']]; |
|
3595 | - |
|
3596 | - else |
|
3597 | - $path = $modSettings['attachmentUploadDir']; |
|
3798 | + if (!empty($modSettings['currentAttachmentUploadDir'])) { |
|
3799 | + $path = $modSettings['attachmentUploadDir'][$modSettings['currentAttachmentUploadDir']]; |
|
3800 | + } else { |
|
3801 | + $path = $modSettings['attachmentUploadDir']; |
|
3802 | + } |
|
3598 | 3803 | |
3599 | 3804 | secureDirectory($path, true); |
3600 | 3805 | secureDirectory($cachedir); |
3601 | 3806 | |
3602 | 3807 | // If agreement is enabled, at least the english version shall exists |
3603 | - if ($modSettings['requireAgreement']) |
|
3604 | - $agreement = !file_exists($boarddir . '/agreement.txt'); |
|
3808 | + if ($modSettings['requireAgreement']) { |
|
3809 | + $agreement = !file_exists($boarddir . '/agreement.txt'); |
|
3810 | + } |
|
3605 | 3811 | |
3606 | 3812 | if (!empty($securityFiles) || (!empty($modSettings['cache_enable']) && !is_writable($cachedir)) || !empty($agreement)) |
3607 | 3813 | { |
@@ -3616,18 +3822,21 @@ discard block |
||
3616 | 3822 | echo ' |
3617 | 3823 | ', $txt['not_removed'], '<strong>', $securityFile, '</strong>!<br>'; |
3618 | 3824 | |
3619 | - if ($securityFile == 'Settings.php~' || $securityFile == 'Settings_bak.php~') |
|
3620 | - echo ' |
|
3825 | + if ($securityFile == 'Settings.php~' || $securityFile == 'Settings_bak.php~') { |
|
3826 | + echo ' |
|
3621 | 3827 | ', sprintf($txt['not_removed_extra'], $securityFile, substr($securityFile, 0, -1)), '<br>'; |
3828 | + } |
|
3622 | 3829 | } |
3623 | 3830 | |
3624 | - if (!empty($modSettings['cache_enable']) && !is_writable($cachedir)) |
|
3625 | - echo ' |
|
3831 | + if (!empty($modSettings['cache_enable']) && !is_writable($cachedir)) { |
|
3832 | + echo ' |
|
3626 | 3833 | <strong>', $txt['cache_writable'], '</strong><br>'; |
3834 | + } |
|
3627 | 3835 | |
3628 | - if (!empty($agreement)) |
|
3629 | - echo ' |
|
3836 | + if (!empty($agreement)) { |
|
3837 | + echo ' |
|
3630 | 3838 | <strong>', $txt['agreement_missing'], '</strong><br>'; |
3839 | + } |
|
3631 | 3840 | |
3632 | 3841 | echo ' |
3633 | 3842 | </p> |
@@ -3642,16 +3851,18 @@ discard block |
||
3642 | 3851 | <div class="windowbg alert" style="margin: 2ex; padding: 2ex; border: 2px dashed red;"> |
3643 | 3852 | ', sprintf($txt['you_are_post_banned'], $user_info['is_guest'] ? $txt['guest_title'] : $user_info['name']); |
3644 | 3853 | |
3645 | - if (!empty($_SESSION['ban']['cannot_post']['reason'])) |
|
3646 | - echo ' |
|
3854 | + if (!empty($_SESSION['ban']['cannot_post']['reason'])) { |
|
3855 | + echo ' |
|
3647 | 3856 | <div style="padding-left: 4ex; padding-top: 1ex;">', $_SESSION['ban']['cannot_post']['reason'], '</div>'; |
3857 | + } |
|
3648 | 3858 | |
3649 | - if (!empty($_SESSION['ban']['expire_time'])) |
|
3650 | - echo ' |
|
3859 | + if (!empty($_SESSION['ban']['expire_time'])) { |
|
3860 | + echo ' |
|
3651 | 3861 | <div>', sprintf($txt['your_ban_expires'], timeformat($_SESSION['ban']['expire_time'], false)), '</div>'; |
3652 | - else |
|
3653 | - echo ' |
|
3862 | + } else { |
|
3863 | + echo ' |
|
3654 | 3864 | <div>', $txt['your_ban_expires_never'], '</div>'; |
3865 | + } |
|
3655 | 3866 | |
3656 | 3867 | echo ' |
3657 | 3868 | </div>'; |
@@ -3667,8 +3878,9 @@ discard block |
||
3667 | 3878 | global $forum_copyright, $software_year, $forum_version; |
3668 | 3879 | |
3669 | 3880 | // Don't display copyright for things like SSI. |
3670 | - if (!isset($forum_version) || !isset($software_year)) |
|
3671 | - return; |
|
3881 | + if (!isset($forum_version) || !isset($software_year)) { |
|
3882 | + return; |
|
3883 | + } |
|
3672 | 3884 | |
3673 | 3885 | // Put in the version... |
3674 | 3886 | printf($forum_copyright, $forum_version, $software_year); |
@@ -3686,9 +3898,10 @@ discard block |
||
3686 | 3898 | $context['load_time'] = round(microtime(true) - $time_start, 3); |
3687 | 3899 | $context['load_queries'] = $db_count; |
3688 | 3900 | |
3689 | - foreach (array_reverse($context['template_layers']) as $layer) |
|
3690 | - loadSubTemplate($layer . '_below', true); |
|
3691 | -} |
|
3901 | + foreach (array_reverse($context['template_layers']) as $layer) { |
|
3902 | + loadSubTemplate($layer . '_below', true); |
|
3903 | + } |
|
3904 | + } |
|
3692 | 3905 | |
3693 | 3906 | /** |
3694 | 3907 | * Output the Javascript files |
@@ -3722,8 +3935,7 @@ discard block |
||
3722 | 3935 | { |
3723 | 3936 | echo ' |
3724 | 3937 | var ', $key, ';'; |
3725 | - } |
|
3726 | - else |
|
3938 | + } else |
|
3727 | 3939 | { |
3728 | 3940 | echo ' |
3729 | 3941 | var ', $key, ' = ', $value, ';'; |
@@ -3742,27 +3954,29 @@ discard block |
||
3742 | 3954 | foreach ($context['javascript_files'] as $id => $js_file) |
3743 | 3955 | { |
3744 | 3956 | // Last minute call! allow theme authors to disable single files. |
3745 | - if (!empty($settings['disable_files']) && in_array($id, $settings['disable_files'])) |
|
3746 | - continue; |
|
3957 | + if (!empty($settings['disable_files']) && in_array($id, $settings['disable_files'])) { |
|
3958 | + continue; |
|
3959 | + } |
|
3747 | 3960 | |
3748 | 3961 | // By default files don't get minimized unless the file explicitly says so! |
3749 | 3962 | if (!empty($js_file['options']['minimize']) && !empty($modSettings['minimize_files'])) |
3750 | 3963 | { |
3751 | - if (!empty($js_file['options']['async'])) |
|
3752 | - $toMinify['async'][] = $js_file; |
|
3753 | - elseif (!empty($js_file['options']['defer'])) |
|
3754 | - $toMinify['defer'][] = $js_file; |
|
3755 | - else |
|
3756 | - $toMinify['standard'][] = $js_file; |
|
3964 | + if (!empty($js_file['options']['async'])) { |
|
3965 | + $toMinify['async'][] = $js_file; |
|
3966 | + } elseif (!empty($js_file['options']['defer'])) { |
|
3967 | + $toMinify['defer'][] = $js_file; |
|
3968 | + } else { |
|
3969 | + $toMinify['standard'][] = $js_file; |
|
3970 | + } |
|
3757 | 3971 | |
3758 | 3972 | // Grab a random seed. |
3759 | - if (!isset($minSeed) && isset($js_file['options']['seed'])) |
|
3760 | - $minSeed = $js_file['options']['seed']; |
|
3761 | - } |
|
3762 | - |
|
3763 | - else |
|
3764 | - echo ' |
|
3973 | + if (!isset($minSeed) && isset($js_file['options']['seed'])) { |
|
3974 | + $minSeed = $js_file['options']['seed']; |
|
3975 | + } |
|
3976 | + } else { |
|
3977 | + echo ' |
|
3765 | 3978 | <script src="', $js_file['fileUrl'], '"', !empty($js_file['options']['async']) ? ' async' : '', !empty($js_file['options']['defer']) ? ' defer' : '', '></script>'; |
3979 | + } |
|
3766 | 3980 | } |
3767 | 3981 | |
3768 | 3982 | foreach ($toMinify as $js_files) |
@@ -3773,9 +3987,10 @@ discard block |
||
3773 | 3987 | |
3774 | 3988 | $minSuccessful = array_keys($result) === array('smf_minified'); |
3775 | 3989 | |
3776 | - foreach ($result as $minFile) |
|
3777 | - echo ' |
|
3990 | + foreach ($result as $minFile) { |
|
3991 | + echo ' |
|
3778 | 3992 | <script src="', $minFile['fileUrl'], $minSuccessful && isset($minSeed) ? $minSeed : '', '"', !empty($minFile['options']['async']) ? ' async' : '', !empty($minFile['options']['defer']) ? ' defer' : '', '></script>'; |
3993 | + } |
|
3779 | 3994 | } |
3780 | 3995 | } |
3781 | 3996 | } |
@@ -3789,8 +4004,9 @@ discard block |
||
3789 | 4004 | <script> |
3790 | 4005 | window.addEventListener("DOMContentLoaded", function() {'; |
3791 | 4006 | |
3792 | - foreach ($context['javascript_inline']['defer'] as $js_code) |
|
3793 | - echo $js_code; |
|
4007 | + foreach ($context['javascript_inline']['defer'] as $js_code) { |
|
4008 | + echo $js_code; |
|
4009 | + } |
|
3794 | 4010 | |
3795 | 4011 | echo ' |
3796 | 4012 | }); |
@@ -3802,8 +4018,9 @@ discard block |
||
3802 | 4018 | echo ' |
3803 | 4019 | <script>'; |
3804 | 4020 | |
3805 | - foreach ($context['javascript_inline']['standard'] as $js_code) |
|
3806 | - echo $js_code; |
|
4021 | + foreach ($context['javascript_inline']['standard'] as $js_code) { |
|
4022 | + echo $js_code; |
|
4023 | + } |
|
3807 | 4024 | |
3808 | 4025 | echo ' |
3809 | 4026 | </script>'; |
@@ -3831,23 +4048,26 @@ discard block |
||
3831 | 4048 | foreach ($context['css_files'] as $id => $file) |
3832 | 4049 | { |
3833 | 4050 | // Last minute call! allow theme authors to disable single files. |
3834 | - if (!empty($settings['disable_files']) && in_array($id, $settings['disable_files'])) |
|
3835 | - continue; |
|
4051 | + if (!empty($settings['disable_files']) && in_array($id, $settings['disable_files'])) { |
|
4052 | + continue; |
|
4053 | + } |
|
3836 | 4054 | |
3837 | 4055 | // Files are minimized unless they explicitly opt out. |
3838 | - if (!isset($file['options']['minimize'])) |
|
3839 | - $file['options']['minimize'] = true; |
|
4056 | + if (!isset($file['options']['minimize'])) { |
|
4057 | + $file['options']['minimize'] = true; |
|
4058 | + } |
|
3840 | 4059 | |
3841 | 4060 | if (!empty($file['options']['minimize']) && !empty($modSettings['minimize_files']) && !isset($_REQUEST['normalcss'])) |
3842 | 4061 | { |
3843 | 4062 | $toMinify[] = $file; |
3844 | 4063 | |
3845 | 4064 | // Grab a random seed. |
3846 | - if (!isset($minSeed) && isset($file['options']['seed'])) |
|
3847 | - $minSeed = $file['options']['seed']; |
|
4065 | + if (!isset($minSeed) && isset($file['options']['seed'])) { |
|
4066 | + $minSeed = $file['options']['seed']; |
|
4067 | + } |
|
4068 | + } else { |
|
4069 | + $normal[] = $file['fileUrl']; |
|
3848 | 4070 | } |
3849 | - else |
|
3850 | - $normal[] = $file['fileUrl']; |
|
3851 | 4071 | } |
3852 | 4072 | |
3853 | 4073 | if (!empty($toMinify)) |
@@ -3856,23 +4076,26 @@ discard block |
||
3856 | 4076 | |
3857 | 4077 | $minSuccessful = array_keys($result) === array('smf_minified'); |
3858 | 4078 | |
3859 | - foreach ($result as $minFile) |
|
3860 | - echo ' |
|
4079 | + foreach ($result as $minFile) { |
|
4080 | + echo ' |
|
3861 | 4081 | <link rel="stylesheet" href="', $minFile['fileUrl'], $minSuccessful && isset($minSeed) ? $minSeed : '', '">'; |
4082 | + } |
|
3862 | 4083 | } |
3863 | 4084 | |
3864 | 4085 | // Print the rest after the minified files. |
3865 | - if (!empty($normal)) |
|
3866 | - foreach ($normal as $nf) |
|
4086 | + if (!empty($normal)) { |
|
4087 | + foreach ($normal as $nf) |
|
3867 | 4088 | echo ' |
3868 | 4089 | <link rel="stylesheet" href="', $nf ,'">'; |
4090 | + } |
|
3869 | 4091 | |
3870 | 4092 | if ($db_show_debug === true) |
3871 | 4093 | { |
3872 | 4094 | // Try to keep only what's useful. |
3873 | 4095 | $repl = array($boardurl . '/Themes/' => '', $boardurl . '/' => ''); |
3874 | - foreach ($context['css_files'] as $file) |
|
3875 | - $context['debug']['sheets'][] = strtr($file['fileName'], $repl); |
|
4096 | + foreach ($context['css_files'] as $file) { |
|
4097 | + $context['debug']['sheets'][] = strtr($file['fileName'], $repl); |
|
4098 | + } |
|
3876 | 4099 | } |
3877 | 4100 | |
3878 | 4101 | if (!empty($context['css_header'])) |
@@ -3880,9 +4103,10 @@ discard block |
||
3880 | 4103 | echo ' |
3881 | 4104 | <style>'; |
3882 | 4105 | |
3883 | - foreach ($context['css_header'] as $css) |
|
3884 | - echo $css .' |
|
4106 | + foreach ($context['css_header'] as $css) { |
|
4107 | + echo $css .' |
|
3885 | 4108 | '; |
4109 | + } |
|
3886 | 4110 | |
3887 | 4111 | echo' |
3888 | 4112 | </style>'; |
@@ -3905,8 +4129,9 @@ discard block |
||
3905 | 4129 | $type = !empty($type) && in_array($type, $types) ? $type : false; |
3906 | 4130 | $data = is_array($data) ? $data : array(); |
3907 | 4131 | |
3908 | - if (empty($type) || empty($data)) |
|
3909 | - return $data; |
|
4132 | + if (empty($type) || empty($data)) { |
|
4133 | + return $data; |
|
4134 | + } |
|
3910 | 4135 | |
3911 | 4136 | // Different pages include different files, so we use a hash to label the different combinations |
3912 | 4137 | $hash = md5(implode(' ', array_map(function($file) { return $file['filePath'] . (int) @filesize($file['filePath']) . (int) @filemtime($file['filePath']); }, $data))); |
@@ -3915,13 +4140,14 @@ discard block |
||
3915 | 4140 | list($toCache, $async, $defer) = array_pad((array) cache_get_data('minimized_' . $settings['theme_id'] . '_' . $type . '_' . $hash, 86400), 3, null); |
3916 | 4141 | |
3917 | 4142 | // Already done? |
3918 | - if (!empty($toCache)) |
|
3919 | - return array('smf_minified' => array( |
|
4143 | + if (!empty($toCache)) { |
|
4144 | + return array('smf_minified' => array( |
|
3920 | 4145 | 'fileUrl' => $settings['theme_url'] . '/' . ($type == 'css' ? 'css' : 'scripts') . '/' . basename($toCache), |
3921 | 4146 | 'filePath' => $toCache, |
3922 | 4147 | 'fileName' => basename($toCache), |
3923 | 4148 | 'options' => array('async' => !empty($async), 'defer' => !empty($defer)), |
3924 | 4149 | )); |
4150 | + } |
|
3925 | 4151 | |
3926 | 4152 | |
3927 | 4153 | // No namespaces, sorry! |
@@ -3951,9 +4177,9 @@ discard block |
||
3951 | 4177 | |
3952 | 4178 | foreach ($data as $id => $file) |
3953 | 4179 | { |
3954 | - if (empty($file['filePath'])) |
|
3955 | - $toAdd = false; |
|
3956 | - else |
|
4180 | + if (empty($file['filePath'])) { |
|
4181 | + $toAdd = false; |
|
4182 | + } else |
|
3957 | 4183 | { |
3958 | 4184 | $seed = isset($file['options']['seed']) ? $file['options']['seed'] : ''; |
3959 | 4185 | $tempFile = str_replace($seed, '', $file['filePath']); |
@@ -3961,12 +4187,14 @@ discard block |
||
3961 | 4187 | } |
3962 | 4188 | |
3963 | 4189 | // A minified script should only be loaded asynchronously if all its components wanted to be. |
3964 | - if (empty($file['options']['async'])) |
|
3965 | - $async = false; |
|
4190 | + if (empty($file['options']['async'])) { |
|
4191 | + $async = false; |
|
4192 | + } |
|
3966 | 4193 | |
3967 | 4194 | // A minified script should only be deferred if all its components wanted to be. |
3968 | - if (empty($file['options']['defer'])) |
|
3969 | - $defer = false; |
|
4195 | + if (empty($file['options']['defer'])) { |
|
4196 | + $defer = false; |
|
4197 | + } |
|
3970 | 4198 | |
3971 | 4199 | // The file couldn't be located so it won't be added. Log this error. |
3972 | 4200 | if (empty($toAdd)) |
@@ -4032,12 +4260,14 @@ discard block |
||
4032 | 4260 | foreach (glob(rtrim($theme['dir'], '/') . '/' . ($type == 'css' ? 'css' : 'scripts') . '/minified*.' . $type) as $filename) |
4033 | 4261 | { |
4034 | 4262 | // Remove the cache entry |
4035 | - if (preg_match('~([a-zA-Z0-9]+)\.' . $type . '$~', $filename, $matches)) |
|
4036 | - cache_put_data('minimized_' . $theme['id'] . '_' . $type . '_' . $matches[1], null); |
|
4263 | + if (preg_match('~([a-zA-Z0-9]+)\.' . $type . '$~', $filename, $matches)) { |
|
4264 | + cache_put_data('minimized_' . $theme['id'] . '_' . $type . '_' . $matches[1], null); |
|
4265 | + } |
|
4037 | 4266 | |
4038 | 4267 | // Try to delete the file. Add it to our error list if it fails. |
4039 | - if (!@unlink($filename)) |
|
4040 | - $not_deleted[] = $filename; |
|
4268 | + if (!@unlink($filename)) { |
|
4269 | + $not_deleted[] = $filename; |
|
4270 | + } |
|
4041 | 4271 | } |
4042 | 4272 | } |
4043 | 4273 | } |
@@ -4069,8 +4299,9 @@ discard block |
||
4069 | 4299 | global $modSettings, $smcFunc; |
4070 | 4300 | |
4071 | 4301 | // Just make up a nice hash... |
4072 | - if ($new) |
|
4073 | - return sha1(md5($filename . time()) . mt_rand()); |
|
4302 | + if ($new) { |
|
4303 | + return sha1(md5($filename . time()) . mt_rand()); |
|
4304 | + } |
|
4074 | 4305 | |
4075 | 4306 | // Just make sure that attachment id is only a int |
4076 | 4307 | $attachment_id = (int) $attachment_id; |
@@ -4087,23 +4318,25 @@ discard block |
||
4087 | 4318 | 'id_attach' => $attachment_id, |
4088 | 4319 | )); |
4089 | 4320 | |
4090 | - if ($smcFunc['db_num_rows']($request) === 0) |
|
4091 | - return false; |
|
4321 | + if ($smcFunc['db_num_rows']($request) === 0) { |
|
4322 | + return false; |
|
4323 | + } |
|
4092 | 4324 | |
4093 | 4325 | list ($file_hash) = $smcFunc['db_fetch_row']($request); |
4094 | 4326 | $smcFunc['db_free_result']($request); |
4095 | 4327 | } |
4096 | 4328 | |
4097 | 4329 | // Still no hash? mmm... |
4098 | - if (empty($file_hash)) |
|
4099 | - $file_hash = sha1(md5($filename . time()) . mt_rand()); |
|
4330 | + if (empty($file_hash)) { |
|
4331 | + $file_hash = sha1(md5($filename . time()) . mt_rand()); |
|
4332 | + } |
|
4100 | 4333 | |
4101 | 4334 | // Are we using multiple directories? |
4102 | - if (is_array($modSettings['attachmentUploadDir'])) |
|
4103 | - $path = $modSettings['attachmentUploadDir'][$dir]; |
|
4104 | - |
|
4105 | - else |
|
4106 | - $path = $modSettings['attachmentUploadDir']; |
|
4335 | + if (is_array($modSettings['attachmentUploadDir'])) { |
|
4336 | + $path = $modSettings['attachmentUploadDir'][$dir]; |
|
4337 | + } else { |
|
4338 | + $path = $modSettings['attachmentUploadDir']; |
|
4339 | + } |
|
4107 | 4340 | |
4108 | 4341 | return $path . '/' . $attachment_id . '_' . $file_hash .'.dat'; |
4109 | 4342 | } |
@@ -4118,8 +4351,9 @@ discard block |
||
4118 | 4351 | function ip2range($fullip) |
4119 | 4352 | { |
4120 | 4353 | // Pretend that 'unknown' is 255.255.255.255. (since that can't be an IP anyway.) |
4121 | - if ($fullip == 'unknown') |
|
4122 | - $fullip = '255.255.255.255'; |
|
4354 | + if ($fullip == 'unknown') { |
|
4355 | + $fullip = '255.255.255.255'; |
|
4356 | + } |
|
4123 | 4357 | |
4124 | 4358 | $ip_parts = explode('-', $fullip); |
4125 | 4359 | $ip_array = array(); |
@@ -4143,10 +4377,11 @@ discard block |
||
4143 | 4377 | $ip_array['low'] = $ip_parts[0]; |
4144 | 4378 | $ip_array['high'] = $ip_parts[1]; |
4145 | 4379 | return $ip_array; |
4146 | - } |
|
4147 | - elseif (count($ip_parts) == 2) // if ip 22.22.*-22.22.* |
|
4380 | + } elseif (count($ip_parts) == 2) { |
|
4381 | + // if ip 22.22.*-22.22.* |
|
4148 | 4382 | { |
4149 | 4383 | $valid_low = isValidIP($ip_parts[0]); |
4384 | + } |
|
4150 | 4385 | $valid_high = isValidIP($ip_parts[1]); |
4151 | 4386 | $count = 0; |
4152 | 4387 | $mode = (preg_match('/:/',$ip_parts[0]) > 0 ? ':' : '.'); |
@@ -4161,7 +4396,9 @@ discard block |
||
4161 | 4396 | $ip_parts[0] .= $mode . $min; |
4162 | 4397 | $valid_low = isValidIP($ip_parts[0]); |
4163 | 4398 | $count++; |
4164 | - if ($count > 9) break; |
|
4399 | + if ($count > 9) { |
|
4400 | + break; |
|
4401 | + } |
|
4165 | 4402 | } |
4166 | 4403 | } |
4167 | 4404 | |
@@ -4175,7 +4412,9 @@ discard block |
||
4175 | 4412 | $ip_parts[1] .= $mode . $max; |
4176 | 4413 | $valid_high = isValidIP($ip_parts[1]); |
4177 | 4414 | $count++; |
4178 | - if ($count > 9) break; |
|
4415 | + if ($count > 9) { |
|
4416 | + break; |
|
4417 | + } |
|
4179 | 4418 | } |
4180 | 4419 | } |
4181 | 4420 | |
@@ -4199,46 +4438,54 @@ discard block |
||
4199 | 4438 | { |
4200 | 4439 | global $modSettings; |
4201 | 4440 | |
4202 | - if (($host = cache_get_data('hostlookup-' . $ip, 600)) !== null) |
|
4203 | - return $host; |
|
4441 | + if (($host = cache_get_data('hostlookup-' . $ip, 600)) !== null) { |
|
4442 | + return $host; |
|
4443 | + } |
|
4204 | 4444 | $t = microtime(true); |
4205 | 4445 | |
4206 | 4446 | // Try the Linux host command, perhaps? |
4207 | 4447 | if (!isset($host) && (strpos(strtolower(PHP_OS), 'win') === false || strpos(strtolower(PHP_OS), 'darwin') !== false) && mt_rand(0, 1) == 1) |
4208 | 4448 | { |
4209 | - if (!isset($modSettings['host_to_dis'])) |
|
4210 | - $test = @shell_exec('host -W 1 ' . @escapeshellarg($ip)); |
|
4211 | - else |
|
4212 | - $test = @shell_exec('host ' . @escapeshellarg($ip)); |
|
4449 | + if (!isset($modSettings['host_to_dis'])) { |
|
4450 | + $test = @shell_exec('host -W 1 ' . @escapeshellarg($ip)); |
|
4451 | + } else { |
|
4452 | + $test = @shell_exec('host ' . @escapeshellarg($ip)); |
|
4453 | + } |
|
4213 | 4454 | |
4214 | 4455 | // Did host say it didn't find anything? |
4215 | - if (strpos($test, 'not found') !== false) |
|
4216 | - $host = ''; |
|
4456 | + if (strpos($test, 'not found') !== false) { |
|
4457 | + $host = ''; |
|
4458 | + } |
|
4217 | 4459 | // Invalid server option? |
4218 | - elseif ((strpos($test, 'invalid option') || strpos($test, 'Invalid query name 1')) && !isset($modSettings['host_to_dis'])) |
|
4219 | - updateSettings(array('host_to_dis' => 1)); |
|
4460 | + elseif ((strpos($test, 'invalid option') || strpos($test, 'Invalid query name 1')) && !isset($modSettings['host_to_dis'])) { |
|
4461 | + updateSettings(array('host_to_dis' => 1)); |
|
4462 | + } |
|
4220 | 4463 | // Maybe it found something, after all? |
4221 | - elseif (preg_match('~\s([^\s]+?)\.\s~', $test, $match) == 1) |
|
4222 | - $host = $match[1]; |
|
4464 | + elseif (preg_match('~\s([^\s]+?)\.\s~', $test, $match) == 1) { |
|
4465 | + $host = $match[1]; |
|
4466 | + } |
|
4223 | 4467 | } |
4224 | 4468 | |
4225 | 4469 | // This is nslookup; usually only Windows, but possibly some Unix? |
4226 | 4470 | if (!isset($host) && stripos(PHP_OS, 'win') !== false && strpos(strtolower(PHP_OS), 'darwin') === false && mt_rand(0, 1) == 1) |
4227 | 4471 | { |
4228 | 4472 | $test = @shell_exec('nslookup -timeout=1 ' . @escapeshellarg($ip)); |
4229 | - if (strpos($test, 'Non-existent domain') !== false) |
|
4230 | - $host = ''; |
|
4231 | - elseif (preg_match('~Name:\s+([^\s]+)~', $test, $match) == 1) |
|
4232 | - $host = $match[1]; |
|
4473 | + if (strpos($test, 'Non-existent domain') !== false) { |
|
4474 | + $host = ''; |
|
4475 | + } elseif (preg_match('~Name:\s+([^\s]+)~', $test, $match) == 1) { |
|
4476 | + $host = $match[1]; |
|
4477 | + } |
|
4233 | 4478 | } |
4234 | 4479 | |
4235 | 4480 | // This is the last try :/. |
4236 | - if (!isset($host) || $host === false) |
|
4237 | - $host = @gethostbyaddr($ip); |
|
4481 | + if (!isset($host) || $host === false) { |
|
4482 | + $host = @gethostbyaddr($ip); |
|
4483 | + } |
|
4238 | 4484 | |
4239 | 4485 | // It took a long time, so let's cache it! |
4240 | - if (microtime(true) - $t > 0.5) |
|
4241 | - cache_put_data('hostlookup-' . $ip, $host, 600); |
|
4486 | + if (microtime(true) - $t > 0.5) { |
|
4487 | + cache_put_data('hostlookup-' . $ip, $host, 600); |
|
4488 | + } |
|
4242 | 4489 | |
4243 | 4490 | return $host; |
4244 | 4491 | } |
@@ -4274,20 +4521,21 @@ discard block |
||
4274 | 4521 | { |
4275 | 4522 | $encrypted = substr(crypt($word, 'uk'), 2, $max_chars); |
4276 | 4523 | $total = 0; |
4277 | - for ($i = 0; $i < $max_chars; $i++) |
|
4278 | - $total += $possible_chars[ord($encrypted{$i})] * pow(63, $i); |
|
4524 | + for ($i = 0; $i < $max_chars; $i++) { |
|
4525 | + $total += $possible_chars[ord($encrypted{$i})] * pow(63, $i); |
|
4526 | + } |
|
4279 | 4527 | $returned_ints[] = $max_chars == 4 ? min($total, 16777215) : $total; |
4280 | 4528 | } |
4281 | 4529 | } |
4282 | 4530 | return array_unique($returned_ints); |
4283 | - } |
|
4284 | - else |
|
4531 | + } else |
|
4285 | 4532 | { |
4286 | 4533 | // Trim characters before and after and add slashes for database insertion. |
4287 | 4534 | $returned_words = array(); |
4288 | - foreach ($words as $word) |
|
4289 | - if (($word = trim($word, '-_\'')) !== '') |
|
4535 | + foreach ($words as $word) { |
|
4536 | + if (($word = trim($word, '-_\'')) !== '') |
|
4290 | 4537 | $returned_words[] = $max_chars === null ? $word : substr($word, 0, $max_chars); |
4538 | + } |
|
4291 | 4539 | |
4292 | 4540 | // Filter out all words that occur more than once. |
4293 | 4541 | return array_unique($returned_words); |
@@ -4309,16 +4557,18 @@ discard block |
||
4309 | 4557 | global $settings, $txt; |
4310 | 4558 | |
4311 | 4559 | // Does the current loaded theme have this and we are not forcing the usage of this function? |
4312 | - if (function_exists('template_create_button') && !$force_use) |
|
4313 | - return template_create_button($name, $alt, $label = '', $custom = ''); |
|
4560 | + if (function_exists('template_create_button') && !$force_use) { |
|
4561 | + return template_create_button($name, $alt, $label = '', $custom = ''); |
|
4562 | + } |
|
4314 | 4563 | |
4315 | - if (!$settings['use_image_buttons']) |
|
4316 | - return $txt[$alt]; |
|
4317 | - elseif (!empty($settings['use_buttons'])) |
|
4318 | - return '<span class="generic_icons ' . $name . '" alt="' . $txt[$alt] . '"></span>' . ($label != '' ? ' <strong>' . $txt[$label] . '</strong>' : ''); |
|
4319 | - else |
|
4320 | - return '<img src="' . $settings['lang_images_url'] . '/' . $name . '" alt="' . $txt[$alt] . '" ' . $custom . '>'; |
|
4321 | -} |
|
4564 | + if (!$settings['use_image_buttons']) { |
|
4565 | + return $txt[$alt]; |
|
4566 | + } elseif (!empty($settings['use_buttons'])) { |
|
4567 | + return '<span class="generic_icons ' . $name . '" alt="' . $txt[$alt] . '"></span>' . ($label != '' ? ' <strong>' . $txt[$label] . '</strong>' : ''); |
|
4568 | + } else { |
|
4569 | + return '<img src="' . $settings['lang_images_url'] . '/' . $name . '" alt="' . $txt[$alt] . '" ' . $custom . '>'; |
|
4570 | + } |
|
4571 | + } |
|
4322 | 4572 | |
4323 | 4573 | /** |
4324 | 4574 | * Sets up all of the top menu buttons |
@@ -4361,9 +4611,10 @@ discard block |
||
4361 | 4611 | var user_menus = new smc_PopupMenu(); |
4362 | 4612 | user_menus.add("profile", "' . $scripturl . '?action=profile;area=popup"); |
4363 | 4613 | user_menus.add("alerts", "' . $scripturl . '?action=profile;area=alerts_popup;u='. $context['user']['id'] .'");', true); |
4364 | - if ($context['allow_pm']) |
|
4365 | - addInlineJavaScript(' |
|
4614 | + if ($context['allow_pm']) { |
|
4615 | + addInlineJavaScript(' |
|
4366 | 4616 | user_menus.add("pm", "' . $scripturl . '?action=pm;sa=popup");', true); |
4617 | + } |
|
4367 | 4618 | |
4368 | 4619 | if (!empty($modSettings['enable_ajax_alerts'])) |
4369 | 4620 | { |
@@ -4523,88 +4774,96 @@ discard block |
||
4523 | 4774 | |
4524 | 4775 | // Now we put the buttons in the context so the theme can use them. |
4525 | 4776 | $menu_buttons = array(); |
4526 | - foreach ($buttons as $act => $button) |
|
4527 | - if (!empty($button['show'])) |
|
4777 | + foreach ($buttons as $act => $button) { |
|
4778 | + if (!empty($button['show'])) |
|
4528 | 4779 | { |
4529 | 4780 | $button['active_button'] = false; |
4781 | + } |
|
4530 | 4782 | |
4531 | 4783 | // This button needs some action. |
4532 | - if (isset($button['action_hook'])) |
|
4533 | - $needs_action_hook = true; |
|
4784 | + if (isset($button['action_hook'])) { |
|
4785 | + $needs_action_hook = true; |
|
4786 | + } |
|
4534 | 4787 | |
4535 | 4788 | // Make sure the last button truly is the last button. |
4536 | 4789 | if (!empty($button['is_last'])) |
4537 | 4790 | { |
4538 | - if (isset($last_button)) |
|
4539 | - unset($menu_buttons[$last_button]['is_last']); |
|
4791 | + if (isset($last_button)) { |
|
4792 | + unset($menu_buttons[$last_button]['is_last']); |
|
4793 | + } |
|
4540 | 4794 | $last_button = $act; |
4541 | 4795 | } |
4542 | 4796 | |
4543 | 4797 | // Go through the sub buttons if there are any. |
4544 | - if (!empty($button['sub_buttons'])) |
|
4545 | - foreach ($button['sub_buttons'] as $key => $subbutton) |
|
4798 | + if (!empty($button['sub_buttons'])) { |
|
4799 | + foreach ($button['sub_buttons'] as $key => $subbutton) |
|
4546 | 4800 | { |
4547 | 4801 | if (empty($subbutton['show'])) |
4548 | 4802 | unset($button['sub_buttons'][$key]); |
4803 | + } |
|
4549 | 4804 | |
4550 | 4805 | // 2nd level sub buttons next... |
4551 | 4806 | if (!empty($subbutton['sub_buttons'])) |
4552 | 4807 | { |
4553 | 4808 | foreach ($subbutton['sub_buttons'] as $key2 => $sub_button2) |
4554 | 4809 | { |
4555 | - if (empty($sub_button2['show'])) |
|
4556 | - unset($button['sub_buttons'][$key]['sub_buttons'][$key2]); |
|
4810 | + if (empty($sub_button2['show'])) { |
|
4811 | + unset($button['sub_buttons'][$key]['sub_buttons'][$key2]); |
|
4812 | + } |
|
4557 | 4813 | } |
4558 | 4814 | } |
4559 | 4815 | } |
4560 | 4816 | |
4561 | 4817 | // Does this button have its own icon? |
4562 | - if (isset($button['icon']) && file_exists($settings['theme_dir'] . '/images/' . $button['icon'])) |
|
4563 | - $button['icon'] = '<img src="' . $settings['images_url'] . '/' . $button['icon'] . '" alt="">'; |
|
4564 | - elseif (isset($button['icon']) && file_exists($settings['default_theme_dir'] . '/images/' . $button['icon'])) |
|
4565 | - $button['icon'] = '<img src="' . $settings['default_images_url'] . '/' . $button['icon'] . '" alt="">'; |
|
4566 | - elseif (isset($button['icon'])) |
|
4567 | - $button['icon'] = '<span class="generic_icons ' . $button['icon'] . '"></span>'; |
|
4568 | - else |
|
4569 | - $button['icon'] = '<span class="generic_icons ' . $act . '"></span>'; |
|
4818 | + if (isset($button['icon']) && file_exists($settings['theme_dir'] . '/images/' . $button['icon'])) { |
|
4819 | + $button['icon'] = '<img src="' . $settings['images_url'] . '/' . $button['icon'] . '" alt="">'; |
|
4820 | + } elseif (isset($button['icon']) && file_exists($settings['default_theme_dir'] . '/images/' . $button['icon'])) { |
|
4821 | + $button['icon'] = '<img src="' . $settings['default_images_url'] . '/' . $button['icon'] . '" alt="">'; |
|
4822 | + } elseif (isset($button['icon'])) { |
|
4823 | + $button['icon'] = '<span class="generic_icons ' . $button['icon'] . '"></span>'; |
|
4824 | + } else { |
|
4825 | + $button['icon'] = '<span class="generic_icons ' . $act . '"></span>'; |
|
4826 | + } |
|
4570 | 4827 | |
4571 | 4828 | $menu_buttons[$act] = $button; |
4572 | 4829 | } |
4573 | 4830 | |
4574 | - if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2) |
|
4575 | - cache_put_data('menu_buttons-' . implode('_', $user_info['groups']) . '-' . $user_info['language'], $menu_buttons, $cacheTime); |
|
4831 | + if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2) { |
|
4832 | + cache_put_data('menu_buttons-' . implode('_', $user_info['groups']) . '-' . $user_info['language'], $menu_buttons, $cacheTime); |
|
4833 | + } |
|
4576 | 4834 | } |
4577 | 4835 | |
4578 | 4836 | $context['menu_buttons'] = $menu_buttons; |
4579 | 4837 | |
4580 | 4838 | // Logging out requires the session id in the url. |
4581 | - if (isset($context['menu_buttons']['logout'])) |
|
4582 | - $context['menu_buttons']['logout']['href'] = sprintf($context['menu_buttons']['logout']['href'], $context['session_var'], $context['session_id']); |
|
4839 | + if (isset($context['menu_buttons']['logout'])) { |
|
4840 | + $context['menu_buttons']['logout']['href'] = sprintf($context['menu_buttons']['logout']['href'], $context['session_var'], $context['session_id']); |
|
4841 | + } |
|
4583 | 4842 | |
4584 | 4843 | // Figure out which action we are doing so we can set the active tab. |
4585 | 4844 | // Default to home. |
4586 | 4845 | $current_action = 'home'; |
4587 | 4846 | |
4588 | - if (isset($context['menu_buttons'][$context['current_action']])) |
|
4589 | - $current_action = $context['current_action']; |
|
4590 | - elseif ($context['current_action'] == 'search2') |
|
4591 | - $current_action = 'search'; |
|
4592 | - elseif ($context['current_action'] == 'theme') |
|
4593 | - $current_action = isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'pick' ? 'profile' : 'admin'; |
|
4594 | - elseif ($context['current_action'] == 'register2') |
|
4595 | - $current_action = 'register'; |
|
4596 | - elseif ($context['current_action'] == 'login2' || ($user_info['is_guest'] && $context['current_action'] == 'reminder')) |
|
4597 | - $current_action = 'login'; |
|
4598 | - elseif ($context['current_action'] == 'groups' && $context['allow_moderation_center']) |
|
4599 | - $current_action = 'moderate'; |
|
4847 | + if (isset($context['menu_buttons'][$context['current_action']])) { |
|
4848 | + $current_action = $context['current_action']; |
|
4849 | + } elseif ($context['current_action'] == 'search2') { |
|
4850 | + $current_action = 'search'; |
|
4851 | + } elseif ($context['current_action'] == 'theme') { |
|
4852 | + $current_action = isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'pick' ? 'profile' : 'admin'; |
|
4853 | + } elseif ($context['current_action'] == 'register2') { |
|
4854 | + $current_action = 'register'; |
|
4855 | + } elseif ($context['current_action'] == 'login2' || ($user_info['is_guest'] && $context['current_action'] == 'reminder')) { |
|
4856 | + $current_action = 'login'; |
|
4857 | + } elseif ($context['current_action'] == 'groups' && $context['allow_moderation_center']) { |
|
4858 | + $current_action = 'moderate'; |
|
4859 | + } |
|
4600 | 4860 | |
4601 | 4861 | // There are certain exceptions to the above where we don't want anything on the menu highlighted. |
4602 | 4862 | if ($context['current_action'] == 'profile' && !empty($context['user']['is_owner'])) |
4603 | 4863 | { |
4604 | 4864 | $current_action = !empty($_GET['area']) && $_GET['area'] == 'showalerts' ? 'self_alerts' : 'self_profile'; |
4605 | 4865 | $context[$current_action] = true; |
4606 | - } |
|
4607 | - elseif ($context['current_action'] == 'pm') |
|
4866 | + } elseif ($context['current_action'] == 'pm') |
|
4608 | 4867 | { |
4609 | 4868 | $current_action = 'self_pm'; |
4610 | 4869 | $context['self_pm'] = true; |
@@ -4667,12 +4926,14 @@ discard block |
||
4667 | 4926 | } |
4668 | 4927 | |
4669 | 4928 | // Not all actions are simple. |
4670 | - if (!empty($needs_action_hook)) |
|
4671 | - call_integration_hook('integrate_current_action', array(&$current_action)); |
|
4929 | + if (!empty($needs_action_hook)) { |
|
4930 | + call_integration_hook('integrate_current_action', array(&$current_action)); |
|
4931 | + } |
|
4672 | 4932 | |
4673 | - if (isset($context['menu_buttons'][$current_action])) |
|
4674 | - $context['menu_buttons'][$current_action]['active_button'] = true; |
|
4675 | -} |
|
4933 | + if (isset($context['menu_buttons'][$current_action])) { |
|
4934 | + $context['menu_buttons'][$current_action]['active_button'] = true; |
|
4935 | + } |
|
4936 | + } |
|
4676 | 4937 | |
4677 | 4938 | /** |
4678 | 4939 | * Generate a random seed and ensure it's stored in settings. |
@@ -4696,30 +4957,35 @@ discard block |
||
4696 | 4957 | global $modSettings, $settings, $boarddir, $sourcedir, $db_show_debug; |
4697 | 4958 | global $context, $txt; |
4698 | 4959 | |
4699 | - if ($db_show_debug === true) |
|
4700 | - $context['debug']['hooks'][] = $hook; |
|
4960 | + if ($db_show_debug === true) { |
|
4961 | + $context['debug']['hooks'][] = $hook; |
|
4962 | + } |
|
4701 | 4963 | |
4702 | 4964 | // Need to have some control. |
4703 | - if (!isset($context['instances'])) |
|
4704 | - $context['instances'] = array(); |
|
4965 | + if (!isset($context['instances'])) { |
|
4966 | + $context['instances'] = array(); |
|
4967 | + } |
|
4705 | 4968 | |
4706 | 4969 | $results = array(); |
4707 | - if (empty($modSettings[$hook])) |
|
4708 | - return $results; |
|
4970 | + if (empty($modSettings[$hook])) { |
|
4971 | + return $results; |
|
4972 | + } |
|
4709 | 4973 | |
4710 | 4974 | $functions = explode(',', $modSettings[$hook]); |
4711 | 4975 | // Loop through each function. |
4712 | 4976 | foreach ($functions as $function) |
4713 | 4977 | { |
4714 | 4978 | // Hook has been marked as "disabled". Skip it! |
4715 | - if (strpos($function, '!') !== false) |
|
4716 | - continue; |
|
4979 | + if (strpos($function, '!') !== false) { |
|
4980 | + continue; |
|
4981 | + } |
|
4717 | 4982 | |
4718 | 4983 | $call = call_helper($function, true); |
4719 | 4984 | |
4720 | 4985 | // Is it valid? |
4721 | - if (!empty($call)) |
|
4722 | - $results[$function] = call_user_func_array($call, $parameters); |
|
4986 | + if (!empty($call)) { |
|
4987 | + $results[$function] = call_user_func_array($call, $parameters); |
|
4988 | + } |
|
4723 | 4989 | |
4724 | 4990 | // Whatever it was suppose to call, it failed :( |
4725 | 4991 | elseif (!empty($function)) |
@@ -4735,8 +5001,9 @@ discard block |
||
4735 | 5001 | } |
4736 | 5002 | |
4737 | 5003 | // "Assume" the file resides on $boarddir somewhere... |
4738 | - else |
|
4739 | - log_error(sprintf($txt['hook_fail_call_to'], $function, $boarddir), 'general'); |
|
5004 | + else { |
|
5005 | + log_error(sprintf($txt['hook_fail_call_to'], $function, $boarddir), 'general'); |
|
5006 | + } |
|
4740 | 5007 | } |
4741 | 5008 | } |
4742 | 5009 | |
@@ -4758,12 +5025,14 @@ discard block |
||
4758 | 5025 | global $smcFunc, $modSettings; |
4759 | 5026 | |
4760 | 5027 | // Any objects? |
4761 | - if ($object) |
|
4762 | - $function = $function . '#'; |
|
5028 | + if ($object) { |
|
5029 | + $function = $function . '#'; |
|
5030 | + } |
|
4763 | 5031 | |
4764 | 5032 | // Any files to load? |
4765 | - if (!empty($file) && is_string($file)) |
|
4766 | - $function = $file . (!empty($function) ? '|' . $function : ''); |
|
5033 | + if (!empty($file) && is_string($file)) { |
|
5034 | + $function = $file . (!empty($function) ? '|' . $function : ''); |
|
5035 | + } |
|
4767 | 5036 | |
4768 | 5037 | // Get the correct string. |
4769 | 5038 | $integration_call = $function; |
@@ -4785,13 +5054,14 @@ discard block |
||
4785 | 5054 | if (!empty($current_functions)) |
4786 | 5055 | { |
4787 | 5056 | $current_functions = explode(',', $current_functions); |
4788 | - if (in_array($integration_call, $current_functions)) |
|
4789 | - return; |
|
5057 | + if (in_array($integration_call, $current_functions)) { |
|
5058 | + return; |
|
5059 | + } |
|
4790 | 5060 | |
4791 | 5061 | $permanent_functions = array_merge($current_functions, array($integration_call)); |
5062 | + } else { |
|
5063 | + $permanent_functions = array($integration_call); |
|
4792 | 5064 | } |
4793 | - else |
|
4794 | - $permanent_functions = array($integration_call); |
|
4795 | 5065 | |
4796 | 5066 | updateSettings(array($hook => implode(',', $permanent_functions))); |
4797 | 5067 | } |
@@ -4800,8 +5070,9 @@ discard block |
||
4800 | 5070 | $functions = empty($modSettings[$hook]) ? array() : explode(',', $modSettings[$hook]); |
4801 | 5071 | |
4802 | 5072 | // Do nothing, if it's already there. |
4803 | - if (in_array($integration_call, $functions)) |
|
4804 | - return; |
|
5073 | + if (in_array($integration_call, $functions)) { |
|
5074 | + return; |
|
5075 | + } |
|
4805 | 5076 | |
4806 | 5077 | $functions[] = $integration_call; |
4807 | 5078 | $modSettings[$hook] = implode(',', $functions); |
@@ -4824,12 +5095,14 @@ discard block |
||
4824 | 5095 | global $smcFunc, $modSettings; |
4825 | 5096 | |
4826 | 5097 | // Any objects? |
4827 | - if ($object) |
|
4828 | - $function = $function . '#'; |
|
5098 | + if ($object) { |
|
5099 | + $function = $function . '#'; |
|
5100 | + } |
|
4829 | 5101 | |
4830 | 5102 | // Any files to load? |
4831 | - if (!empty($file) && is_string($file)) |
|
4832 | - $function = $file . '|' . $function; |
|
5103 | + if (!empty($file) && is_string($file)) { |
|
5104 | + $function = $file . '|' . $function; |
|
5105 | + } |
|
4833 | 5106 | |
4834 | 5107 | // Get the correct string. |
4835 | 5108 | $integration_call = $function; |
@@ -4850,16 +5123,18 @@ discard block |
||
4850 | 5123 | { |
4851 | 5124 | $current_functions = explode(',', $current_functions); |
4852 | 5125 | |
4853 | - if (in_array($integration_call, $current_functions)) |
|
4854 | - updateSettings(array($hook => implode(',', array_diff($current_functions, array($integration_call))))); |
|
5126 | + if (in_array($integration_call, $current_functions)) { |
|
5127 | + updateSettings(array($hook => implode(',', array_diff($current_functions, array($integration_call))))); |
|
5128 | + } |
|
4855 | 5129 | } |
4856 | 5130 | |
4857 | 5131 | // Turn the function list into something usable. |
4858 | 5132 | $functions = empty($modSettings[$hook]) ? array() : explode(',', $modSettings[$hook]); |
4859 | 5133 | |
4860 | 5134 | // You can only remove it if it's available. |
4861 | - if (!in_array($integration_call, $functions)) |
|
4862 | - return; |
|
5135 | + if (!in_array($integration_call, $functions)) { |
|
5136 | + return; |
|
5137 | + } |
|
4863 | 5138 | |
4864 | 5139 | $functions = array_diff($functions, array($integration_call)); |
4865 | 5140 | $modSettings[$hook] = implode(',', $functions); |
@@ -4880,17 +5155,20 @@ discard block |
||
4880 | 5155 | global $context, $smcFunc, $txt, $db_show_debug; |
4881 | 5156 | |
4882 | 5157 | // Really? |
4883 | - if (empty($string)) |
|
4884 | - return false; |
|
5158 | + if (empty($string)) { |
|
5159 | + return false; |
|
5160 | + } |
|
4885 | 5161 | |
4886 | 5162 | // An array? should be a "callable" array IE array(object/class, valid_callable). |
4887 | 5163 | // A closure? should be a callable one. |
4888 | - if (is_array($string) || $string instanceof Closure) |
|
4889 | - return $return ? $string : (is_callable($string) ? call_user_func($string) : false); |
|
5164 | + if (is_array($string) || $string instanceof Closure) { |
|
5165 | + return $return ? $string : (is_callable($string) ? call_user_func($string) : false); |
|
5166 | + } |
|
4890 | 5167 | |
4891 | 5168 | // No full objects, sorry! pass a method or a property instead! |
4892 | - if (is_object($string)) |
|
4893 | - return false; |
|
5169 | + if (is_object($string)) { |
|
5170 | + return false; |
|
5171 | + } |
|
4894 | 5172 | |
4895 | 5173 | // Stay vitaminized my friends... |
4896 | 5174 | $string = $smcFunc['htmlspecialchars']($smcFunc['htmltrim']($string)); |
@@ -4899,8 +5177,9 @@ discard block |
||
4899 | 5177 | $string = load_file($string); |
4900 | 5178 | |
4901 | 5179 | // Loaded file failed |
4902 | - if (empty($string)) |
|
4903 | - return false; |
|
5180 | + if (empty($string)) { |
|
5181 | + return false; |
|
5182 | + } |
|
4904 | 5183 | |
4905 | 5184 | // Found a method. |
4906 | 5185 | if (strpos($string, '::') !== false) |
@@ -4921,8 +5200,9 @@ discard block |
||
4921 | 5200 | // Add another one to the list. |
4922 | 5201 | if ($db_show_debug === true) |
4923 | 5202 | { |
4924 | - if (!isset($context['debug']['instances'])) |
|
4925 | - $context['debug']['instances'] = array(); |
|
5203 | + if (!isset($context['debug']['instances'])) { |
|
5204 | + $context['debug']['instances'] = array(); |
|
5205 | + } |
|
4926 | 5206 | |
4927 | 5207 | $context['debug']['instances'][$class] = $class; |
4928 | 5208 | } |
@@ -4932,13 +5212,15 @@ discard block |
||
4932 | 5212 | } |
4933 | 5213 | |
4934 | 5214 | // Right then. This is a call to a static method. |
4935 | - else |
|
4936 | - $func = array($class, $method); |
|
5215 | + else { |
|
5216 | + $func = array($class, $method); |
|
5217 | + } |
|
4937 | 5218 | } |
4938 | 5219 | |
4939 | 5220 | // Nope! just a plain regular function. |
4940 | - else |
|
4941 | - $func = $string; |
|
5221 | + else { |
|
5222 | + $func = $string; |
|
5223 | + } |
|
4942 | 5224 | |
4943 | 5225 | // Right, we got what we need, time to do some checks. |
4944 | 5226 | if (!is_callable($func, false, $callable_name)) |
@@ -4954,17 +5236,18 @@ discard block |
||
4954 | 5236 | else |
4955 | 5237 | { |
4956 | 5238 | // What are we gonna do about it? |
4957 | - if ($return) |
|
4958 | - return $func; |
|
5239 | + if ($return) { |
|
5240 | + return $func; |
|
5241 | + } |
|
4959 | 5242 | |
4960 | 5243 | // If this is a plain function, avoid the heat of calling call_user_func(). |
4961 | 5244 | else |
4962 | 5245 | { |
4963 | - if (is_array($func)) |
|
4964 | - call_user_func($func); |
|
4965 | - |
|
4966 | - else |
|
4967 | - $func(); |
|
5246 | + if (is_array($func)) { |
|
5247 | + call_user_func($func); |
|
5248 | + } else { |
|
5249 | + $func(); |
|
5250 | + } |
|
4968 | 5251 | } |
4969 | 5252 | } |
4970 | 5253 | } |
@@ -4981,31 +5264,34 @@ discard block |
||
4981 | 5264 | { |
4982 | 5265 | global $sourcedir, $txt, $boarddir, $settings; |
4983 | 5266 | |
4984 | - if (empty($string)) |
|
4985 | - return false; |
|
5267 | + if (empty($string)) { |
|
5268 | + return false; |
|
5269 | + } |
|
4986 | 5270 | |
4987 | 5271 | if (strpos($string, '|') !== false) |
4988 | 5272 | { |
4989 | 5273 | list ($file, $string) = explode('|', $string); |
4990 | 5274 | |
4991 | 5275 | // Match the wildcards to their regular vars. |
4992 | - if (empty($settings['theme_dir'])) |
|
4993 | - $absPath = strtr(trim($file), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir)); |
|
4994 | - |
|
4995 | - else |
|
4996 | - $absPath = strtr(trim($file), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir, '$themedir' => $settings['theme_dir'])); |
|
5276 | + if (empty($settings['theme_dir'])) { |
|
5277 | + $absPath = strtr(trim($file), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir)); |
|
5278 | + } else { |
|
5279 | + $absPath = strtr(trim($file), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir, '$themedir' => $settings['theme_dir'])); |
|
5280 | + } |
|
4997 | 5281 | |
4998 | 5282 | // Load the file if it can be loaded. |
4999 | - if (file_exists($absPath)) |
|
5000 | - require_once($absPath); |
|
5283 | + if (file_exists($absPath)) { |
|
5284 | + require_once($absPath); |
|
5285 | + } |
|
5001 | 5286 | |
5002 | 5287 | // No? try a fallback to $sourcedir |
5003 | 5288 | else |
5004 | 5289 | { |
5005 | 5290 | $absPath = $sourcedir .'/'. $file; |
5006 | 5291 | |
5007 | - if (file_exists($absPath)) |
|
5008 | - require_once($absPath); |
|
5292 | + if (file_exists($absPath)) { |
|
5293 | + require_once($absPath); |
|
5294 | + } |
|
5009 | 5295 | |
5010 | 5296 | // Sorry, can't do much for you at this point. |
5011 | 5297 | else |
@@ -5044,8 +5330,9 @@ discard block |
||
5044 | 5330 | preg_match('~^(http|ftp)(s)?://([^/:]+)(:(\d+))?(.+)$~', $url, $match); |
5045 | 5331 | |
5046 | 5332 | // No scheme? No data for you! |
5047 | - if (empty($match[1])) |
|
5048 | - return false; |
|
5333 | + if (empty($match[1])) { |
|
5334 | + return false; |
|
5335 | + } |
|
5049 | 5336 | |
5050 | 5337 | // An FTP url. We should try connecting and RETRieving it... |
5051 | 5338 | elseif ($match[1] == 'ftp') |
@@ -5055,23 +5342,26 @@ discard block |
||
5055 | 5342 | |
5056 | 5343 | // Establish a connection and attempt to enable passive mode. |
5057 | 5344 | $ftp = new ftp_connection(($match[2] ? 'ssl://' : '') . $match[3], empty($match[5]) ? 21 : $match[5], 'anonymous', $webmaster_email); |
5058 | - if ($ftp->error !== false || !$ftp->passive()) |
|
5059 | - return false; |
|
5345 | + if ($ftp->error !== false || !$ftp->passive()) { |
|
5346 | + return false; |
|
5347 | + } |
|
5060 | 5348 | |
5061 | 5349 | // I want that one *points*! |
5062 | 5350 | fwrite($ftp->connection, 'RETR ' . $match[6] . "\r\n"); |
5063 | 5351 | |
5064 | 5352 | // Since passive mode worked (or we would have returned already!) open the connection. |
5065 | 5353 | $fp = @fsockopen($ftp->pasv['ip'], $ftp->pasv['port'], $err, $err, 5); |
5066 | - if (!$fp) |
|
5067 | - return false; |
|
5354 | + if (!$fp) { |
|
5355 | + return false; |
|
5356 | + } |
|
5068 | 5357 | |
5069 | 5358 | // The server should now say something in acknowledgement. |
5070 | 5359 | $ftp->check_response(150); |
5071 | 5360 | |
5072 | 5361 | $data = ''; |
5073 | - while (!feof($fp)) |
|
5074 | - $data .= fread($fp, 4096); |
|
5362 | + while (!feof($fp)) { |
|
5363 | + $data .= fread($fp, 4096); |
|
5364 | + } |
|
5075 | 5365 | fclose($fp); |
5076 | 5366 | |
5077 | 5367 | // All done, right? Good. |
@@ -5083,8 +5373,9 @@ discard block |
||
5083 | 5373 | elseif (isset($match[1]) && $match[1] == 'http') |
5084 | 5374 | { |
5085 | 5375 | // First try to use fsockopen, because it is fastest. |
5086 | - if ($keep_alive && $match[3] == $keep_alive_dom) |
|
5087 | - $fp = $keep_alive_fp; |
|
5376 | + if ($keep_alive && $match[3] == $keep_alive_dom) { |
|
5377 | + $fp = $keep_alive_fp; |
|
5378 | + } |
|
5088 | 5379 | if (empty($fp)) |
5089 | 5380 | { |
5090 | 5381 | // Open the socket on the port we want... |
@@ -5104,20 +5395,21 @@ discard block |
||
5104 | 5395 | fwrite($fp, 'GET ' . ($match[6] !== '/' ? str_replace(' ', '%20', $match[6]) : '') . ' HTTP/1.0' . "\r\n"); |
5105 | 5396 | fwrite($fp, 'Host: ' . $match[3] . (empty($match[5]) ? ($match[2] ? ':443' : '') : ':' . $match[5]) . "\r\n"); |
5106 | 5397 | fwrite($fp, 'user-agent: PHP/SMF' . "\r\n"); |
5107 | - if ($keep_alive) |
|
5108 | - fwrite($fp, 'connection: Keep-Alive' . "\r\n\r\n"); |
|
5109 | - else |
|
5110 | - fwrite($fp, 'connection: close' . "\r\n\r\n"); |
|
5111 | - } |
|
5112 | - else |
|
5398 | + if ($keep_alive) { |
|
5399 | + fwrite($fp, 'connection: Keep-Alive' . "\r\n\r\n"); |
|
5400 | + } else { |
|
5401 | + fwrite($fp, 'connection: close' . "\r\n\r\n"); |
|
5402 | + } |
|
5403 | + } else |
|
5113 | 5404 | { |
5114 | 5405 | fwrite($fp, 'POST ' . ($match[6] !== '/' ? $match[6] : '') . ' HTTP/1.0' . "\r\n"); |
5115 | 5406 | fwrite($fp, 'Host: ' . $match[3] . (empty($match[5]) ? ($match[2] ? ':443' : '') : ':' . $match[5]) . "\r\n"); |
5116 | 5407 | fwrite($fp, 'user-agent: PHP/SMF' . "\r\n"); |
5117 | - if ($keep_alive) |
|
5118 | - fwrite($fp, 'connection: Keep-Alive' . "\r\n"); |
|
5119 | - else |
|
5120 | - fwrite($fp, 'connection: close' . "\r\n"); |
|
5408 | + if ($keep_alive) { |
|
5409 | + fwrite($fp, 'connection: Keep-Alive' . "\r\n"); |
|
5410 | + } else { |
|
5411 | + fwrite($fp, 'connection: close' . "\r\n"); |
|
5412 | + } |
|
5121 | 5413 | fwrite($fp, 'content-type: application/x-www-form-urlencoded' . "\r\n"); |
5122 | 5414 | fwrite($fp, 'content-length: ' . strlen($post_data) . "\r\n\r\n"); |
5123 | 5415 | fwrite($fp, $post_data); |
@@ -5130,30 +5422,33 @@ discard block |
||
5130 | 5422 | { |
5131 | 5423 | $header = ''; |
5132 | 5424 | $location = ''; |
5133 | - while (!feof($fp) && trim($header = fgets($fp, 4096)) != '') |
|
5134 | - if (strpos($header, 'location:') !== false) |
|
5425 | + while (!feof($fp) && trim($header = fgets($fp, 4096)) != '') { |
|
5426 | + if (strpos($header, 'location:') !== false) |
|
5135 | 5427 | $location = trim(substr($header, strpos($header, ':') + 1)); |
5428 | + } |
|
5136 | 5429 | |
5137 | - if (empty($location)) |
|
5138 | - return false; |
|
5139 | - else |
|
5430 | + if (empty($location)) { |
|
5431 | + return false; |
|
5432 | + } else |
|
5140 | 5433 | { |
5141 | - if (!$keep_alive) |
|
5142 | - fclose($fp); |
|
5434 | + if (!$keep_alive) { |
|
5435 | + fclose($fp); |
|
5436 | + } |
|
5143 | 5437 | return fetch_web_data($location, $post_data, $keep_alive, $redirection_level + 1); |
5144 | 5438 | } |
5145 | 5439 | } |
5146 | 5440 | |
5147 | 5441 | // Make sure we get a 200 OK. |
5148 | - elseif (preg_match('~^HTTP/\S+\s+20[01]~i', $response) === 0) |
|
5149 | - return false; |
|
5442 | + elseif (preg_match('~^HTTP/\S+\s+20[01]~i', $response) === 0) { |
|
5443 | + return false; |
|
5444 | + } |
|
5150 | 5445 | |
5151 | 5446 | // Skip the headers... |
5152 | 5447 | while (!feof($fp) && trim($header = fgets($fp, 4096)) != '') |
5153 | 5448 | { |
5154 | - if (preg_match('~content-length:\s*(\d+)~i', $header, $match) != 0) |
|
5155 | - $content_length = $match[1]; |
|
5156 | - elseif (preg_match('~connection:\s*close~i', $header) != 0) |
|
5449 | + if (preg_match('~content-length:\s*(\d+)~i', $header, $match) != 0) { |
|
5450 | + $content_length = $match[1]; |
|
5451 | + } elseif (preg_match('~connection:\s*close~i', $header) != 0) |
|
5157 | 5452 | { |
5158 | 5453 | $keep_alive_dom = null; |
5159 | 5454 | $keep_alive = false; |
@@ -5165,17 +5460,19 @@ discard block |
||
5165 | 5460 | $data = ''; |
5166 | 5461 | if (isset($content_length)) |
5167 | 5462 | { |
5168 | - while (!feof($fp) && strlen($data) < $content_length) |
|
5169 | - $data .= fread($fp, $content_length - strlen($data)); |
|
5170 | - } |
|
5171 | - else |
|
5463 | + while (!feof($fp) && strlen($data) < $content_length) { |
|
5464 | + $data .= fread($fp, $content_length - strlen($data)); |
|
5465 | + } |
|
5466 | + } else |
|
5172 | 5467 | { |
5173 | - while (!feof($fp)) |
|
5174 | - $data .= fread($fp, 4096); |
|
5468 | + while (!feof($fp)) { |
|
5469 | + $data .= fread($fp, 4096); |
|
5470 | + } |
|
5175 | 5471 | } |
5176 | 5472 | |
5177 | - if (!$keep_alive) |
|
5178 | - fclose($fp); |
|
5473 | + if (!$keep_alive) { |
|
5474 | + fclose($fp); |
|
5475 | + } |
|
5179 | 5476 | } |
5180 | 5477 | |
5181 | 5478 | // If using fsockopen didn't work, try to use cURL if available. |
@@ -5188,17 +5485,18 @@ discard block |
||
5188 | 5485 | $fetch_data->get_url_data($url, $post_data); |
5189 | 5486 | |
5190 | 5487 | // no errors and a 200 result, then we have a good dataset, well we at least have data. ;) |
5191 | - if ($fetch_data->result('code') == 200 && !$fetch_data->result('error')) |
|
5192 | - $data = $fetch_data->result('body'); |
|
5193 | - else |
|
5194 | - return false; |
|
5488 | + if ($fetch_data->result('code') == 200 && !$fetch_data->result('error')) { |
|
5489 | + $data = $fetch_data->result('body'); |
|
5490 | + } else { |
|
5491 | + return false; |
|
5492 | + } |
|
5195 | 5493 | } |
5196 | 5494 | |
5197 | 5495 | // Neither fsockopen nor curl are available. Well, phooey. |
5198 | - else |
|
5199 | - return false; |
|
5200 | - } |
|
5201 | - else |
|
5496 | + else { |
|
5497 | + return false; |
|
5498 | + } |
|
5499 | + } else |
|
5202 | 5500 | { |
5203 | 5501 | // Umm, this shouldn't happen? |
5204 | 5502 | trigger_error('fetch_web_data(): Bad URL', E_USER_NOTICE); |
@@ -5218,8 +5516,9 @@ discard block |
||
5218 | 5516 | global $user_info, $smcFunc; |
5219 | 5517 | |
5220 | 5518 | // Make sure we have something to work with. |
5221 | - if (empty($topic)) |
|
5222 | - return array(); |
|
5519 | + if (empty($topic)) { |
|
5520 | + return array(); |
|
5521 | + } |
|
5223 | 5522 | |
5224 | 5523 | |
5225 | 5524 | // We already know the number of likes per message, we just want to know whether the current user liked it or not. |
@@ -5242,8 +5541,9 @@ discard block |
||
5242 | 5541 | 'topic' => $topic, |
5243 | 5542 | ) |
5244 | 5543 | ); |
5245 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
5246 | - $temp[] = (int) $row['content_id']; |
|
5544 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
5545 | + $temp[] = (int) $row['content_id']; |
|
5546 | + } |
|
5247 | 5547 | |
5248 | 5548 | cache_put_data($cache_key, $temp, $ttl); |
5249 | 5549 | } |
@@ -5264,8 +5564,9 @@ discard block |
||
5264 | 5564 | { |
5265 | 5565 | global $context; |
5266 | 5566 | |
5267 | - if (empty($string)) |
|
5268 | - return $string; |
|
5567 | + if (empty($string)) { |
|
5568 | + return $string; |
|
5569 | + } |
|
5269 | 5570 | |
5270 | 5571 | // UTF-8 occurences of MS special characters |
5271 | 5572 | $findchars_utf8 = array( |
@@ -5306,10 +5607,11 @@ discard block |
||
5306 | 5607 | '--', // — |
5307 | 5608 | ); |
5308 | 5609 | |
5309 | - if ($context['utf8']) |
|
5310 | - $string = str_replace($findchars_utf8, $replacechars, $string); |
|
5311 | - else |
|
5312 | - $string = str_replace($findchars_iso, $replacechars, $string); |
|
5610 | + if ($context['utf8']) { |
|
5611 | + $string = str_replace($findchars_utf8, $replacechars, $string); |
|
5612 | + } else { |
|
5613 | + $string = str_replace($findchars_iso, $replacechars, $string); |
|
5614 | + } |
|
5313 | 5615 | |
5314 | 5616 | return $string; |
5315 | 5617 | } |
@@ -5328,49 +5630,59 @@ discard block |
||
5328 | 5630 | { |
5329 | 5631 | global $context; |
5330 | 5632 | |
5331 | - if (!isset($matches[2])) |
|
5332 | - return ''; |
|
5633 | + if (!isset($matches[2])) { |
|
5634 | + return ''; |
|
5635 | + } |
|
5333 | 5636 | |
5334 | 5637 | $num = $matches[2][0] === 'x' ? hexdec(substr($matches[2], 1)) : (int) $matches[2]; |
5335 | 5638 | |
5336 | 5639 | // remove left to right / right to left overrides |
5337 | - if ($num === 0x202D || $num === 0x202E) |
|
5338 | - return ''; |
|
5640 | + if ($num === 0x202D || $num === 0x202E) { |
|
5641 | + return ''; |
|
5642 | + } |
|
5339 | 5643 | |
5340 | 5644 | // Quote, Ampersand, Apostrophe, Less/Greater Than get html replaced |
5341 | - if (in_array($num, array(0x22, 0x26, 0x27, 0x3C, 0x3E))) |
|
5342 | - return '&#' . $num . ';'; |
|
5645 | + if (in_array($num, array(0x22, 0x26, 0x27, 0x3C, 0x3E))) { |
|
5646 | + return '&#' . $num . ';'; |
|
5647 | + } |
|
5343 | 5648 | |
5344 | 5649 | if (empty($context['utf8'])) |
5345 | 5650 | { |
5346 | 5651 | // no control characters |
5347 | - if ($num < 0x20) |
|
5348 | - return ''; |
|
5652 | + if ($num < 0x20) { |
|
5653 | + return ''; |
|
5654 | + } |
|
5349 | 5655 | // text is text |
5350 | - elseif ($num < 0x80) |
|
5351 | - return chr($num); |
|
5656 | + elseif ($num < 0x80) { |
|
5657 | + return chr($num); |
|
5658 | + } |
|
5352 | 5659 | // all others get html-ised |
5353 | - else |
|
5354 | - return '&#' . $matches[2] . ';'; |
|
5355 | - } |
|
5356 | - else |
|
5660 | + else { |
|
5661 | + return '&#' . $matches[2] . ';'; |
|
5662 | + } |
|
5663 | + } else |
|
5357 | 5664 | { |
5358 | 5665 | // <0x20 are control characters, 0x20 is a space, > 0x10FFFF is past the end of the utf8 character set |
5359 | 5666 | // 0xD800 >= $num <= 0xDFFF are surrogate markers (not valid for utf8 text) |
5360 | - if ($num < 0x20 || $num > 0x10FFFF || ($num >= 0xD800 && $num <= 0xDFFF)) |
|
5361 | - return ''; |
|
5667 | + if ($num < 0x20 || $num > 0x10FFFF || ($num >= 0xD800 && $num <= 0xDFFF)) { |
|
5668 | + return ''; |
|
5669 | + } |
|
5362 | 5670 | // <0x80 (or less than 128) are standard ascii characters a-z A-Z 0-9 and punctuation |
5363 | - elseif ($num < 0x80) |
|
5364 | - return chr($num); |
|
5671 | + elseif ($num < 0x80) { |
|
5672 | + return chr($num); |
|
5673 | + } |
|
5365 | 5674 | // <0x800 (2048) |
5366 | - elseif ($num < 0x800) |
|
5367 | - return chr(($num >> 6) + 192) . chr(($num & 63) + 128); |
|
5675 | + elseif ($num < 0x800) { |
|
5676 | + return chr(($num >> 6) + 192) . chr(($num & 63) + 128); |
|
5677 | + } |
|
5368 | 5678 | // < 0x10000 (65536) |
5369 | - elseif ($num < 0x10000) |
|
5370 | - return chr(($num >> 12) + 224) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128); |
|
5679 | + elseif ($num < 0x10000) { |
|
5680 | + return chr(($num >> 12) + 224) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128); |
|
5681 | + } |
|
5371 | 5682 | // <= 0x10FFFF (1114111) |
5372 | - else |
|
5373 | - return chr(($num >> 18) + 240) . chr((($num >> 12) & 63) + 128) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128); |
|
5683 | + else { |
|
5684 | + return chr(($num >> 18) + 240) . chr((($num >> 12) & 63) + 128) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128); |
|
5685 | + } |
|
5374 | 5686 | } |
5375 | 5687 | } |
5376 | 5688 | |
@@ -5386,28 +5698,34 @@ discard block |
||
5386 | 5698 | */ |
5387 | 5699 | function fixchar__callback($matches) |
5388 | 5700 | { |
5389 | - if (!isset($matches[1])) |
|
5390 | - return ''; |
|
5701 | + if (!isset($matches[1])) { |
|
5702 | + return ''; |
|
5703 | + } |
|
5391 | 5704 | |
5392 | 5705 | $num = $matches[1][0] === 'x' ? hexdec(substr($matches[1], 1)) : (int) $matches[1]; |
5393 | 5706 | |
5394 | 5707 | // <0x20 are control characters, > 0x10FFFF is past the end of the utf8 character set |
5395 | 5708 | // 0xD800 >= $num <= 0xDFFF are surrogate markers (not valid for utf8 text), 0x202D-E are left to right overrides |
5396 | - if ($num < 0x20 || $num > 0x10FFFF || ($num >= 0xD800 && $num <= 0xDFFF) || $num === 0x202D || $num === 0x202E) |
|
5397 | - return ''; |
|
5709 | + if ($num < 0x20 || $num > 0x10FFFF || ($num >= 0xD800 && $num <= 0xDFFF) || $num === 0x202D || $num === 0x202E) { |
|
5710 | + return ''; |
|
5711 | + } |
|
5398 | 5712 | // <0x80 (or less than 128) are standard ascii characters a-z A-Z 0-9 and punctuation |
5399 | - elseif ($num < 0x80) |
|
5400 | - return chr($num); |
|
5713 | + elseif ($num < 0x80) { |
|
5714 | + return chr($num); |
|
5715 | + } |
|
5401 | 5716 | // <0x800 (2048) |
5402 | - elseif ($num < 0x800) |
|
5403 | - return chr(($num >> 6) + 192) . chr(($num & 63) + 128); |
|
5717 | + elseif ($num < 0x800) { |
|
5718 | + return chr(($num >> 6) + 192) . chr(($num & 63) + 128); |
|
5719 | + } |
|
5404 | 5720 | // < 0x10000 (65536) |
5405 | - elseif ($num < 0x10000) |
|
5406 | - return chr(($num >> 12) + 224) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128); |
|
5721 | + elseif ($num < 0x10000) { |
|
5722 | + return chr(($num >> 12) + 224) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128); |
|
5723 | + } |
|
5407 | 5724 | // <= 0x10FFFF (1114111) |
5408 | - else |
|
5409 | - return chr(($num >> 18) + 240) . chr((($num >> 12) & 63) + 128) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128); |
|
5410 | -} |
|
5725 | + else { |
|
5726 | + return chr(($num >> 18) + 240) . chr((($num >> 12) & 63) + 128) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128); |
|
5727 | + } |
|
5728 | + } |
|
5411 | 5729 | |
5412 | 5730 | /** |
5413 | 5731 | * Strips out invalid html entities, replaces others with html style { codes |
@@ -5420,17 +5738,19 @@ discard block |
||
5420 | 5738 | */ |
5421 | 5739 | function entity_fix__callback($matches) |
5422 | 5740 | { |
5423 | - if (!isset($matches[2])) |
|
5424 | - return ''; |
|
5741 | + if (!isset($matches[2])) { |
|
5742 | + return ''; |
|
5743 | + } |
|
5425 | 5744 | |
5426 | 5745 | $num = $matches[2][0] === 'x' ? hexdec(substr($matches[2], 1)) : (int) $matches[2]; |
5427 | 5746 | |
5428 | 5747 | // we don't allow control characters, characters out of range, byte markers, etc |
5429 | - if ($num < 0x20 || $num > 0x10FFFF || ($num >= 0xD800 && $num <= 0xDFFF) || $num == 0x202D || $num == 0x202E) |
|
5430 | - return ''; |
|
5431 | - else |
|
5432 | - return '&#' . $num . ';'; |
|
5433 | -} |
|
5748 | + if ($num < 0x20 || $num > 0x10FFFF || ($num >= 0xD800 && $num <= 0xDFFF) || $num == 0x202D || $num == 0x202E) { |
|
5749 | + return ''; |
|
5750 | + } else { |
|
5751 | + return '&#' . $num . ';'; |
|
5752 | + } |
|
5753 | + } |
|
5434 | 5754 | |
5435 | 5755 | /** |
5436 | 5756 | * Return a Gravatar URL based on |
@@ -5454,18 +5774,23 @@ discard block |
||
5454 | 5774 | $ratings = array('G', 'PG', 'R', 'X'); |
5455 | 5775 | $defaults = array('mm', 'identicon', 'monsterid', 'wavatar', 'retro', 'blank'); |
5456 | 5776 | $url_params = array(); |
5457 | - if (!empty($modSettings['gravatarMaxRating']) && in_array($modSettings['gravatarMaxRating'], $ratings)) |
|
5458 | - $url_params[] = 'rating=' . $modSettings['gravatarMaxRating']; |
|
5459 | - if (!empty($modSettings['gravatarDefault']) && in_array($modSettings['gravatarDefault'], $defaults)) |
|
5460 | - $url_params[] = 'default=' . $modSettings['gravatarDefault']; |
|
5461 | - if (!empty($modSettings['avatar_max_width_external'])) |
|
5462 | - $size_string = (int) $modSettings['avatar_max_width_external']; |
|
5463 | - if (!empty($modSettings['avatar_max_height_external']) && !empty($size_string)) |
|
5464 | - if ((int) $modSettings['avatar_max_height_external'] < $size_string) |
|
5777 | + if (!empty($modSettings['gravatarMaxRating']) && in_array($modSettings['gravatarMaxRating'], $ratings)) { |
|
5778 | + $url_params[] = 'rating=' . $modSettings['gravatarMaxRating']; |
|
5779 | + } |
|
5780 | + if (!empty($modSettings['gravatarDefault']) && in_array($modSettings['gravatarDefault'], $defaults)) { |
|
5781 | + $url_params[] = 'default=' . $modSettings['gravatarDefault']; |
|
5782 | + } |
|
5783 | + if (!empty($modSettings['avatar_max_width_external'])) { |
|
5784 | + $size_string = (int) $modSettings['avatar_max_width_external']; |
|
5785 | + } |
|
5786 | + if (!empty($modSettings['avatar_max_height_external']) && !empty($size_string)) { |
|
5787 | + if ((int) $modSettings['avatar_max_height_external'] < $size_string) |
|
5465 | 5788 | $size_string = $modSettings['avatar_max_height_external']; |
5789 | + } |
|
5466 | 5790 | |
5467 | - if (!empty($size_string)) |
|
5468 | - $url_params[] = 's=' . $size_string; |
|
5791 | + if (!empty($size_string)) { |
|
5792 | + $url_params[] = 's=' . $size_string; |
|
5793 | + } |
|
5469 | 5794 | } |
5470 | 5795 | $http_method = !empty($modSettings['force_ssl']) ? 'https://secure' : 'http://www'; |
5471 | 5796 | |
@@ -5484,22 +5809,26 @@ discard block |
||
5484 | 5809 | static $timezones = null, $lastwhen = null; |
5485 | 5810 | |
5486 | 5811 | // No point doing this over if we already did it once |
5487 | - if (!empty($timezones) && $when == $lastwhen) |
|
5488 | - return $timezones; |
|
5489 | - else |
|
5490 | - $lastwhen = $when; |
|
5812 | + if (!empty($timezones) && $when == $lastwhen) { |
|
5813 | + return $timezones; |
|
5814 | + } else { |
|
5815 | + $lastwhen = $when; |
|
5816 | + } |
|
5491 | 5817 | |
5492 | 5818 | // Parseable datetime string? |
5493 | - if (is_int($timestamp = strtotime($when))) |
|
5494 | - $when = $timestamp; |
|
5819 | + if (is_int($timestamp = strtotime($when))) { |
|
5820 | + $when = $timestamp; |
|
5821 | + } |
|
5495 | 5822 | |
5496 | 5823 | // A Unix timestamp? |
5497 | - elseif (is_numeric($when)) |
|
5498 | - $when = intval($when); |
|
5824 | + elseif (is_numeric($when)) { |
|
5825 | + $when = intval($when); |
|
5826 | + } |
|
5499 | 5827 | |
5500 | 5828 | // Invalid value? Just get current Unix timestamp. |
5501 | - else |
|
5502 | - $when = time(); |
|
5829 | + else { |
|
5830 | + $when = time(); |
|
5831 | + } |
|
5503 | 5832 | |
5504 | 5833 | // We'll need these too |
5505 | 5834 | $date_when = date_create('@' . $when); |
@@ -5514,8 +5843,9 @@ discard block |
||
5514 | 5843 | foreach ($priority_countries as $country) |
5515 | 5844 | { |
5516 | 5845 | $country_tzids = @timezone_identifiers_list(DateTimeZone::PER_COUNTRY, strtoupper(trim($country))); |
5517 | - if (!empty($country_tzids)) |
|
5518 | - $priority_tzids = array_merge($priority_tzids, $country_tzids); |
|
5846 | + if (!empty($country_tzids)) { |
|
5847 | + $priority_tzids = array_merge($priority_tzids, $country_tzids); |
|
5848 | + } |
|
5519 | 5849 | } |
5520 | 5850 | |
5521 | 5851 | // Antarctic research stations should be listed last, unless you're running a penguin forum |
@@ -5529,8 +5859,9 @@ discard block |
||
5529 | 5859 | foreach ($tzids as $tzid) |
5530 | 5860 | { |
5531 | 5861 | // We don't want UTC right now |
5532 | - if ($tzid == 'UTC') |
|
5533 | - continue; |
|
5862 | + if ($tzid == 'UTC') { |
|
5863 | + continue; |
|
5864 | + } |
|
5534 | 5865 | |
5535 | 5866 | $tz = timezone_open($tzid); |
5536 | 5867 | |
@@ -5551,13 +5882,14 @@ discard block |
||
5551 | 5882 | } |
5552 | 5883 | |
5553 | 5884 | // A time zone from a prioritized country? |
5554 | - if (in_array($tzid, $priority_tzids)) |
|
5555 | - $priority_zones[$tzkey] = true; |
|
5885 | + if (in_array($tzid, $priority_tzids)) { |
|
5886 | + $priority_zones[$tzkey] = true; |
|
5887 | + } |
|
5556 | 5888 | |
5557 | 5889 | // Keep track of the location and offset for this tzid |
5558 | - if (!empty($txt[$tzid])) |
|
5559 | - $zones[$tzkey]['locations'][] = $txt[$tzid]; |
|
5560 | - else |
|
5890 | + if (!empty($txt[$tzid])) { |
|
5891 | + $zones[$tzkey]['locations'][] = $txt[$tzid]; |
|
5892 | + } else |
|
5561 | 5893 | { |
5562 | 5894 | $tzid_parts = explode('/', $tzid); |
5563 | 5895 | $zones[$tzkey]['locations'][] = str_replace(array('St_', '_'), array('St. ', ' '), array_pop($tzid_parts)); |
@@ -5577,23 +5909,27 @@ discard block |
||
5577 | 5909 | date_timezone_set($date_when, timezone_open($tzvalue['tzid'])); |
5578 | 5910 | |
5579 | 5911 | // Use the custom description, if there is one |
5580 | - if (!empty($tztxt[$tzvalue['tzid']])) |
|
5581 | - $desc = $tztxt[$tzvalue['tzid']]; |
|
5912 | + if (!empty($tztxt[$tzvalue['tzid']])) { |
|
5913 | + $desc = $tztxt[$tzvalue['tzid']]; |
|
5914 | + } |
|
5582 | 5915 | // Otherwise, use the list of locations (max 5, so things don't get silly) |
5583 | - else |
|
5584 | - $desc = implode(', ', array_slice(array_unique($tzvalue['locations']), 0, 5)) . (count($tzvalue['locations']) > 5 ? ', ' . $txt['etc'] : ''); |
|
5916 | + else { |
|
5917 | + $desc = implode(', ', array_slice(array_unique($tzvalue['locations']), 0, 5)) . (count($tzvalue['locations']) > 5 ? ', ' . $txt['etc'] : ''); |
|
5918 | + } |
|
5585 | 5919 | |
5586 | 5920 | // Show the UTC offset and the abbreviation, if it's something like 'MST' and not '-06' |
5587 | 5921 | $desc = '[UTC' . date_format($date_when, 'P') . '] - ' . (!strspn($tzvalue['abbr'], '+-') ? $tzvalue['abbr'] . ' - ' : '') . $desc; |
5588 | 5922 | |
5589 | - if (isset($priority_zones[$tzkey])) |
|
5590 | - $priority_timezones[$tzvalue['tzid']] = $desc; |
|
5591 | - else |
|
5592 | - $timezones[$tzvalue['tzid']] = $desc; |
|
5923 | + if (isset($priority_zones[$tzkey])) { |
|
5924 | + $priority_timezones[$tzvalue['tzid']] = $desc; |
|
5925 | + } else { |
|
5926 | + $timezones[$tzvalue['tzid']] = $desc; |
|
5927 | + } |
|
5593 | 5928 | } |
5594 | 5929 | |
5595 | - if (!empty($priority_timezones)) |
|
5596 | - $priority_timezones[] = '-----'; |
|
5930 | + if (!empty($priority_timezones)) { |
|
5931 | + $priority_timezones[] = '-----'; |
|
5932 | + } |
|
5597 | 5933 | |
5598 | 5934 | $timezones = array_merge( |
5599 | 5935 | $priority_timezones, |
@@ -5610,8 +5946,9 @@ discard block |
||
5610 | 5946 | */ |
5611 | 5947 | function inet_ptod($ip_address) |
5612 | 5948 | { |
5613 | - if (!isValidIP($ip_address)) |
|
5614 | - return $ip_address; |
|
5949 | + if (!isValidIP($ip_address)) { |
|
5950 | + return $ip_address; |
|
5951 | + } |
|
5615 | 5952 | |
5616 | 5953 | $bin = inet_pton($ip_address); |
5617 | 5954 | return $bin; |
@@ -5623,13 +5960,15 @@ discard block |
||
5623 | 5960 | */ |
5624 | 5961 | function inet_dtop($bin) |
5625 | 5962 | { |
5626 | - if(empty($bin)) |
|
5627 | - return ''; |
|
5963 | + if(empty($bin)) { |
|
5964 | + return ''; |
|
5965 | + } |
|
5628 | 5966 | |
5629 | 5967 | global $db_type; |
5630 | 5968 | |
5631 | - if ($db_type == 'postgresql') |
|
5632 | - return $bin; |
|
5969 | + if ($db_type == 'postgresql') { |
|
5970 | + return $bin; |
|
5971 | + } |
|
5633 | 5972 | |
5634 | 5973 | $ip_address = inet_ntop($bin); |
5635 | 5974 | |
@@ -5654,26 +5993,32 @@ discard block |
||
5654 | 5993 | */ |
5655 | 5994 | function _safe_serialize($value) |
5656 | 5995 | { |
5657 | - if(is_null($value)) |
|
5658 | - return 'N;'; |
|
5996 | + if(is_null($value)) { |
|
5997 | + return 'N;'; |
|
5998 | + } |
|
5659 | 5999 | |
5660 | - if(is_bool($value)) |
|
5661 | - return 'b:'. (int) $value .';'; |
|
6000 | + if(is_bool($value)) { |
|
6001 | + return 'b:'. (int) $value .';'; |
|
6002 | + } |
|
5662 | 6003 | |
5663 | - if(is_int($value)) |
|
5664 | - return 'i:'. $value .';'; |
|
6004 | + if(is_int($value)) { |
|
6005 | + return 'i:'. $value .';'; |
|
6006 | + } |
|
5665 | 6007 | |
5666 | - if(is_float($value)) |
|
5667 | - return 'd:'. str_replace(',', '.', $value) .';'; |
|
6008 | + if(is_float($value)) { |
|
6009 | + return 'd:'. str_replace(',', '.', $value) .';'; |
|
6010 | + } |
|
5668 | 6011 | |
5669 | - if(is_string($value)) |
|
5670 | - return 's:'. strlen($value) .':"'. $value .'";'; |
|
6012 | + if(is_string($value)) { |
|
6013 | + return 's:'. strlen($value) .':"'. $value .'";'; |
|
6014 | + } |
|
5671 | 6015 | |
5672 | 6016 | if(is_array($value)) |
5673 | 6017 | { |
5674 | 6018 | $out = ''; |
5675 | - foreach($value as $k => $v) |
|
5676 | - $out .= _safe_serialize($k) . _safe_serialize($v); |
|
6019 | + foreach($value as $k => $v) { |
|
6020 | + $out .= _safe_serialize($k) . _safe_serialize($v); |
|
6021 | + } |
|
5677 | 6022 | |
5678 | 6023 | return 'a:'. count($value) .':{'. $out .'}'; |
5679 | 6024 | } |
@@ -5699,8 +6044,9 @@ discard block |
||
5699 | 6044 | |
5700 | 6045 | $out = _safe_serialize($value); |
5701 | 6046 | |
5702 | - if (isset($mbIntEnc)) |
|
5703 | - mb_internal_encoding($mbIntEnc); |
|
6047 | + if (isset($mbIntEnc)) { |
|
6048 | + mb_internal_encoding($mbIntEnc); |
|
6049 | + } |
|
5704 | 6050 | |
5705 | 6051 | return $out; |
5706 | 6052 | } |
@@ -5717,8 +6063,9 @@ discard block |
||
5717 | 6063 | function _safe_unserialize($str) |
5718 | 6064 | { |
5719 | 6065 | // Input is not a string. |
5720 | - if(empty($str) || !is_string($str)) |
|
5721 | - return false; |
|
6066 | + if(empty($str) || !is_string($str)) { |
|
6067 | + return false; |
|
6068 | + } |
|
5722 | 6069 | |
5723 | 6070 | $stack = array(); |
5724 | 6071 | $expected = array(); |
@@ -5734,43 +6081,38 @@ discard block |
||
5734 | 6081 | while($state != 1) |
5735 | 6082 | { |
5736 | 6083 | $type = isset($str[0]) ? $str[0] : ''; |
5737 | - if($type == '}') |
|
5738 | - $str = substr($str, 1); |
|
5739 | - |
|
5740 | - else if($type == 'N' && $str[1] == ';') |
|
6084 | + if($type == '}') { |
|
6085 | + $str = substr($str, 1); |
|
6086 | + } else if($type == 'N' && $str[1] == ';') |
|
5741 | 6087 | { |
5742 | 6088 | $value = null; |
5743 | 6089 | $str = substr($str, 2); |
5744 | - } |
|
5745 | - else if($type == 'b' && preg_match('/^b:([01]);/', $str, $matches)) |
|
6090 | + } else if($type == 'b' && preg_match('/^b:([01]);/', $str, $matches)) |
|
5746 | 6091 | { |
5747 | 6092 | $value = $matches[1] == '1' ? true : false; |
5748 | 6093 | $str = substr($str, 4); |
5749 | - } |
|
5750 | - else if($type == 'i' && preg_match('/^i:(-?[0-9]+);(.*)/s', $str, $matches)) |
|
6094 | + } else if($type == 'i' && preg_match('/^i:(-?[0-9]+);(.*)/s', $str, $matches)) |
|
5751 | 6095 | { |
5752 | 6096 | $value = (int)$matches[1]; |
5753 | 6097 | $str = $matches[2]; |
5754 | - } |
|
5755 | - else if($type == 'd' && preg_match('/^d:(-?[0-9]+\.?[0-9]*(E[+-][0-9]+)?);(.*)/s', $str, $matches)) |
|
6098 | + } else if($type == 'd' && preg_match('/^d:(-?[0-9]+\.?[0-9]*(E[+-][0-9]+)?);(.*)/s', $str, $matches)) |
|
5756 | 6099 | { |
5757 | 6100 | $value = (float)$matches[1]; |
5758 | 6101 | $str = $matches[3]; |
5759 | - } |
|
5760 | - else if($type == 's' && preg_match('/^s:([0-9]+):"(.*)/s', $str, $matches) && substr($matches[2], (int)$matches[1], 2) == '";') |
|
6102 | + } else if($type == 's' && preg_match('/^s:([0-9]+):"(.*)/s', $str, $matches) && substr($matches[2], (int)$matches[1], 2) == '";') |
|
5761 | 6103 | { |
5762 | 6104 | $value = substr($matches[2], 0, (int)$matches[1]); |
5763 | 6105 | $str = substr($matches[2], (int)$matches[1] + 2); |
5764 | - } |
|
5765 | - else if($type == 'a' && preg_match('/^a:([0-9]+):{(.*)/s', $str, $matches)) |
|
6106 | + } else if($type == 'a' && preg_match('/^a:([0-9]+):{(.*)/s', $str, $matches)) |
|
5766 | 6107 | { |
5767 | 6108 | $expectedLength = (int)$matches[1]; |
5768 | 6109 | $str = $matches[2]; |
5769 | 6110 | } |
5770 | 6111 | |
5771 | 6112 | // Object or unknown/malformed type. |
5772 | - else |
|
5773 | - return false; |
|
6113 | + else { |
|
6114 | + return false; |
|
6115 | + } |
|
5774 | 6116 | |
5775 | 6117 | switch($state) |
5776 | 6118 | { |
@@ -5798,8 +6140,9 @@ discard block |
||
5798 | 6140 | if($type == '}') |
5799 | 6141 | { |
5800 | 6142 | // Array size is less than expected. |
5801 | - if(count($list) < end($expected)) |
|
5802 | - return false; |
|
6143 | + if(count($list) < end($expected)) { |
|
6144 | + return false; |
|
6145 | + } |
|
5803 | 6146 | |
5804 | 6147 | unset($list); |
5805 | 6148 | $list = &$stack[count($stack)-1]; |
@@ -5808,8 +6151,9 @@ discard block |
||
5808 | 6151 | // Go to terminal state if we're at the end of the root array. |
5809 | 6152 | array_pop($expected); |
5810 | 6153 | |
5811 | - if(count($expected) == 0) |
|
5812 | - $state = 1; |
|
6154 | + if(count($expected) == 0) { |
|
6155 | + $state = 1; |
|
6156 | + } |
|
5813 | 6157 | |
5814 | 6158 | break; |
5815 | 6159 | } |
@@ -5817,8 +6161,9 @@ discard block |
||
5817 | 6161 | if($type == 'i' || $type == 's') |
5818 | 6162 | { |
5819 | 6163 | // Array size exceeds expected length. |
5820 | - if(count($list) >= end($expected)) |
|
5821 | - return false; |
|
6164 | + if(count($list) >= end($expected)) { |
|
6165 | + return false; |
|
6166 | + } |
|
5822 | 6167 | |
5823 | 6168 | $key = $value; |
5824 | 6169 | $state = 3; |
@@ -5852,8 +6197,9 @@ discard block |
||
5852 | 6197 | } |
5853 | 6198 | |
5854 | 6199 | // Trailing data in input. |
5855 | - if(!empty($str)) |
|
5856 | - return false; |
|
6200 | + if(!empty($str)) { |
|
6201 | + return false; |
|
6202 | + } |
|
5857 | 6203 | |
5858 | 6204 | return $data; |
5859 | 6205 | } |
@@ -5876,8 +6222,9 @@ discard block |
||
5876 | 6222 | |
5877 | 6223 | $out = _safe_unserialize($str); |
5878 | 6224 | |
5879 | - if (isset($mbIntEnc)) |
|
5880 | - mb_internal_encoding($mbIntEnc); |
|
6225 | + if (isset($mbIntEnc)) { |
|
6226 | + mb_internal_encoding($mbIntEnc); |
|
6227 | + } |
|
5881 | 6228 | |
5882 | 6229 | return $out; |
5883 | 6230 | } |
@@ -5892,12 +6239,14 @@ discard block |
||
5892 | 6239 | function smf_chmod($file, $value = 0) |
5893 | 6240 | { |
5894 | 6241 | // No file? no checks! |
5895 | - if (empty($file)) |
|
5896 | - return false; |
|
6242 | + if (empty($file)) { |
|
6243 | + return false; |
|
6244 | + } |
|
5897 | 6245 | |
5898 | 6246 | // Already writable? |
5899 | - if (is_writable($file)) |
|
5900 | - return true; |
|
6247 | + if (is_writable($file)) { |
|
6248 | + return true; |
|
6249 | + } |
|
5901 | 6250 | |
5902 | 6251 | // Do we have a file or a dir? |
5903 | 6252 | $isDir = is_dir($file); |
@@ -5913,10 +6262,9 @@ discard block |
||
5913 | 6262 | { |
5914 | 6263 | $isWritable = true; |
5915 | 6264 | break; |
6265 | + } else { |
|
6266 | + @chmod($file, $val); |
|
5916 | 6267 | } |
5917 | - |
|
5918 | - else |
|
5919 | - @chmod($file, $val); |
|
5920 | 6268 | } |
5921 | 6269 | |
5922 | 6270 | return $isWritable; |
@@ -5935,8 +6283,9 @@ discard block |
||
5935 | 6283 | global $txt; |
5936 | 6284 | |
5937 | 6285 | // Come on... |
5938 | - if (empty($json) || !is_string($json)) |
|
5939 | - return array(); |
|
6286 | + if (empty($json) || !is_string($json)) { |
|
6287 | + return array(); |
|
6288 | + } |
|
5940 | 6289 | |
5941 | 6290 | $returnArray = @json_decode($json, $returnAsArray); |
5942 | 6291 | |
@@ -5974,11 +6323,11 @@ discard block |
||
5974 | 6323 | $jsonDebug = $jsonDebug[0]; |
5975 | 6324 | loadLanguage('Errors'); |
5976 | 6325 | |
5977 | - if (!empty($jsonDebug)) |
|
5978 | - log_error($txt['json_'. $jsonError], 'critical', $jsonDebug['file'], $jsonDebug['line']); |
|
5979 | - |
|
5980 | - else |
|
5981 | - log_error($txt['json_'. $jsonError], 'critical'); |
|
6326 | + if (!empty($jsonDebug)) { |
|
6327 | + log_error($txt['json_'. $jsonError], 'critical', $jsonDebug['file'], $jsonDebug['line']); |
|
6328 | + } else { |
|
6329 | + log_error($txt['json_'. $jsonError], 'critical'); |
|
6330 | + } |
|
5982 | 6331 | |
5983 | 6332 | // Everyone expects an array. |
5984 | 6333 | return array(); |
@@ -6012,8 +6361,9 @@ discard block |
||
6012 | 6361 | global $db_show_debug, $modSettings; |
6013 | 6362 | |
6014 | 6363 | // Defensive programming anyone? |
6015 | - if (empty($data)) |
|
6016 | - return false; |
|
6364 | + if (empty($data)) { |
|
6365 | + return false; |
|
6366 | + } |
|
6017 | 6367 | |
6018 | 6368 | // Don't need extra stuff... |
6019 | 6369 | $db_show_debug = false; |
@@ -6021,11 +6371,11 @@ discard block |
||
6021 | 6371 | // Kill anything else. |
6022 | 6372 | ob_end_clean(); |
6023 | 6373 | |
6024 | - if (!empty($modSettings['CompressedOutput'])) |
|
6025 | - @ob_start('ob_gzhandler'); |
|
6026 | - |
|
6027 | - else |
|
6028 | - ob_start(); |
|
6374 | + if (!empty($modSettings['CompressedOutput'])) { |
|
6375 | + @ob_start('ob_gzhandler'); |
|
6376 | + } else { |
|
6377 | + ob_start(); |
|
6378 | + } |
|
6029 | 6379 | |
6030 | 6380 | // Set the header. |
6031 | 6381 | header($type); |
@@ -6057,8 +6407,9 @@ discard block |
||
6057 | 6407 | static $done = false; |
6058 | 6408 | |
6059 | 6409 | // If we don't need to do anything, don't |
6060 | - if (!$update && $done) |
|
6061 | - return; |
|
6410 | + if (!$update && $done) { |
|
6411 | + return; |
|
6412 | + } |
|
6062 | 6413 | |
6063 | 6414 | // Should we get a new copy of the official list of TLDs? |
6064 | 6415 | if ($update) |
@@ -6070,8 +6421,9 @@ discard block |
||
6070 | 6421 | // marauding bandits roaming on the surface. We don't want to waste precious electricity on |
6071 | 6422 | // pointlessly repeating background tasks, so we'll wait until the next regularly scheduled |
6072 | 6423 | // update to see if civilization has been restored. |
6073 | - if ($tlds === false) |
|
6074 | - $postapocalypticNightmare = true; |
|
6424 | + if ($tlds === false) { |
|
6425 | + $postapocalypticNightmare = true; |
|
6426 | + } |
|
6075 | 6427 | } |
6076 | 6428 | // If we aren't updating and the regex is valid, we're done |
6077 | 6429 | elseif (!empty($modSettings['tld_regex']) && @preg_match('~' . $modSettings['tld_regex'] . '~', null) !== false) |
@@ -6086,10 +6438,11 @@ discard block |
||
6086 | 6438 | // Clean $tlds and convert it to an array |
6087 | 6439 | $tlds = array_filter(explode("\n", strtolower($tlds)), function($line) { |
6088 | 6440 | $line = trim($line); |
6089 | - if (empty($line) || strpos($line, '#') !== false || strpos($line, ' ') !== false) |
|
6090 | - return false; |
|
6091 | - else |
|
6092 | - return true; |
|
6441 | + if (empty($line) || strpos($line, '#') !== false || strpos($line, ' ') !== false) { |
|
6442 | + return false; |
|
6443 | + } else { |
|
6444 | + return true; |
|
6445 | + } |
|
6093 | 6446 | }); |
6094 | 6447 | |
6095 | 6448 | // Convert Punycode to Unicode |
@@ -6181,8 +6534,7 @@ discard block |
||
6181 | 6534 | |
6182 | 6535 | $strlen = 'mb_strlen'; |
6183 | 6536 | $substr = 'mb_substr'; |
6184 | - } |
|
6185 | - else |
|
6537 | + } else |
|
6186 | 6538 | { |
6187 | 6539 | $strlen = $smcFunc['strlen']; |
6188 | 6540 | $substr = $smcFunc['substr']; |
@@ -6196,20 +6548,21 @@ discard block |
||
6196 | 6548 | |
6197 | 6549 | $first = $substr($string, 0, 1); |
6198 | 6550 | |
6199 | - if (empty($index[$first])) |
|
6200 | - $index[$first] = array(); |
|
6551 | + if (empty($index[$first])) { |
|
6552 | + $index[$first] = array(); |
|
6553 | + } |
|
6201 | 6554 | |
6202 | 6555 | if ($strlen($string) > 1) |
6203 | 6556 | { |
6204 | 6557 | // Sanity check on recursion |
6205 | - if ($depth > 99) |
|
6206 | - $index[$first][$substr($string, 1)] = ''; |
|
6207 | - |
|
6208 | - else |
|
6209 | - $index[$first] = $add_string_to_index($substr($string, 1), $index[$first]); |
|
6558 | + if ($depth > 99) { |
|
6559 | + $index[$first][$substr($string, 1)] = ''; |
|
6560 | + } else { |
|
6561 | + $index[$first] = $add_string_to_index($substr($string, 1), $index[$first]); |
|
6562 | + } |
|
6563 | + } else { |
|
6564 | + $index[$first][''] = ''; |
|
6210 | 6565 | } |
6211 | - else |
|
6212 | - $index[$first][''] = ''; |
|
6213 | 6566 | |
6214 | 6567 | $depth--; |
6215 | 6568 | return $index; |
@@ -6232,9 +6585,9 @@ discard block |
||
6232 | 6585 | $key_regex = preg_quote($key, $delim); |
6233 | 6586 | $new_key = $key; |
6234 | 6587 | |
6235 | - if (empty($value)) |
|
6236 | - $sub_regex = ''; |
|
6237 | - else |
|
6588 | + if (empty($value)) { |
|
6589 | + $sub_regex = ''; |
|
6590 | + } else |
|
6238 | 6591 | { |
6239 | 6592 | $sub_regex = $index_to_regex($value, $delim); |
6240 | 6593 | |
@@ -6242,22 +6595,22 @@ discard block |
||
6242 | 6595 | { |
6243 | 6596 | $new_key_array = explode('(?'.'>', $sub_regex); |
6244 | 6597 | $new_key .= $new_key_array[0]; |
6598 | + } else { |
|
6599 | + $sub_regex = '(?'.'>' . $sub_regex . ')'; |
|
6245 | 6600 | } |
6246 | - else |
|
6247 | - $sub_regex = '(?'.'>' . $sub_regex . ')'; |
|
6248 | 6601 | } |
6249 | 6602 | |
6250 | - if ($depth > 1) |
|
6251 | - $regex[$new_key] = $key_regex . $sub_regex; |
|
6252 | - else |
|
6603 | + if ($depth > 1) { |
|
6604 | + $regex[$new_key] = $key_regex . $sub_regex; |
|
6605 | + } else |
|
6253 | 6606 | { |
6254 | 6607 | if (($length += strlen($key_regex) + 1) < $max_length || empty($regex)) |
6255 | 6608 | { |
6256 | 6609 | $regex[$new_key] = $key_regex . $sub_regex; |
6257 | 6610 | unset($index[$key]); |
6611 | + } else { |
|
6612 | + break; |
|
6258 | 6613 | } |
6259 | - else |
|
6260 | - break; |
|
6261 | 6614 | } |
6262 | 6615 | } |
6263 | 6616 | |
@@ -6266,10 +6619,11 @@ discard block |
||
6266 | 6619 | $l1 = $strlen($k1); |
6267 | 6620 | $l2 = $strlen($k2); |
6268 | 6621 | |
6269 | - if ($l1 == $l2) |
|
6270 | - return strcmp($k1, $k2) > 0 ? 1 : -1; |
|
6271 | - else |
|
6272 | - return $l1 > $l2 ? -1 : 1; |
|
6622 | + if ($l1 == $l2) { |
|
6623 | + return strcmp($k1, $k2) > 0 ? 1 : -1; |
|
6624 | + } else { |
|
6625 | + return $l1 > $l2 ? -1 : 1; |
|
6626 | + } |
|
6273 | 6627 | }); |
6274 | 6628 | |
6275 | 6629 | $depth--; |
@@ -6280,21 +6634,24 @@ discard block |
||
6280 | 6634 | $index = array(); |
6281 | 6635 | $regex = ''; |
6282 | 6636 | |
6283 | - foreach ($strings as $string) |
|
6284 | - $index = $add_string_to_index($string, $index); |
|
6637 | + foreach ($strings as $string) { |
|
6638 | + $index = $add_string_to_index($string, $index); |
|
6639 | + } |
|
6285 | 6640 | |
6286 | 6641 | if ($returnArray === true) |
6287 | 6642 | { |
6288 | 6643 | $regex = array(); |
6289 | - while (!empty($index)) |
|
6290 | - $regex[] = '(?'.'>' . $index_to_regex($index, $delim) . ')'; |
|
6644 | + while (!empty($index)) { |
|
6645 | + $regex[] = '(?'.'>' . $index_to_regex($index, $delim) . ')'; |
|
6646 | + } |
|
6647 | + } else { |
|
6648 | + $regex = '(?'.'>' . $index_to_regex($index, $delim) . ')'; |
|
6291 | 6649 | } |
6292 | - else |
|
6293 | - $regex = '(?'.'>' . $index_to_regex($index, $delim) . ')'; |
|
6294 | 6650 | |
6295 | 6651 | // Restore PHP's internal character encoding to whatever it was originally |
6296 | - if (!empty($current_encoding)) |
|
6297 | - mb_internal_encoding($current_encoding); |
|
6652 | + if (!empty($current_encoding)) { |
|
6653 | + mb_internal_encoding($current_encoding); |
|
6654 | + } |
|
6298 | 6655 | |
6299 | 6656 | return $regex; |
6300 | 6657 | } |
@@ -6337,13 +6694,15 @@ discard block |
||
6337 | 6694 | // Need to add the trailing slash, or it puts it there & thinks there's a redirect when there isn't... |
6338 | 6695 | $url = str_ireplace('https://', 'http://', $url) . '/'; |
6339 | 6696 | $headers = @get_headers($url); |
6340 | - if ($headers === false) |
|
6341 | - return false; |
|
6697 | + if ($headers === false) { |
|
6698 | + return false; |
|
6699 | + } |
|
6342 | 6700 | |
6343 | 6701 | // Now to see if it came back https... |
6344 | 6702 | // First check for a redirect status code in first row (301, 302, 307) |
6345 | - if (strstr($headers[0], '301') === false && strstr($headers[0], '302') === false && strstr($headers[0], '307') === false) |
|
6346 | - return false; |
|
6703 | + if (strstr($headers[0], '301') === false && strstr($headers[0], '302') === false && strstr($headers[0], '307') === false) { |
|
6704 | + return false; |
|
6705 | + } |
|
6347 | 6706 | |
6348 | 6707 | // Search for the location entry to confirm https |
6349 | 6708 | $result = false; |
@@ -6381,8 +6740,7 @@ discard block |
||
6381 | 6740 | $is_admin = $user_info['is_admin']; |
6382 | 6741 | $mod_cache = !empty($user_info['mod_cache']) ? $user_info['mod_cache'] : null; |
6383 | 6742 | $ignoreboards = !empty($user_info['ignoreboards']) ? $user_info['ignoreboards'] : null; |
6384 | - } |
|
6385 | - else |
|
6743 | + } else |
|
6386 | 6744 | { |
6387 | 6745 | $request = $smcFunc['db_query']('', ' |
6388 | 6746 | SELECT mem.ignore_boards, mem.id_group, mem.additional_groups, mem.id_post_group |
@@ -6396,17 +6754,19 @@ discard block |
||
6396 | 6754 | |
6397 | 6755 | $row = $smcFunc['db_fetch_assoc']($request); |
6398 | 6756 | |
6399 | - if (empty($row['additional_groups'])) |
|
6400 | - $groups = array($row['id_group'], $row['id_post_group']); |
|
6401 | - else |
|
6402 | - $groups = array_merge( |
|
6757 | + if (empty($row['additional_groups'])) { |
|
6758 | + $groups = array($row['id_group'], $row['id_post_group']); |
|
6759 | + } else { |
|
6760 | + $groups = array_merge( |
|
6403 | 6761 | array($row['id_group'], $row['id_post_group']), |
6404 | 6762 | explode(',', $row['additional_groups']) |
6405 | 6763 | ); |
6764 | + } |
|
6406 | 6765 | |
6407 | 6766 | // Because history has proven that it is possible for groups to go bad - clean up in case. |
6408 | - foreach ($groups as $k => $v) |
|
6409 | - $groups[$k] = (int) $v; |
|
6767 | + foreach ($groups as $k => $v) { |
|
6768 | + $groups[$k] = (int) $v; |
|
6769 | + } |
|
6410 | 6770 | |
6411 | 6771 | $is_admin = in_array(1, $groups); |
6412 | 6772 | |
@@ -6423,8 +6783,9 @@ discard block |
||
6423 | 6783 | 'current_member' => $userid, |
6424 | 6784 | ) |
6425 | 6785 | ); |
6426 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
6427 | - $boards_mod[] = $row['id_board']; |
|
6786 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
6787 | + $boards_mod[] = $row['id_board']; |
|
6788 | + } |
|
6428 | 6789 | $smcFunc['db_free_result']($request); |
6429 | 6790 | |
6430 | 6791 | // Can any of the groups they're in moderate any of the boards? |
@@ -6436,8 +6797,9 @@ discard block |
||
6436 | 6797 | 'groups' => $groups, |
6437 | 6798 | ) |
6438 | 6799 | ); |
6439 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
6440 | - $boards_mod[] = $row['id_board']; |
|
6800 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
6801 | + $boards_mod[] = $row['id_board']; |
|
6802 | + } |
|
6441 | 6803 | $smcFunc['db_free_result']($request); |
6442 | 6804 | |
6443 | 6805 | // Just in case we've got duplicates here... |
@@ -6447,23 +6809,27 @@ discard block |
||
6447 | 6809 | } |
6448 | 6810 | |
6449 | 6811 | // Just build this here, it makes it easier to change/use - administrators can see all boards. |
6450 | - if ($is_admin) |
|
6451 | - $query_part['query_see_board'] = '1=1'; |
|
6812 | + if ($is_admin) { |
|
6813 | + $query_part['query_see_board'] = '1=1'; |
|
6814 | + } |
|
6452 | 6815 | // Otherwise just the groups in $user_info['groups']. |
6453 | - else |
|
6454 | - $query_part['query_see_board'] = 'EXISTS (SELECT DISTINCT bpv.id_board FROM ' . $db_prefix . 'board_permissions_view bpv WHERE (bpv.id_group IN ( '. implode(',', $groups) .') AND bpv.deny = 0) ' |
|
6816 | + else { |
|
6817 | + $query_part['query_see_board'] = 'EXISTS (SELECT DISTINCT bpv.id_board FROM ' . $db_prefix . 'board_permissions_view bpv WHERE (bpv.id_group IN ( '. implode(',', $groups) .') AND bpv.deny = 0) ' |
|
6455 | 6818 | . ( !empty($deny_boards_access) ? ' AND (bpv.id_group NOT IN ( '. implode(',', $groups) .') and bpv.deny = 1)' : '') |
6456 | 6819 | . ' AND bpv.id_board = b.id_board)'; |
6820 | + } |
|
6457 | 6821 | |
6458 | 6822 | // Build the list of boards they WANT to see. |
6459 | 6823 | // This will take the place of query_see_boards in certain spots, so it better include the boards they can see also |
6460 | 6824 | |
6461 | 6825 | // If they aren't ignoring any boards then they want to see all the boards they can see |
6462 | - if (empty($ignoreboards)) |
|
6463 | - $query_part['query_wanna_see_board'] = $query_part['query_see_board']; |
|
6826 | + if (empty($ignoreboards)) { |
|
6827 | + $query_part['query_wanna_see_board'] = $query_part['query_see_board']; |
|
6828 | + } |
|
6464 | 6829 | // Ok I guess they don't want to see all the boards |
6465 | - else |
|
6466 | - $query_part['query_wanna_see_board'] = '(' . $query_part['query_see_board'] . ' AND b.id_board NOT IN (' . implode(',', $ignoreboards) . '))'; |
|
6830 | + else { |
|
6831 | + $query_part['query_wanna_see_board'] = '(' . $query_part['query_see_board'] . ' AND b.id_board NOT IN (' . implode(',', $ignoreboards) . '))'; |
|
6832 | + } |
|
6467 | 6833 | |
6468 | 6834 | return $query_part; |
6469 | 6835 | } |
@@ -6477,10 +6843,11 @@ discard block |
||
6477 | 6843 | { |
6478 | 6844 | $secure = false; |
6479 | 6845 | |
6480 | - if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') |
|
6481 | - $secure = true; |
|
6482 | - elseif (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' || !empty($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on') |
|
6483 | - $secure = true; |
|
6846 | + if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') { |
|
6847 | + $secure = true; |
|
6848 | + } elseif (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' || !empty($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on') { |
|
6849 | + $secure = true; |
|
6850 | + } |
|
6484 | 6851 | |
6485 | 6852 | return $secure; |
6486 | 6853 | } |
@@ -6497,11 +6864,12 @@ discard block |
||
6497 | 6864 | { |
6498 | 6865 | $url = iri_to_url($iri); |
6499 | 6866 | |
6500 | - if (filter_var($url, FILTER_VALIDATE_URL, $flags) !== false) |
|
6501 | - return $iri; |
|
6502 | - else |
|
6503 | - return false; |
|
6504 | -} |
|
6867 | + if (filter_var($url, FILTER_VALIDATE_URL, $flags) !== false) { |
|
6868 | + return $iri; |
|
6869 | + } else { |
|
6870 | + return false; |
|
6871 | + } |
|
6872 | + } |
|
6505 | 6873 | |
6506 | 6874 | /** |
6507 | 6875 | * A wrapper for `filter_var($url, FILTER_SANITIZE_URL)` that can handle URLs |
@@ -6544,8 +6912,9 @@ discard block |
||
6544 | 6912 | |
6545 | 6913 | $host = parse_url((strpos($iri, '://') === false ? 'http://' : '') . ltrim($iri, ':/'), PHP_URL_HOST); |
6546 | 6914 | |
6547 | - if (empty($host)) |
|
6548 | - return $iri; |
|
6915 | + if (empty($host)) { |
|
6916 | + return $iri; |
|
6917 | + } |
|
6549 | 6918 | |
6550 | 6919 | // Convert the domain using the Punycode algorithm |
6551 | 6920 | require_once($sourcedir . '/Class-Punycode.php'); |
@@ -6581,8 +6950,9 @@ discard block |
||
6581 | 6950 | |
6582 | 6951 | $host = parse_url((strpos($url, '://') === false ? 'http://' : '') . ltrim($url, ':/'), PHP_URL_HOST); |
6583 | 6952 | |
6584 | - if (empty($host)) |
|
6585 | - return $url; |
|
6953 | + if (empty($host)) { |
|
6954 | + return $url; |
|
6955 | + } |
|
6586 | 6956 | |
6587 | 6957 | // Decode the domain from Punycode |
6588 | 6958 | require_once($sourcedir . '/Class-Punycode.php'); |
@@ -6608,8 +6978,9 @@ discard block |
||
6608 | 6978 | { |
6609 | 6979 | global $user_info, $modSettings, $smcFunc, $txt; |
6610 | 6980 | |
6611 | - if (empty($modSettings['cron_last_checked'])) |
|
6612 | - $modSettings['cron_last_checked'] = 0; |
|
6981 | + if (empty($modSettings['cron_last_checked'])) { |
|
6982 | + $modSettings['cron_last_checked'] = 0; |
|
6983 | + } |
|
6613 | 6984 | |
6614 | 6985 | if (!empty($modSettings['cron_is_real_cron']) && time() - $modSettings['cron_last_checked'] > 84600) |
6615 | 6986 | { |
@@ -6629,9 +7000,9 @@ discard block |
||
6629 | 7000 | loadLanguage('ManageScheduledTasks'); |
6630 | 7001 | log_error($txt['cron_not_working']); |
6631 | 7002 | updateSettings(array('cron_is_real_cron' => 0)); |
7003 | + } else { |
|
7004 | + updateSettings(array('cron_last_checked' => time())); |
|
6632 | 7005 | } |
6633 | - else |
|
6634 | - updateSettings(array('cron_last_checked' => time())); |
|
6635 | 7006 | } |
6636 | 7007 | } |
6637 | 7008 | |
@@ -6655,10 +7026,11 @@ discard block |
||
6655 | 7026 | |
6656 | 7027 | $protocol = preg_match('~^\s*(HTTP/[12]\.\d)\s*$~i', $_SERVER['SERVER_PROTOCOL'], $matches) ? $matches[1] : 'HTTP/1.0'; |
6657 | 7028 | |
6658 | - if (!isset($statuses[$code]) && empty($status)) |
|
6659 | - header($protocol . ' 500 Internal Server Error'); |
|
6660 | - else |
|
6661 | - header($protocol . ' ' . $code . ' ' . (!empty($status) ? $status : $statuses[$code])); |
|
6662 | -} |
|
7029 | + if (!isset($statuses[$code]) && empty($status)) { |
|
7030 | + header($protocol . ' 500 Internal Server Error'); |
|
7031 | + } else { |
|
7032 | + header($protocol . ' ' . $code . ' ' . (!empty($status) ? $status : $statuses[$code])); |
|
7033 | + } |
|
7034 | + } |
|
6663 | 7035 | |
6664 | 7036 | ?> |
6665 | 7037 | \ No newline at end of file |