albertlast /
SMF2.1
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | require_once($sourcedir . '/Subs-Auth.php'); |
| 53 | 53 | |
| 54 | 54 | // Posting the password... check it. |
| 55 | - if (isset($_POST[$type. '_pass'])) |
|
| 55 | + if (isset($_POST[$type . '_pass'])) |
|
| 56 | 56 | { |
| 57 | 57 | // Check to ensure we're forcing SSL for authentication |
| 58 | 58 | if (!empty($modSettings['force_ssl']) && empty($maintenance) && (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != 'on')) |
@@ -179,7 +179,7 @@ discard block |
||
| 179 | 179 | { |
| 180 | 180 | if ($ip_number == 'ip2' && $user_info['ip2'] == $user_info['ip']) |
| 181 | 181 | continue; |
| 182 | - $ban_query[] = ' {inet:'.$ip_number.'} BETWEEN bi.ip_low and bi.ip_high'; |
|
| 182 | + $ban_query[] = ' {inet:' . $ip_number . '} BETWEEN bi.ip_low and bi.ip_high'; |
|
| 183 | 183 | $ban_query_vars[$ip_number] = $user_info[$ip_number]; |
| 184 | 184 | // IP was valid, maybe there's also a hostname... |
| 185 | 185 | if (empty($modSettings['disableHostnameLookup']) && $user_info[$ip_number] != 'unknown') |
@@ -187,8 +187,8 @@ discard block |
||
| 187 | 187 | $hostname = host_from_ip($user_info[$ip_number]); |
| 188 | 188 | if (strlen($hostname) > 0) |
| 189 | 189 | { |
| 190 | - $ban_query[] = '({string:hostname'.$ip_number.'} LIKE bi.hostname)'; |
|
| 191 | - $ban_query_vars['hostname'.$ip_number] = $hostname; |
|
| 190 | + $ban_query[] = '({string:hostname' . $ip_number . '} LIKE bi.hostname)'; |
|
| 191 | + $ban_query_vars['hostname' . $ip_number] = $hostname; |
|
| 192 | 192 | } |
| 193 | 193 | } |
| 194 | 194 | } |
@@ -912,7 +912,7 @@ discard block |
||
| 912 | 912 | return true; |
| 913 | 913 | |
| 914 | 914 | // Let's ensure this is an array. |
| 915 | - $permission = (array)$permission; |
|
| 915 | + $permission = (array) $permission; |
|
| 916 | 916 | |
| 917 | 917 | // Are we checking the _current_ board, or some other boards? |
| 918 | 918 | if ($boards === null) |
@@ -14,8 +14,9 @@ discard block |
||
| 14 | 14 | * @version 2.1 Beta 3 |
| 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 user is who he/she says he is |
@@ -42,12 +43,14 @@ discard block |
||
| 42 | 43 | $refreshTime = isset($_GET['xml']) ? 4200 : 3600; |
| 43 | 44 | |
| 44 | 45 | // Is the security option off? |
| 45 | - if (!empty($modSettings['securityDisable' . ($type != 'admin' ? '_' . $type : '')])) |
|
| 46 | - return; |
|
| 46 | + if (!empty($modSettings['securityDisable' . ($type != 'admin' ? '_' . $type : '')])) { |
|
| 47 | + return; |
|
| 48 | + } |
|
| 47 | 49 | |
| 48 | 50 | // Or are they already logged in?, Moderator or admin session is need for this area |
| 49 | - if ((!empty($_SESSION[$type . '_time']) && $_SESSION[$type . '_time'] + $refreshTime >= time()) || (!empty($_SESSION['admin_time']) && $_SESSION['admin_time'] + $refreshTime >= time())) |
|
| 50 | - return; |
|
| 51 | + if ((!empty($_SESSION[$type . '_time']) && $_SESSION[$type . '_time'] + $refreshTime >= time()) || (!empty($_SESSION['admin_time']) && $_SESSION['admin_time'] + $refreshTime >= time())) { |
|
| 52 | + return; |
|
| 53 | + } |
|
| 51 | 54 | |
| 52 | 55 | require_once($sourcedir . '/Subs-Auth.php'); |
| 53 | 56 | |
@@ -55,8 +58,9 @@ discard block |
||
| 55 | 58 | if (isset($_POST[$type. '_pass'])) |
| 56 | 59 | { |
| 57 | 60 | // Check to ensure we're forcing SSL for authentication |
| 58 | - if (!empty($modSettings['force_ssl']) && empty($maintenance) && (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != 'on')) |
|
| 59 | - fatal_lang_error('login_ssl_required'); |
|
| 61 | + if (!empty($modSettings['force_ssl']) && empty($maintenance) && (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != 'on')) { |
|
| 62 | + fatal_lang_error('login_ssl_required'); |
|
| 63 | + } |
|
| 60 | 64 | |
| 61 | 65 | checkSession(); |
| 62 | 66 | |
@@ -72,17 +76,19 @@ discard block |
||
| 72 | 76 | } |
| 73 | 77 | |
| 74 | 78 | // Better be sure to remember the real referer |
| 75 | - if (empty($_SESSION['request_referer'])) |
|
| 76 | - $_SESSION['request_referer'] = isset($_SERVER['HTTP_REFERER']) ? @parse_url($_SERVER['HTTP_REFERER']) : array(); |
|
| 77 | - elseif (empty($_POST)) |
|
| 78 | - unset($_SESSION['request_referer']); |
|
| 79 | + if (empty($_SESSION['request_referer'])) { |
|
| 80 | + $_SESSION['request_referer'] = isset($_SERVER['HTTP_REFERER']) ? @parse_url($_SERVER['HTTP_REFERER']) : array(); |
|
| 81 | + } elseif (empty($_POST)) { |
|
| 82 | + unset($_SESSION['request_referer']); |
|
| 83 | + } |
|
| 79 | 84 | |
| 80 | 85 | // Need to type in a password for that, man. |
| 81 | - if (!isset($_GET['xml'])) |
|
| 82 | - adminLogin($type); |
|
| 83 | - else |
|
| 84 | - return 'session_verify_fail'; |
|
| 85 | -} |
|
| 86 | + if (!isset($_GET['xml'])) { |
|
| 87 | + adminLogin($type); |
|
| 88 | + } else { |
|
| 89 | + return 'session_verify_fail'; |
|
| 90 | + } |
|
| 91 | + } |
|
| 86 | 92 | |
| 87 | 93 | /** |
| 88 | 94 | * Require a user who is logged in. (not a guest.) |
@@ -96,25 +102,30 @@ discard block |
||
| 96 | 102 | global $user_info, $txt, $context, $scripturl, $modSettings; |
| 97 | 103 | |
| 98 | 104 | // Luckily, this person isn't a guest. |
| 99 | - if (!$user_info['is_guest']) |
|
| 100 | - return; |
|
| 105 | + if (!$user_info['is_guest']) { |
|
| 106 | + return; |
|
| 107 | + } |
|
| 101 | 108 | |
| 102 | 109 | // Log what they were trying to do didn't work) |
| 103 | - if (!empty($modSettings['who_enabled'])) |
|
| 104 | - $_GET['error'] = 'guest_login'; |
|
| 110 | + if (!empty($modSettings['who_enabled'])) { |
|
| 111 | + $_GET['error'] = 'guest_login'; |
|
| 112 | + } |
|
| 105 | 113 | writeLog(true); |
| 106 | 114 | |
| 107 | 115 | // Just die. |
| 108 | - if (isset($_REQUEST['xml'])) |
|
| 109 | - obExit(false); |
|
| 116 | + if (isset($_REQUEST['xml'])) { |
|
| 117 | + obExit(false); |
|
| 118 | + } |
|
| 110 | 119 | |
| 111 | 120 | // Attempt to detect if they came from dlattach. |
| 112 | - if (SMF != 'SSI' && empty($context['theme_loaded'])) |
|
| 113 | - loadTheme(); |
|
| 121 | + if (SMF != 'SSI' && empty($context['theme_loaded'])) { |
|
| 122 | + loadTheme(); |
|
| 123 | + } |
|
| 114 | 124 | |
| 115 | 125 | // Never redirect to an attachment |
| 116 | - if (strpos($_SERVER['REQUEST_URL'], 'dlattach') === false) |
|
| 117 | - $_SESSION['login_url'] = $_SERVER['REQUEST_URL']; |
|
| 126 | + if (strpos($_SERVER['REQUEST_URL'], 'dlattach') === false) { |
|
| 127 | + $_SESSION['login_url'] = $_SERVER['REQUEST_URL']; |
|
| 128 | + } |
|
| 118 | 129 | |
| 119 | 130 | // Load the Login template and language file. |
| 120 | 131 | loadLanguage('Login'); |
@@ -124,8 +135,7 @@ discard block |
||
| 124 | 135 | { |
| 125 | 136 | $_SESSION['login_url'] = $scripturl . '?' . $_SERVER['QUERY_STRING']; |
| 126 | 137 | redirectexit('action=login'); |
| 127 | - } |
|
| 128 | - else |
|
| 138 | + } else |
|
| 129 | 139 | { |
| 130 | 140 | loadTemplate('Login'); |
| 131 | 141 | $context['sub_template'] = 'kick_guest'; |
@@ -155,8 +165,9 @@ discard block |
||
| 155 | 165 | global $sourcedir, $cookiename, $user_settings, $smcFunc; |
| 156 | 166 | |
| 157 | 167 | // You cannot be banned if you are an admin - doesn't help if you log out. |
| 158 | - if ($user_info['is_admin']) |
|
| 159 | - return; |
|
| 168 | + if ($user_info['is_admin']) { |
|
| 169 | + return; |
|
| 170 | + } |
|
| 160 | 171 | |
| 161 | 172 | // Only check the ban every so often. (to reduce load.) |
| 162 | 173 | if ($forceCheck || !isset($_SESSION['ban']) || empty($modSettings['banLastUpdated']) || ($_SESSION['ban']['last_checked'] < $modSettings['banLastUpdated']) || $_SESSION['ban']['id_member'] != $user_info['id'] || $_SESSION['ban']['ip'] != $user_info['ip'] || $_SESSION['ban']['ip2'] != $user_info['ip2'] || (isset($user_info['email'], $_SESSION['ban']['email']) && $_SESSION['ban']['email'] != $user_info['email'])) |
@@ -177,8 +188,9 @@ discard block |
||
| 177 | 188 | // Check both IP addresses. |
| 178 | 189 | foreach (array('ip', 'ip2') as $ip_number) |
| 179 | 190 | { |
| 180 | - if ($ip_number == 'ip2' && $user_info['ip2'] == $user_info['ip']) |
|
| 181 | - continue; |
|
| 191 | + if ($ip_number == 'ip2' && $user_info['ip2'] == $user_info['ip']) { |
|
| 192 | + continue; |
|
| 193 | + } |
|
| 182 | 194 | $ban_query[] = ' {inet:'.$ip_number.'} BETWEEN bi.ip_low and bi.ip_high'; |
| 183 | 195 | $ban_query_vars[$ip_number] = $user_info[$ip_number]; |
| 184 | 196 | // IP was valid, maybe there's also a hostname... |
@@ -228,24 +240,28 @@ discard block |
||
| 228 | 240 | // Store every type of ban that applies to you in your session. |
| 229 | 241 | while ($row = $smcFunc['db_fetch_assoc']($request)) |
| 230 | 242 | { |
| 231 | - foreach ($restrictions as $restriction) |
|
| 232 | - if (!empty($row[$restriction])) |
|
| 243 | + foreach ($restrictions as $restriction) { |
|
| 244 | + if (!empty($row[$restriction])) |
|
| 233 | 245 | { |
| 234 | 246 | $_SESSION['ban'][$restriction]['reason'] = $row['reason']; |
| 247 | + } |
|
| 235 | 248 | $_SESSION['ban'][$restriction]['ids'][] = $row['id_ban']; |
| 236 | - if (!isset($_SESSION['ban']['expire_time']) || ($_SESSION['ban']['expire_time'] != 0 && ($row['expire_time'] == 0 || $row['expire_time'] > $_SESSION['ban']['expire_time']))) |
|
| 237 | - $_SESSION['ban']['expire_time'] = $row['expire_time']; |
|
| 249 | + if (!isset($_SESSION['ban']['expire_time']) || ($_SESSION['ban']['expire_time'] != 0 && ($row['expire_time'] == 0 || $row['expire_time'] > $_SESSION['ban']['expire_time']))) { |
|
| 250 | + $_SESSION['ban']['expire_time'] = $row['expire_time']; |
|
| 251 | + } |
|
| 238 | 252 | |
| 239 | - if (!$user_info['is_guest'] && $restriction == 'cannot_access' && ($row['id_member'] == $user_info['id'] || $row['email_address'] == $user_info['email'])) |
|
| 240 | - $flag_is_activated = true; |
|
| 253 | + if (!$user_info['is_guest'] && $restriction == 'cannot_access' && ($row['id_member'] == $user_info['id'] || $row['email_address'] == $user_info['email'])) { |
|
| 254 | + $flag_is_activated = true; |
|
| 255 | + } |
|
| 241 | 256 | } |
| 242 | 257 | } |
| 243 | 258 | $smcFunc['db_free_result']($request); |
| 244 | 259 | } |
| 245 | 260 | |
| 246 | 261 | // Mark the cannot_access and cannot_post bans as being 'hit'. |
| 247 | - if (isset($_SESSION['ban']['cannot_access']) || isset($_SESSION['ban']['cannot_post']) || isset($_SESSION['ban']['cannot_login'])) |
|
| 248 | - log_ban(array_merge(isset($_SESSION['ban']['cannot_access']) ? $_SESSION['ban']['cannot_access']['ids'] : array(), isset($_SESSION['ban']['cannot_post']) ? $_SESSION['ban']['cannot_post']['ids'] : array(), isset($_SESSION['ban']['cannot_login']) ? $_SESSION['ban']['cannot_login']['ids'] : array())); |
|
| 262 | + if (isset($_SESSION['ban']['cannot_access']) || isset($_SESSION['ban']['cannot_post']) || isset($_SESSION['ban']['cannot_login'])) { |
|
| 263 | + log_ban(array_merge(isset($_SESSION['ban']['cannot_access']) ? $_SESSION['ban']['cannot_access']['ids'] : array(), isset($_SESSION['ban']['cannot_post']) ? $_SESSION['ban']['cannot_post']['ids'] : array(), isset($_SESSION['ban']['cannot_login']) ? $_SESSION['ban']['cannot_login']['ids'] : array())); |
|
| 264 | + } |
|
| 249 | 265 | |
| 250 | 266 | // If for whatever reason the is_activated flag seems wrong, do a little work to clear it up. |
| 251 | 267 | if ($user_info['id'] && (($user_settings['is_activated'] >= 10 && !$flag_is_activated) |
@@ -260,8 +276,9 @@ discard block |
||
| 260 | 276 | if (!isset($_SESSION['ban']['cannot_access']) && !empty($_COOKIE[$cookiename . '_'])) |
| 261 | 277 | { |
| 262 | 278 | $bans = explode(',', $_COOKIE[$cookiename . '_']); |
| 263 | - foreach ($bans as $key => $value) |
|
| 264 | - $bans[$key] = (int) $value; |
|
| 279 | + foreach ($bans as $key => $value) { |
|
| 280 | + $bans[$key] = (int) $value; |
|
| 281 | + } |
|
| 265 | 282 | $request = $smcFunc['db_query']('', ' |
| 266 | 283 | SELECT bi.id_ban, bg.reason |
| 267 | 284 | FROM {db_prefix}ban_items AS bi |
@@ -297,14 +314,15 @@ discard block |
||
| 297 | 314 | if (isset($_SESSION['ban']['cannot_access'])) |
| 298 | 315 | { |
| 299 | 316 | // We don't wanna see you! |
| 300 | - if (!$user_info['is_guest']) |
|
| 301 | - $smcFunc['db_query']('', ' |
|
| 317 | + if (!$user_info['is_guest']) { |
|
| 318 | + $smcFunc['db_query']('', ' |
|
| 302 | 319 | DELETE FROM {db_prefix}log_online |
| 303 | 320 | WHERE id_member = {int:current_member}', |
| 304 | 321 | array( |
| 305 | 322 | 'current_member' => $user_info['id'], |
| 306 | 323 | ) |
| 307 | 324 | ); |
| 325 | + } |
|
| 308 | 326 | |
| 309 | 327 | // 'Log' the user out. Can't have any funny business... (save the name!) |
| 310 | 328 | $old_name = isset($user_info['name']) && $user_info['name'] != '' ? $user_info['name'] : $txt['guest_title']; |
@@ -390,9 +408,10 @@ discard block |
||
| 390 | 408 | } |
| 391 | 409 | |
| 392 | 410 | // Fix up the banning permissions. |
| 393 | - if (isset($user_info['permissions'])) |
|
| 394 | - banPermissions(); |
|
| 395 | -} |
|
| 411 | + if (isset($user_info['permissions'])) { |
|
| 412 | + banPermissions(); |
|
| 413 | + } |
|
| 414 | + } |
|
| 396 | 415 | |
| 397 | 416 | /** |
| 398 | 417 | * Fix permissions according to ban status. |
@@ -403,8 +422,9 @@ discard block |
||
| 403 | 422 | global $user_info, $sourcedir, $modSettings, $context; |
| 404 | 423 | |
| 405 | 424 | // Somehow they got here, at least take away all permissions... |
| 406 | - if (isset($_SESSION['ban']['cannot_access'])) |
|
| 407 | - $user_info['permissions'] = array(); |
|
| 425 | + if (isset($_SESSION['ban']['cannot_access'])) { |
|
| 426 | + $user_info['permissions'] = array(); |
|
| 427 | + } |
|
| 408 | 428 | // Okay, well, you can watch, but don't touch a thing. |
| 409 | 429 | elseif (isset($_SESSION['ban']['cannot_post']) || (!empty($modSettings['warning_mute']) && $modSettings['warning_mute'] <= $user_info['warning'])) |
| 410 | 430 | { |
@@ -446,44 +466,45 @@ discard block |
||
| 446 | 466 | call_integration_hook('integrate_warn_permissions', array(&$permission_change)); |
| 447 | 467 | foreach ($permission_change as $old => $new) |
| 448 | 468 | { |
| 449 | - if (!in_array($old, $user_info['permissions'])) |
|
| 450 | - unset($permission_change[$old]); |
|
| 451 | - else |
|
| 452 | - $user_info['permissions'][] = $new; |
|
| 469 | + if (!in_array($old, $user_info['permissions'])) { |
|
| 470 | + unset($permission_change[$old]); |
|
| 471 | + } else { |
|
| 472 | + $user_info['permissions'][] = $new; |
|
| 473 | + } |
|
| 453 | 474 | } |
| 454 | 475 | $user_info['permissions'] = array_diff($user_info['permissions'], array_keys($permission_change)); |
| 455 | 476 | } |
| 456 | 477 | |
| 457 | 478 | // @todo Find a better place to call this? Needs to be after permissions loaded! |
| 458 | 479 | // Finally, some bits we cache in the session because it saves queries. |
| 459 | - if (isset($_SESSION['mc']) && $_SESSION['mc']['time'] > $modSettings['settings_updated'] && $_SESSION['mc']['id'] == $user_info['id']) |
|
| 460 | - $user_info['mod_cache'] = $_SESSION['mc']; |
|
| 461 | - else |
|
| 480 | + if (isset($_SESSION['mc']) && $_SESSION['mc']['time'] > $modSettings['settings_updated'] && $_SESSION['mc']['id'] == $user_info['id']) { |
|
| 481 | + $user_info['mod_cache'] = $_SESSION['mc']; |
|
| 482 | + } else |
|
| 462 | 483 | { |
| 463 | 484 | require_once($sourcedir . '/Subs-Auth.php'); |
| 464 | 485 | rebuildModCache(); |
| 465 | 486 | } |
| 466 | 487 | |
| 467 | 488 | // Now that we have the mod cache taken care of lets setup a cache for the number of mod reports still open |
| 468 | - if (!empty($_SESSION['rc']) && $_SESSION['rc']['time'] > $modSettings['last_mod_report_action'] && $_SESSION['rc']['id'] == $user_info['id']) |
|
| 469 | - $context['open_mod_reports'] = $_SESSION['rc']['reports']; |
|
| 470 | - elseif ($_SESSION['mc']['bq'] != '0=1') |
|
| 489 | + if (!empty($_SESSION['rc']) && $_SESSION['rc']['time'] > $modSettings['last_mod_report_action'] && $_SESSION['rc']['id'] == $user_info['id']) { |
|
| 490 | + $context['open_mod_reports'] = $_SESSION['rc']['reports']; |
|
| 491 | + } elseif ($_SESSION['mc']['bq'] != '0=1') |
|
| 471 | 492 | { |
| 472 | 493 | require_once($sourcedir . '/Subs-ReportedContent.php'); |
| 473 | 494 | recountOpenReports('posts'); |
| 495 | + } else { |
|
| 496 | + $context['open_mod_reports'] = 0; |
|
| 474 | 497 | } |
| 475 | - else |
|
| 476 | - $context['open_mod_reports'] = 0; |
|
| 477 | 498 | |
| 478 | - if (!empty($_SESSION['rc']) && $_SESSION['rc']['time'] > $modSettings['last_mod_report_action'] && $_SESSION['rc']['id'] == $user_info['id']) |
|
| 479 | - $context['open_member_reports'] = !empty($_SESSION['rc']['member_reports']) ? $_SESSION['rc']['member_reports'] : 0; |
|
| 480 | - elseif (allowedTo('moderate_forum')) |
|
| 499 | + if (!empty($_SESSION['rc']) && $_SESSION['rc']['time'] > $modSettings['last_mod_report_action'] && $_SESSION['rc']['id'] == $user_info['id']) { |
|
| 500 | + $context['open_member_reports'] = !empty($_SESSION['rc']['member_reports']) ? $_SESSION['rc']['member_reports'] : 0; |
|
| 501 | + } elseif (allowedTo('moderate_forum')) |
|
| 481 | 502 | { |
| 482 | 503 | require_once($sourcedir . '/Subs-ReportedContent.php'); |
| 483 | 504 | recountOpenReports('members'); |
| 505 | + } else { |
|
| 506 | + $context['open_member_reports'] = 0; |
|
| 484 | 507 | } |
| 485 | - else |
|
| 486 | - $context['open_member_reports'] = 0; |
|
| 487 | 508 | |
| 488 | 509 | } |
| 489 | 510 | |
@@ -500,8 +521,9 @@ discard block |
||
| 500 | 521 | global $user_info, $smcFunc; |
| 501 | 522 | |
| 502 | 523 | // Don't log web accelerators, it's very confusing... |
| 503 | - if (isset($_SERVER['HTTP_X_MOZ']) && $_SERVER['HTTP_X_MOZ'] == 'prefetch') |
|
| 504 | - return; |
|
| 524 | + if (isset($_SERVER['HTTP_X_MOZ']) && $_SERVER['HTTP_X_MOZ'] == 'prefetch') { |
|
| 525 | + return; |
|
| 526 | + } |
|
| 505 | 527 | |
| 506 | 528 | $smcFunc['db_insert']('', |
| 507 | 529 | '{db_prefix}log_banned', |
@@ -511,8 +533,8 @@ discard block |
||
| 511 | 533 | ); |
| 512 | 534 | |
| 513 | 535 | // One extra point for these bans. |
| 514 | - if (!empty($ban_ids)) |
|
| 515 | - $smcFunc['db_query']('', ' |
|
| 536 | + if (!empty($ban_ids)) { |
|
| 537 | + $smcFunc['db_query']('', ' |
|
| 516 | 538 | UPDATE {db_prefix}ban_items |
| 517 | 539 | SET hits = hits + 1 |
| 518 | 540 | WHERE id_ban IN ({array_int:ban_ids})', |
@@ -520,7 +542,8 @@ discard block |
||
| 520 | 542 | 'ban_ids' => $ban_ids, |
| 521 | 543 | ) |
| 522 | 544 | ); |
| 523 | -} |
|
| 545 | + } |
|
| 546 | + } |
|
| 524 | 547 | |
| 525 | 548 | /** |
| 526 | 549 | * Checks if a given email address might be banned. |
@@ -536,8 +559,9 @@ discard block |
||
| 536 | 559 | global $txt, $smcFunc; |
| 537 | 560 | |
| 538 | 561 | // Can't ban an empty email |
| 539 | - if (empty($email) || trim($email) == '') |
|
| 540 | - return; |
|
| 562 | + if (empty($email) || trim($email) == '') { |
|
| 563 | + return; |
|
| 564 | + } |
|
| 541 | 565 | |
| 542 | 566 | // Let's start with the bans based on your IP/hostname/memberID... |
| 543 | 567 | $ban_ids = isset($_SESSION['ban'][$restriction]) ? $_SESSION['ban'][$restriction]['ids'] : array(); |
@@ -610,16 +634,18 @@ discard block |
||
| 610 | 634 | if ($type == 'post') |
| 611 | 635 | { |
| 612 | 636 | $check = isset($_POST[$_SESSION['session_var']]) ? $_POST[$_SESSION['session_var']] : (empty($modSettings['strictSessionCheck']) && isset($_POST['sc']) ? $_POST['sc'] : null); |
| 613 | - if ($check !== $sc) |
|
| 614 | - $error = 'session_timeout'; |
|
| 637 | + if ($check !== $sc) { |
|
| 638 | + $error = 'session_timeout'; |
|
| 639 | + } |
|
| 615 | 640 | } |
| 616 | 641 | |
| 617 | 642 | // How about $_GET['sesc']? |
| 618 | 643 | elseif ($type == 'get') |
| 619 | 644 | { |
| 620 | 645 | $check = isset($_GET[$_SESSION['session_var']]) ? $_GET[$_SESSION['session_var']] : (empty($modSettings['strictSessionCheck']) && isset($_GET['sesc']) ? $_GET['sesc'] : null); |
| 621 | - if ($check !== $sc) |
|
| 622 | - $error = 'session_verify_fail'; |
|
| 646 | + if ($check !== $sc) { |
|
| 647 | + $error = 'session_verify_fail'; |
|
| 648 | + } |
|
| 623 | 649 | } |
| 624 | 650 | |
| 625 | 651 | // Or can it be in either? |
@@ -627,13 +653,15 @@ discard block |
||
| 627 | 653 | { |
| 628 | 654 | $check = isset($_GET[$_SESSION['session_var']]) ? $_GET[$_SESSION['session_var']] : (empty($modSettings['strictSessionCheck']) && isset($_GET['sesc']) ? $_GET['sesc'] : (isset($_POST[$_SESSION['session_var']]) ? $_POST[$_SESSION['session_var']] : (empty($modSettings['strictSessionCheck']) && isset($_POST['sc']) ? $_POST['sc'] : null))); |
| 629 | 655 | |
| 630 | - if ($check !== $sc) |
|
| 631 | - $error = 'session_verify_fail'; |
|
| 656 | + if ($check !== $sc) { |
|
| 657 | + $error = 'session_verify_fail'; |
|
| 658 | + } |
|
| 632 | 659 | } |
| 633 | 660 | |
| 634 | 661 | // Verify that they aren't changing user agents on us - that could be bad. |
| 635 | - if ((!isset($_SESSION['USER_AGENT']) || $_SESSION['USER_AGENT'] != $_SERVER['HTTP_USER_AGENT']) && empty($modSettings['disableCheckUA'])) |
|
| 636 | - $error = 'session_verify_fail'; |
|
| 662 | + if ((!isset($_SESSION['USER_AGENT']) || $_SESSION['USER_AGENT'] != $_SERVER['HTTP_USER_AGENT']) && empty($modSettings['disableCheckUA'])) { |
|
| 663 | + $error = 'session_verify_fail'; |
|
| 664 | + } |
|
| 637 | 665 | |
| 638 | 666 | // Make sure a page with session check requirement is not being prefetched. |
| 639 | 667 | if (isset($_SERVER['HTTP_X_MOZ']) && $_SERVER['HTTP_X_MOZ'] == 'prefetch') |
@@ -644,30 +672,35 @@ discard block |
||
| 644 | 672 | } |
| 645 | 673 | |
| 646 | 674 | // Check the referring site - it should be the same server at least! |
| 647 | - if (isset($_SESSION['request_referer'])) |
|
| 648 | - $referrer = $_SESSION['request_referer']; |
|
| 649 | - else |
|
| 650 | - $referrer = isset($_SERVER['HTTP_REFERER']) ? @parse_url($_SERVER['HTTP_REFERER']) : array(); |
|
| 675 | + if (isset($_SESSION['request_referer'])) { |
|
| 676 | + $referrer = $_SESSION['request_referer']; |
|
| 677 | + } else { |
|
| 678 | + $referrer = isset($_SERVER['HTTP_REFERER']) ? @parse_url($_SERVER['HTTP_REFERER']) : array(); |
|
| 679 | + } |
|
| 651 | 680 | if (!empty($referrer['host'])) |
| 652 | 681 | { |
| 653 | - if (strpos($_SERVER['HTTP_HOST'], ':') !== false) |
|
| 654 | - $real_host = substr($_SERVER['HTTP_HOST'], 0, strpos($_SERVER['HTTP_HOST'], ':')); |
|
| 655 | - else |
|
| 656 | - $real_host = $_SERVER['HTTP_HOST']; |
|
| 682 | + if (strpos($_SERVER['HTTP_HOST'], ':') !== false) { |
|
| 683 | + $real_host = substr($_SERVER['HTTP_HOST'], 0, strpos($_SERVER['HTTP_HOST'], ':')); |
|
| 684 | + } else { |
|
| 685 | + $real_host = $_SERVER['HTTP_HOST']; |
|
| 686 | + } |
|
| 657 | 687 | |
| 658 | 688 | $parsed_url = parse_url($boardurl); |
| 659 | 689 | |
| 660 | 690 | // Are global cookies on? If so, let's check them ;). |
| 661 | 691 | if (!empty($modSettings['globalCookies'])) |
| 662 | 692 | { |
| 663 | - if (preg_match('~(?:[^\.]+\.)?([^\.]{3,}\..+)\z~i', $parsed_url['host'], $parts) == 1) |
|
| 664 | - $parsed_url['host'] = $parts[1]; |
|
| 693 | + if (preg_match('~(?:[^\.]+\.)?([^\.]{3,}\..+)\z~i', $parsed_url['host'], $parts) == 1) { |
|
| 694 | + $parsed_url['host'] = $parts[1]; |
|
| 695 | + } |
|
| 665 | 696 | |
| 666 | - if (preg_match('~(?:[^\.]+\.)?([^\.]{3,}\..+)\z~i', $referrer['host'], $parts) == 1) |
|
| 667 | - $referrer['host'] = $parts[1]; |
|
| 697 | + if (preg_match('~(?:[^\.]+\.)?([^\.]{3,}\..+)\z~i', $referrer['host'], $parts) == 1) { |
|
| 698 | + $referrer['host'] = $parts[1]; |
|
| 699 | + } |
|
| 668 | 700 | |
| 669 | - if (preg_match('~(?:[^\.]+\.)?([^\.]{3,}\..+)\z~i', $real_host, $parts) == 1) |
|
| 670 | - $real_host = $parts[1]; |
|
| 701 | + if (preg_match('~(?:[^\.]+\.)?([^\.]{3,}\..+)\z~i', $real_host, $parts) == 1) { |
|
| 702 | + $real_host = $parts[1]; |
|
| 703 | + } |
|
| 671 | 704 | } |
| 672 | 705 | |
| 673 | 706 | // Okay: referrer must either match parsed_url or real_host. |
@@ -685,12 +718,14 @@ discard block |
||
| 685 | 718 | $log_error = true; |
| 686 | 719 | } |
| 687 | 720 | |
| 688 | - if (strtolower($_SERVER['HTTP_USER_AGENT']) == 'hacker') |
|
| 689 | - fatal_error('Sound the alarm! It\'s a hacker! Close the castle gates!!', false); |
|
| 721 | + if (strtolower($_SERVER['HTTP_USER_AGENT']) == 'hacker') { |
|
| 722 | + fatal_error('Sound the alarm! It\'s a hacker! Close the castle gates!!', false); |
|
| 723 | + } |
|
| 690 | 724 | |
| 691 | 725 | // Everything is ok, return an empty string. |
| 692 | - if (!isset($error)) |
|
| 693 | - return ''; |
|
| 726 | + if (!isset($error)) { |
|
| 727 | + return ''; |
|
| 728 | + } |
|
| 694 | 729 | // A session error occurred, show the error. |
| 695 | 730 | elseif ($is_fatal) |
| 696 | 731 | { |
@@ -699,13 +734,14 @@ discard block |
||
| 699 | 734 | ob_end_clean(); |
| 700 | 735 | header('HTTP/1.1 403 Forbidden - Session timeout'); |
| 701 | 736 | die; |
| 737 | + } else { |
|
| 738 | + fatal_lang_error($error, isset($log_error) ? 'user' : false); |
|
| 702 | 739 | } |
| 703 | - else |
|
| 704 | - fatal_lang_error($error, isset($log_error) ? 'user' : false); |
|
| 705 | 740 | } |
| 706 | 741 | // A session error occurred, return the error to the calling function. |
| 707 | - else |
|
| 708 | - return $error; |
|
| 742 | + else { |
|
| 743 | + return $error; |
|
| 744 | + } |
|
| 709 | 745 | |
| 710 | 746 | // We really should never fall through here, for very important reasons. Let's make sure. |
| 711 | 747 | trigger_error('Hacking attempt...', E_USER_ERROR); |
@@ -721,10 +757,9 @@ discard block |
||
| 721 | 757 | { |
| 722 | 758 | global $modSettings; |
| 723 | 759 | |
| 724 | - if (isset($_GET['confirm']) && isset($_SESSION['confirm_' . $action]) && md5($_GET['confirm'] . $_SERVER['HTTP_USER_AGENT']) == $_SESSION['confirm_' . $action]) |
|
| 725 | - return true; |
|
| 726 | - |
|
| 727 | - else |
|
| 760 | + if (isset($_GET['confirm']) && isset($_SESSION['confirm_' . $action]) && md5($_GET['confirm'] . $_SERVER['HTTP_USER_AGENT']) == $_SESSION['confirm_' . $action]) { |
|
| 761 | + return true; |
|
| 762 | + } else |
|
| 728 | 763 | { |
| 729 | 764 | $token = md5(mt_rand() . session_id() . (string) microtime() . $modSettings['rand_seed']); |
| 730 | 765 | $_SESSION['confirm_' . $action] = md5($token . $_SERVER['HTTP_USER_AGENT']); |
@@ -775,9 +810,9 @@ discard block |
||
| 775 | 810 | $return = $_SESSION['token'][$type . '-' . $action][3]; |
| 776 | 811 | unset($_SESSION['token'][$type . '-' . $action]); |
| 777 | 812 | return $return; |
| 813 | + } else { |
|
| 814 | + return ''; |
|
| 778 | 815 | } |
| 779 | - else |
|
| 780 | - return ''; |
|
| 781 | 816 | } |
| 782 | 817 | |
| 783 | 818 | // This nasty piece of code validates a token. |
@@ -808,12 +843,14 @@ discard block |
||
| 808 | 843 | fatal_lang_error('token_verify_fail', false); |
| 809 | 844 | } |
| 810 | 845 | // Remove this token as its useless |
| 811 | - else |
|
| 812 | - unset($_SESSION['token'][$type . '-' . $action]); |
|
| 846 | + else { |
|
| 847 | + unset($_SESSION['token'][$type . '-' . $action]); |
|
| 848 | + } |
|
| 813 | 849 | |
| 814 | 850 | // Randomly check if we should remove some older tokens. |
| 815 | - if (mt_rand(0, 138) == 23) |
|
| 816 | - cleanTokens(); |
|
| 851 | + if (mt_rand(0, 138) == 23) { |
|
| 852 | + cleanTokens(); |
|
| 853 | + } |
|
| 817 | 854 | |
| 818 | 855 | return false; |
| 819 | 856 | } |
@@ -828,14 +865,16 @@ discard block |
||
| 828 | 865 | function cleanTokens($complete = false) |
| 829 | 866 | { |
| 830 | 867 | // We appreciate cleaning up after yourselves. |
| 831 | - if (!isset($_SESSION['token'])) |
|
| 832 | - return; |
|
| 868 | + if (!isset($_SESSION['token'])) { |
|
| 869 | + return; |
|
| 870 | + } |
|
| 833 | 871 | |
| 834 | 872 | // Clean up tokens, trying to give enough time still. |
| 835 | - foreach ($_SESSION['token'] as $key => $data) |
|
| 836 | - if ($data[2] + 10800 < time() || $complete) |
|
| 873 | + foreach ($_SESSION['token'] as $key => $data) { |
|
| 874 | + if ($data[2] + 10800 < time() || $complete) |
|
| 837 | 875 | unset($_SESSION['token'][$key]); |
| 838 | -} |
|
| 876 | + } |
|
| 877 | + } |
|
| 839 | 878 | |
| 840 | 879 | /** |
| 841 | 880 | * Check whether a form has been submitted twice. |
@@ -853,37 +892,40 @@ discard block |
||
| 853 | 892 | { |
| 854 | 893 | global $context; |
| 855 | 894 | |
| 856 | - if (!isset($_SESSION['forms'])) |
|
| 857 | - $_SESSION['forms'] = array(); |
|
| 895 | + if (!isset($_SESSION['forms'])) { |
|
| 896 | + $_SESSION['forms'] = array(); |
|
| 897 | + } |
|
| 858 | 898 | |
| 859 | 899 | // Register a form number and store it in the session stack. (use this on the page that has the form.) |
| 860 | 900 | if ($action == 'register') |
| 861 | 901 | { |
| 862 | 902 | $context['form_sequence_number'] = 0; |
| 863 | - while (empty($context['form_sequence_number']) || in_array($context['form_sequence_number'], $_SESSION['forms'])) |
|
| 864 | - $context['form_sequence_number'] = mt_rand(1, 16000000); |
|
| 903 | + while (empty($context['form_sequence_number']) || in_array($context['form_sequence_number'], $_SESSION['forms'])) { |
|
| 904 | + $context['form_sequence_number'] = mt_rand(1, 16000000); |
|
| 905 | + } |
|
| 865 | 906 | } |
| 866 | 907 | // Check whether the submitted number can be found in the session. |
| 867 | 908 | elseif ($action == 'check') |
| 868 | 909 | { |
| 869 | - if (!isset($_REQUEST['seqnum'])) |
|
| 870 | - return true; |
|
| 871 | - elseif (!in_array($_REQUEST['seqnum'], $_SESSION['forms'])) |
|
| 910 | + if (!isset($_REQUEST['seqnum'])) { |
|
| 911 | + return true; |
|
| 912 | + } elseif (!in_array($_REQUEST['seqnum'], $_SESSION['forms'])) |
|
| 872 | 913 | { |
| 873 | 914 | $_SESSION['forms'][] = (int) $_REQUEST['seqnum']; |
| 874 | 915 | return true; |
| 916 | + } elseif ($is_fatal) { |
|
| 917 | + fatal_lang_error('error_form_already_submitted', false); |
|
| 918 | + } else { |
|
| 919 | + return false; |
|
| 875 | 920 | } |
| 876 | - elseif ($is_fatal) |
|
| 877 | - fatal_lang_error('error_form_already_submitted', false); |
|
| 878 | - else |
|
| 879 | - return false; |
|
| 880 | 921 | } |
| 881 | 922 | // Don't check, just free the stack number. |
| 882 | - elseif ($action == 'free' && isset($_REQUEST['seqnum']) && in_array($_REQUEST['seqnum'], $_SESSION['forms'])) |
|
| 883 | - $_SESSION['forms'] = array_diff($_SESSION['forms'], array($_REQUEST['seqnum'])); |
|
| 884 | - elseif ($action != 'free') |
|
| 885 | - trigger_error('checkSubmitOnce(): Invalid action \'' . $action . '\'', E_USER_WARNING); |
|
| 886 | -} |
|
| 923 | + elseif ($action == 'free' && isset($_REQUEST['seqnum']) && in_array($_REQUEST['seqnum'], $_SESSION['forms'])) { |
|
| 924 | + $_SESSION['forms'] = array_diff($_SESSION['forms'], array($_REQUEST['seqnum'])); |
|
| 925 | + } elseif ($action != 'free') { |
|
| 926 | + trigger_error('checkSubmitOnce(): Invalid action \'' . $action . '\'', E_USER_WARNING); |
|
| 927 | + } |
|
| 928 | + } |
|
| 887 | 929 | |
| 888 | 930 | /** |
| 889 | 931 | * Check the user's permissions. |
@@ -900,16 +942,19 @@ discard block |
||
| 900 | 942 | global $user_info, $smcFunc; |
| 901 | 943 | |
| 902 | 944 | // You're always allowed to do nothing. (unless you're a working man, MR. LAZY :P!) |
| 903 | - if (empty($permission)) |
|
| 904 | - return true; |
|
| 945 | + if (empty($permission)) { |
|
| 946 | + return true; |
|
| 947 | + } |
|
| 905 | 948 | |
| 906 | 949 | // You're never allowed to do something if your data hasn't been loaded yet! |
| 907 | - if (empty($user_info)) |
|
| 908 | - return false; |
|
| 950 | + if (empty($user_info)) { |
|
| 951 | + return false; |
|
| 952 | + } |
|
| 909 | 953 | |
| 910 | 954 | // Administrators are supermen :P. |
| 911 | - if ($user_info['is_admin']) |
|
| 912 | - return true; |
|
| 955 | + if ($user_info['is_admin']) { |
|
| 956 | + return true; |
|
| 957 | + } |
|
| 913 | 958 | |
| 914 | 959 | // Let's ensure this is an array. |
| 915 | 960 | $permission = (array)$permission; |
@@ -917,14 +962,16 @@ discard block |
||
| 917 | 962 | // Are we checking the _current_ board, or some other boards? |
| 918 | 963 | if ($boards === null) |
| 919 | 964 | { |
| 920 | - if (count(array_intersect($permission, $user_info['permissions'])) != 0) |
|
| 921 | - return true; |
|
| 965 | + if (count(array_intersect($permission, $user_info['permissions'])) != 0) { |
|
| 966 | + return true; |
|
| 967 | + } |
|
| 922 | 968 | // You aren't allowed, by default. |
| 923 | - else |
|
| 924 | - return false; |
|
| 969 | + else { |
|
| 970 | + return false; |
|
| 971 | + } |
|
| 972 | + } elseif (!is_array($boards)) { |
|
| 973 | + $boards = array($boards); |
|
| 925 | 974 | } |
| 926 | - elseif (!is_array($boards)) |
|
| 927 | - $boards = array($boards); |
|
| 928 | 975 | |
| 929 | 976 | $request = $smcFunc['db_query']('', ' |
| 930 | 977 | SELECT MIN(bp.add_deny) AS add_deny |
@@ -947,12 +994,14 @@ discard block |
||
| 947 | 994 | ); |
| 948 | 995 | |
| 949 | 996 | // Make sure they can do it on all of the boards. |
| 950 | - if ($smcFunc['db_num_rows']($request) != count($boards)) |
|
| 951 | - return false; |
|
| 997 | + if ($smcFunc['db_num_rows']($request) != count($boards)) { |
|
| 998 | + return false; |
|
| 999 | + } |
|
| 952 | 1000 | |
| 953 | 1001 | $result = true; |
| 954 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
| 955 | - $result &= !empty($row['add_deny']); |
|
| 1002 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
| 1003 | + $result &= !empty($row['add_deny']); |
|
| 1004 | + } |
|
| 956 | 1005 | $smcFunc['db_free_result']($request); |
| 957 | 1006 | |
| 958 | 1007 | // If the query returned 1, they can do it... otherwise, they can't. |
@@ -1017,9 +1066,10 @@ discard block |
||
| 1017 | 1066 | |
| 1018 | 1067 | // If you're doing something on behalf of some "heavy" permissions, validate your session. |
| 1019 | 1068 | // (take out the heavy permissions, and if you can't do anything but those, you need a validated session.) |
| 1020 | - if (!allowedTo(array_diff($permission, $heavy_permissions), $boards)) |
|
| 1021 | - validateSession(); |
|
| 1022 | -} |
|
| 1069 | + if (!allowedTo(array_diff($permission, $heavy_permissions), $boards)) { |
|
| 1070 | + validateSession(); |
|
| 1071 | + } |
|
| 1072 | + } |
|
| 1023 | 1073 | |
| 1024 | 1074 | /** |
| 1025 | 1075 | * Return the boards a user has a certain (board) permission on. (array(0) if all.) |
@@ -1038,8 +1088,9 @@ discard block |
||
| 1038 | 1088 | global $user_info, $smcFunc; |
| 1039 | 1089 | |
| 1040 | 1090 | // Arrays are nice, most of the time. |
| 1041 | - if (!is_array($permissions)) |
|
| 1042 | - $permissions = array($permissions); |
|
| 1091 | + if (!is_array($permissions)) { |
|
| 1092 | + $permissions = array($permissions); |
|
| 1093 | + } |
|
| 1043 | 1094 | |
| 1044 | 1095 | /* |
| 1045 | 1096 | * Set $simple to true to use this function as it were in SMF 2.0.x. |
@@ -1051,13 +1102,14 @@ discard block |
||
| 1051 | 1102 | // Administrators are all powerful, sorry. |
| 1052 | 1103 | if ($user_info['is_admin']) |
| 1053 | 1104 | { |
| 1054 | - if ($simple) |
|
| 1055 | - return array(0); |
|
| 1056 | - else |
|
| 1105 | + if ($simple) { |
|
| 1106 | + return array(0); |
|
| 1107 | + } else |
|
| 1057 | 1108 | { |
| 1058 | 1109 | $boards = array(); |
| 1059 | - foreach ($permissions as $permission) |
|
| 1060 | - $boards[$permission] = array(0); |
|
| 1110 | + foreach ($permissions as $permission) { |
|
| 1111 | + $boards[$permission] = array(0); |
|
| 1112 | + } |
|
| 1061 | 1113 | |
| 1062 | 1114 | return $boards; |
| 1063 | 1115 | } |
@@ -1089,31 +1141,32 @@ discard block |
||
| 1089 | 1141 | { |
| 1090 | 1142 | if ($simple) |
| 1091 | 1143 | { |
| 1092 | - if (empty($row['add_deny'])) |
|
| 1093 | - $deny_boards[] = $row['id_board']; |
|
| 1094 | - else |
|
| 1095 | - $boards[] = $row['id_board']; |
|
| 1096 | - } |
|
| 1097 | - else |
|
| 1144 | + if (empty($row['add_deny'])) { |
|
| 1145 | + $deny_boards[] = $row['id_board']; |
|
| 1146 | + } else { |
|
| 1147 | + $boards[] = $row['id_board']; |
|
| 1148 | + } |
|
| 1149 | + } else |
|
| 1098 | 1150 | { |
| 1099 | - if (empty($row['add_deny'])) |
|
| 1100 | - $deny_boards[$row['permission']][] = $row['id_board']; |
|
| 1101 | - else |
|
| 1102 | - $boards[$row['permission']][] = $row['id_board']; |
|
| 1151 | + if (empty($row['add_deny'])) { |
|
| 1152 | + $deny_boards[$row['permission']][] = $row['id_board']; |
|
| 1153 | + } else { |
|
| 1154 | + $boards[$row['permission']][] = $row['id_board']; |
|
| 1155 | + } |
|
| 1103 | 1156 | } |
| 1104 | 1157 | } |
| 1105 | 1158 | $smcFunc['db_free_result']($request); |
| 1106 | 1159 | |
| 1107 | - if ($simple) |
|
| 1108 | - $boards = array_unique(array_values(array_diff($boards, $deny_boards))); |
|
| 1109 | - else |
|
| 1160 | + if ($simple) { |
|
| 1161 | + $boards = array_unique(array_values(array_diff($boards, $deny_boards))); |
|
| 1162 | + } else |
|
| 1110 | 1163 | { |
| 1111 | 1164 | foreach ($permissions as $permission) |
| 1112 | 1165 | { |
| 1113 | 1166 | // never had it to start with |
| 1114 | - if (empty($boards[$permission])) |
|
| 1115 | - $boards[$permission] = array(); |
|
| 1116 | - else |
|
| 1167 | + if (empty($boards[$permission])) { |
|
| 1168 | + $boards[$permission] = array(); |
|
| 1169 | + } else |
|
| 1117 | 1170 | { |
| 1118 | 1171 | // Or it may have been removed |
| 1119 | 1172 | $deny_boards[$permission] = isset($deny_boards[$permission]) ? $deny_boards[$permission] : array(); |
@@ -1149,10 +1202,11 @@ discard block |
||
| 1149 | 1202 | |
| 1150 | 1203 | |
| 1151 | 1204 | // Moderators are free... |
| 1152 | - if (!allowedTo('moderate_board')) |
|
| 1153 | - $timeLimit = isset($timeOverrides[$error_type]) ? $timeOverrides[$error_type] : $modSettings['spamWaitTime']; |
|
| 1154 | - else |
|
| 1155 | - $timeLimit = 2; |
|
| 1205 | + if (!allowedTo('moderate_board')) { |
|
| 1206 | + $timeLimit = isset($timeOverrides[$error_type]) ? $timeOverrides[$error_type] : $modSettings['spamWaitTime']; |
|
| 1207 | + } else { |
|
| 1208 | + $timeLimit = 2; |
|
| 1209 | + } |
|
| 1156 | 1210 | |
| 1157 | 1211 | call_integration_hook('integrate_spam_protection', array(&$timeOverrides, &$timeLimit)); |
| 1158 | 1212 | |
@@ -1179,8 +1233,9 @@ discard block |
||
| 1179 | 1233 | if ($smcFunc['db_affected_rows']() != 1) |
| 1180 | 1234 | { |
| 1181 | 1235 | // Spammer! You only have to wait a *few* seconds! |
| 1182 | - if (!$only_return_result) |
|
| 1183 | - fatal_lang_error($error_type . '_WaitTime_broken', false, array($timeLimit)); |
|
| 1236 | + if (!$only_return_result) { |
|
| 1237 | + fatal_lang_error($error_type . '_WaitTime_broken', false, array($timeLimit)); |
|
| 1238 | + } |
|
| 1184 | 1239 | |
| 1185 | 1240 | return true; |
| 1186 | 1241 | } |
@@ -1198,11 +1253,13 @@ discard block |
||
| 1198 | 1253 | */ |
| 1199 | 1254 | function secureDirectory($path, $attachments = false) |
| 1200 | 1255 | { |
| 1201 | - if (empty($path)) |
|
| 1202 | - return 'empty_path'; |
|
| 1256 | + if (empty($path)) { |
|
| 1257 | + return 'empty_path'; |
|
| 1258 | + } |
|
| 1203 | 1259 | |
| 1204 | - if (!is_writable($path)) |
|
| 1205 | - return 'path_not_writable'; |
|
| 1260 | + if (!is_writable($path)) { |
|
| 1261 | + return 'path_not_writable'; |
|
| 1262 | + } |
|
| 1206 | 1263 | |
| 1207 | 1264 | $directoryname = basename($path); |
| 1208 | 1265 | |
@@ -1214,9 +1271,9 @@ discard block |
||
| 1214 | 1271 | |
| 1215 | 1272 | RemoveHandler .php .php3 .phtml .cgi .fcgi .pl .fpl .shtml'; |
| 1216 | 1273 | |
| 1217 | - if (file_exists($path . '/.htaccess')) |
|
| 1218 | - $errors[] = 'htaccess_exists'; |
|
| 1219 | - else |
|
| 1274 | + if (file_exists($path . '/.htaccess')) { |
|
| 1275 | + $errors[] = 'htaccess_exists'; |
|
| 1276 | + } else |
|
| 1220 | 1277 | { |
| 1221 | 1278 | $fh = @fopen($path . '/.htaccess', 'w'); |
| 1222 | 1279 | if ($fh) { |
@@ -1228,9 +1285,9 @@ discard block |
||
| 1228 | 1285 | $errors[] = 'htaccess_cannot_create_file'; |
| 1229 | 1286 | } |
| 1230 | 1287 | |
| 1231 | - if (file_exists($path . '/index.php')) |
|
| 1232 | - $errors[] = 'index-php_exists'; |
|
| 1233 | - else |
|
| 1288 | + if (file_exists($path . '/index.php')) { |
|
| 1289 | + $errors[] = 'index-php_exists'; |
|
| 1290 | + } else |
|
| 1234 | 1291 | { |
| 1235 | 1292 | $fh = @fopen($path . '/index.php', 'w'); |
| 1236 | 1293 | if ($fh) { |
@@ -1257,11 +1314,12 @@ discard block |
||
| 1257 | 1314 | $errors[] = 'index-php_cannot_create_file'; |
| 1258 | 1315 | } |
| 1259 | 1316 | |
| 1260 | - if (!empty($errors)) |
|
| 1261 | - return $errors; |
|
| 1262 | - else |
|
| 1263 | - return true; |
|
| 1264 | -} |
|
| 1317 | + if (!empty($errors)) { |
|
| 1318 | + return $errors; |
|
| 1319 | + } else { |
|
| 1320 | + return true; |
|
| 1321 | + } |
|
| 1322 | + } |
|
| 1265 | 1323 | |
| 1266 | 1324 | /** |
| 1267 | 1325 | * This sets the X-Frame-Options header. |
@@ -1274,14 +1332,16 @@ discard block |
||
| 1274 | 1332 | global $modSettings; |
| 1275 | 1333 | |
| 1276 | 1334 | $option = 'SAMEORIGIN'; |
| 1277 | - if (is_null($override) && !empty($modSettings['frame_security'])) |
|
| 1278 | - $option = $modSettings['frame_security']; |
|
| 1279 | - elseif (in_array($override, array('SAMEORIGIN', 'DENY'))) |
|
| 1280 | - $option = $override; |
|
| 1335 | + if (is_null($override) && !empty($modSettings['frame_security'])) { |
|
| 1336 | + $option = $modSettings['frame_security']; |
|
| 1337 | + } elseif (in_array($override, array('SAMEORIGIN', 'DENY'))) { |
|
| 1338 | + $option = $override; |
|
| 1339 | + } |
|
| 1281 | 1340 | |
| 1282 | 1341 | // Don't bother setting the header if we have disabled it. |
| 1283 | - if ($option == 'DISABLE') |
|
| 1284 | - return; |
|
| 1342 | + if ($option == 'DISABLE') { |
|
| 1343 | + return; |
|
| 1344 | + } |
|
| 1285 | 1345 | |
| 1286 | 1346 | // Finally set it. |
| 1287 | 1347 | header('X-Frame-Options: ' . $option); |
@@ -176,11 +176,11 @@ discard block |
||
| 176 | 176 | { |
| 177 | 177 | if ($curAction == 'approve') |
| 178 | 178 | { |
| 179 | - approveMessages ($toAction, $details, $context['current_view']); |
|
| 179 | + approveMessages($toAction, $details, $context['current_view']); |
|
| 180 | 180 | } |
| 181 | 181 | else |
| 182 | 182 | { |
| 183 | - removeMessages ($toAction, $details, $context['current_view']); |
|
| 183 | + removeMessages($toAction, $details, $context['current_view']); |
|
| 184 | 184 | } |
| 185 | 185 | } |
| 186 | 186 | } |
@@ -437,7 +437,7 @@ discard block |
||
| 437 | 437 | 'value' => $txt['mc_unapproved_attach_poster'], |
| 438 | 438 | ), |
| 439 | 439 | 'data' => array( |
| 440 | - 'function' => function ($data) |
|
| 440 | + 'function' => function($data) |
|
| 441 | 441 | { |
| 442 | 442 | return $data['poster']['link']; |
| 443 | 443 | }, |
@@ -467,7 +467,7 @@ discard block |
||
| 467 | 467 | 'value' => $txt['post'], |
| 468 | 468 | ), |
| 469 | 469 | 'data' => array( |
| 470 | - 'function' => function ($data) |
|
| 470 | + 'function' => function($data) |
|
| 471 | 471 | { |
| 472 | 472 | return '<a href="' . $data['message']['href'] . '">' . shorten_subject($data['message']['subject'], 20) . '</a>'; |
| 473 | 473 | }, |
@@ -693,7 +693,7 @@ discard block |
||
| 693 | 693 | logAction(($approved ? 'un' : '') . 'approve', array('topic' => $topic, 'subject' => $subject, 'member' => $poster, 'board' => $board)); |
| 694 | 694 | } |
| 695 | 695 | |
| 696 | - redirectexit('topic=' . $topic . '.msg' . $_REQUEST['msg']. '#msg' . $_REQUEST['msg']); |
|
| 696 | + redirectexit('topic=' . $topic . '.msg' . $_REQUEST['msg'] . '#msg' . $_REQUEST['msg']); |
|
| 697 | 697 | } |
| 698 | 698 | |
| 699 | 699 | /** |
@@ -13,8 +13,9 @@ discard block |
||
| 13 | 13 | * @version 2.1 Beta 3 |
| 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 | * This is a handling function for all things post moderation. |
@@ -39,8 +40,9 @@ discard block |
||
| 39 | 40 | ); |
| 40 | 41 | |
| 41 | 42 | // Pick something valid... |
| 42 | - if (!isset($_REQUEST['sa']) || !isset($subActions[$_REQUEST['sa']])) |
|
| 43 | - $_REQUEST['sa'] = 'replies'; |
|
| 43 | + if (!isset($_REQUEST['sa']) || !isset($subActions[$_REQUEST['sa']])) { |
|
| 44 | + $_REQUEST['sa'] = 'replies'; |
|
| 45 | + } |
|
| 44 | 46 | |
| 45 | 47 | call_integration_hook('integrate_post_moderation', array(&$subActions)); |
| 46 | 48 | |
@@ -68,13 +70,15 @@ discard block |
||
| 68 | 70 | $approve_boards = $approve_boards == array(0) ? $filter_board : array_intersect($approve_boards, $filter_board); |
| 69 | 71 | } |
| 70 | 72 | |
| 71 | - if ($approve_boards == array(0)) |
|
| 72 | - $approve_query = ''; |
|
| 73 | - elseif (!empty($approve_boards)) |
|
| 74 | - $approve_query = ' AND m.id_board IN (' . implode(',', $approve_boards) . ')'; |
|
| 73 | + if ($approve_boards == array(0)) { |
|
| 74 | + $approve_query = ''; |
|
| 75 | + } elseif (!empty($approve_boards)) { |
|
| 76 | + $approve_query = ' AND m.id_board IN (' . implode(',', $approve_boards) . ')'; |
|
| 77 | + } |
|
| 75 | 78 | // Nada, zip, etc... |
| 76 | - else |
|
| 77 | - $approve_query = ' AND 1=0'; |
|
| 79 | + else { |
|
| 80 | + $approve_query = ' AND 1=0'; |
|
| 81 | + } |
|
| 78 | 82 | |
| 79 | 83 | // We also need to know where we can delete topics and/or replies to. |
| 80 | 84 | if ($context['current_view'] == 'topics') |
@@ -82,8 +86,7 @@ discard block |
||
| 82 | 86 | $delete_own_boards = boardsAllowedTo('remove_own'); |
| 83 | 87 | $delete_any_boards = boardsAllowedTo('remove_any'); |
| 84 | 88 | $delete_own_replies = array(); |
| 85 | - } |
|
| 86 | - else |
|
| 89 | + } else |
|
| 87 | 90 | { |
| 88 | 91 | $delete_own_boards = boardsAllowedTo('delete_own'); |
| 89 | 92 | $delete_any_boards = boardsAllowedTo('delete_any'); |
@@ -92,21 +95,25 @@ discard block |
||
| 92 | 95 | |
| 93 | 96 | $toAction = array(); |
| 94 | 97 | // Check if we have something to do? |
| 95 | - if (isset($_GET['approve'])) |
|
| 96 | - $toAction[] = (int) $_GET['approve']; |
|
| 98 | + if (isset($_GET['approve'])) { |
|
| 99 | + $toAction[] = (int) $_GET['approve']; |
|
| 100 | + } |
|
| 97 | 101 | // Just a deletion? |
| 98 | - elseif (isset($_GET['delete'])) |
|
| 99 | - $toAction[] = (int) $_GET['delete']; |
|
| 102 | + elseif (isset($_GET['delete'])) { |
|
| 103 | + $toAction[] = (int) $_GET['delete']; |
|
| 104 | + } |
|
| 100 | 105 | // Lots of approvals? |
| 101 | - elseif (isset($_POST['item'])) |
|
| 102 | - foreach ($_POST['item'] as $item) |
|
| 106 | + elseif (isset($_POST['item'])) { |
|
| 107 | + foreach ($_POST['item'] as $item) |
|
| 103 | 108 | $toAction[] = (int) $item; |
| 109 | + } |
|
| 104 | 110 | |
| 105 | 111 | // What are we actually doing. |
| 106 | - if (isset($_GET['approve']) || (isset($_POST['do']) && $_POST['do'] == 'approve')) |
|
| 107 | - $curAction = 'approve'; |
|
| 108 | - elseif (isset($_GET['delete']) || (isset($_POST['do']) && $_POST['do'] == 'delete')) |
|
| 109 | - $curAction = 'delete'; |
|
| 112 | + if (isset($_GET['approve']) || (isset($_POST['do']) && $_POST['do'] == 'approve')) { |
|
| 113 | + $curAction = 'approve'; |
|
| 114 | + } elseif (isset($_GET['delete']) || (isset($_POST['do']) && $_POST['do'] == 'delete')) { |
|
| 115 | + $curAction = 'delete'; |
|
| 116 | + } |
|
| 110 | 117 | |
| 111 | 118 | // Right, so we have something to do? |
| 112 | 119 | if (!empty($toAction) && isset($curAction)) |
@@ -135,8 +142,9 @@ discard block |
||
| 135 | 142 | while ($row = $smcFunc['db_fetch_assoc']($request)) |
| 136 | 143 | { |
| 137 | 144 | // If it's not within what our view is ignore it... |
| 138 | - if (($row['id_msg'] == $row['id_first_msg'] && $context['current_view'] != 'topics') || ($row['id_msg'] != $row['id_first_msg'] && $context['current_view'] != 'replies')) |
|
| 139 | - continue; |
|
| 145 | + if (($row['id_msg'] == $row['id_first_msg'] && $context['current_view'] != 'topics') || ($row['id_msg'] != $row['id_first_msg'] && $context['current_view'] != 'replies')) { |
|
| 146 | + continue; |
|
| 147 | + } |
|
| 140 | 148 | |
| 141 | 149 | $can_add = false; |
| 142 | 150 | // If we're approving this is simple. |
@@ -148,18 +156,22 @@ discard block |
||
| 148 | 156 | elseif ($curAction == 'delete') |
| 149 | 157 | { |
| 150 | 158 | // Own post is easy! |
| 151 | - if ($row['id_member'] == $user_info['id'] && ($delete_own_boards == array(0) || in_array($row['id_board'], $delete_own_boards))) |
|
| 152 | - $can_add = true; |
|
| 159 | + if ($row['id_member'] == $user_info['id'] && ($delete_own_boards == array(0) || in_array($row['id_board'], $delete_own_boards))) { |
|
| 160 | + $can_add = true; |
|
| 161 | + } |
|
| 153 | 162 | // Is it a reply to their own topic? |
| 154 | - elseif ($row['id_member'] == $row['id_member_started'] && $row['id_msg'] != $row['id_first_msg'] && ($delete_own_replies == array(0) || in_array($row['id_board'], $delete_own_replies))) |
|
| 155 | - $can_add = true; |
|
| 163 | + elseif ($row['id_member'] == $row['id_member_started'] && $row['id_msg'] != $row['id_first_msg'] && ($delete_own_replies == array(0) || in_array($row['id_board'], $delete_own_replies))) { |
|
| 164 | + $can_add = true; |
|
| 165 | + } |
|
| 156 | 166 | // Someone elses? |
| 157 | - elseif ($row['id_member'] != $user_info['id'] && ($delete_any_boards == array(0) || in_array($row['id_board'], $delete_any_boards))) |
|
| 158 | - $can_add = true; |
|
| 167 | + elseif ($row['id_member'] != $user_info['id'] && ($delete_any_boards == array(0) || in_array($row['id_board'], $delete_any_boards))) { |
|
| 168 | + $can_add = true; |
|
| 169 | + } |
|
| 159 | 170 | } |
| 160 | 171 | |
| 161 | - if ($can_add) |
|
| 162 | - $anItem = $context['current_view'] == 'topics' ? $row['id_topic'] : $row['id_msg']; |
|
| 172 | + if ($can_add) { |
|
| 173 | + $anItem = $context['current_view'] == 'topics' ? $row['id_topic'] : $row['id_msg']; |
|
| 174 | + } |
|
| 163 | 175 | $toAction[] = $anItem; |
| 164 | 176 | |
| 165 | 177 | // All clear. What have we got now, what, what? |
@@ -177,8 +189,7 @@ discard block |
||
| 177 | 189 | if ($curAction == 'approve') |
| 178 | 190 | { |
| 179 | 191 | approveMessages ($toAction, $details, $context['current_view']); |
| 180 | - } |
|
| 181 | - else |
|
| 192 | + } else |
|
| 182 | 193 | { |
| 183 | 194 | removeMessages ($toAction, $details, $context['current_view']); |
| 184 | 195 | } |
@@ -265,16 +276,19 @@ discard block |
||
| 265 | 276 | for ($i = 1; $row = $smcFunc['db_fetch_assoc']($request); $i++) |
| 266 | 277 | { |
| 267 | 278 | // Can delete is complicated, let's solve it first... is it their own post? |
| 268 | - if ($row['id_member'] == $user_info['id'] && ($delete_own_boards == array(0) || in_array($row['id_board'], $delete_own_boards))) |
|
| 269 | - $can_delete = true; |
|
| 279 | + if ($row['id_member'] == $user_info['id'] && ($delete_own_boards == array(0) || in_array($row['id_board'], $delete_own_boards))) { |
|
| 280 | + $can_delete = true; |
|
| 281 | + } |
|
| 270 | 282 | // Is it a reply to their own topic? |
| 271 | - elseif ($row['id_member'] == $row['id_member_started'] && $row['id_msg'] != $row['id_first_msg'] && ($delete_own_replies == array(0) || in_array($row['id_board'], $delete_own_replies))) |
|
| 272 | - $can_delete = true; |
|
| 283 | + elseif ($row['id_member'] == $row['id_member_started'] && $row['id_msg'] != $row['id_first_msg'] && ($delete_own_replies == array(0) || in_array($row['id_board'], $delete_own_replies))) { |
|
| 284 | + $can_delete = true; |
|
| 285 | + } |
|
| 273 | 286 | // Someone elses? |
| 274 | - elseif ($row['id_member'] != $user_info['id'] && ($delete_any_boards == array(0) || in_array($row['id_board'], $delete_any_boards))) |
|
| 275 | - $can_delete = true; |
|
| 276 | - else |
|
| 277 | - $can_delete = false; |
|
| 287 | + elseif ($row['id_member'] != $user_info['id'] && ($delete_any_boards == array(0) || in_array($row['id_board'], $delete_any_boards))) { |
|
| 288 | + $can_delete = true; |
|
| 289 | + } else { |
|
| 290 | + $can_delete = false; |
|
| 291 | + } |
|
| 278 | 292 | |
| 279 | 293 | $context['unapproved_items'][] = array( |
| 280 | 294 | 'id' => $row['id_msg'], |
@@ -323,28 +337,31 @@ discard block |
||
| 323 | 337 | // Once again, permissions are king! |
| 324 | 338 | $approve_boards = boardsAllowedTo('approve_posts'); |
| 325 | 339 | |
| 326 | - if ($approve_boards == array(0)) |
|
| 327 | - $approve_query = ''; |
|
| 328 | - elseif (!empty($approve_boards)) |
|
| 329 | - $approve_query = ' AND m.id_board IN (' . implode(',', $approve_boards) . ')'; |
|
| 330 | - else |
|
| 331 | - $approve_query = ' AND 1=0'; |
|
| 340 | + if ($approve_boards == array(0)) { |
|
| 341 | + $approve_query = ''; |
|
| 342 | + } elseif (!empty($approve_boards)) { |
|
| 343 | + $approve_query = ' AND m.id_board IN (' . implode(',', $approve_boards) . ')'; |
|
| 344 | + } else { |
|
| 345 | + $approve_query = ' AND 1=0'; |
|
| 346 | + } |
|
| 332 | 347 | |
| 333 | 348 | // Get together the array of things to act on, if any. |
| 334 | 349 | $attachments = array(); |
| 335 | - if (isset($_GET['approve'])) |
|
| 336 | - $attachments[] = (int) $_GET['approve']; |
|
| 337 | - elseif (isset($_GET['delete'])) |
|
| 338 | - $attachments[] = (int) $_GET['delete']; |
|
| 339 | - elseif (isset($_POST['item'])) |
|
| 340 | - foreach ($_POST['item'] as $item) |
|
| 350 | + if (isset($_GET['approve'])) { |
|
| 351 | + $attachments[] = (int) $_GET['approve']; |
|
| 352 | + } elseif (isset($_GET['delete'])) { |
|
| 353 | + $attachments[] = (int) $_GET['delete']; |
|
| 354 | + } elseif (isset($_POST['item'])) { |
|
| 355 | + foreach ($_POST['item'] as $item) |
|
| 341 | 356 | $attachments[] = (int) $item; |
| 357 | + } |
|
| 342 | 358 | |
| 343 | 359 | // Are we approving or deleting? |
| 344 | - if (isset($_GET['approve']) || (isset($_POST['do']) && $_POST['do'] == 'approve')) |
|
| 345 | - $curAction = 'approve'; |
|
| 346 | - elseif (isset($_GET['delete']) || (isset($_POST['do']) && $_POST['do'] == 'delete')) |
|
| 347 | - $curAction = 'delete'; |
|
| 360 | + if (isset($_GET['approve']) || (isset($_POST['do']) && $_POST['do'] == 'approve')) { |
|
| 361 | + $curAction = 'approve'; |
|
| 362 | + } elseif (isset($_GET['delete']) || (isset($_POST['do']) && $_POST['do'] == 'delete')) { |
|
| 363 | + $curAction = 'delete'; |
|
| 364 | + } |
|
| 348 | 365 | |
| 349 | 366 | // Something to do, let's do it! |
| 350 | 367 | if (!empty($attachments) && isset($curAction)) |
@@ -372,17 +389,19 @@ discard block |
||
| 372 | 389 | ) |
| 373 | 390 | ); |
| 374 | 391 | $attachments = array(); |
| 375 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
| 376 | - $attachments[] = $row['id_attach']; |
|
| 392 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
| 393 | + $attachments[] = $row['id_attach']; |
|
| 394 | + } |
|
| 377 | 395 | $smcFunc['db_free_result']($request); |
| 378 | 396 | |
| 379 | 397 | // Assuming it wasn't all like, proper illegal, we can do the approving. |
| 380 | 398 | if (!empty($attachments)) |
| 381 | 399 | { |
| 382 | - if ($curAction == 'approve') |
|
| 383 | - ApproveAttachments($attachments); |
|
| 384 | - else |
|
| 385 | - removeAttachments(array('id_attach' => $attachments, 'do_logging' => true)); |
|
| 400 | + if ($curAction == 'approve') { |
|
| 401 | + ApproveAttachments($attachments); |
|
| 402 | + } else { |
|
| 403 | + removeAttachments(array('id_attach' => $attachments, 'do_logging' => true)); |
|
| 404 | + } |
|
| 386 | 405 | } |
| 387 | 406 | } |
| 388 | 407 | |
@@ -682,15 +701,16 @@ discard block |
||
| 682 | 701 | { |
| 683 | 702 | approveTopics($topic, !$approved); |
| 684 | 703 | |
| 685 | - if ($starter != $user_info['id']) |
|
| 686 | - logAction(($approved ? 'un' : '') . 'approve_topic', array('topic' => $topic, 'subject' => $subject, 'member' => $starter, 'board' => $board)); |
|
| 687 | - } |
|
| 688 | - else |
|
| 704 | + if ($starter != $user_info['id']) { |
|
| 705 | + logAction(($approved ? 'un' : '') . 'approve_topic', array('topic' => $topic, 'subject' => $subject, 'member' => $starter, 'board' => $board)); |
|
| 706 | + } |
|
| 707 | + } else |
|
| 689 | 708 | { |
| 690 | 709 | approvePosts($_REQUEST['msg'], !$approved); |
| 691 | 710 | |
| 692 | - if ($poster != $user_info['id']) |
|
| 693 | - logAction(($approved ? 'un' : '') . 'approve', array('topic' => $topic, 'subject' => $subject, 'member' => $poster, 'board' => $board)); |
|
| 711 | + if ($poster != $user_info['id']) { |
|
| 712 | + logAction(($approved ? 'un' : '') . 'approve', array('topic' => $topic, 'subject' => $subject, 'member' => $poster, 'board' => $board)); |
|
| 713 | + } |
|
| 694 | 714 | } |
| 695 | 715 | |
| 696 | 716 | redirectexit('topic=' . $topic . '.msg' . $_REQUEST['msg']. '#msg' . $_REQUEST['msg']); |
@@ -716,8 +736,7 @@ discard block |
||
| 716 | 736 | { |
| 717 | 737 | logAction('approve_topic', array('topic' => $topic, 'subject' => $messageDetails[$topic]['subject'], 'member' => $messageDetails[$topic]['member'], 'board' => $messageDetails[$topic]['board'])); |
| 718 | 738 | } |
| 719 | - } |
|
| 720 | - else |
|
| 739 | + } else |
|
| 721 | 740 | { |
| 722 | 741 | approvePosts($messages); |
| 723 | 742 | // and tell the world about it again |
@@ -745,8 +764,9 @@ discard block |
||
| 745 | 764 | ) |
| 746 | 765 | ); |
| 747 | 766 | $msgs = array(); |
| 748 | - while ($row = $smcFunc['db_fetch_row']($request)) |
|
| 749 | - $msgs[] = $row[0]; |
|
| 767 | + while ($row = $smcFunc['db_fetch_row']($request)) { |
|
| 768 | + $msgs[] = $row[0]; |
|
| 769 | + } |
|
| 750 | 770 | $smcFunc['db_free_result']($request); |
| 751 | 771 | |
| 752 | 772 | if (!empty($msgs)) |
@@ -765,8 +785,9 @@ discard block |
||
| 765 | 785 | ) |
| 766 | 786 | ); |
| 767 | 787 | $attaches = array(); |
| 768 | - while ($row = $smcFunc['db_fetch_row']($request)) |
|
| 769 | - $attaches[] = $row[0]; |
|
| 788 | + while ($row = $smcFunc['db_fetch_row']($request)) { |
|
| 789 | + $attaches[] = $row[0]; |
|
| 790 | + } |
|
| 770 | 791 | $smcFunc['db_free_result']($request); |
| 771 | 792 | |
| 772 | 793 | if (!empty($attaches)) |
@@ -794,12 +815,12 @@ discard block |
||
| 794 | 815 | { |
| 795 | 816 | removeTopics($messages); |
| 796 | 817 | // and tell the world about it |
| 797 | - foreach ($messages as $topic) |
|
| 798 | - // Note, only log topic ID in native form if it's not gone forever. |
|
| 818 | + foreach ($messages as $topic) { |
|
| 819 | + // Note, only log topic ID in native form if it's not gone forever. |
|
| 799 | 820 | logAction('remove', array( |
| 800 | 821 | (empty($modSettings['recycle_enable']) || $modSettings['recycle_board'] != $messageDetails[$topic]['board'] ? 'topic' : 'old_topic_id') => $topic, 'subject' => $messageDetails[$topic]['subject'], 'member' => $messageDetails[$topic]['member'], 'board' => $messageDetails[$topic]['board'])); |
| 801 | - } |
|
| 802 | - else |
|
| 822 | + } |
|
| 823 | + } else |
|
| 803 | 824 | { |
| 804 | 825 | foreach ($messages as $post) |
| 805 | 826 | { |
@@ -14,122 +14,122 @@ discard block |
||
| 14 | 14 | */ |
| 15 | 15 | class JS extends Minify |
| 16 | 16 | { |
| 17 | - /** |
|
| 18 | - * Var-matching regex based on http://stackoverflow.com/a/9337047/802993. |
|
| 19 | - * |
|
| 20 | - * Note that regular expressions using that bit must have the PCRE_UTF8 |
|
| 21 | - * pattern modifier (/u) set. |
|
| 22 | - * |
|
| 23 | - * @var string |
|
| 24 | - */ |
|
| 25 | - const REGEX_VARIABLE = '\b[$A-Z\_a-z\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\x{02c1}\x{02c6}-\x{02d1}\x{02e0}-\x{02e4}\x{02ec}\x{02ee}\x{0370}-\x{0374}\x{0376}\x{0377}\x{037a}-\x{037d}\x{0386}\x{0388}-\x{038a}\x{038c}\x{038e}-\x{03a1}\x{03a3}-\x{03f5}\x{03f7}-\x{0481}\x{048a}-\x{0527}\x{0531}-\x{0556}\x{0559}\x{0561}-\x{0587}\x{05d0}-\x{05ea}\x{05f0}-\x{05f2}\x{0620}-\x{064a}\x{066e}\x{066f}\x{0671}-\x{06d3}\x{06d5}\x{06e5}\x{06e6}\x{06ee}\x{06ef}\x{06fa}-\x{06fc}\x{06ff}\x{0710}\x{0712}-\x{072f}\x{074d}-\x{07a5}\x{07b1}\x{07ca}-\x{07ea}\x{07f4}\x{07f5}\x{07fa}\x{0800}-\x{0815}\x{081a}\x{0824}\x{0828}\x{0840}-\x{0858}\x{08a0}\x{08a2}-\x{08ac}\x{0904}-\x{0939}\x{093d}\x{0950}\x{0958}-\x{0961}\x{0971}-\x{0977}\x{0979}-\x{097f}\x{0985}-\x{098c}\x{098f}\x{0990}\x{0993}-\x{09a8}\x{09aa}-\x{09b0}\x{09b2}\x{09b6}-\x{09b9}\x{09bd}\x{09ce}\x{09dc}\x{09dd}\x{09df}-\x{09e1}\x{09f0}\x{09f1}\x{0a05}-\x{0a0a}\x{0a0f}\x{0a10}\x{0a13}-\x{0a28}\x{0a2a}-\x{0a30}\x{0a32}\x{0a33}\x{0a35}\x{0a36}\x{0a38}\x{0a39}\x{0a59}-\x{0a5c}\x{0a5e}\x{0a72}-\x{0a74}\x{0a85}-\x{0a8d}\x{0a8f}-\x{0a91}\x{0a93}-\x{0aa8}\x{0aaa}-\x{0ab0}\x{0ab2}\x{0ab3}\x{0ab5}-\x{0ab9}\x{0abd}\x{0ad0}\x{0ae0}\x{0ae1}\x{0b05}-\x{0b0c}\x{0b0f}\x{0b10}\x{0b13}-\x{0b28}\x{0b2a}-\x{0b30}\x{0b32}\x{0b33}\x{0b35}-\x{0b39}\x{0b3d}\x{0b5c}\x{0b5d}\x{0b5f}-\x{0b61}\x{0b71}\x{0b83}\x{0b85}-\x{0b8a}\x{0b8e}-\x{0b90}\x{0b92}-\x{0b95}\x{0b99}\x{0b9a}\x{0b9c}\x{0b9e}\x{0b9f}\x{0ba3}\x{0ba4}\x{0ba8}-\x{0baa}\x{0bae}-\x{0bb9}\x{0bd0}\x{0c05}-\x{0c0c}\x{0c0e}-\x{0c10}\x{0c12}-\x{0c28}\x{0c2a}-\x{0c33}\x{0c35}-\x{0c39}\x{0c3d}\x{0c58}\x{0c59}\x{0c60}\x{0c61}\x{0c85}-\x{0c8c}\x{0c8e}-\x{0c90}\x{0c92}-\x{0ca8}\x{0caa}-\x{0cb3}\x{0cb5}-\x{0cb9}\x{0cbd}\x{0cde}\x{0ce0}\x{0ce1}\x{0cf1}\x{0cf2}\x{0d05}-\x{0d0c}\x{0d0e}-\x{0d10}\x{0d12}-\x{0d3a}\x{0d3d}\x{0d4e}\x{0d60}\x{0d61}\x{0d7a}-\x{0d7f}\x{0d85}-\x{0d96}\x{0d9a}-\x{0db1}\x{0db3}-\x{0dbb}\x{0dbd}\x{0dc0}-\x{0dc6}\x{0e01}-\x{0e30}\x{0e32}\x{0e33}\x{0e40}-\x{0e46}\x{0e81}\x{0e82}\x{0e84}\x{0e87}\x{0e88}\x{0e8a}\x{0e8d}\x{0e94}-\x{0e97}\x{0e99}-\x{0e9f}\x{0ea1}-\x{0ea3}\x{0ea5}\x{0ea7}\x{0eaa}\x{0eab}\x{0ead}-\x{0eb0}\x{0eb2}\x{0eb3}\x{0ebd}\x{0ec0}-\x{0ec4}\x{0ec6}\x{0edc}-\x{0edf}\x{0f00}\x{0f40}-\x{0f47}\x{0f49}-\x{0f6c}\x{0f88}-\x{0f8c}\x{1000}-\x{102a}\x{103f}\x{1050}-\x{1055}\x{105a}-\x{105d}\x{1061}\x{1065}\x{1066}\x{106e}-\x{1070}\x{1075}-\x{1081}\x{108e}\x{10a0}-\x{10c5}\x{10c7}\x{10cd}\x{10d0}-\x{10fa}\x{10fc}-\x{1248}\x{124a}-\x{124d}\x{1250}-\x{1256}\x{1258}\x{125a}-\x{125d}\x{1260}-\x{1288}\x{128a}-\x{128d}\x{1290}-\x{12b0}\x{12b2}-\x{12b5}\x{12b8}-\x{12be}\x{12c0}\x{12c2}-\x{12c5}\x{12c8}-\x{12d6}\x{12d8}-\x{1310}\x{1312}-\x{1315}\x{1318}-\x{135a}\x{1380}-\x{138f}\x{13a0}-\x{13f4}\x{1401}-\x{166c}\x{166f}-\x{167f}\x{1681}-\x{169a}\x{16a0}-\x{16ea}\x{16ee}-\x{16f0}\x{1700}-\x{170c}\x{170e}-\x{1711}\x{1720}-\x{1731}\x{1740}-\x{1751}\x{1760}-\x{176c}\x{176e}-\x{1770}\x{1780}-\x{17b3}\x{17d7}\x{17dc}\x{1820}-\x{1877}\x{1880}-\x{18a8}\x{18aa}\x{18b0}-\x{18f5}\x{1900}-\x{191c}\x{1950}-\x{196d}\x{1970}-\x{1974}\x{1980}-\x{19ab}\x{19c1}-\x{19c7}\x{1a00}-\x{1a16}\x{1a20}-\x{1a54}\x{1aa7}\x{1b05}-\x{1b33}\x{1b45}-\x{1b4b}\x{1b83}-\x{1ba0}\x{1bae}\x{1baf}\x{1bba}-\x{1be5}\x{1c00}-\x{1c23}\x{1c4d}-\x{1c4f}\x{1c5a}-\x{1c7d}\x{1ce9}-\x{1cec}\x{1cee}-\x{1cf1}\x{1cf5}\x{1cf6}\x{1d00}-\x{1dbf}\x{1e00}-\x{1f15}\x{1f18}-\x{1f1d}\x{1f20}-\x{1f45}\x{1f48}-\x{1f4d}\x{1f50}-\x{1f57}\x{1f59}\x{1f5b}\x{1f5d}\x{1f5f}-\x{1f7d}\x{1f80}-\x{1fb4}\x{1fb6}-\x{1fbc}\x{1fbe}\x{1fc2}-\x{1fc4}\x{1fc6}-\x{1fcc}\x{1fd0}-\x{1fd3}\x{1fd6}-\x{1fdb}\x{1fe0}-\x{1fec}\x{1ff2}-\x{1ff4}\x{1ff6}-\x{1ffc}\x{2071}\x{207f}\x{2090}-\x{209c}\x{2102}\x{2107}\x{210a}-\x{2113}\x{2115}\x{2119}-\x{211d}\x{2124}\x{2126}\x{2128}\x{212a}-\x{212d}\x{212f}-\x{2139}\x{213c}-\x{213f}\x{2145}-\x{2149}\x{214e}\x{2160}-\x{2188}\x{2c00}-\x{2c2e}\x{2c30}-\x{2c5e}\x{2c60}-\x{2ce4}\x{2ceb}-\x{2cee}\x{2cf2}\x{2cf3}\x{2d00}-\x{2d25}\x{2d27}\x{2d2d}\x{2d30}-\x{2d67}\x{2d6f}\x{2d80}-\x{2d96}\x{2da0}-\x{2da6}\x{2da8}-\x{2dae}\x{2db0}-\x{2db6}\x{2db8}-\x{2dbe}\x{2dc0}-\x{2dc6}\x{2dc8}-\x{2dce}\x{2dd0}-\x{2dd6}\x{2dd8}-\x{2dde}\x{2e2f}\x{3005}-\x{3007}\x{3021}-\x{3029}\x{3031}-\x{3035}\x{3038}-\x{303c}\x{3041}-\x{3096}\x{309d}-\x{309f}\x{30a1}-\x{30fa}\x{30fc}-\x{30ff}\x{3105}-\x{312d}\x{3131}-\x{318e}\x{31a0}-\x{31ba}\x{31f0}-\x{31ff}\x{3400}-\x{4db5}\x{4e00}-\x{9fcc}\x{a000}-\x{a48c}\x{a4d0}-\x{a4fd}\x{a500}-\x{a60c}\x{a610}-\x{a61f}\x{a62a}\x{a62b}\x{a640}-\x{a66e}\x{a67f}-\x{a697}\x{a6a0}-\x{a6ef}\x{a717}-\x{a71f}\x{a722}-\x{a788}\x{a78b}-\x{a78e}\x{a790}-\x{a793}\x{a7a0}-\x{a7aa}\x{a7f8}-\x{a801}\x{a803}-\x{a805}\x{a807}-\x{a80a}\x{a80c}-\x{a822}\x{a840}-\x{a873}\x{a882}-\x{a8b3}\x{a8f2}-\x{a8f7}\x{a8fb}\x{a90a}-\x{a925}\x{a930}-\x{a946}\x{a960}-\x{a97c}\x{a984}-\x{a9b2}\x{a9cf}\x{aa00}-\x{aa28}\x{aa40}-\x{aa42}\x{aa44}-\x{aa4b}\x{aa60}-\x{aa76}\x{aa7a}\x{aa80}-\x{aaaf}\x{aab1}\x{aab5}\x{aab6}\x{aab9}-\x{aabd}\x{aac0}\x{aac2}\x{aadb}-\x{aadd}\x{aae0}-\x{aaea}\x{aaf2}-\x{aaf4}\x{ab01}-\x{ab06}\x{ab09}-\x{ab0e}\x{ab11}-\x{ab16}\x{ab20}-\x{ab26}\x{ab28}-\x{ab2e}\x{abc0}-\x{abe2}\x{ac00}-\x{d7a3}\x{d7b0}-\x{d7c6}\x{d7cb}-\x{d7fb}\x{f900}-\x{fa6d}\x{fa70}-\x{fad9}\x{fb00}-\x{fb06}\x{fb13}-\x{fb17}\x{fb1d}\x{fb1f}-\x{fb28}\x{fb2a}-\x{fb36}\x{fb38}-\x{fb3c}\x{fb3e}\x{fb40}\x{fb41}\x{fb43}\x{fb44}\x{fb46}-\x{fbb1}\x{fbd3}-\x{fd3d}\x{fd50}-\x{fd8f}\x{fd92}-\x{fdc7}\x{fdf0}-\x{fdfb}\x{fe70}-\x{fe74}\x{fe76}-\x{fefc}\x{ff21}-\x{ff3a}\x{ff41}-\x{ff5a}\x{ff66}-\x{ffbe}\x{ffc2}-\x{ffc7}\x{ffca}-\x{ffcf}\x{ffd2}-\x{ffd7}\x{ffda}-\x{ffdc}][$A-Z\_a-z\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\x{02c1}\x{02c6}-\x{02d1}\x{02e0}-\x{02e4}\x{02ec}\x{02ee}\x{0370}-\x{0374}\x{0376}\x{0377}\x{037a}-\x{037d}\x{0386}\x{0388}-\x{038a}\x{038c}\x{038e}-\x{03a1}\x{03a3}-\x{03f5}\x{03f7}-\x{0481}\x{048a}-\x{0527}\x{0531}-\x{0556}\x{0559}\x{0561}-\x{0587}\x{05d0}-\x{05ea}\x{05f0}-\x{05f2}\x{0620}-\x{064a}\x{066e}\x{066f}\x{0671}-\x{06d3}\x{06d5}\x{06e5}\x{06e6}\x{06ee}\x{06ef}\x{06fa}-\x{06fc}\x{06ff}\x{0710}\x{0712}-\x{072f}\x{074d}-\x{07a5}\x{07b1}\x{07ca}-\x{07ea}\x{07f4}\x{07f5}\x{07fa}\x{0800}-\x{0815}\x{081a}\x{0824}\x{0828}\x{0840}-\x{0858}\x{08a0}\x{08a2}-\x{08ac}\x{0904}-\x{0939}\x{093d}\x{0950}\x{0958}-\x{0961}\x{0971}-\x{0977}\x{0979}-\x{097f}\x{0985}-\x{098c}\x{098f}\x{0990}\x{0993}-\x{09a8}\x{09aa}-\x{09b0}\x{09b2}\x{09b6}-\x{09b9}\x{09bd}\x{09ce}\x{09dc}\x{09dd}\x{09df}-\x{09e1}\x{09f0}\x{09f1}\x{0a05}-\x{0a0a}\x{0a0f}\x{0a10}\x{0a13}-\x{0a28}\x{0a2a}-\x{0a30}\x{0a32}\x{0a33}\x{0a35}\x{0a36}\x{0a38}\x{0a39}\x{0a59}-\x{0a5c}\x{0a5e}\x{0a72}-\x{0a74}\x{0a85}-\x{0a8d}\x{0a8f}-\x{0a91}\x{0a93}-\x{0aa8}\x{0aaa}-\x{0ab0}\x{0ab2}\x{0ab3}\x{0ab5}-\x{0ab9}\x{0abd}\x{0ad0}\x{0ae0}\x{0ae1}\x{0b05}-\x{0b0c}\x{0b0f}\x{0b10}\x{0b13}-\x{0b28}\x{0b2a}-\x{0b30}\x{0b32}\x{0b33}\x{0b35}-\x{0b39}\x{0b3d}\x{0b5c}\x{0b5d}\x{0b5f}-\x{0b61}\x{0b71}\x{0b83}\x{0b85}-\x{0b8a}\x{0b8e}-\x{0b90}\x{0b92}-\x{0b95}\x{0b99}\x{0b9a}\x{0b9c}\x{0b9e}\x{0b9f}\x{0ba3}\x{0ba4}\x{0ba8}-\x{0baa}\x{0bae}-\x{0bb9}\x{0bd0}\x{0c05}-\x{0c0c}\x{0c0e}-\x{0c10}\x{0c12}-\x{0c28}\x{0c2a}-\x{0c33}\x{0c35}-\x{0c39}\x{0c3d}\x{0c58}\x{0c59}\x{0c60}\x{0c61}\x{0c85}-\x{0c8c}\x{0c8e}-\x{0c90}\x{0c92}-\x{0ca8}\x{0caa}-\x{0cb3}\x{0cb5}-\x{0cb9}\x{0cbd}\x{0cde}\x{0ce0}\x{0ce1}\x{0cf1}\x{0cf2}\x{0d05}-\x{0d0c}\x{0d0e}-\x{0d10}\x{0d12}-\x{0d3a}\x{0d3d}\x{0d4e}\x{0d60}\x{0d61}\x{0d7a}-\x{0d7f}\x{0d85}-\x{0d96}\x{0d9a}-\x{0db1}\x{0db3}-\x{0dbb}\x{0dbd}\x{0dc0}-\x{0dc6}\x{0e01}-\x{0e30}\x{0e32}\x{0e33}\x{0e40}-\x{0e46}\x{0e81}\x{0e82}\x{0e84}\x{0e87}\x{0e88}\x{0e8a}\x{0e8d}\x{0e94}-\x{0e97}\x{0e99}-\x{0e9f}\x{0ea1}-\x{0ea3}\x{0ea5}\x{0ea7}\x{0eaa}\x{0eab}\x{0ead}-\x{0eb0}\x{0eb2}\x{0eb3}\x{0ebd}\x{0ec0}-\x{0ec4}\x{0ec6}\x{0edc}-\x{0edf}\x{0f00}\x{0f40}-\x{0f47}\x{0f49}-\x{0f6c}\x{0f88}-\x{0f8c}\x{1000}-\x{102a}\x{103f}\x{1050}-\x{1055}\x{105a}-\x{105d}\x{1061}\x{1065}\x{1066}\x{106e}-\x{1070}\x{1075}-\x{1081}\x{108e}\x{10a0}-\x{10c5}\x{10c7}\x{10cd}\x{10d0}-\x{10fa}\x{10fc}-\x{1248}\x{124a}-\x{124d}\x{1250}-\x{1256}\x{1258}\x{125a}-\x{125d}\x{1260}-\x{1288}\x{128a}-\x{128d}\x{1290}-\x{12b0}\x{12b2}-\x{12b5}\x{12b8}-\x{12be}\x{12c0}\x{12c2}-\x{12c5}\x{12c8}-\x{12d6}\x{12d8}-\x{1310}\x{1312}-\x{1315}\x{1318}-\x{135a}\x{1380}-\x{138f}\x{13a0}-\x{13f4}\x{1401}-\x{166c}\x{166f}-\x{167f}\x{1681}-\x{169a}\x{16a0}-\x{16ea}\x{16ee}-\x{16f0}\x{1700}-\x{170c}\x{170e}-\x{1711}\x{1720}-\x{1731}\x{1740}-\x{1751}\x{1760}-\x{176c}\x{176e}-\x{1770}\x{1780}-\x{17b3}\x{17d7}\x{17dc}\x{1820}-\x{1877}\x{1880}-\x{18a8}\x{18aa}\x{18b0}-\x{18f5}\x{1900}-\x{191c}\x{1950}-\x{196d}\x{1970}-\x{1974}\x{1980}-\x{19ab}\x{19c1}-\x{19c7}\x{1a00}-\x{1a16}\x{1a20}-\x{1a54}\x{1aa7}\x{1b05}-\x{1b33}\x{1b45}-\x{1b4b}\x{1b83}-\x{1ba0}\x{1bae}\x{1baf}\x{1bba}-\x{1be5}\x{1c00}-\x{1c23}\x{1c4d}-\x{1c4f}\x{1c5a}-\x{1c7d}\x{1ce9}-\x{1cec}\x{1cee}-\x{1cf1}\x{1cf5}\x{1cf6}\x{1d00}-\x{1dbf}\x{1e00}-\x{1f15}\x{1f18}-\x{1f1d}\x{1f20}-\x{1f45}\x{1f48}-\x{1f4d}\x{1f50}-\x{1f57}\x{1f59}\x{1f5b}\x{1f5d}\x{1f5f}-\x{1f7d}\x{1f80}-\x{1fb4}\x{1fb6}-\x{1fbc}\x{1fbe}\x{1fc2}-\x{1fc4}\x{1fc6}-\x{1fcc}\x{1fd0}-\x{1fd3}\x{1fd6}-\x{1fdb}\x{1fe0}-\x{1fec}\x{1ff2}-\x{1ff4}\x{1ff6}-\x{1ffc}\x{2071}\x{207f}\x{2090}-\x{209c}\x{2102}\x{2107}\x{210a}-\x{2113}\x{2115}\x{2119}-\x{211d}\x{2124}\x{2126}\x{2128}\x{212a}-\x{212d}\x{212f}-\x{2139}\x{213c}-\x{213f}\x{2145}-\x{2149}\x{214e}\x{2160}-\x{2188}\x{2c00}-\x{2c2e}\x{2c30}-\x{2c5e}\x{2c60}-\x{2ce4}\x{2ceb}-\x{2cee}\x{2cf2}\x{2cf3}\x{2d00}-\x{2d25}\x{2d27}\x{2d2d}\x{2d30}-\x{2d67}\x{2d6f}\x{2d80}-\x{2d96}\x{2da0}-\x{2da6}\x{2da8}-\x{2dae}\x{2db0}-\x{2db6}\x{2db8}-\x{2dbe}\x{2dc0}-\x{2dc6}\x{2dc8}-\x{2dce}\x{2dd0}-\x{2dd6}\x{2dd8}-\x{2dde}\x{2e2f}\x{3005}-\x{3007}\x{3021}-\x{3029}\x{3031}-\x{3035}\x{3038}-\x{303c}\x{3041}-\x{3096}\x{309d}-\x{309f}\x{30a1}-\x{30fa}\x{30fc}-\x{30ff}\x{3105}-\x{312d}\x{3131}-\x{318e}\x{31a0}-\x{31ba}\x{31f0}-\x{31ff}\x{3400}-\x{4db5}\x{4e00}-\x{9fcc}\x{a000}-\x{a48c}\x{a4d0}-\x{a4fd}\x{a500}-\x{a60c}\x{a610}-\x{a61f}\x{a62a}\x{a62b}\x{a640}-\x{a66e}\x{a67f}-\x{a697}\x{a6a0}-\x{a6ef}\x{a717}-\x{a71f}\x{a722}-\x{a788}\x{a78b}-\x{a78e}\x{a790}-\x{a793}\x{a7a0}-\x{a7aa}\x{a7f8}-\x{a801}\x{a803}-\x{a805}\x{a807}-\x{a80a}\x{a80c}-\x{a822}\x{a840}-\x{a873}\x{a882}-\x{a8b3}\x{a8f2}-\x{a8f7}\x{a8fb}\x{a90a}-\x{a925}\x{a930}-\x{a946}\x{a960}-\x{a97c}\x{a984}-\x{a9b2}\x{a9cf}\x{aa00}-\x{aa28}\x{aa40}-\x{aa42}\x{aa44}-\x{aa4b}\x{aa60}-\x{aa76}\x{aa7a}\x{aa80}-\x{aaaf}\x{aab1}\x{aab5}\x{aab6}\x{aab9}-\x{aabd}\x{aac0}\x{aac2}\x{aadb}-\x{aadd}\x{aae0}-\x{aaea}\x{aaf2}-\x{aaf4}\x{ab01}-\x{ab06}\x{ab09}-\x{ab0e}\x{ab11}-\x{ab16}\x{ab20}-\x{ab26}\x{ab28}-\x{ab2e}\x{abc0}-\x{abe2}\x{ac00}-\x{d7a3}\x{d7b0}-\x{d7c6}\x{d7cb}-\x{d7fb}\x{f900}-\x{fa6d}\x{fa70}-\x{fad9}\x{fb00}-\x{fb06}\x{fb13}-\x{fb17}\x{fb1d}\x{fb1f}-\x{fb28}\x{fb2a}-\x{fb36}\x{fb38}-\x{fb3c}\x{fb3e}\x{fb40}\x{fb41}\x{fb43}\x{fb44}\x{fb46}-\x{fbb1}\x{fbd3}-\x{fd3d}\x{fd50}-\x{fd8f}\x{fd92}-\x{fdc7}\x{fdf0}-\x{fdfb}\x{fe70}-\x{fe74}\x{fe76}-\x{fefc}\x{ff21}-\x{ff3a}\x{ff41}-\x{ff5a}\x{ff66}-\x{ffbe}\x{ffc2}-\x{ffc7}\x{ffca}-\x{ffcf}\x{ffd2}-\x{ffd7}\x{ffda}-\x{ffdc}0-9\x{0300}-\x{036f}\x{0483}-\x{0487}\x{0591}-\x{05bd}\x{05bf}\x{05c1}\x{05c2}\x{05c4}\x{05c5}\x{05c7}\x{0610}-\x{061a}\x{064b}-\x{0669}\x{0670}\x{06d6}-\x{06dc}\x{06df}-\x{06e4}\x{06e7}\x{06e8}\x{06ea}-\x{06ed}\x{06f0}-\x{06f9}\x{0711}\x{0730}-\x{074a}\x{07a6}-\x{07b0}\x{07c0}-\x{07c9}\x{07eb}-\x{07f3}\x{0816}-\x{0819}\x{081b}-\x{0823}\x{0825}-\x{0827}\x{0829}-\x{082d}\x{0859}-\x{085b}\x{08e4}-\x{08fe}\x{0900}-\x{0903}\x{093a}-\x{093c}\x{093e}-\x{094f}\x{0951}-\x{0957}\x{0962}\x{0963}\x{0966}-\x{096f}\x{0981}-\x{0983}\x{09bc}\x{09be}-\x{09c4}\x{09c7}\x{09c8}\x{09cb}-\x{09cd}\x{09d7}\x{09e2}\x{09e3}\x{09e6}-\x{09ef}\x{0a01}-\x{0a03}\x{0a3c}\x{0a3e}-\x{0a42}\x{0a47}\x{0a48}\x{0a4b}-\x{0a4d}\x{0a51}\x{0a66}-\x{0a71}\x{0a75}\x{0a81}-\x{0a83}\x{0abc}\x{0abe}-\x{0ac5}\x{0ac7}-\x{0ac9}\x{0acb}-\x{0acd}\x{0ae2}\x{0ae3}\x{0ae6}-\x{0aef}\x{0b01}-\x{0b03}\x{0b3c}\x{0b3e}-\x{0b44}\x{0b47}\x{0b48}\x{0b4b}-\x{0b4d}\x{0b56}\x{0b57}\x{0b62}\x{0b63}\x{0b66}-\x{0b6f}\x{0b82}\x{0bbe}-\x{0bc2}\x{0bc6}-\x{0bc8}\x{0bca}-\x{0bcd}\x{0bd7}\x{0be6}-\x{0bef}\x{0c01}-\x{0c03}\x{0c3e}-\x{0c44}\x{0c46}-\x{0c48}\x{0c4a}-\x{0c4d}\x{0c55}\x{0c56}\x{0c62}\x{0c63}\x{0c66}-\x{0c6f}\x{0c82}\x{0c83}\x{0cbc}\x{0cbe}-\x{0cc4}\x{0cc6}-\x{0cc8}\x{0cca}-\x{0ccd}\x{0cd5}\x{0cd6}\x{0ce2}\x{0ce3}\x{0ce6}-\x{0cef}\x{0d02}\x{0d03}\x{0d3e}-\x{0d44}\x{0d46}-\x{0d48}\x{0d4a}-\x{0d4d}\x{0d57}\x{0d62}\x{0d63}\x{0d66}-\x{0d6f}\x{0d82}\x{0d83}\x{0dca}\x{0dcf}-\x{0dd4}\x{0dd6}\x{0dd8}-\x{0ddf}\x{0df2}\x{0df3}\x{0e31}\x{0e34}-\x{0e3a}\x{0e47}-\x{0e4e}\x{0e50}-\x{0e59}\x{0eb1}\x{0eb4}-\x{0eb9}\x{0ebb}\x{0ebc}\x{0ec8}-\x{0ecd}\x{0ed0}-\x{0ed9}\x{0f18}\x{0f19}\x{0f20}-\x{0f29}\x{0f35}\x{0f37}\x{0f39}\x{0f3e}\x{0f3f}\x{0f71}-\x{0f84}\x{0f86}\x{0f87}\x{0f8d}-\x{0f97}\x{0f99}-\x{0fbc}\x{0fc6}\x{102b}-\x{103e}\x{1040}-\x{1049}\x{1056}-\x{1059}\x{105e}-\x{1060}\x{1062}-\x{1064}\x{1067}-\x{106d}\x{1071}-\x{1074}\x{1082}-\x{108d}\x{108f}-\x{109d}\x{135d}-\x{135f}\x{1712}-\x{1714}\x{1732}-\x{1734}\x{1752}\x{1753}\x{1772}\x{1773}\x{17b4}-\x{17d3}\x{17dd}\x{17e0}-\x{17e9}\x{180b}-\x{180d}\x{1810}-\x{1819}\x{18a9}\x{1920}-\x{192b}\x{1930}-\x{193b}\x{1946}-\x{194f}\x{19b0}-\x{19c0}\x{19c8}\x{19c9}\x{19d0}-\x{19d9}\x{1a17}-\x{1a1b}\x{1a55}-\x{1a5e}\x{1a60}-\x{1a7c}\x{1a7f}-\x{1a89}\x{1a90}-\x{1a99}\x{1b00}-\x{1b04}\x{1b34}-\x{1b44}\x{1b50}-\x{1b59}\x{1b6b}-\x{1b73}\x{1b80}-\x{1b82}\x{1ba1}-\x{1bad}\x{1bb0}-\x{1bb9}\x{1be6}-\x{1bf3}\x{1c24}-\x{1c37}\x{1c40}-\x{1c49}\x{1c50}-\x{1c59}\x{1cd0}-\x{1cd2}\x{1cd4}-\x{1ce8}\x{1ced}\x{1cf2}-\x{1cf4}\x{1dc0}-\x{1de6}\x{1dfc}-\x{1dff}\x{200c}\x{200d}\x{203f}\x{2040}\x{2054}\x{20d0}-\x{20dc}\x{20e1}\x{20e5}-\x{20f0}\x{2cef}-\x{2cf1}\x{2d7f}\x{2de0}-\x{2dff}\x{302a}-\x{302f}\x{3099}\x{309a}\x{a620}-\x{a629}\x{a66f}\x{a674}-\x{a67d}\x{a69f}\x{a6f0}\x{a6f1}\x{a802}\x{a806}\x{a80b}\x{a823}-\x{a827}\x{a880}\x{a881}\x{a8b4}-\x{a8c4}\x{a8d0}-\x{a8d9}\x{a8e0}-\x{a8f1}\x{a900}-\x{a909}\x{a926}-\x{a92d}\x{a947}-\x{a953}\x{a980}-\x{a983}\x{a9b3}-\x{a9c0}\x{a9d0}-\x{a9d9}\x{aa29}-\x{aa36}\x{aa43}\x{aa4c}\x{aa4d}\x{aa50}-\x{aa59}\x{aa7b}\x{aab0}\x{aab2}-\x{aab4}\x{aab7}\x{aab8}\x{aabe}\x{aabf}\x{aac1}\x{aaeb}-\x{aaef}\x{aaf5}\x{aaf6}\x{abe3}-\x{abea}\x{abec}\x{abed}\x{abf0}-\x{abf9}\x{fb1e}\x{fe00}-\x{fe0f}\x{fe20}-\x{fe26}\x{fe33}\x{fe34}\x{fe4d}-\x{fe4f}\x{ff10}-\x{ff19}\x{ff3f}]*\b'; |
|
| 26 | - |
|
| 27 | - /** |
|
| 28 | - * Full list of JavaScript reserved words. |
|
| 29 | - * Will be loaded from /data/js/keywords_reserved.txt. |
|
| 30 | - * |
|
| 31 | - * @see https://mathiasbynens.be/notes/reserved-keywords |
|
| 32 | - * |
|
| 33 | - * @var string[] |
|
| 34 | - */ |
|
| 35 | - protected $keywordsReserved = array(); |
|
| 36 | - |
|
| 37 | - /** |
|
| 38 | - * List of JavaScript reserved words that accept a <variable, value, ...> |
|
| 39 | - * after them. Some end of lines are not the end of a statement, like with |
|
| 40 | - * these keywords. |
|
| 41 | - * |
|
| 42 | - * E.g.: we shouldn't insert a ; after this else |
|
| 43 | - * else |
|
| 44 | - * console.log('this is quite fine') |
|
| 45 | - * |
|
| 46 | - * Will be loaded from /data/js/keywords_before.txt |
|
| 47 | - * |
|
| 48 | - * @var string[] |
|
| 49 | - */ |
|
| 50 | - protected $keywordsBefore = array(); |
|
| 51 | - |
|
| 52 | - /** |
|
| 53 | - * List of JavaScript reserved words that accept a <variable, value, ...> |
|
| 54 | - * before them. Some end of lines are not the end of a statement, like when |
|
| 55 | - * continued by one of these keywords on the newline. |
|
| 56 | - * |
|
| 57 | - * E.g.: we shouldn't insert a ; before this instanceof |
|
| 58 | - * variable |
|
| 59 | - * instanceof String |
|
| 60 | - * |
|
| 61 | - * Will be loaded from /data/js/keywords_after.txt |
|
| 62 | - * |
|
| 63 | - * @var string[] |
|
| 64 | - */ |
|
| 65 | - protected $keywordsAfter = array(); |
|
| 66 | - |
|
| 67 | - /** |
|
| 68 | - * List of JavaScript operators that accept a <variable, value, ...> after |
|
| 69 | - * them. Some end of lines are not the end of a statement, like with these |
|
| 70 | - * operators. |
|
| 71 | - * |
|
| 72 | - * Note: Most operators are fine, we've only removed !, ++ and --. |
|
| 73 | - * There can't be a newline separating ! and whatever it is negating. |
|
| 74 | - * ++ & -- have to be joined with the value they're in-/decrementing. |
|
| 75 | - * |
|
| 76 | - * Will be loaded from /data/js/operators_before.txt |
|
| 77 | - * |
|
| 78 | - * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Expressions_and_Operators |
|
| 79 | - * |
|
| 80 | - * @var string[] |
|
| 81 | - */ |
|
| 82 | - protected $operatorsBefore = array(); |
|
| 83 | - |
|
| 84 | - /** |
|
| 85 | - * List of JavaScript operators that accept a <variable, value, ...> before |
|
| 86 | - * them. Some end of lines are not the end of a statement, like when |
|
| 87 | - * continued by one of these operators on the newline. |
|
| 88 | - * |
|
| 89 | - * Note: Most operators are fine, we've only removed ), ], ++ and --. |
|
| 90 | - * ++ & -- have to be joined with the value they're in-/decrementing. |
|
| 91 | - * ) & ] are "special" in that they have lots or usecases. () for example |
|
| 92 | - * is used for function calls, for grouping, in if () and for (), ... |
|
| 93 | - * |
|
| 94 | - * Will be loaded from /data/js/operators_after.txt |
|
| 95 | - * |
|
| 96 | - * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Expressions_and_Operators |
|
| 97 | - * |
|
| 98 | - * @var string[] |
|
| 99 | - */ |
|
| 100 | - protected $operatorsAfter = array(); |
|
| 101 | - |
|
| 102 | - /** |
|
| 103 | - * {@inheritdoc} |
|
| 104 | - */ |
|
| 105 | - public function __construct() |
|
| 106 | - { |
|
| 107 | - call_user_func_array(array('parent', '__construct'), func_get_args()); |
|
| 108 | - |
|
| 109 | - $dataDir = __DIR__.'/../data/js/'; |
|
| 110 | - $options = FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES; |
|
| 111 | - $this->keywordsReserved = file($dataDir.'keywords_reserved.txt', $options); |
|
| 112 | - $this->keywordsBefore = file($dataDir.'keywords_before.txt', $options); |
|
| 113 | - $this->keywordsAfter = file($dataDir.'keywords_after.txt', $options); |
|
| 114 | - $this->operatorsBefore = file($dataDir.'operators_before.txt', $options); |
|
| 115 | - $this->operatorsAfter = file($dataDir.'operators_after.txt', $options); |
|
| 116 | - } |
|
| 117 | - |
|
| 118 | - /** |
|
| 119 | - * Minify the data. |
|
| 120 | - * Perform JS optimizations. |
|
| 121 | - * |
|
| 122 | - * @param string[optional] $path Path to write the data to. |
|
| 123 | - * |
|
| 124 | - * @return string The minified data. |
|
| 125 | - */ |
|
| 126 | - public function execute($path = null) |
|
| 127 | - { |
|
| 128 | - $content = ''; |
|
| 129 | - |
|
| 130 | - // loop files |
|
| 131 | - foreach ($this->data as $source => $js) { |
|
| 132 | - /* |
|
| 17 | + /** |
|
| 18 | + * Var-matching regex based on http://stackoverflow.com/a/9337047/802993. |
|
| 19 | + * |
|
| 20 | + * Note that regular expressions using that bit must have the PCRE_UTF8 |
|
| 21 | + * pattern modifier (/u) set. |
|
| 22 | + * |
|
| 23 | + * @var string |
|
| 24 | + */ |
|
| 25 | + const REGEX_VARIABLE = '\b[$A-Z\_a-z\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\x{02c1}\x{02c6}-\x{02d1}\x{02e0}-\x{02e4}\x{02ec}\x{02ee}\x{0370}-\x{0374}\x{0376}\x{0377}\x{037a}-\x{037d}\x{0386}\x{0388}-\x{038a}\x{038c}\x{038e}-\x{03a1}\x{03a3}-\x{03f5}\x{03f7}-\x{0481}\x{048a}-\x{0527}\x{0531}-\x{0556}\x{0559}\x{0561}-\x{0587}\x{05d0}-\x{05ea}\x{05f0}-\x{05f2}\x{0620}-\x{064a}\x{066e}\x{066f}\x{0671}-\x{06d3}\x{06d5}\x{06e5}\x{06e6}\x{06ee}\x{06ef}\x{06fa}-\x{06fc}\x{06ff}\x{0710}\x{0712}-\x{072f}\x{074d}-\x{07a5}\x{07b1}\x{07ca}-\x{07ea}\x{07f4}\x{07f5}\x{07fa}\x{0800}-\x{0815}\x{081a}\x{0824}\x{0828}\x{0840}-\x{0858}\x{08a0}\x{08a2}-\x{08ac}\x{0904}-\x{0939}\x{093d}\x{0950}\x{0958}-\x{0961}\x{0971}-\x{0977}\x{0979}-\x{097f}\x{0985}-\x{098c}\x{098f}\x{0990}\x{0993}-\x{09a8}\x{09aa}-\x{09b0}\x{09b2}\x{09b6}-\x{09b9}\x{09bd}\x{09ce}\x{09dc}\x{09dd}\x{09df}-\x{09e1}\x{09f0}\x{09f1}\x{0a05}-\x{0a0a}\x{0a0f}\x{0a10}\x{0a13}-\x{0a28}\x{0a2a}-\x{0a30}\x{0a32}\x{0a33}\x{0a35}\x{0a36}\x{0a38}\x{0a39}\x{0a59}-\x{0a5c}\x{0a5e}\x{0a72}-\x{0a74}\x{0a85}-\x{0a8d}\x{0a8f}-\x{0a91}\x{0a93}-\x{0aa8}\x{0aaa}-\x{0ab0}\x{0ab2}\x{0ab3}\x{0ab5}-\x{0ab9}\x{0abd}\x{0ad0}\x{0ae0}\x{0ae1}\x{0b05}-\x{0b0c}\x{0b0f}\x{0b10}\x{0b13}-\x{0b28}\x{0b2a}-\x{0b30}\x{0b32}\x{0b33}\x{0b35}-\x{0b39}\x{0b3d}\x{0b5c}\x{0b5d}\x{0b5f}-\x{0b61}\x{0b71}\x{0b83}\x{0b85}-\x{0b8a}\x{0b8e}-\x{0b90}\x{0b92}-\x{0b95}\x{0b99}\x{0b9a}\x{0b9c}\x{0b9e}\x{0b9f}\x{0ba3}\x{0ba4}\x{0ba8}-\x{0baa}\x{0bae}-\x{0bb9}\x{0bd0}\x{0c05}-\x{0c0c}\x{0c0e}-\x{0c10}\x{0c12}-\x{0c28}\x{0c2a}-\x{0c33}\x{0c35}-\x{0c39}\x{0c3d}\x{0c58}\x{0c59}\x{0c60}\x{0c61}\x{0c85}-\x{0c8c}\x{0c8e}-\x{0c90}\x{0c92}-\x{0ca8}\x{0caa}-\x{0cb3}\x{0cb5}-\x{0cb9}\x{0cbd}\x{0cde}\x{0ce0}\x{0ce1}\x{0cf1}\x{0cf2}\x{0d05}-\x{0d0c}\x{0d0e}-\x{0d10}\x{0d12}-\x{0d3a}\x{0d3d}\x{0d4e}\x{0d60}\x{0d61}\x{0d7a}-\x{0d7f}\x{0d85}-\x{0d96}\x{0d9a}-\x{0db1}\x{0db3}-\x{0dbb}\x{0dbd}\x{0dc0}-\x{0dc6}\x{0e01}-\x{0e30}\x{0e32}\x{0e33}\x{0e40}-\x{0e46}\x{0e81}\x{0e82}\x{0e84}\x{0e87}\x{0e88}\x{0e8a}\x{0e8d}\x{0e94}-\x{0e97}\x{0e99}-\x{0e9f}\x{0ea1}-\x{0ea3}\x{0ea5}\x{0ea7}\x{0eaa}\x{0eab}\x{0ead}-\x{0eb0}\x{0eb2}\x{0eb3}\x{0ebd}\x{0ec0}-\x{0ec4}\x{0ec6}\x{0edc}-\x{0edf}\x{0f00}\x{0f40}-\x{0f47}\x{0f49}-\x{0f6c}\x{0f88}-\x{0f8c}\x{1000}-\x{102a}\x{103f}\x{1050}-\x{1055}\x{105a}-\x{105d}\x{1061}\x{1065}\x{1066}\x{106e}-\x{1070}\x{1075}-\x{1081}\x{108e}\x{10a0}-\x{10c5}\x{10c7}\x{10cd}\x{10d0}-\x{10fa}\x{10fc}-\x{1248}\x{124a}-\x{124d}\x{1250}-\x{1256}\x{1258}\x{125a}-\x{125d}\x{1260}-\x{1288}\x{128a}-\x{128d}\x{1290}-\x{12b0}\x{12b2}-\x{12b5}\x{12b8}-\x{12be}\x{12c0}\x{12c2}-\x{12c5}\x{12c8}-\x{12d6}\x{12d8}-\x{1310}\x{1312}-\x{1315}\x{1318}-\x{135a}\x{1380}-\x{138f}\x{13a0}-\x{13f4}\x{1401}-\x{166c}\x{166f}-\x{167f}\x{1681}-\x{169a}\x{16a0}-\x{16ea}\x{16ee}-\x{16f0}\x{1700}-\x{170c}\x{170e}-\x{1711}\x{1720}-\x{1731}\x{1740}-\x{1751}\x{1760}-\x{176c}\x{176e}-\x{1770}\x{1780}-\x{17b3}\x{17d7}\x{17dc}\x{1820}-\x{1877}\x{1880}-\x{18a8}\x{18aa}\x{18b0}-\x{18f5}\x{1900}-\x{191c}\x{1950}-\x{196d}\x{1970}-\x{1974}\x{1980}-\x{19ab}\x{19c1}-\x{19c7}\x{1a00}-\x{1a16}\x{1a20}-\x{1a54}\x{1aa7}\x{1b05}-\x{1b33}\x{1b45}-\x{1b4b}\x{1b83}-\x{1ba0}\x{1bae}\x{1baf}\x{1bba}-\x{1be5}\x{1c00}-\x{1c23}\x{1c4d}-\x{1c4f}\x{1c5a}-\x{1c7d}\x{1ce9}-\x{1cec}\x{1cee}-\x{1cf1}\x{1cf5}\x{1cf6}\x{1d00}-\x{1dbf}\x{1e00}-\x{1f15}\x{1f18}-\x{1f1d}\x{1f20}-\x{1f45}\x{1f48}-\x{1f4d}\x{1f50}-\x{1f57}\x{1f59}\x{1f5b}\x{1f5d}\x{1f5f}-\x{1f7d}\x{1f80}-\x{1fb4}\x{1fb6}-\x{1fbc}\x{1fbe}\x{1fc2}-\x{1fc4}\x{1fc6}-\x{1fcc}\x{1fd0}-\x{1fd3}\x{1fd6}-\x{1fdb}\x{1fe0}-\x{1fec}\x{1ff2}-\x{1ff4}\x{1ff6}-\x{1ffc}\x{2071}\x{207f}\x{2090}-\x{209c}\x{2102}\x{2107}\x{210a}-\x{2113}\x{2115}\x{2119}-\x{211d}\x{2124}\x{2126}\x{2128}\x{212a}-\x{212d}\x{212f}-\x{2139}\x{213c}-\x{213f}\x{2145}-\x{2149}\x{214e}\x{2160}-\x{2188}\x{2c00}-\x{2c2e}\x{2c30}-\x{2c5e}\x{2c60}-\x{2ce4}\x{2ceb}-\x{2cee}\x{2cf2}\x{2cf3}\x{2d00}-\x{2d25}\x{2d27}\x{2d2d}\x{2d30}-\x{2d67}\x{2d6f}\x{2d80}-\x{2d96}\x{2da0}-\x{2da6}\x{2da8}-\x{2dae}\x{2db0}-\x{2db6}\x{2db8}-\x{2dbe}\x{2dc0}-\x{2dc6}\x{2dc8}-\x{2dce}\x{2dd0}-\x{2dd6}\x{2dd8}-\x{2dde}\x{2e2f}\x{3005}-\x{3007}\x{3021}-\x{3029}\x{3031}-\x{3035}\x{3038}-\x{303c}\x{3041}-\x{3096}\x{309d}-\x{309f}\x{30a1}-\x{30fa}\x{30fc}-\x{30ff}\x{3105}-\x{312d}\x{3131}-\x{318e}\x{31a0}-\x{31ba}\x{31f0}-\x{31ff}\x{3400}-\x{4db5}\x{4e00}-\x{9fcc}\x{a000}-\x{a48c}\x{a4d0}-\x{a4fd}\x{a500}-\x{a60c}\x{a610}-\x{a61f}\x{a62a}\x{a62b}\x{a640}-\x{a66e}\x{a67f}-\x{a697}\x{a6a0}-\x{a6ef}\x{a717}-\x{a71f}\x{a722}-\x{a788}\x{a78b}-\x{a78e}\x{a790}-\x{a793}\x{a7a0}-\x{a7aa}\x{a7f8}-\x{a801}\x{a803}-\x{a805}\x{a807}-\x{a80a}\x{a80c}-\x{a822}\x{a840}-\x{a873}\x{a882}-\x{a8b3}\x{a8f2}-\x{a8f7}\x{a8fb}\x{a90a}-\x{a925}\x{a930}-\x{a946}\x{a960}-\x{a97c}\x{a984}-\x{a9b2}\x{a9cf}\x{aa00}-\x{aa28}\x{aa40}-\x{aa42}\x{aa44}-\x{aa4b}\x{aa60}-\x{aa76}\x{aa7a}\x{aa80}-\x{aaaf}\x{aab1}\x{aab5}\x{aab6}\x{aab9}-\x{aabd}\x{aac0}\x{aac2}\x{aadb}-\x{aadd}\x{aae0}-\x{aaea}\x{aaf2}-\x{aaf4}\x{ab01}-\x{ab06}\x{ab09}-\x{ab0e}\x{ab11}-\x{ab16}\x{ab20}-\x{ab26}\x{ab28}-\x{ab2e}\x{abc0}-\x{abe2}\x{ac00}-\x{d7a3}\x{d7b0}-\x{d7c6}\x{d7cb}-\x{d7fb}\x{f900}-\x{fa6d}\x{fa70}-\x{fad9}\x{fb00}-\x{fb06}\x{fb13}-\x{fb17}\x{fb1d}\x{fb1f}-\x{fb28}\x{fb2a}-\x{fb36}\x{fb38}-\x{fb3c}\x{fb3e}\x{fb40}\x{fb41}\x{fb43}\x{fb44}\x{fb46}-\x{fbb1}\x{fbd3}-\x{fd3d}\x{fd50}-\x{fd8f}\x{fd92}-\x{fdc7}\x{fdf0}-\x{fdfb}\x{fe70}-\x{fe74}\x{fe76}-\x{fefc}\x{ff21}-\x{ff3a}\x{ff41}-\x{ff5a}\x{ff66}-\x{ffbe}\x{ffc2}-\x{ffc7}\x{ffca}-\x{ffcf}\x{ffd2}-\x{ffd7}\x{ffda}-\x{ffdc}][$A-Z\_a-z\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\x{02c1}\x{02c6}-\x{02d1}\x{02e0}-\x{02e4}\x{02ec}\x{02ee}\x{0370}-\x{0374}\x{0376}\x{0377}\x{037a}-\x{037d}\x{0386}\x{0388}-\x{038a}\x{038c}\x{038e}-\x{03a1}\x{03a3}-\x{03f5}\x{03f7}-\x{0481}\x{048a}-\x{0527}\x{0531}-\x{0556}\x{0559}\x{0561}-\x{0587}\x{05d0}-\x{05ea}\x{05f0}-\x{05f2}\x{0620}-\x{064a}\x{066e}\x{066f}\x{0671}-\x{06d3}\x{06d5}\x{06e5}\x{06e6}\x{06ee}\x{06ef}\x{06fa}-\x{06fc}\x{06ff}\x{0710}\x{0712}-\x{072f}\x{074d}-\x{07a5}\x{07b1}\x{07ca}-\x{07ea}\x{07f4}\x{07f5}\x{07fa}\x{0800}-\x{0815}\x{081a}\x{0824}\x{0828}\x{0840}-\x{0858}\x{08a0}\x{08a2}-\x{08ac}\x{0904}-\x{0939}\x{093d}\x{0950}\x{0958}-\x{0961}\x{0971}-\x{0977}\x{0979}-\x{097f}\x{0985}-\x{098c}\x{098f}\x{0990}\x{0993}-\x{09a8}\x{09aa}-\x{09b0}\x{09b2}\x{09b6}-\x{09b9}\x{09bd}\x{09ce}\x{09dc}\x{09dd}\x{09df}-\x{09e1}\x{09f0}\x{09f1}\x{0a05}-\x{0a0a}\x{0a0f}\x{0a10}\x{0a13}-\x{0a28}\x{0a2a}-\x{0a30}\x{0a32}\x{0a33}\x{0a35}\x{0a36}\x{0a38}\x{0a39}\x{0a59}-\x{0a5c}\x{0a5e}\x{0a72}-\x{0a74}\x{0a85}-\x{0a8d}\x{0a8f}-\x{0a91}\x{0a93}-\x{0aa8}\x{0aaa}-\x{0ab0}\x{0ab2}\x{0ab3}\x{0ab5}-\x{0ab9}\x{0abd}\x{0ad0}\x{0ae0}\x{0ae1}\x{0b05}-\x{0b0c}\x{0b0f}\x{0b10}\x{0b13}-\x{0b28}\x{0b2a}-\x{0b30}\x{0b32}\x{0b33}\x{0b35}-\x{0b39}\x{0b3d}\x{0b5c}\x{0b5d}\x{0b5f}-\x{0b61}\x{0b71}\x{0b83}\x{0b85}-\x{0b8a}\x{0b8e}-\x{0b90}\x{0b92}-\x{0b95}\x{0b99}\x{0b9a}\x{0b9c}\x{0b9e}\x{0b9f}\x{0ba3}\x{0ba4}\x{0ba8}-\x{0baa}\x{0bae}-\x{0bb9}\x{0bd0}\x{0c05}-\x{0c0c}\x{0c0e}-\x{0c10}\x{0c12}-\x{0c28}\x{0c2a}-\x{0c33}\x{0c35}-\x{0c39}\x{0c3d}\x{0c58}\x{0c59}\x{0c60}\x{0c61}\x{0c85}-\x{0c8c}\x{0c8e}-\x{0c90}\x{0c92}-\x{0ca8}\x{0caa}-\x{0cb3}\x{0cb5}-\x{0cb9}\x{0cbd}\x{0cde}\x{0ce0}\x{0ce1}\x{0cf1}\x{0cf2}\x{0d05}-\x{0d0c}\x{0d0e}-\x{0d10}\x{0d12}-\x{0d3a}\x{0d3d}\x{0d4e}\x{0d60}\x{0d61}\x{0d7a}-\x{0d7f}\x{0d85}-\x{0d96}\x{0d9a}-\x{0db1}\x{0db3}-\x{0dbb}\x{0dbd}\x{0dc0}-\x{0dc6}\x{0e01}-\x{0e30}\x{0e32}\x{0e33}\x{0e40}-\x{0e46}\x{0e81}\x{0e82}\x{0e84}\x{0e87}\x{0e88}\x{0e8a}\x{0e8d}\x{0e94}-\x{0e97}\x{0e99}-\x{0e9f}\x{0ea1}-\x{0ea3}\x{0ea5}\x{0ea7}\x{0eaa}\x{0eab}\x{0ead}-\x{0eb0}\x{0eb2}\x{0eb3}\x{0ebd}\x{0ec0}-\x{0ec4}\x{0ec6}\x{0edc}-\x{0edf}\x{0f00}\x{0f40}-\x{0f47}\x{0f49}-\x{0f6c}\x{0f88}-\x{0f8c}\x{1000}-\x{102a}\x{103f}\x{1050}-\x{1055}\x{105a}-\x{105d}\x{1061}\x{1065}\x{1066}\x{106e}-\x{1070}\x{1075}-\x{1081}\x{108e}\x{10a0}-\x{10c5}\x{10c7}\x{10cd}\x{10d0}-\x{10fa}\x{10fc}-\x{1248}\x{124a}-\x{124d}\x{1250}-\x{1256}\x{1258}\x{125a}-\x{125d}\x{1260}-\x{1288}\x{128a}-\x{128d}\x{1290}-\x{12b0}\x{12b2}-\x{12b5}\x{12b8}-\x{12be}\x{12c0}\x{12c2}-\x{12c5}\x{12c8}-\x{12d6}\x{12d8}-\x{1310}\x{1312}-\x{1315}\x{1318}-\x{135a}\x{1380}-\x{138f}\x{13a0}-\x{13f4}\x{1401}-\x{166c}\x{166f}-\x{167f}\x{1681}-\x{169a}\x{16a0}-\x{16ea}\x{16ee}-\x{16f0}\x{1700}-\x{170c}\x{170e}-\x{1711}\x{1720}-\x{1731}\x{1740}-\x{1751}\x{1760}-\x{176c}\x{176e}-\x{1770}\x{1780}-\x{17b3}\x{17d7}\x{17dc}\x{1820}-\x{1877}\x{1880}-\x{18a8}\x{18aa}\x{18b0}-\x{18f5}\x{1900}-\x{191c}\x{1950}-\x{196d}\x{1970}-\x{1974}\x{1980}-\x{19ab}\x{19c1}-\x{19c7}\x{1a00}-\x{1a16}\x{1a20}-\x{1a54}\x{1aa7}\x{1b05}-\x{1b33}\x{1b45}-\x{1b4b}\x{1b83}-\x{1ba0}\x{1bae}\x{1baf}\x{1bba}-\x{1be5}\x{1c00}-\x{1c23}\x{1c4d}-\x{1c4f}\x{1c5a}-\x{1c7d}\x{1ce9}-\x{1cec}\x{1cee}-\x{1cf1}\x{1cf5}\x{1cf6}\x{1d00}-\x{1dbf}\x{1e00}-\x{1f15}\x{1f18}-\x{1f1d}\x{1f20}-\x{1f45}\x{1f48}-\x{1f4d}\x{1f50}-\x{1f57}\x{1f59}\x{1f5b}\x{1f5d}\x{1f5f}-\x{1f7d}\x{1f80}-\x{1fb4}\x{1fb6}-\x{1fbc}\x{1fbe}\x{1fc2}-\x{1fc4}\x{1fc6}-\x{1fcc}\x{1fd0}-\x{1fd3}\x{1fd6}-\x{1fdb}\x{1fe0}-\x{1fec}\x{1ff2}-\x{1ff4}\x{1ff6}-\x{1ffc}\x{2071}\x{207f}\x{2090}-\x{209c}\x{2102}\x{2107}\x{210a}-\x{2113}\x{2115}\x{2119}-\x{211d}\x{2124}\x{2126}\x{2128}\x{212a}-\x{212d}\x{212f}-\x{2139}\x{213c}-\x{213f}\x{2145}-\x{2149}\x{214e}\x{2160}-\x{2188}\x{2c00}-\x{2c2e}\x{2c30}-\x{2c5e}\x{2c60}-\x{2ce4}\x{2ceb}-\x{2cee}\x{2cf2}\x{2cf3}\x{2d00}-\x{2d25}\x{2d27}\x{2d2d}\x{2d30}-\x{2d67}\x{2d6f}\x{2d80}-\x{2d96}\x{2da0}-\x{2da6}\x{2da8}-\x{2dae}\x{2db0}-\x{2db6}\x{2db8}-\x{2dbe}\x{2dc0}-\x{2dc6}\x{2dc8}-\x{2dce}\x{2dd0}-\x{2dd6}\x{2dd8}-\x{2dde}\x{2e2f}\x{3005}-\x{3007}\x{3021}-\x{3029}\x{3031}-\x{3035}\x{3038}-\x{303c}\x{3041}-\x{3096}\x{309d}-\x{309f}\x{30a1}-\x{30fa}\x{30fc}-\x{30ff}\x{3105}-\x{312d}\x{3131}-\x{318e}\x{31a0}-\x{31ba}\x{31f0}-\x{31ff}\x{3400}-\x{4db5}\x{4e00}-\x{9fcc}\x{a000}-\x{a48c}\x{a4d0}-\x{a4fd}\x{a500}-\x{a60c}\x{a610}-\x{a61f}\x{a62a}\x{a62b}\x{a640}-\x{a66e}\x{a67f}-\x{a697}\x{a6a0}-\x{a6ef}\x{a717}-\x{a71f}\x{a722}-\x{a788}\x{a78b}-\x{a78e}\x{a790}-\x{a793}\x{a7a0}-\x{a7aa}\x{a7f8}-\x{a801}\x{a803}-\x{a805}\x{a807}-\x{a80a}\x{a80c}-\x{a822}\x{a840}-\x{a873}\x{a882}-\x{a8b3}\x{a8f2}-\x{a8f7}\x{a8fb}\x{a90a}-\x{a925}\x{a930}-\x{a946}\x{a960}-\x{a97c}\x{a984}-\x{a9b2}\x{a9cf}\x{aa00}-\x{aa28}\x{aa40}-\x{aa42}\x{aa44}-\x{aa4b}\x{aa60}-\x{aa76}\x{aa7a}\x{aa80}-\x{aaaf}\x{aab1}\x{aab5}\x{aab6}\x{aab9}-\x{aabd}\x{aac0}\x{aac2}\x{aadb}-\x{aadd}\x{aae0}-\x{aaea}\x{aaf2}-\x{aaf4}\x{ab01}-\x{ab06}\x{ab09}-\x{ab0e}\x{ab11}-\x{ab16}\x{ab20}-\x{ab26}\x{ab28}-\x{ab2e}\x{abc0}-\x{abe2}\x{ac00}-\x{d7a3}\x{d7b0}-\x{d7c6}\x{d7cb}-\x{d7fb}\x{f900}-\x{fa6d}\x{fa70}-\x{fad9}\x{fb00}-\x{fb06}\x{fb13}-\x{fb17}\x{fb1d}\x{fb1f}-\x{fb28}\x{fb2a}-\x{fb36}\x{fb38}-\x{fb3c}\x{fb3e}\x{fb40}\x{fb41}\x{fb43}\x{fb44}\x{fb46}-\x{fbb1}\x{fbd3}-\x{fd3d}\x{fd50}-\x{fd8f}\x{fd92}-\x{fdc7}\x{fdf0}-\x{fdfb}\x{fe70}-\x{fe74}\x{fe76}-\x{fefc}\x{ff21}-\x{ff3a}\x{ff41}-\x{ff5a}\x{ff66}-\x{ffbe}\x{ffc2}-\x{ffc7}\x{ffca}-\x{ffcf}\x{ffd2}-\x{ffd7}\x{ffda}-\x{ffdc}0-9\x{0300}-\x{036f}\x{0483}-\x{0487}\x{0591}-\x{05bd}\x{05bf}\x{05c1}\x{05c2}\x{05c4}\x{05c5}\x{05c7}\x{0610}-\x{061a}\x{064b}-\x{0669}\x{0670}\x{06d6}-\x{06dc}\x{06df}-\x{06e4}\x{06e7}\x{06e8}\x{06ea}-\x{06ed}\x{06f0}-\x{06f9}\x{0711}\x{0730}-\x{074a}\x{07a6}-\x{07b0}\x{07c0}-\x{07c9}\x{07eb}-\x{07f3}\x{0816}-\x{0819}\x{081b}-\x{0823}\x{0825}-\x{0827}\x{0829}-\x{082d}\x{0859}-\x{085b}\x{08e4}-\x{08fe}\x{0900}-\x{0903}\x{093a}-\x{093c}\x{093e}-\x{094f}\x{0951}-\x{0957}\x{0962}\x{0963}\x{0966}-\x{096f}\x{0981}-\x{0983}\x{09bc}\x{09be}-\x{09c4}\x{09c7}\x{09c8}\x{09cb}-\x{09cd}\x{09d7}\x{09e2}\x{09e3}\x{09e6}-\x{09ef}\x{0a01}-\x{0a03}\x{0a3c}\x{0a3e}-\x{0a42}\x{0a47}\x{0a48}\x{0a4b}-\x{0a4d}\x{0a51}\x{0a66}-\x{0a71}\x{0a75}\x{0a81}-\x{0a83}\x{0abc}\x{0abe}-\x{0ac5}\x{0ac7}-\x{0ac9}\x{0acb}-\x{0acd}\x{0ae2}\x{0ae3}\x{0ae6}-\x{0aef}\x{0b01}-\x{0b03}\x{0b3c}\x{0b3e}-\x{0b44}\x{0b47}\x{0b48}\x{0b4b}-\x{0b4d}\x{0b56}\x{0b57}\x{0b62}\x{0b63}\x{0b66}-\x{0b6f}\x{0b82}\x{0bbe}-\x{0bc2}\x{0bc6}-\x{0bc8}\x{0bca}-\x{0bcd}\x{0bd7}\x{0be6}-\x{0bef}\x{0c01}-\x{0c03}\x{0c3e}-\x{0c44}\x{0c46}-\x{0c48}\x{0c4a}-\x{0c4d}\x{0c55}\x{0c56}\x{0c62}\x{0c63}\x{0c66}-\x{0c6f}\x{0c82}\x{0c83}\x{0cbc}\x{0cbe}-\x{0cc4}\x{0cc6}-\x{0cc8}\x{0cca}-\x{0ccd}\x{0cd5}\x{0cd6}\x{0ce2}\x{0ce3}\x{0ce6}-\x{0cef}\x{0d02}\x{0d03}\x{0d3e}-\x{0d44}\x{0d46}-\x{0d48}\x{0d4a}-\x{0d4d}\x{0d57}\x{0d62}\x{0d63}\x{0d66}-\x{0d6f}\x{0d82}\x{0d83}\x{0dca}\x{0dcf}-\x{0dd4}\x{0dd6}\x{0dd8}-\x{0ddf}\x{0df2}\x{0df3}\x{0e31}\x{0e34}-\x{0e3a}\x{0e47}-\x{0e4e}\x{0e50}-\x{0e59}\x{0eb1}\x{0eb4}-\x{0eb9}\x{0ebb}\x{0ebc}\x{0ec8}-\x{0ecd}\x{0ed0}-\x{0ed9}\x{0f18}\x{0f19}\x{0f20}-\x{0f29}\x{0f35}\x{0f37}\x{0f39}\x{0f3e}\x{0f3f}\x{0f71}-\x{0f84}\x{0f86}\x{0f87}\x{0f8d}-\x{0f97}\x{0f99}-\x{0fbc}\x{0fc6}\x{102b}-\x{103e}\x{1040}-\x{1049}\x{1056}-\x{1059}\x{105e}-\x{1060}\x{1062}-\x{1064}\x{1067}-\x{106d}\x{1071}-\x{1074}\x{1082}-\x{108d}\x{108f}-\x{109d}\x{135d}-\x{135f}\x{1712}-\x{1714}\x{1732}-\x{1734}\x{1752}\x{1753}\x{1772}\x{1773}\x{17b4}-\x{17d3}\x{17dd}\x{17e0}-\x{17e9}\x{180b}-\x{180d}\x{1810}-\x{1819}\x{18a9}\x{1920}-\x{192b}\x{1930}-\x{193b}\x{1946}-\x{194f}\x{19b0}-\x{19c0}\x{19c8}\x{19c9}\x{19d0}-\x{19d9}\x{1a17}-\x{1a1b}\x{1a55}-\x{1a5e}\x{1a60}-\x{1a7c}\x{1a7f}-\x{1a89}\x{1a90}-\x{1a99}\x{1b00}-\x{1b04}\x{1b34}-\x{1b44}\x{1b50}-\x{1b59}\x{1b6b}-\x{1b73}\x{1b80}-\x{1b82}\x{1ba1}-\x{1bad}\x{1bb0}-\x{1bb9}\x{1be6}-\x{1bf3}\x{1c24}-\x{1c37}\x{1c40}-\x{1c49}\x{1c50}-\x{1c59}\x{1cd0}-\x{1cd2}\x{1cd4}-\x{1ce8}\x{1ced}\x{1cf2}-\x{1cf4}\x{1dc0}-\x{1de6}\x{1dfc}-\x{1dff}\x{200c}\x{200d}\x{203f}\x{2040}\x{2054}\x{20d0}-\x{20dc}\x{20e1}\x{20e5}-\x{20f0}\x{2cef}-\x{2cf1}\x{2d7f}\x{2de0}-\x{2dff}\x{302a}-\x{302f}\x{3099}\x{309a}\x{a620}-\x{a629}\x{a66f}\x{a674}-\x{a67d}\x{a69f}\x{a6f0}\x{a6f1}\x{a802}\x{a806}\x{a80b}\x{a823}-\x{a827}\x{a880}\x{a881}\x{a8b4}-\x{a8c4}\x{a8d0}-\x{a8d9}\x{a8e0}-\x{a8f1}\x{a900}-\x{a909}\x{a926}-\x{a92d}\x{a947}-\x{a953}\x{a980}-\x{a983}\x{a9b3}-\x{a9c0}\x{a9d0}-\x{a9d9}\x{aa29}-\x{aa36}\x{aa43}\x{aa4c}\x{aa4d}\x{aa50}-\x{aa59}\x{aa7b}\x{aab0}\x{aab2}-\x{aab4}\x{aab7}\x{aab8}\x{aabe}\x{aabf}\x{aac1}\x{aaeb}-\x{aaef}\x{aaf5}\x{aaf6}\x{abe3}-\x{abea}\x{abec}\x{abed}\x{abf0}-\x{abf9}\x{fb1e}\x{fe00}-\x{fe0f}\x{fe20}-\x{fe26}\x{fe33}\x{fe34}\x{fe4d}-\x{fe4f}\x{ff10}-\x{ff19}\x{ff3f}]*\b'; |
|
| 26 | + |
|
| 27 | + /** |
|
| 28 | + * Full list of JavaScript reserved words. |
|
| 29 | + * Will be loaded from /data/js/keywords_reserved.txt. |
|
| 30 | + * |
|
| 31 | + * @see https://mathiasbynens.be/notes/reserved-keywords |
|
| 32 | + * |
|
| 33 | + * @var string[] |
|
| 34 | + */ |
|
| 35 | + protected $keywordsReserved = array(); |
|
| 36 | + |
|
| 37 | + /** |
|
| 38 | + * List of JavaScript reserved words that accept a <variable, value, ...> |
|
| 39 | + * after them. Some end of lines are not the end of a statement, like with |
|
| 40 | + * these keywords. |
|
| 41 | + * |
|
| 42 | + * E.g.: we shouldn't insert a ; after this else |
|
| 43 | + * else |
|
| 44 | + * console.log('this is quite fine') |
|
| 45 | + * |
|
| 46 | + * Will be loaded from /data/js/keywords_before.txt |
|
| 47 | + * |
|
| 48 | + * @var string[] |
|
| 49 | + */ |
|
| 50 | + protected $keywordsBefore = array(); |
|
| 51 | + |
|
| 52 | + /** |
|
| 53 | + * List of JavaScript reserved words that accept a <variable, value, ...> |
|
| 54 | + * before them. Some end of lines are not the end of a statement, like when |
|
| 55 | + * continued by one of these keywords on the newline. |
|
| 56 | + * |
|
| 57 | + * E.g.: we shouldn't insert a ; before this instanceof |
|
| 58 | + * variable |
|
| 59 | + * instanceof String |
|
| 60 | + * |
|
| 61 | + * Will be loaded from /data/js/keywords_after.txt |
|
| 62 | + * |
|
| 63 | + * @var string[] |
|
| 64 | + */ |
|
| 65 | + protected $keywordsAfter = array(); |
|
| 66 | + |
|
| 67 | + /** |
|
| 68 | + * List of JavaScript operators that accept a <variable, value, ...> after |
|
| 69 | + * them. Some end of lines are not the end of a statement, like with these |
|
| 70 | + * operators. |
|
| 71 | + * |
|
| 72 | + * Note: Most operators are fine, we've only removed !, ++ and --. |
|
| 73 | + * There can't be a newline separating ! and whatever it is negating. |
|
| 74 | + * ++ & -- have to be joined with the value they're in-/decrementing. |
|
| 75 | + * |
|
| 76 | + * Will be loaded from /data/js/operators_before.txt |
|
| 77 | + * |
|
| 78 | + * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Expressions_and_Operators |
|
| 79 | + * |
|
| 80 | + * @var string[] |
|
| 81 | + */ |
|
| 82 | + protected $operatorsBefore = array(); |
|
| 83 | + |
|
| 84 | + /** |
|
| 85 | + * List of JavaScript operators that accept a <variable, value, ...> before |
|
| 86 | + * them. Some end of lines are not the end of a statement, like when |
|
| 87 | + * continued by one of these operators on the newline. |
|
| 88 | + * |
|
| 89 | + * Note: Most operators are fine, we've only removed ), ], ++ and --. |
|
| 90 | + * ++ & -- have to be joined with the value they're in-/decrementing. |
|
| 91 | + * ) & ] are "special" in that they have lots or usecases. () for example |
|
| 92 | + * is used for function calls, for grouping, in if () and for (), ... |
|
| 93 | + * |
|
| 94 | + * Will be loaded from /data/js/operators_after.txt |
|
| 95 | + * |
|
| 96 | + * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Expressions_and_Operators |
|
| 97 | + * |
|
| 98 | + * @var string[] |
|
| 99 | + */ |
|
| 100 | + protected $operatorsAfter = array(); |
|
| 101 | + |
|
| 102 | + /** |
|
| 103 | + * {@inheritdoc} |
|
| 104 | + */ |
|
| 105 | + public function __construct() |
|
| 106 | + { |
|
| 107 | + call_user_func_array(array('parent', '__construct'), func_get_args()); |
|
| 108 | + |
|
| 109 | + $dataDir = __DIR__.'/../data/js/'; |
|
| 110 | + $options = FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES; |
|
| 111 | + $this->keywordsReserved = file($dataDir.'keywords_reserved.txt', $options); |
|
| 112 | + $this->keywordsBefore = file($dataDir.'keywords_before.txt', $options); |
|
| 113 | + $this->keywordsAfter = file($dataDir.'keywords_after.txt', $options); |
|
| 114 | + $this->operatorsBefore = file($dataDir.'operators_before.txt', $options); |
|
| 115 | + $this->operatorsAfter = file($dataDir.'operators_after.txt', $options); |
|
| 116 | + } |
|
| 117 | + |
|
| 118 | + /** |
|
| 119 | + * Minify the data. |
|
| 120 | + * Perform JS optimizations. |
|
| 121 | + * |
|
| 122 | + * @param string[optional] $path Path to write the data to. |
|
| 123 | + * |
|
| 124 | + * @return string The minified data. |
|
| 125 | + */ |
|
| 126 | + public function execute($path = null) |
|
| 127 | + { |
|
| 128 | + $content = ''; |
|
| 129 | + |
|
| 130 | + // loop files |
|
| 131 | + foreach ($this->data as $source => $js) { |
|
| 132 | + /* |
|
| 133 | 133 | * Combine js: separating the scripts by a ; |
| 134 | 134 | * I'm also adding a newline: it will be eaten when whitespace is |
| 135 | 135 | * stripped, but we need to make sure we're not just appending |
@@ -137,10 +137,10 @@ discard block |
||
| 137 | 137 | * singe-line comment on the last line (in which case it would also |
| 138 | 138 | * be seen as part of that comment) |
| 139 | 139 | */ |
| 140 | - $content .= $js."\n;"; |
|
| 141 | - } |
|
| 140 | + $content .= $js."\n;"; |
|
| 141 | + } |
|
| 142 | 142 | |
| 143 | - /* |
|
| 143 | + /* |
|
| 144 | 144 | * Let's first take out strings, comments and regular expressions. |
| 145 | 145 | * All of these can contain JS code-like characters, and we should make |
| 146 | 146 | * sure any further magic ignores anything inside of these. |
@@ -151,159 +151,159 @@ discard block |
||
| 151 | 151 | * Comments will be removed altogether, strings and regular expressions |
| 152 | 152 | * will be replaced by placeholder text, which we'll restore later. |
| 153 | 153 | */ |
| 154 | - $this->extractStrings('\'"`'); |
|
| 155 | - $this->stripComments(); |
|
| 156 | - $this->extractRegex(); |
|
| 157 | - $content = $this->replace($content); |
|
| 154 | + $this->extractStrings('\'"`'); |
|
| 155 | + $this->stripComments(); |
|
| 156 | + $this->extractRegex(); |
|
| 157 | + $content = $this->replace($content); |
|
| 158 | 158 | |
| 159 | - $content = $this->stripWhitespace($content); |
|
| 160 | - $content = $this->propertyNotation($content); |
|
| 161 | - $content = $this->shortenBools($content); |
|
| 159 | + $content = $this->stripWhitespace($content); |
|
| 160 | + $content = $this->propertyNotation($content); |
|
| 161 | + $content = $this->shortenBools($content); |
|
| 162 | 162 | |
| 163 | - /* |
|
| 163 | + /* |
|
| 164 | 164 | * Earlier, we extracted strings & regular expressions and replaced them |
| 165 | 165 | * with placeholder text. This will restore them. |
| 166 | 166 | */ |
| 167 | - $content = $this->restoreExtractedData($content); |
|
| 168 | - |
|
| 169 | - return $content; |
|
| 170 | - } |
|
| 171 | - |
|
| 172 | - /** |
|
| 173 | - * Strip comments from source code. |
|
| 174 | - */ |
|
| 175 | - protected function stripComments() |
|
| 176 | - { |
|
| 177 | - // single-line comments |
|
| 178 | - $this->registerPattern('/\/\/.*$/m', ''); |
|
| 179 | - |
|
| 180 | - // multi-line comments |
|
| 181 | - $this->registerPattern('/\/\*.*?\*\//s', ''); |
|
| 182 | - } |
|
| 183 | - |
|
| 184 | - /** |
|
| 185 | - * JS can have /-delimited regular expressions, like: /ab+c/.match(string). |
|
| 186 | - * |
|
| 187 | - * The content inside the regex can contain characters that may be confused |
|
| 188 | - * for JS code: e.g. it could contain whitespace it needs to match & we |
|
| 189 | - * don't want to strip whitespace in there. |
|
| 190 | - * |
|
| 191 | - * The regex can be pretty simple: we don't have to care about comments, |
|
| 192 | - * (which also use slashes) because stripComments() will have stripped those |
|
| 193 | - * already. |
|
| 194 | - * |
|
| 195 | - * This method will replace all string content with simple REGEX# |
|
| 196 | - * placeholder text, so we've rid all regular expressions from characters |
|
| 197 | - * that may be misinterpreted. Original regex content will be saved in |
|
| 198 | - * $this->extracted and after doing all other minifying, we can restore the |
|
| 199 | - * original content via restoreRegex() |
|
| 200 | - */ |
|
| 201 | - protected function extractRegex() |
|
| 202 | - { |
|
| 203 | - // PHP only supports $this inside anonymous functions since 5.4 |
|
| 204 | - $minifier = $this; |
|
| 205 | - $callback = function ($match) use ($minifier) { |
|
| 206 | - $count = count($minifier->extracted); |
|
| 207 | - $placeholder = '/'.$count.'/'; |
|
| 208 | - $minifier->extracted[$placeholder] = $match[1]; |
|
| 209 | - |
|
| 210 | - return $placeholder; |
|
| 211 | - }; |
|
| 212 | - |
|
| 213 | - // it's a regex if we can find an opening and (not escaped) closing /, |
|
| 214 | - // include \n because it may be there for a reason |
|
| 215 | - // (https://github.com/matthiasmullie/minify/issues/56) |
|
| 216 | - $pattern = '(\/.*?(?<!\\\\)(\\\\\\\\)*+\/\n?)'; |
|
| 217 | - |
|
| 218 | - // / can't be preceded by variable, value, or similar because then |
|
| 219 | - // it's going to be division |
|
| 220 | - // checking for that is complex, so we'll do inverse: |
|
| 221 | - // * at the beginning of the file, it's not division, but regex |
|
| 222 | - $this->registerPattern('/^\s*\K'.$pattern.'/', $callback); |
|
| 223 | - // * following another operator, it's not division, but regex |
|
| 224 | - $operators = $this->getOperatorsForRegex($this->operatorsBefore, '/'); |
|
| 225 | - $operators += $this->getKeywordsForRegex($this->keywordsReserved, '/'); |
|
| 226 | - $this->registerPattern('/(?:'.implode('|', $operators).')\s*\K'.$pattern.'/', $callback); |
|
| 227 | - } |
|
| 228 | - |
|
| 229 | - /** |
|
| 230 | - * Strip whitespace. |
|
| 231 | - * |
|
| 232 | - * We won't strip *all* whitespace, but as much as possible. The thing that |
|
| 233 | - * we'll preserve are newlines we're unsure about. |
|
| 234 | - * JavaScript doesn't require statements to be terminated with a semicolon. |
|
| 235 | - * It will automatically fix missing semicolons with ASI (automatic semi- |
|
| 236 | - * colon insertion) at the end of line causing errors (without semicolon.) |
|
| 237 | - * |
|
| 238 | - * Because it's sometimes hard to tell if a newline is part of a statement |
|
| 239 | - * that should be terminated or not, we'll just leave some of them alone. |
|
| 240 | - * |
|
| 241 | - * @param string $content The content to strip the whitespace for. |
|
| 242 | - * |
|
| 243 | - * @return string |
|
| 244 | - */ |
|
| 245 | - protected function stripWhitespace($content) |
|
| 246 | - { |
|
| 247 | - // uniform line endings, make them all line feed |
|
| 248 | - $content = str_replace(array("\r\n", "\r"), "\n", $content); |
|
| 249 | - |
|
| 250 | - // collapse all non-line feed whitespace into a single space |
|
| 251 | - $content = preg_replace('/[^\S\n]+/', ' ', $content); |
|
| 252 | - |
|
| 253 | - // strip leading & trailing whitespace |
|
| 254 | - $content = str_replace(array(" \n", "\n "), "\n", $content); |
|
| 255 | - |
|
| 256 | - // collapse consecutive line feeds into just 1 |
|
| 257 | - $content = preg_replace('/\n+/', "\n", $content); |
|
| 258 | - |
|
| 259 | - $before = $this->getOperatorsForRegex($this->operatorsBefore, '/'); |
|
| 260 | - $after = $this->getOperatorsForRegex($this->operatorsAfter, '/'); |
|
| 261 | - $operators = $before + $after; |
|
| 262 | - |
|
| 263 | - // strip whitespace that ends in (or next line begin with) an operator |
|
| 264 | - // that allows statements to be broken up over multiple lines |
|
| 265 | - unset($before['+'], $before['-'], $after['+'], $after['-']); |
|
| 266 | - $content = preg_replace( |
|
| 267 | - array( |
|
| 268 | - '/('.implode('|', $before).')\s+/', |
|
| 269 | - '/\s+('.implode('|', $after).')/', |
|
| 270 | - ), '\\1', $content |
|
| 271 | - ); |
|
| 272 | - |
|
| 273 | - // make sure + and - can't be mistaken for, or joined into ++ and -- |
|
| 274 | - $content = preg_replace( |
|
| 275 | - array( |
|
| 276 | - '/(?<![\+\-])\s*([\+\-])(?![\+\-])/', |
|
| 277 | - '/(?<![\+\-])([\+\-])\s*(?![\+\-])/', |
|
| 278 | - ), '\\1', $content |
|
| 279 | - ); |
|
| 280 | - |
|
| 281 | - /* |
|
| 167 | + $content = $this->restoreExtractedData($content); |
|
| 168 | + |
|
| 169 | + return $content; |
|
| 170 | + } |
|
| 171 | + |
|
| 172 | + /** |
|
| 173 | + * Strip comments from source code. |
|
| 174 | + */ |
|
| 175 | + protected function stripComments() |
|
| 176 | + { |
|
| 177 | + // single-line comments |
|
| 178 | + $this->registerPattern('/\/\/.*$/m', ''); |
|
| 179 | + |
|
| 180 | + // multi-line comments |
|
| 181 | + $this->registerPattern('/\/\*.*?\*\//s', ''); |
|
| 182 | + } |
|
| 183 | + |
|
| 184 | + /** |
|
| 185 | + * JS can have /-delimited regular expressions, like: /ab+c/.match(string). |
|
| 186 | + * |
|
| 187 | + * The content inside the regex can contain characters that may be confused |
|
| 188 | + * for JS code: e.g. it could contain whitespace it needs to match & we |
|
| 189 | + * don't want to strip whitespace in there. |
|
| 190 | + * |
|
| 191 | + * The regex can be pretty simple: we don't have to care about comments, |
|
| 192 | + * (which also use slashes) because stripComments() will have stripped those |
|
| 193 | + * already. |
|
| 194 | + * |
|
| 195 | + * This method will replace all string content with simple REGEX# |
|
| 196 | + * placeholder text, so we've rid all regular expressions from characters |
|
| 197 | + * that may be misinterpreted. Original regex content will be saved in |
|
| 198 | + * $this->extracted and after doing all other minifying, we can restore the |
|
| 199 | + * original content via restoreRegex() |
|
| 200 | + */ |
|
| 201 | + protected function extractRegex() |
|
| 202 | + { |
|
| 203 | + // PHP only supports $this inside anonymous functions since 5.4 |
|
| 204 | + $minifier = $this; |
|
| 205 | + $callback = function ($match) use ($minifier) { |
|
| 206 | + $count = count($minifier->extracted); |
|
| 207 | + $placeholder = '/'.$count.'/'; |
|
| 208 | + $minifier->extracted[$placeholder] = $match[1]; |
|
| 209 | + |
|
| 210 | + return $placeholder; |
|
| 211 | + }; |
|
| 212 | + |
|
| 213 | + // it's a regex if we can find an opening and (not escaped) closing /, |
|
| 214 | + // include \n because it may be there for a reason |
|
| 215 | + // (https://github.com/matthiasmullie/minify/issues/56) |
|
| 216 | + $pattern = '(\/.*?(?<!\\\\)(\\\\\\\\)*+\/\n?)'; |
|
| 217 | + |
|
| 218 | + // / can't be preceded by variable, value, or similar because then |
|
| 219 | + // it's going to be division |
|
| 220 | + // checking for that is complex, so we'll do inverse: |
|
| 221 | + // * at the beginning of the file, it's not division, but regex |
|
| 222 | + $this->registerPattern('/^\s*\K'.$pattern.'/', $callback); |
|
| 223 | + // * following another operator, it's not division, but regex |
|
| 224 | + $operators = $this->getOperatorsForRegex($this->operatorsBefore, '/'); |
|
| 225 | + $operators += $this->getKeywordsForRegex($this->keywordsReserved, '/'); |
|
| 226 | + $this->registerPattern('/(?:'.implode('|', $operators).')\s*\K'.$pattern.'/', $callback); |
|
| 227 | + } |
|
| 228 | + |
|
| 229 | + /** |
|
| 230 | + * Strip whitespace. |
|
| 231 | + * |
|
| 232 | + * We won't strip *all* whitespace, but as much as possible. The thing that |
|
| 233 | + * we'll preserve are newlines we're unsure about. |
|
| 234 | + * JavaScript doesn't require statements to be terminated with a semicolon. |
|
| 235 | + * It will automatically fix missing semicolons with ASI (automatic semi- |
|
| 236 | + * colon insertion) at the end of line causing errors (without semicolon.) |
|
| 237 | + * |
|
| 238 | + * Because it's sometimes hard to tell if a newline is part of a statement |
|
| 239 | + * that should be terminated or not, we'll just leave some of them alone. |
|
| 240 | + * |
|
| 241 | + * @param string $content The content to strip the whitespace for. |
|
| 242 | + * |
|
| 243 | + * @return string |
|
| 244 | + */ |
|
| 245 | + protected function stripWhitespace($content) |
|
| 246 | + { |
|
| 247 | + // uniform line endings, make them all line feed |
|
| 248 | + $content = str_replace(array("\r\n", "\r"), "\n", $content); |
|
| 249 | + |
|
| 250 | + // collapse all non-line feed whitespace into a single space |
|
| 251 | + $content = preg_replace('/[^\S\n]+/', ' ', $content); |
|
| 252 | + |
|
| 253 | + // strip leading & trailing whitespace |
|
| 254 | + $content = str_replace(array(" \n", "\n "), "\n", $content); |
|
| 255 | + |
|
| 256 | + // collapse consecutive line feeds into just 1 |
|
| 257 | + $content = preg_replace('/\n+/', "\n", $content); |
|
| 258 | + |
|
| 259 | + $before = $this->getOperatorsForRegex($this->operatorsBefore, '/'); |
|
| 260 | + $after = $this->getOperatorsForRegex($this->operatorsAfter, '/'); |
|
| 261 | + $operators = $before + $after; |
|
| 262 | + |
|
| 263 | + // strip whitespace that ends in (or next line begin with) an operator |
|
| 264 | + // that allows statements to be broken up over multiple lines |
|
| 265 | + unset($before['+'], $before['-'], $after['+'], $after['-']); |
|
| 266 | + $content = preg_replace( |
|
| 267 | + array( |
|
| 268 | + '/('.implode('|', $before).')\s+/', |
|
| 269 | + '/\s+('.implode('|', $after).')/', |
|
| 270 | + ), '\\1', $content |
|
| 271 | + ); |
|
| 272 | + |
|
| 273 | + // make sure + and - can't be mistaken for, or joined into ++ and -- |
|
| 274 | + $content = preg_replace( |
|
| 275 | + array( |
|
| 276 | + '/(?<![\+\-])\s*([\+\-])(?![\+\-])/', |
|
| 277 | + '/(?<![\+\-])([\+\-])\s*(?![\+\-])/', |
|
| 278 | + ), '\\1', $content |
|
| 279 | + ); |
|
| 280 | + |
|
| 281 | + /* |
|
| 282 | 282 | * We didn't strip whitespace after a couple of operators because they |
| 283 | 283 | * could be used in different contexts and we can't be sure it's ok to |
| 284 | 284 | * strip the newlines. However, we can safely strip any non-line feed |
| 285 | 285 | * whitespace that follows them. |
| 286 | 286 | */ |
| 287 | - $content = preg_replace('/([\}\)\]])[^\S\n]+(?!'.implode('|', $operators).')/', '\\1', $content); |
|
| 287 | + $content = preg_replace('/([\}\)\]])[^\S\n]+(?!'.implode('|', $operators).')/', '\\1', $content); |
|
| 288 | 288 | |
| 289 | - // collapse whitespace around reserved words into single space |
|
| 290 | - $before = $this->getKeywordsForRegex($this->keywordsBefore, '/'); |
|
| 291 | - $after = $this->getKeywordsForRegex($this->keywordsAfter, '/'); |
|
| 292 | - $content = preg_replace('/(^|[;\}\s])\K('.implode('|', $before).')\s+/', '\\2 ', $content); |
|
| 293 | - $content = preg_replace('/\s+('.implode('|', $after).')(?=([;\{\s]|$))/', ' \\1', $content); |
|
| 289 | + // collapse whitespace around reserved words into single space |
|
| 290 | + $before = $this->getKeywordsForRegex($this->keywordsBefore, '/'); |
|
| 291 | + $after = $this->getKeywordsForRegex($this->keywordsAfter, '/'); |
|
| 292 | + $content = preg_replace('/(^|[;\}\s])\K('.implode('|', $before).')\s+/', '\\2 ', $content); |
|
| 293 | + $content = preg_replace('/\s+('.implode('|', $after).')(?=([;\{\s]|$))/', ' \\1', $content); |
|
| 294 | 294 | |
| 295 | - /* |
|
| 295 | + /* |
|
| 296 | 296 | * Get rid of double semicolons, except where they can be used like: |
| 297 | 297 | * "for(v=1,_=b;;)", "for(v=1;;v++)" or "for(;;ja||(ja=true))". |
| 298 | 298 | * I'll safeguard these double semicolons inside for-loops by |
| 299 | 299 | * temporarily replacing them with an invalid condition: they won't have |
| 300 | 300 | * a double semicolon and will be easy to spot to restore afterwards. |
| 301 | 301 | */ |
| 302 | - $content = preg_replace('/\bfor\(([^;]*);;([^;]*)\)/', 'for(\\1;-;\\2)', $content); |
|
| 303 | - $content = preg_replace('/;+/', ';', $content); |
|
| 304 | - $content = preg_replace('/\bfor\(([^;]*);-;([^;]*)\)/', 'for(\\1;;\\2)', $content); |
|
| 302 | + $content = preg_replace('/\bfor\(([^;]*);;([^;]*)\)/', 'for(\\1;-;\\2)', $content); |
|
| 303 | + $content = preg_replace('/;+/', ';', $content); |
|
| 304 | + $content = preg_replace('/\bfor\(([^;]*);-;([^;]*)\)/', 'for(\\1;;\\2)', $content); |
|
| 305 | 305 | |
| 306 | - /* |
|
| 306 | + /* |
|
| 307 | 307 | * Next, we'll be removing all semicolons where ASI kicks in. |
| 308 | 308 | * for-loops however, can have an empty body (ending in only a |
| 309 | 309 | * semicolon), like: `for(i=1;i<3;i++);` |
@@ -313,9 +313,9 @@ discard block |
||
| 313 | 313 | * I'm going to double that semicolon (if any) so after the next line, |
| 314 | 314 | * which strips semicolons here & there, we're still left with this one. |
| 315 | 315 | */ |
| 316 | - $content = preg_replace('/(for\([^;]*;[^;]*;[^;\{]*\));(\}|$)/s', '\\1;;\\2', $content); |
|
| 316 | + $content = preg_replace('/(for\([^;]*;[^;]*;[^;\{]*\));(\}|$)/s', '\\1;;\\2', $content); |
|
| 317 | 317 | |
| 318 | - /* |
|
| 318 | + /* |
|
| 319 | 319 | * We also can't strip empty else-statements. Even though they're |
| 320 | 320 | * useless and probably shouldn't be in the code in the first place, we |
| 321 | 321 | * shouldn't be stripping the `;` that follows it as it breaks the code. |
@@ -323,114 +323,114 @@ discard block |
||
| 323 | 323 | * |
| 324 | 324 | * @see https://github.com/matthiasmullie/minify/issues/91 |
| 325 | 325 | */ |
| 326 | - $content = preg_replace('/else;/s', '', $content); |
|
| 326 | + $content = preg_replace('/else;/s', '', $content); |
|
| 327 | 327 | |
| 328 | - /* |
|
| 328 | + /* |
|
| 329 | 329 | * We also don't really want to terminate statements followed by closing |
| 330 | 330 | * curly braces (which we've ignored completely up until now) or end-of- |
| 331 | 331 | * script: ASI will kick in here & we're all about minifying. |
| 332 | 332 | * Semicolons at beginning of the file don't make any sense either. |
| 333 | 333 | */ |
| 334 | - $content = preg_replace('/;(\}|$)/s', '\\1', $content); |
|
| 335 | - $content = ltrim($content, ';'); |
|
| 336 | - |
|
| 337 | - // get rid of remaining whitespace af beginning/end |
|
| 338 | - return trim($content); |
|
| 339 | - } |
|
| 340 | - |
|
| 341 | - /** |
|
| 342 | - * We'll strip whitespace around certain operators with regular expressions. |
|
| 343 | - * This will prepare the given array by escaping all characters. |
|
| 344 | - * |
|
| 345 | - * @param string[] $operators |
|
| 346 | - * @param string $delimiter |
|
| 347 | - * |
|
| 348 | - * @return string[] |
|
| 349 | - */ |
|
| 350 | - protected function getOperatorsForRegex(array $operators, $delimiter = '/') |
|
| 351 | - { |
|
| 352 | - // escape operators for use in regex |
|
| 353 | - $delimiter = array_fill(0, count($operators), $delimiter); |
|
| 354 | - $escaped = array_map('preg_quote', $operators, $delimiter); |
|
| 355 | - |
|
| 356 | - $operators = array_combine($operators, $escaped); |
|
| 357 | - |
|
| 358 | - // ignore + & - for now, they'll get special treatment |
|
| 359 | - unset($operators['+'], $operators['-']); |
|
| 360 | - |
|
| 361 | - // dot can not just immediately follow a number; it can be confused for |
|
| 362 | - // decimal point, or calling a method on it, e.g. 42 .toString() |
|
| 363 | - $operators['.'] = '(?<![0-9]\s)\.'; |
|
| 364 | - |
|
| 365 | - // don't confuse = with other assignment shortcuts (e.g. +=) |
|
| 366 | - $chars = preg_quote('+-*\=<>%&|'); |
|
| 367 | - $operators['='] = '(?<!['.$chars.'])\='; |
|
| 368 | - |
|
| 369 | - return $operators; |
|
| 370 | - } |
|
| 371 | - |
|
| 372 | - /** |
|
| 373 | - * We'll strip whitespace around certain keywords with regular expressions. |
|
| 374 | - * This will prepare the given array by escaping all characters. |
|
| 375 | - * |
|
| 376 | - * @param string[] $keywords |
|
| 377 | - * @param string $delimiter |
|
| 378 | - * |
|
| 379 | - * @return string[] |
|
| 380 | - */ |
|
| 381 | - protected function getKeywordsForRegex(array $keywords, $delimiter = '/') |
|
| 382 | - { |
|
| 383 | - // escape keywords for use in regex |
|
| 384 | - $delimiter = array_fill(0, count($keywords), $delimiter); |
|
| 385 | - $escaped = array_map('preg_quote', $keywords, $delimiter); |
|
| 386 | - |
|
| 387 | - // add word boundaries |
|
| 388 | - array_walk($keywords, function ($value) { |
|
| 389 | - return '\b'.$value.'\b'; |
|
| 390 | - }); |
|
| 391 | - |
|
| 392 | - $keywords = array_combine($keywords, $escaped); |
|
| 393 | - |
|
| 394 | - return $keywords; |
|
| 395 | - } |
|
| 396 | - |
|
| 397 | - /** |
|
| 398 | - * Replaces all occurrences of array['key'] by array.key. |
|
| 399 | - * |
|
| 400 | - * @param string $content |
|
| 401 | - * |
|
| 402 | - * @return string |
|
| 403 | - */ |
|
| 404 | - protected function propertyNotation($content) |
|
| 405 | - { |
|
| 406 | - // PHP only supports $this inside anonymous functions since 5.4 |
|
| 407 | - $minifier = $this; |
|
| 408 | - $keywords = $this->keywordsReserved; |
|
| 409 | - $callback = function ($match) use ($minifier, $keywords) { |
|
| 410 | - $property = trim($minifier->extracted[$match[1]], '\'"'); |
|
| 411 | - |
|
| 412 | - /* |
|
| 334 | + $content = preg_replace('/;(\}|$)/s', '\\1', $content); |
|
| 335 | + $content = ltrim($content, ';'); |
|
| 336 | + |
|
| 337 | + // get rid of remaining whitespace af beginning/end |
|
| 338 | + return trim($content); |
|
| 339 | + } |
|
| 340 | + |
|
| 341 | + /** |
|
| 342 | + * We'll strip whitespace around certain operators with regular expressions. |
|
| 343 | + * This will prepare the given array by escaping all characters. |
|
| 344 | + * |
|
| 345 | + * @param string[] $operators |
|
| 346 | + * @param string $delimiter |
|
| 347 | + * |
|
| 348 | + * @return string[] |
|
| 349 | + */ |
|
| 350 | + protected function getOperatorsForRegex(array $operators, $delimiter = '/') |
|
| 351 | + { |
|
| 352 | + // escape operators for use in regex |
|
| 353 | + $delimiter = array_fill(0, count($operators), $delimiter); |
|
| 354 | + $escaped = array_map('preg_quote', $operators, $delimiter); |
|
| 355 | + |
|
| 356 | + $operators = array_combine($operators, $escaped); |
|
| 357 | + |
|
| 358 | + // ignore + & - for now, they'll get special treatment |
|
| 359 | + unset($operators['+'], $operators['-']); |
|
| 360 | + |
|
| 361 | + // dot can not just immediately follow a number; it can be confused for |
|
| 362 | + // decimal point, or calling a method on it, e.g. 42 .toString() |
|
| 363 | + $operators['.'] = '(?<![0-9]\s)\.'; |
|
| 364 | + |
|
| 365 | + // don't confuse = with other assignment shortcuts (e.g. +=) |
|
| 366 | + $chars = preg_quote('+-*\=<>%&|'); |
|
| 367 | + $operators['='] = '(?<!['.$chars.'])\='; |
|
| 368 | + |
|
| 369 | + return $operators; |
|
| 370 | + } |
|
| 371 | + |
|
| 372 | + /** |
|
| 373 | + * We'll strip whitespace around certain keywords with regular expressions. |
|
| 374 | + * This will prepare the given array by escaping all characters. |
|
| 375 | + * |
|
| 376 | + * @param string[] $keywords |
|
| 377 | + * @param string $delimiter |
|
| 378 | + * |
|
| 379 | + * @return string[] |
|
| 380 | + */ |
|
| 381 | + protected function getKeywordsForRegex(array $keywords, $delimiter = '/') |
|
| 382 | + { |
|
| 383 | + // escape keywords for use in regex |
|
| 384 | + $delimiter = array_fill(0, count($keywords), $delimiter); |
|
| 385 | + $escaped = array_map('preg_quote', $keywords, $delimiter); |
|
| 386 | + |
|
| 387 | + // add word boundaries |
|
| 388 | + array_walk($keywords, function ($value) { |
|
| 389 | + return '\b'.$value.'\b'; |
|
| 390 | + }); |
|
| 391 | + |
|
| 392 | + $keywords = array_combine($keywords, $escaped); |
|
| 393 | + |
|
| 394 | + return $keywords; |
|
| 395 | + } |
|
| 396 | + |
|
| 397 | + /** |
|
| 398 | + * Replaces all occurrences of array['key'] by array.key. |
|
| 399 | + * |
|
| 400 | + * @param string $content |
|
| 401 | + * |
|
| 402 | + * @return string |
|
| 403 | + */ |
|
| 404 | + protected function propertyNotation($content) |
|
| 405 | + { |
|
| 406 | + // PHP only supports $this inside anonymous functions since 5.4 |
|
| 407 | + $minifier = $this; |
|
| 408 | + $keywords = $this->keywordsReserved; |
|
| 409 | + $callback = function ($match) use ($minifier, $keywords) { |
|
| 410 | + $property = trim($minifier->extracted[$match[1]], '\'"'); |
|
| 411 | + |
|
| 412 | + /* |
|
| 413 | 413 | * Check if the property is a reserved keyword. In this context (as |
| 414 | 414 | * property of an object literal/array) it shouldn't matter, but IE8 |
| 415 | 415 | * freaks out with "Expected identifier". |
| 416 | 416 | */ |
| 417 | - if (in_array($property, $keywords)) { |
|
| 418 | - return $match[0]; |
|
| 419 | - } |
|
| 417 | + if (in_array($property, $keywords)) { |
|
| 418 | + return $match[0]; |
|
| 419 | + } |
|
| 420 | 420 | |
| 421 | - /* |
|
| 421 | + /* |
|
| 422 | 422 | * See if the property is in a variable-like format (e.g. |
| 423 | 423 | * array['key-here'] can't be replaced by array.key-here since '-' |
| 424 | 424 | * is not a valid character there. |
| 425 | 425 | */ |
| 426 | - if (!preg_match('/^'.$minifier::REGEX_VARIABLE.'$/u', $property)) { |
|
| 427 | - return $match[0]; |
|
| 428 | - } |
|
| 426 | + if (!preg_match('/^'.$minifier::REGEX_VARIABLE.'$/u', $property)) { |
|
| 427 | + return $match[0]; |
|
| 428 | + } |
|
| 429 | 429 | |
| 430 | - return '.'.$property; |
|
| 431 | - }; |
|
| 430 | + return '.'.$property; |
|
| 431 | + }; |
|
| 432 | 432 | |
| 433 | - /* |
|
| 433 | + /* |
|
| 434 | 434 | * Figure out if previous character is a variable name (of the array |
| 435 | 435 | * we want to use property notation on) - this is to make sure |
| 436 | 436 | * standalone ['value'] arrays aren't confused for keys-of-an-array. |
@@ -438,61 +438,61 @@ discard block |
||
| 438 | 438 | * regex implementation doesn't allow unfixed-length look-behind |
| 439 | 439 | * assertions. |
| 440 | 440 | */ |
| 441 | - preg_match('/(\[[^\]]+\])[^\]]*$/', static::REGEX_VARIABLE, $previousChar); |
|
| 442 | - $previousChar = $previousChar[1]; |
|
| 441 | + preg_match('/(\[[^\]]+\])[^\]]*$/', static::REGEX_VARIABLE, $previousChar); |
|
| 442 | + $previousChar = $previousChar[1]; |
|
| 443 | 443 | |
| 444 | - /* |
|
| 444 | + /* |
|
| 445 | 445 | * Make sure word preceding the ['value'] is not a keyword, e.g. |
| 446 | 446 | * return['x']. Because -again- PHP's regex implementation doesn't allow |
| 447 | 447 | * unfixed-length look-behind assertions, I'm just going to do a lot of |
| 448 | 448 | * separate look-behind assertions, one for each keyword. |
| 449 | 449 | */ |
| 450 | - $keywords = $this->getKeywordsForRegex($keywords); |
|
| 451 | - $keywords = '(?<!'.implode(')(?<!', $keywords).')'; |
|
| 452 | - |
|
| 453 | - return preg_replace_callback('/(?<='.$previousChar.'|\])'.$keywords.'\[(([\'"])[0-9]+\\2)\]/u', $callback, $content); |
|
| 454 | - } |
|
| 455 | - |
|
| 456 | - /** |
|
| 457 | - * Replaces true & false by !0 and !1. |
|
| 458 | - * |
|
| 459 | - * @param string $content |
|
| 460 | - * |
|
| 461 | - * @return string |
|
| 462 | - */ |
|
| 463 | - protected function shortenBools($content) |
|
| 464 | - { |
|
| 465 | - $content = preg_replace('/\btrue\b/', '!0', $content); |
|
| 466 | - $content = preg_replace('/\bfalse\b/', '!1', $content); |
|
| 467 | - |
|
| 468 | - // for(;;) is exactly the same as while(true) |
|
| 469 | - $content = preg_replace('/\bwhile\(!0\){/', 'for(;;){', $content); |
|
| 470 | - |
|
| 471 | - // now make sure we didn't turn any do ... while(true) into do ... for(;;) |
|
| 472 | - preg_match_all('/\bdo\b/', $content, $dos, PREG_OFFSET_CAPTURE | PREG_SET_ORDER); |
|
| 473 | - |
|
| 474 | - // go backward to make sure positional offsets aren't altered when $content changes |
|
| 475 | - $dos = array_reverse($dos); |
|
| 476 | - foreach ($dos as $do) { |
|
| 477 | - $offsetDo = $do[0][1]; |
|
| 478 | - |
|
| 479 | - // find all `while` (now `for`) following `do`: one of those must be |
|
| 480 | - // associated with the `do` and be turned back into `while` |
|
| 481 | - preg_match_all('/\bfor\(;;\)/', $content, $whiles, PREG_OFFSET_CAPTURE | PREG_SET_ORDER, $offsetDo); |
|
| 482 | - foreach ($whiles as $while) { |
|
| 483 | - $offsetWhile = $while[0][1]; |
|
| 484 | - |
|
| 485 | - $open = substr_count($content, '{', $offsetDo, $offsetWhile - $offsetDo); |
|
| 486 | - $close = substr_count($content, '}', $offsetDo, $offsetWhile - $offsetDo); |
|
| 487 | - if ($open === $close) { |
|
| 488 | - // only restore `while` if amount of `{` and `}` are the same; |
|
| 489 | - // otherwise, that `for` isn't associated with this `do` |
|
| 490 | - $content = substr_replace($content, 'while(!0)', $offsetWhile, strlen('for(;;)')); |
|
| 491 | - break; |
|
| 492 | - } |
|
| 493 | - } |
|
| 494 | - } |
|
| 495 | - |
|
| 496 | - return $content; |
|
| 497 | - } |
|
| 450 | + $keywords = $this->getKeywordsForRegex($keywords); |
|
| 451 | + $keywords = '(?<!'.implode(')(?<!', $keywords).')'; |
|
| 452 | + |
|
| 453 | + return preg_replace_callback('/(?<='.$previousChar.'|\])'.$keywords.'\[(([\'"])[0-9]+\\2)\]/u', $callback, $content); |
|
| 454 | + } |
|
| 455 | + |
|
| 456 | + /** |
|
| 457 | + * Replaces true & false by !0 and !1. |
|
| 458 | + * |
|
| 459 | + * @param string $content |
|
| 460 | + * |
|
| 461 | + * @return string |
|
| 462 | + */ |
|
| 463 | + protected function shortenBools($content) |
|
| 464 | + { |
|
| 465 | + $content = preg_replace('/\btrue\b/', '!0', $content); |
|
| 466 | + $content = preg_replace('/\bfalse\b/', '!1', $content); |
|
| 467 | + |
|
| 468 | + // for(;;) is exactly the same as while(true) |
|
| 469 | + $content = preg_replace('/\bwhile\(!0\){/', 'for(;;){', $content); |
|
| 470 | + |
|
| 471 | + // now make sure we didn't turn any do ... while(true) into do ... for(;;) |
|
| 472 | + preg_match_all('/\bdo\b/', $content, $dos, PREG_OFFSET_CAPTURE | PREG_SET_ORDER); |
|
| 473 | + |
|
| 474 | + // go backward to make sure positional offsets aren't altered when $content changes |
|
| 475 | + $dos = array_reverse($dos); |
|
| 476 | + foreach ($dos as $do) { |
|
| 477 | + $offsetDo = $do[0][1]; |
|
| 478 | + |
|
| 479 | + // find all `while` (now `for`) following `do`: one of those must be |
|
| 480 | + // associated with the `do` and be turned back into `while` |
|
| 481 | + preg_match_all('/\bfor\(;;\)/', $content, $whiles, PREG_OFFSET_CAPTURE | PREG_SET_ORDER, $offsetDo); |
|
| 482 | + foreach ($whiles as $while) { |
|
| 483 | + $offsetWhile = $while[0][1]; |
|
| 484 | + |
|
| 485 | + $open = substr_count($content, '{', $offsetDo, $offsetWhile - $offsetDo); |
|
| 486 | + $close = substr_count($content, '}', $offsetDo, $offsetWhile - $offsetDo); |
|
| 487 | + if ($open === $close) { |
|
| 488 | + // only restore `while` if amount of `{` and `}` are the same; |
|
| 489 | + // otherwise, that `for` isn't associated with this `do` |
|
| 490 | + $content = substr_replace($content, 'while(!0)', $offsetWhile, strlen('for(;;)')); |
|
| 491 | + break; |
|
| 492 | + } |
|
| 493 | + } |
|
| 494 | + } |
|
| 495 | + |
|
| 496 | + return $content; |
|
| 497 | + } |
|
| 498 | 498 | } |
@@ -106,13 +106,13 @@ discard block |
||
| 106 | 106 | { |
| 107 | 107 | call_user_func_array(array('parent', '__construct'), func_get_args()); |
| 108 | 108 | |
| 109 | - $dataDir = __DIR__.'/../data/js/'; |
|
| 109 | + $dataDir = __DIR__ . '/../data/js/'; |
|
| 110 | 110 | $options = FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES; |
| 111 | - $this->keywordsReserved = file($dataDir.'keywords_reserved.txt', $options); |
|
| 112 | - $this->keywordsBefore = file($dataDir.'keywords_before.txt', $options); |
|
| 113 | - $this->keywordsAfter = file($dataDir.'keywords_after.txt', $options); |
|
| 114 | - $this->operatorsBefore = file($dataDir.'operators_before.txt', $options); |
|
| 115 | - $this->operatorsAfter = file($dataDir.'operators_after.txt', $options); |
|
| 111 | + $this->keywordsReserved = file($dataDir . 'keywords_reserved.txt', $options); |
|
| 112 | + $this->keywordsBefore = file($dataDir . 'keywords_before.txt', $options); |
|
| 113 | + $this->keywordsAfter = file($dataDir . 'keywords_after.txt', $options); |
|
| 114 | + $this->operatorsBefore = file($dataDir . 'operators_before.txt', $options); |
|
| 115 | + $this->operatorsAfter = file($dataDir . 'operators_after.txt', $options); |
|
| 116 | 116 | } |
| 117 | 117 | |
| 118 | 118 | /** |
@@ -137,7 +137,7 @@ discard block |
||
| 137 | 137 | * singe-line comment on the last line (in which case it would also |
| 138 | 138 | * be seen as part of that comment) |
| 139 | 139 | */ |
| 140 | - $content .= $js."\n;"; |
|
| 140 | + $content .= $js . "\n;"; |
|
| 141 | 141 | } |
| 142 | 142 | |
| 143 | 143 | /* |
@@ -202,9 +202,9 @@ discard block |
||
| 202 | 202 | { |
| 203 | 203 | // PHP only supports $this inside anonymous functions since 5.4 |
| 204 | 204 | $minifier = $this; |
| 205 | - $callback = function ($match) use ($minifier) { |
|
| 205 | + $callback = function($match) use ($minifier) { |
|
| 206 | 206 | $count = count($minifier->extracted); |
| 207 | - $placeholder = '/'.$count.'/'; |
|
| 207 | + $placeholder = '/' . $count . '/'; |
|
| 208 | 208 | $minifier->extracted[$placeholder] = $match[1]; |
| 209 | 209 | |
| 210 | 210 | return $placeholder; |
@@ -219,11 +219,11 @@ discard block |
||
| 219 | 219 | // it's going to be division |
| 220 | 220 | // checking for that is complex, so we'll do inverse: |
| 221 | 221 | // * at the beginning of the file, it's not division, but regex |
| 222 | - $this->registerPattern('/^\s*\K'.$pattern.'/', $callback); |
|
| 222 | + $this->registerPattern('/^\s*\K' . $pattern . '/', $callback); |
|
| 223 | 223 | // * following another operator, it's not division, but regex |
| 224 | 224 | $operators = $this->getOperatorsForRegex($this->operatorsBefore, '/'); |
| 225 | 225 | $operators += $this->getKeywordsForRegex($this->keywordsReserved, '/'); |
| 226 | - $this->registerPattern('/(?:'.implode('|', $operators).')\s*\K'.$pattern.'/', $callback); |
|
| 226 | + $this->registerPattern('/(?:' . implode('|', $operators) . ')\s*\K' . $pattern . '/', $callback); |
|
| 227 | 227 | } |
| 228 | 228 | |
| 229 | 229 | /** |
@@ -265,8 +265,8 @@ discard block |
||
| 265 | 265 | unset($before['+'], $before['-'], $after['+'], $after['-']); |
| 266 | 266 | $content = preg_replace( |
| 267 | 267 | array( |
| 268 | - '/('.implode('|', $before).')\s+/', |
|
| 269 | - '/\s+('.implode('|', $after).')/', |
|
| 268 | + '/(' . implode('|', $before) . ')\s+/', |
|
| 269 | + '/\s+(' . implode('|', $after) . ')/', |
|
| 270 | 270 | ), '\\1', $content |
| 271 | 271 | ); |
| 272 | 272 | |
@@ -284,13 +284,13 @@ discard block |
||
| 284 | 284 | * strip the newlines. However, we can safely strip any non-line feed |
| 285 | 285 | * whitespace that follows them. |
| 286 | 286 | */ |
| 287 | - $content = preg_replace('/([\}\)\]])[^\S\n]+(?!'.implode('|', $operators).')/', '\\1', $content); |
|
| 287 | + $content = preg_replace('/([\}\)\]])[^\S\n]+(?!' . implode('|', $operators) . ')/', '\\1', $content); |
|
| 288 | 288 | |
| 289 | 289 | // collapse whitespace around reserved words into single space |
| 290 | 290 | $before = $this->getKeywordsForRegex($this->keywordsBefore, '/'); |
| 291 | 291 | $after = $this->getKeywordsForRegex($this->keywordsAfter, '/'); |
| 292 | - $content = preg_replace('/(^|[;\}\s])\K('.implode('|', $before).')\s+/', '\\2 ', $content); |
|
| 293 | - $content = preg_replace('/\s+('.implode('|', $after).')(?=([;\{\s]|$))/', ' \\1', $content); |
|
| 292 | + $content = preg_replace('/(^|[;\}\s])\K(' . implode('|', $before) . ')\s+/', '\\2 ', $content); |
|
| 293 | + $content = preg_replace('/\s+(' . implode('|', $after) . ')(?=([;\{\s]|$))/', ' \\1', $content); |
|
| 294 | 294 | |
| 295 | 295 | /* |
| 296 | 296 | * Get rid of double semicolons, except where they can be used like: |
@@ -364,7 +364,7 @@ discard block |
||
| 364 | 364 | |
| 365 | 365 | // don't confuse = with other assignment shortcuts (e.g. +=) |
| 366 | 366 | $chars = preg_quote('+-*\=<>%&|'); |
| 367 | - $operators['='] = '(?<!['.$chars.'])\='; |
|
| 367 | + $operators['='] = '(?<![' . $chars . '])\='; |
|
| 368 | 368 | |
| 369 | 369 | return $operators; |
| 370 | 370 | } |
@@ -385,8 +385,8 @@ discard block |
||
| 385 | 385 | $escaped = array_map('preg_quote', $keywords, $delimiter); |
| 386 | 386 | |
| 387 | 387 | // add word boundaries |
| 388 | - array_walk($keywords, function ($value) { |
|
| 389 | - return '\b'.$value.'\b'; |
|
| 388 | + array_walk($keywords, function($value) { |
|
| 389 | + return '\b' . $value . '\b'; |
|
| 390 | 390 | }); |
| 391 | 391 | |
| 392 | 392 | $keywords = array_combine($keywords, $escaped); |
@@ -406,7 +406,7 @@ discard block |
||
| 406 | 406 | // PHP only supports $this inside anonymous functions since 5.4 |
| 407 | 407 | $minifier = $this; |
| 408 | 408 | $keywords = $this->keywordsReserved; |
| 409 | - $callback = function ($match) use ($minifier, $keywords) { |
|
| 409 | + $callback = function($match) use ($minifier, $keywords) { |
|
| 410 | 410 | $property = trim($minifier->extracted[$match[1]], '\'"'); |
| 411 | 411 | |
| 412 | 412 | /* |
@@ -423,11 +423,11 @@ discard block |
||
| 423 | 423 | * array['key-here'] can't be replaced by array.key-here since '-' |
| 424 | 424 | * is not a valid character there. |
| 425 | 425 | */ |
| 426 | - if (!preg_match('/^'.$minifier::REGEX_VARIABLE.'$/u', $property)) { |
|
| 426 | + if (!preg_match('/^' . $minifier::REGEX_VARIABLE . '$/u', $property)) { |
|
| 427 | 427 | return $match[0]; |
| 428 | 428 | } |
| 429 | 429 | |
| 430 | - return '.'.$property; |
|
| 430 | + return '.' . $property; |
|
| 431 | 431 | }; |
| 432 | 432 | |
| 433 | 433 | /* |
@@ -448,9 +448,9 @@ discard block |
||
| 448 | 448 | * separate look-behind assertions, one for each keyword. |
| 449 | 449 | */ |
| 450 | 450 | $keywords = $this->getKeywordsForRegex($keywords); |
| 451 | - $keywords = '(?<!'.implode(')(?<!', $keywords).')'; |
|
| 451 | + $keywords = '(?<!' . implode(')(?<!', $keywords) . ')'; |
|
| 452 | 452 | |
| 453 | - return preg_replace_callback('/(?<='.$previousChar.'|\])'.$keywords.'\[(([\'"])[0-9]+\\2)\]/u', $callback, $content); |
|
| 453 | + return preg_replace_callback('/(?<=' . $previousChar . '|\])' . $keywords . '\[(([\'"])[0-9]+\\2)\]/u', $callback, $content); |
|
| 454 | 454 | } |
| 455 | 455 | |
| 456 | 456 | /** |
@@ -18,178 +18,178 @@ |
||
| 18 | 18 | */ |
| 19 | 19 | class Converter |
| 20 | 20 | { |
| 21 | - /** |
|
| 22 | - * @var string |
|
| 23 | - */ |
|
| 24 | - protected $from; |
|
| 25 | - |
|
| 26 | - /** |
|
| 27 | - * @var string |
|
| 28 | - */ |
|
| 29 | - protected $to; |
|
| 30 | - |
|
| 31 | - /** |
|
| 32 | - * @param string $from The original base path (directory, not file!) |
|
| 33 | - * @param string $to The new base path (directory, not file!) |
|
| 34 | - */ |
|
| 35 | - public function __construct($from, $to) |
|
| 36 | - { |
|
| 37 | - $shared = $this->shared($from, $to); |
|
| 38 | - if ($shared === '') { |
|
| 39 | - // when both paths have nothing in common, one of them is probably |
|
| 40 | - // absolute while the other is relative |
|
| 41 | - $cwd = getcwd(); |
|
| 42 | - $from = strpos($from, $cwd) === 0 ? $from : $cwd.'/'.$from; |
|
| 43 | - $to = strpos($to, $cwd) === 0 ? $to : $cwd.'/'.$to; |
|
| 44 | - |
|
| 45 | - // or traveling the tree via `..` |
|
| 46 | - // attempt to resolve path, or assume it's fine if it doesn't exist |
|
| 47 | - $from = realpath($from) ?: $from; |
|
| 48 | - $to = realpath($to) ?: $to; |
|
| 49 | - } |
|
| 50 | - |
|
| 51 | - $from = $this->normalize($from); |
|
| 52 | - $to = $this->normalize($to); |
|
| 53 | - |
|
| 54 | - $from = $this->dirname($from); |
|
| 55 | - $to = $this->dirname($to); |
|
| 56 | - |
|
| 57 | - $this->from = $from; |
|
| 58 | - $this->to = $to; |
|
| 59 | - } |
|
| 60 | - |
|
| 61 | - /** |
|
| 62 | - * Normalize path. |
|
| 63 | - * |
|
| 64 | - * @param string $path |
|
| 65 | - * |
|
| 66 | - * @return string |
|
| 67 | - */ |
|
| 68 | - protected function normalize($path) |
|
| 69 | - { |
|
| 70 | - // deal with different operating systems' directory structure |
|
| 71 | - $path = rtrim(str_replace(DIRECTORY_SEPARATOR, '/', $path), '/'); |
|
| 72 | - |
|
| 73 | - /* |
|
| 21 | + /** |
|
| 22 | + * @var string |
|
| 23 | + */ |
|
| 24 | + protected $from; |
|
| 25 | + |
|
| 26 | + /** |
|
| 27 | + * @var string |
|
| 28 | + */ |
|
| 29 | + protected $to; |
|
| 30 | + |
|
| 31 | + /** |
|
| 32 | + * @param string $from The original base path (directory, not file!) |
|
| 33 | + * @param string $to The new base path (directory, not file!) |
|
| 34 | + */ |
|
| 35 | + public function __construct($from, $to) |
|
| 36 | + { |
|
| 37 | + $shared = $this->shared($from, $to); |
|
| 38 | + if ($shared === '') { |
|
| 39 | + // when both paths have nothing in common, one of them is probably |
|
| 40 | + // absolute while the other is relative |
|
| 41 | + $cwd = getcwd(); |
|
| 42 | + $from = strpos($from, $cwd) === 0 ? $from : $cwd.'/'.$from; |
|
| 43 | + $to = strpos($to, $cwd) === 0 ? $to : $cwd.'/'.$to; |
|
| 44 | + |
|
| 45 | + // or traveling the tree via `..` |
|
| 46 | + // attempt to resolve path, or assume it's fine if it doesn't exist |
|
| 47 | + $from = realpath($from) ?: $from; |
|
| 48 | + $to = realpath($to) ?: $to; |
|
| 49 | + } |
|
| 50 | + |
|
| 51 | + $from = $this->normalize($from); |
|
| 52 | + $to = $this->normalize($to); |
|
| 53 | + |
|
| 54 | + $from = $this->dirname($from); |
|
| 55 | + $to = $this->dirname($to); |
|
| 56 | + |
|
| 57 | + $this->from = $from; |
|
| 58 | + $this->to = $to; |
|
| 59 | + } |
|
| 60 | + |
|
| 61 | + /** |
|
| 62 | + * Normalize path. |
|
| 63 | + * |
|
| 64 | + * @param string $path |
|
| 65 | + * |
|
| 66 | + * @return string |
|
| 67 | + */ |
|
| 68 | + protected function normalize($path) |
|
| 69 | + { |
|
| 70 | + // deal with different operating systems' directory structure |
|
| 71 | + $path = rtrim(str_replace(DIRECTORY_SEPARATOR, '/', $path), '/'); |
|
| 72 | + |
|
| 73 | + /* |
|
| 74 | 74 | * Example: |
| 75 | 75 | * /home/forkcms/frontend/cache/compiled_templates/../../core/layout/css/../images/img.gif |
| 76 | 76 | * to |
| 77 | 77 | * /home/forkcms/frontend/core/layout/images/img.gif |
| 78 | 78 | */ |
| 79 | - do { |
|
| 80 | - $path = preg_replace('/[^\/]+(?<!\.\.)\/\.\.\//', '', $path, -1, $count); |
|
| 81 | - } while ($count); |
|
| 82 | - |
|
| 83 | - return $path; |
|
| 84 | - } |
|
| 85 | - |
|
| 86 | - /** |
|
| 87 | - * Figure out the shared path of 2 locations. |
|
| 88 | - * |
|
| 89 | - * Example: |
|
| 90 | - * /home/forkcms/frontend/core/layout/images/img.gif |
|
| 91 | - * and |
|
| 92 | - * /home/forkcms/frontend/cache/minified_css |
|
| 93 | - * share |
|
| 94 | - * /home/forkcms/frontend |
|
| 95 | - * |
|
| 96 | - * @param string $path1 |
|
| 97 | - * @param string $path2 |
|
| 98 | - * |
|
| 99 | - * @return string |
|
| 100 | - */ |
|
| 101 | - protected function shared($path1, $path2) |
|
| 102 | - { |
|
| 103 | - // $path could theoretically be empty (e.g. no path is given), in which |
|
| 104 | - // case it shouldn't expand to array(''), which would compare to one's |
|
| 105 | - // root / |
|
| 106 | - $path1 = $path1 ? explode('/', $path1) : array(); |
|
| 107 | - $path2 = $path2 ? explode('/', $path2) : array(); |
|
| 108 | - |
|
| 109 | - $shared = array(); |
|
| 110 | - |
|
| 111 | - // compare paths & strip identical ancestors |
|
| 112 | - foreach ($path1 as $i => $chunk) { |
|
| 113 | - if (isset($path2[$i]) && $path1[$i] == $path2[$i]) { |
|
| 114 | - $shared[] = $chunk; |
|
| 115 | - } else { |
|
| 116 | - break; |
|
| 117 | - } |
|
| 118 | - } |
|
| 119 | - |
|
| 120 | - return implode('/', $shared); |
|
| 121 | - } |
|
| 122 | - |
|
| 123 | - /** |
|
| 124 | - * Convert paths relative from 1 file to another. |
|
| 125 | - * |
|
| 126 | - * E.g. |
|
| 127 | - * ../images/img.gif relative to /home/forkcms/frontend/core/layout/css |
|
| 128 | - * should become: |
|
| 129 | - * ../../core/layout/images/img.gif relative to |
|
| 130 | - * /home/forkcms/frontend/cache/minified_css |
|
| 131 | - * |
|
| 132 | - * @param string $path The relative path that needs to be converted. |
|
| 133 | - * |
|
| 134 | - * @return string The new relative path. |
|
| 135 | - */ |
|
| 136 | - public function convert($path) |
|
| 137 | - { |
|
| 138 | - // quit early if conversion makes no sense |
|
| 139 | - if ($this->from === $this->to) { |
|
| 140 | - return $path; |
|
| 141 | - } |
|
| 142 | - |
|
| 143 | - $path = $this->normalize($path); |
|
| 144 | - // if we're not dealing with a relative path, just return absolute |
|
| 145 | - if (strpos($path, '/') === 0) { |
|
| 146 | - return $path; |
|
| 147 | - } |
|
| 148 | - |
|
| 149 | - // normalize paths |
|
| 150 | - $path = $this->normalize($this->from.'/'.$path); |
|
| 151 | - |
|
| 152 | - // strip shared ancestor paths |
|
| 153 | - $shared = $this->shared($path, $this->to); |
|
| 154 | - $path = mb_substr($path, mb_strlen($shared)); |
|
| 155 | - $to = mb_substr($this->to, mb_strlen($shared)); |
|
| 156 | - |
|
| 157 | - // add .. for every directory that needs to be traversed to new path |
|
| 158 | - $to = str_repeat('../', mb_substr_count($to, '/')); |
|
| 159 | - |
|
| 160 | - return $to.ltrim($path, '/'); |
|
| 161 | - } |
|
| 162 | - |
|
| 163 | - /** |
|
| 164 | - * Attempt to get the directory name from a path. |
|
| 165 | - * |
|
| 166 | - * @param string $path |
|
| 167 | - * |
|
| 168 | - * @return string |
|
| 169 | - */ |
|
| 170 | - public function dirname($path) |
|
| 171 | - { |
|
| 172 | - if (is_file($path)) { |
|
| 173 | - return dirname($path); |
|
| 174 | - } |
|
| 175 | - |
|
| 176 | - if (is_dir($path)) { |
|
| 177 | - return rtrim($path, '/'); |
|
| 178 | - } |
|
| 179 | - |
|
| 180 | - // no known file/dir, start making assumptions |
|
| 181 | - |
|
| 182 | - // ends in / = dir |
|
| 183 | - if (mb_substr($path, -1) === '/') { |
|
| 184 | - return rtrim($path, '/'); |
|
| 185 | - } |
|
| 186 | - |
|
| 187 | - // has a dot in the name, likely a file |
|
| 188 | - if (preg_match('/.*\..*$/', basename($path)) !== 0) { |
|
| 189 | - return dirname($path); |
|
| 190 | - } |
|
| 191 | - |
|
| 192 | - // you're on your own here! |
|
| 193 | - return $path; |
|
| 194 | - } |
|
| 79 | + do { |
|
| 80 | + $path = preg_replace('/[^\/]+(?<!\.\.)\/\.\.\//', '', $path, -1, $count); |
|
| 81 | + } while ($count); |
|
| 82 | + |
|
| 83 | + return $path; |
|
| 84 | + } |
|
| 85 | + |
|
| 86 | + /** |
|
| 87 | + * Figure out the shared path of 2 locations. |
|
| 88 | + * |
|
| 89 | + * Example: |
|
| 90 | + * /home/forkcms/frontend/core/layout/images/img.gif |
|
| 91 | + * and |
|
| 92 | + * /home/forkcms/frontend/cache/minified_css |
|
| 93 | + * share |
|
| 94 | + * /home/forkcms/frontend |
|
| 95 | + * |
|
| 96 | + * @param string $path1 |
|
| 97 | + * @param string $path2 |
|
| 98 | + * |
|
| 99 | + * @return string |
|
| 100 | + */ |
|
| 101 | + protected function shared($path1, $path2) |
|
| 102 | + { |
|
| 103 | + // $path could theoretically be empty (e.g. no path is given), in which |
|
| 104 | + // case it shouldn't expand to array(''), which would compare to one's |
|
| 105 | + // root / |
|
| 106 | + $path1 = $path1 ? explode('/', $path1) : array(); |
|
| 107 | + $path2 = $path2 ? explode('/', $path2) : array(); |
|
| 108 | + |
|
| 109 | + $shared = array(); |
|
| 110 | + |
|
| 111 | + // compare paths & strip identical ancestors |
|
| 112 | + foreach ($path1 as $i => $chunk) { |
|
| 113 | + if (isset($path2[$i]) && $path1[$i] == $path2[$i]) { |
|
| 114 | + $shared[] = $chunk; |
|
| 115 | + } else { |
|
| 116 | + break; |
|
| 117 | + } |
|
| 118 | + } |
|
| 119 | + |
|
| 120 | + return implode('/', $shared); |
|
| 121 | + } |
|
| 122 | + |
|
| 123 | + /** |
|
| 124 | + * Convert paths relative from 1 file to another. |
|
| 125 | + * |
|
| 126 | + * E.g. |
|
| 127 | + * ../images/img.gif relative to /home/forkcms/frontend/core/layout/css |
|
| 128 | + * should become: |
|
| 129 | + * ../../core/layout/images/img.gif relative to |
|
| 130 | + * /home/forkcms/frontend/cache/minified_css |
|
| 131 | + * |
|
| 132 | + * @param string $path The relative path that needs to be converted. |
|
| 133 | + * |
|
| 134 | + * @return string The new relative path. |
|
| 135 | + */ |
|
| 136 | + public function convert($path) |
|
| 137 | + { |
|
| 138 | + // quit early if conversion makes no sense |
|
| 139 | + if ($this->from === $this->to) { |
|
| 140 | + return $path; |
|
| 141 | + } |
|
| 142 | + |
|
| 143 | + $path = $this->normalize($path); |
|
| 144 | + // if we're not dealing with a relative path, just return absolute |
|
| 145 | + if (strpos($path, '/') === 0) { |
|
| 146 | + return $path; |
|
| 147 | + } |
|
| 148 | + |
|
| 149 | + // normalize paths |
|
| 150 | + $path = $this->normalize($this->from.'/'.$path); |
|
| 151 | + |
|
| 152 | + // strip shared ancestor paths |
|
| 153 | + $shared = $this->shared($path, $this->to); |
|
| 154 | + $path = mb_substr($path, mb_strlen($shared)); |
|
| 155 | + $to = mb_substr($this->to, mb_strlen($shared)); |
|
| 156 | + |
|
| 157 | + // add .. for every directory that needs to be traversed to new path |
|
| 158 | + $to = str_repeat('../', mb_substr_count($to, '/')); |
|
| 159 | + |
|
| 160 | + return $to.ltrim($path, '/'); |
|
| 161 | + } |
|
| 162 | + |
|
| 163 | + /** |
|
| 164 | + * Attempt to get the directory name from a path. |
|
| 165 | + * |
|
| 166 | + * @param string $path |
|
| 167 | + * |
|
| 168 | + * @return string |
|
| 169 | + */ |
|
| 170 | + public function dirname($path) |
|
| 171 | + { |
|
| 172 | + if (is_file($path)) { |
|
| 173 | + return dirname($path); |
|
| 174 | + } |
|
| 175 | + |
|
| 176 | + if (is_dir($path)) { |
|
| 177 | + return rtrim($path, '/'); |
|
| 178 | + } |
|
| 179 | + |
|
| 180 | + // no known file/dir, start making assumptions |
|
| 181 | + |
|
| 182 | + // ends in / = dir |
|
| 183 | + if (mb_substr($path, -1) === '/') { |
|
| 184 | + return rtrim($path, '/'); |
|
| 185 | + } |
|
| 186 | + |
|
| 187 | + // has a dot in the name, likely a file |
|
| 188 | + if (preg_match('/.*\..*$/', basename($path)) !== 0) { |
|
| 189 | + return dirname($path); |
|
| 190 | + } |
|
| 191 | + |
|
| 192 | + // you're on your own here! |
|
| 193 | + return $path; |
|
| 194 | + } |
|
| 195 | 195 | } |
@@ -39,8 +39,8 @@ discard block |
||
| 39 | 39 | // when both paths have nothing in common, one of them is probably |
| 40 | 40 | // absolute while the other is relative |
| 41 | 41 | $cwd = getcwd(); |
| 42 | - $from = strpos($from, $cwd) === 0 ? $from : $cwd.'/'.$from; |
|
| 43 | - $to = strpos($to, $cwd) === 0 ? $to : $cwd.'/'.$to; |
|
| 42 | + $from = strpos($from, $cwd) === 0 ? $from : $cwd . '/' . $from; |
|
| 43 | + $to = strpos($to, $cwd) === 0 ? $to : $cwd . '/' . $to; |
|
| 44 | 44 | |
| 45 | 45 | // or traveling the tree via `..` |
| 46 | 46 | // attempt to resolve path, or assume it's fine if it doesn't exist |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | } |
| 148 | 148 | |
| 149 | 149 | // normalize paths |
| 150 | - $path = $this->normalize($this->from.'/'.$path); |
|
| 150 | + $path = $this->normalize($this->from . '/' . $path); |
|
| 151 | 151 | |
| 152 | 152 | // strip shared ancestor paths |
| 153 | 153 | $shared = $this->shared($path, $this->to); |
@@ -157,7 +157,7 @@ discard block |
||
| 157 | 157 | // add .. for every directory that needs to be traversed to new path |
| 158 | 158 | $to = str_repeat('../', mb_substr_count($to, '/')); |
| 159 | 159 | |
| 160 | - return $to.ltrim($path, '/'); |
|
| 160 | + return $to . ltrim($path, '/'); |
|
| 161 | 161 | } |
| 162 | 162 | |
| 163 | 163 | /** |
@@ -17,97 +17,97 @@ discard block |
||
| 17 | 17 | */ |
| 18 | 18 | class CSS extends Minify |
| 19 | 19 | { |
| 20 | - /** |
|
| 21 | - * @var int |
|
| 22 | - */ |
|
| 23 | - protected $maxImportSize = 5; |
|
| 24 | - |
|
| 25 | - /** |
|
| 26 | - * @var string[] |
|
| 27 | - */ |
|
| 28 | - protected $importExtensions = array( |
|
| 29 | - 'gif' => 'data:image/gif', |
|
| 30 | - 'png' => 'data:image/png', |
|
| 31 | - 'jpe' => 'data:image/jpeg', |
|
| 32 | - 'jpg' => 'data:image/jpeg', |
|
| 33 | - 'jpeg' => 'data:image/jpeg', |
|
| 34 | - 'svg' => 'data:image/svg+xml', |
|
| 35 | - 'woff' => 'data:application/x-font-woff', |
|
| 36 | - 'tif' => 'image/tiff', |
|
| 37 | - 'tiff' => 'image/tiff', |
|
| 38 | - 'xbm' => 'image/x-xbitmap', |
|
| 39 | - ); |
|
| 40 | - |
|
| 41 | - /** |
|
| 42 | - * Set the maximum size if files to be imported. |
|
| 43 | - * |
|
| 44 | - * Files larger than this size (in kB) will not be imported into the CSS. |
|
| 45 | - * Importing files into the CSS as data-uri will save you some connections, |
|
| 46 | - * but we should only import relatively small decorative images so that our |
|
| 47 | - * CSS file doesn't get too bulky. |
|
| 48 | - * |
|
| 49 | - * @param int $size Size in kB |
|
| 50 | - */ |
|
| 51 | - public function setMaxImportSize($size) |
|
| 52 | - { |
|
| 53 | - $this->maxImportSize = $size; |
|
| 54 | - } |
|
| 55 | - |
|
| 56 | - /** |
|
| 57 | - * Set the type of extensions to be imported into the CSS (to save network |
|
| 58 | - * connections). |
|
| 59 | - * Keys of the array should be the file extensions & respective values |
|
| 60 | - * should be the data type. |
|
| 61 | - * |
|
| 62 | - * @param string[] $extensions Array of file extensions |
|
| 63 | - */ |
|
| 64 | - public function setImportExtensions(array $extensions) |
|
| 65 | - { |
|
| 66 | - $this->importExtensions = $extensions; |
|
| 67 | - } |
|
| 68 | - |
|
| 69 | - /** |
|
| 70 | - * Move any import statements to the top. |
|
| 71 | - * |
|
| 72 | - * @param string $content Nearly finished CSS content |
|
| 73 | - * |
|
| 74 | - * @return string |
|
| 75 | - */ |
|
| 76 | - protected function moveImportsToTop($content) |
|
| 77 | - { |
|
| 78 | - if (preg_match_all('/@import[^;]+;/', $content, $matches)) { |
|
| 79 | - |
|
| 80 | - // remove from content |
|
| 81 | - foreach ($matches[0] as $import) { |
|
| 82 | - $content = str_replace($import, '', $content); |
|
| 83 | - } |
|
| 84 | - |
|
| 85 | - // add to top |
|
| 86 | - $content = implode('', $matches[0]).$content; |
|
| 87 | - }; |
|
| 88 | - |
|
| 89 | - return $content; |
|
| 90 | - } |
|
| 91 | - |
|
| 92 | - /** |
|
| 93 | - * Combine CSS from import statements. |
|
| 94 | - * |
|
| 95 | - * @import's will be loaded and their content merged into the original file, |
|
| 96 | - * to save HTTP requests. |
|
| 97 | - * |
|
| 98 | - * @param string $source The file to combine imports for. |
|
| 99 | - * @param string $content The CSS content to combine imports for. |
|
| 100 | - * @param string[] $parents Parent paths, for circular reference checks. |
|
| 101 | - * |
|
| 102 | - * @return string |
|
| 103 | - * |
|
| 104 | - * @throws FileImportException |
|
| 105 | - */ |
|
| 106 | - protected function combineImports($source, $content, $parents) |
|
| 107 | - { |
|
| 108 | - $importRegexes = array( |
|
| 109 | - // @import url(xxx) |
|
| 110 | - '/ |
|
| 20 | + /** |
|
| 21 | + * @var int |
|
| 22 | + */ |
|
| 23 | + protected $maxImportSize = 5; |
|
| 24 | + |
|
| 25 | + /** |
|
| 26 | + * @var string[] |
|
| 27 | + */ |
|
| 28 | + protected $importExtensions = array( |
|
| 29 | + 'gif' => 'data:image/gif', |
|
| 30 | + 'png' => 'data:image/png', |
|
| 31 | + 'jpe' => 'data:image/jpeg', |
|
| 32 | + 'jpg' => 'data:image/jpeg', |
|
| 33 | + 'jpeg' => 'data:image/jpeg', |
|
| 34 | + 'svg' => 'data:image/svg+xml', |
|
| 35 | + 'woff' => 'data:application/x-font-woff', |
|
| 36 | + 'tif' => 'image/tiff', |
|
| 37 | + 'tiff' => 'image/tiff', |
|
| 38 | + 'xbm' => 'image/x-xbitmap', |
|
| 39 | + ); |
|
| 40 | + |
|
| 41 | + /** |
|
| 42 | + * Set the maximum size if files to be imported. |
|
| 43 | + * |
|
| 44 | + * Files larger than this size (in kB) will not be imported into the CSS. |
|
| 45 | + * Importing files into the CSS as data-uri will save you some connections, |
|
| 46 | + * but we should only import relatively small decorative images so that our |
|
| 47 | + * CSS file doesn't get too bulky. |
|
| 48 | + * |
|
| 49 | + * @param int $size Size in kB |
|
| 50 | + */ |
|
| 51 | + public function setMaxImportSize($size) |
|
| 52 | + { |
|
| 53 | + $this->maxImportSize = $size; |
|
| 54 | + } |
|
| 55 | + |
|
| 56 | + /** |
|
| 57 | + * Set the type of extensions to be imported into the CSS (to save network |
|
| 58 | + * connections). |
|
| 59 | + * Keys of the array should be the file extensions & respective values |
|
| 60 | + * should be the data type. |
|
| 61 | + * |
|
| 62 | + * @param string[] $extensions Array of file extensions |
|
| 63 | + */ |
|
| 64 | + public function setImportExtensions(array $extensions) |
|
| 65 | + { |
|
| 66 | + $this->importExtensions = $extensions; |
|
| 67 | + } |
|
| 68 | + |
|
| 69 | + /** |
|
| 70 | + * Move any import statements to the top. |
|
| 71 | + * |
|
| 72 | + * @param string $content Nearly finished CSS content |
|
| 73 | + * |
|
| 74 | + * @return string |
|
| 75 | + */ |
|
| 76 | + protected function moveImportsToTop($content) |
|
| 77 | + { |
|
| 78 | + if (preg_match_all('/@import[^;]+;/', $content, $matches)) { |
|
| 79 | + |
|
| 80 | + // remove from content |
|
| 81 | + foreach ($matches[0] as $import) { |
|
| 82 | + $content = str_replace($import, '', $content); |
|
| 83 | + } |
|
| 84 | + |
|
| 85 | + // add to top |
|
| 86 | + $content = implode('', $matches[0]).$content; |
|
| 87 | + }; |
|
| 88 | + |
|
| 89 | + return $content; |
|
| 90 | + } |
|
| 91 | + |
|
| 92 | + /** |
|
| 93 | + * Combine CSS from import statements. |
|
| 94 | + * |
|
| 95 | + * @import's will be loaded and their content merged into the original file, |
|
| 96 | + * to save HTTP requests. |
|
| 97 | + * |
|
| 98 | + * @param string $source The file to combine imports for. |
|
| 99 | + * @param string $content The CSS content to combine imports for. |
|
| 100 | + * @param string[] $parents Parent paths, for circular reference checks. |
|
| 101 | + * |
|
| 102 | + * @return string |
|
| 103 | + * |
|
| 104 | + * @throws FileImportException |
|
| 105 | + */ |
|
| 106 | + protected function combineImports($source, $content, $parents) |
|
| 107 | + { |
|
| 108 | + $importRegexes = array( |
|
| 109 | + // @import url(xxx) |
|
| 110 | + '/ |
|
| 111 | 111 | # import statement |
| 112 | 112 | @import |
| 113 | 113 | |
@@ -152,8 +152,8 @@ discard block |
||
| 152 | 152 | |
| 153 | 153 | /ix', |
| 154 | 154 | |
| 155 | - // @import 'xxx' |
|
| 156 | - '/ |
|
| 155 | + // @import 'xxx' |
|
| 156 | + '/ |
|
| 157 | 157 | |
| 158 | 158 | # import statement |
| 159 | 159 | @import |
@@ -192,172 +192,172 @@ discard block |
||
| 192 | 192 | ;? |
| 193 | 193 | |
| 194 | 194 | /ix', |
| 195 | - ); |
|
| 196 | - |
|
| 197 | - // find all relative imports in css |
|
| 198 | - $matches = array(); |
|
| 199 | - foreach ($importRegexes as $importRegex) { |
|
| 200 | - if (preg_match_all($importRegex, $content, $regexMatches, PREG_SET_ORDER)) { |
|
| 201 | - $matches = array_merge($matches, $regexMatches); |
|
| 202 | - } |
|
| 203 | - } |
|
| 204 | - |
|
| 205 | - $search = array(); |
|
| 206 | - $replace = array(); |
|
| 207 | - |
|
| 208 | - // loop the matches |
|
| 209 | - foreach ($matches as $match) { |
|
| 210 | - // get the path for the file that will be imported |
|
| 211 | - $importPath = dirname($source).'/'.$match['path']; |
|
| 212 | - |
|
| 213 | - // only replace the import with the content if we can grab the |
|
| 214 | - // content of the file |
|
| 215 | - if ($this->canImportFile($importPath)) { |
|
| 216 | - // check if current file was not imported previously in the same |
|
| 217 | - // import chain. |
|
| 218 | - if (in_array($importPath, $parents)) { |
|
| 219 | - throw new FileImportException('Failed to import file "'.$importPath.'": circular reference detected.'); |
|
| 220 | - } |
|
| 221 | - |
|
| 222 | - // grab referenced file & minify it (which may include importing |
|
| 223 | - // yet other @import statements recursively) |
|
| 224 | - $minifier = new static($importPath); |
|
| 225 | - $importContent = $minifier->execute($source, $parents); |
|
| 226 | - |
|
| 227 | - // check if this is only valid for certain media |
|
| 228 | - if (!empty($match['media'])) { |
|
| 229 | - $importContent = '@media '.$match['media'].'{'.$importContent.'}'; |
|
| 230 | - } |
|
| 231 | - |
|
| 232 | - // add to replacement array |
|
| 233 | - $search[] = $match[0]; |
|
| 234 | - $replace[] = $importContent; |
|
| 235 | - } |
|
| 236 | - } |
|
| 237 | - |
|
| 238 | - // replace the import statements |
|
| 239 | - $content = str_replace($search, $replace, $content); |
|
| 240 | - |
|
| 241 | - return $content; |
|
| 242 | - } |
|
| 243 | - |
|
| 244 | - /** |
|
| 245 | - * Import files into the CSS, base64-ized. |
|
| 246 | - * |
|
| 247 | - * @url(image.jpg) images will be loaded and their content merged into the |
|
| 248 | - * original file, to save HTTP requests. |
|
| 249 | - * |
|
| 250 | - * @param string $source The file to import files for. |
|
| 251 | - * @param string $content The CSS content to import files for. |
|
| 252 | - * |
|
| 253 | - * @return string |
|
| 254 | - */ |
|
| 255 | - protected function importFiles($source, $content) |
|
| 256 | - { |
|
| 257 | - $extensions = array_keys($this->importExtensions); |
|
| 258 | - $regex = '/url\((["\']?)((?!["\']?data:).*?\.('.implode('|', $extensions).'))\\1\)/i'; |
|
| 259 | - if ($extensions && preg_match_all($regex, $content, $matches, PREG_SET_ORDER)) { |
|
| 260 | - $search = array(); |
|
| 261 | - $replace = array(); |
|
| 262 | - |
|
| 263 | - // loop the matches |
|
| 264 | - foreach ($matches as $match) { |
|
| 265 | - // get the path for the file that will be imported |
|
| 266 | - $path = $match[2]; |
|
| 267 | - $path = dirname($source).'/'.$path; |
|
| 268 | - $extension = $match[3]; |
|
| 269 | - |
|
| 270 | - // only replace the import with the content if we're able to get |
|
| 271 | - // the content of the file, and it's relatively small |
|
| 272 | - if ($this->canImportFile($path) && $this->canImportBySize($path)) { |
|
| 273 | - // grab content && base64-ize |
|
| 274 | - $importContent = $this->load($path); |
|
| 275 | - $importContent = base64_encode($importContent); |
|
| 276 | - |
|
| 277 | - // build replacement |
|
| 278 | - $search[] = $match[0]; |
|
| 279 | - $replace[] = 'url('.$this->importExtensions[$extension].';base64,'.$importContent.')'; |
|
| 280 | - } |
|
| 281 | - } |
|
| 282 | - |
|
| 283 | - // replace the import statements |
|
| 284 | - $content = str_replace($search, $replace, $content); |
|
| 285 | - } |
|
| 286 | - |
|
| 287 | - return $content; |
|
| 288 | - } |
|
| 289 | - |
|
| 290 | - /** |
|
| 291 | - * Minify the data. |
|
| 292 | - * Perform CSS optimizations. |
|
| 293 | - * |
|
| 294 | - * @param string[optional] $path Path to write the data to. |
|
| 295 | - * @param string[] $parents Parent paths, for circular reference checks. |
|
| 296 | - * |
|
| 297 | - * @return string The minified data. |
|
| 298 | - */ |
|
| 299 | - public function execute($path = null, $parents = array()) |
|
| 300 | - { |
|
| 301 | - $content = ''; |
|
| 302 | - |
|
| 303 | - // loop css data (raw data and files) |
|
| 304 | - foreach ($this->data as $source => $css) { |
|
| 305 | - /* |
|
| 195 | + ); |
|
| 196 | + |
|
| 197 | + // find all relative imports in css |
|
| 198 | + $matches = array(); |
|
| 199 | + foreach ($importRegexes as $importRegex) { |
|
| 200 | + if (preg_match_all($importRegex, $content, $regexMatches, PREG_SET_ORDER)) { |
|
| 201 | + $matches = array_merge($matches, $regexMatches); |
|
| 202 | + } |
|
| 203 | + } |
|
| 204 | + |
|
| 205 | + $search = array(); |
|
| 206 | + $replace = array(); |
|
| 207 | + |
|
| 208 | + // loop the matches |
|
| 209 | + foreach ($matches as $match) { |
|
| 210 | + // get the path for the file that will be imported |
|
| 211 | + $importPath = dirname($source).'/'.$match['path']; |
|
| 212 | + |
|
| 213 | + // only replace the import with the content if we can grab the |
|
| 214 | + // content of the file |
|
| 215 | + if ($this->canImportFile($importPath)) { |
|
| 216 | + // check if current file was not imported previously in the same |
|
| 217 | + // import chain. |
|
| 218 | + if (in_array($importPath, $parents)) { |
|
| 219 | + throw new FileImportException('Failed to import file "'.$importPath.'": circular reference detected.'); |
|
| 220 | + } |
|
| 221 | + |
|
| 222 | + // grab referenced file & minify it (which may include importing |
|
| 223 | + // yet other @import statements recursively) |
|
| 224 | + $minifier = new static($importPath); |
|
| 225 | + $importContent = $minifier->execute($source, $parents); |
|
| 226 | + |
|
| 227 | + // check if this is only valid for certain media |
|
| 228 | + if (!empty($match['media'])) { |
|
| 229 | + $importContent = '@media '.$match['media'].'{'.$importContent.'}'; |
|
| 230 | + } |
|
| 231 | + |
|
| 232 | + // add to replacement array |
|
| 233 | + $search[] = $match[0]; |
|
| 234 | + $replace[] = $importContent; |
|
| 235 | + } |
|
| 236 | + } |
|
| 237 | + |
|
| 238 | + // replace the import statements |
|
| 239 | + $content = str_replace($search, $replace, $content); |
|
| 240 | + |
|
| 241 | + return $content; |
|
| 242 | + } |
|
| 243 | + |
|
| 244 | + /** |
|
| 245 | + * Import files into the CSS, base64-ized. |
|
| 246 | + * |
|
| 247 | + * @url(image.jpg) images will be loaded and their content merged into the |
|
| 248 | + * original file, to save HTTP requests. |
|
| 249 | + * |
|
| 250 | + * @param string $source The file to import files for. |
|
| 251 | + * @param string $content The CSS content to import files for. |
|
| 252 | + * |
|
| 253 | + * @return string |
|
| 254 | + */ |
|
| 255 | + protected function importFiles($source, $content) |
|
| 256 | + { |
|
| 257 | + $extensions = array_keys($this->importExtensions); |
|
| 258 | + $regex = '/url\((["\']?)((?!["\']?data:).*?\.('.implode('|', $extensions).'))\\1\)/i'; |
|
| 259 | + if ($extensions && preg_match_all($regex, $content, $matches, PREG_SET_ORDER)) { |
|
| 260 | + $search = array(); |
|
| 261 | + $replace = array(); |
|
| 262 | + |
|
| 263 | + // loop the matches |
|
| 264 | + foreach ($matches as $match) { |
|
| 265 | + // get the path for the file that will be imported |
|
| 266 | + $path = $match[2]; |
|
| 267 | + $path = dirname($source).'/'.$path; |
|
| 268 | + $extension = $match[3]; |
|
| 269 | + |
|
| 270 | + // only replace the import with the content if we're able to get |
|
| 271 | + // the content of the file, and it's relatively small |
|
| 272 | + if ($this->canImportFile($path) && $this->canImportBySize($path)) { |
|
| 273 | + // grab content && base64-ize |
|
| 274 | + $importContent = $this->load($path); |
|
| 275 | + $importContent = base64_encode($importContent); |
|
| 276 | + |
|
| 277 | + // build replacement |
|
| 278 | + $search[] = $match[0]; |
|
| 279 | + $replace[] = 'url('.$this->importExtensions[$extension].';base64,'.$importContent.')'; |
|
| 280 | + } |
|
| 281 | + } |
|
| 282 | + |
|
| 283 | + // replace the import statements |
|
| 284 | + $content = str_replace($search, $replace, $content); |
|
| 285 | + } |
|
| 286 | + |
|
| 287 | + return $content; |
|
| 288 | + } |
|
| 289 | + |
|
| 290 | + /** |
|
| 291 | + * Minify the data. |
|
| 292 | + * Perform CSS optimizations. |
|
| 293 | + * |
|
| 294 | + * @param string[optional] $path Path to write the data to. |
|
| 295 | + * @param string[] $parents Parent paths, for circular reference checks. |
|
| 296 | + * |
|
| 297 | + * @return string The minified data. |
|
| 298 | + */ |
|
| 299 | + public function execute($path = null, $parents = array()) |
|
| 300 | + { |
|
| 301 | + $content = ''; |
|
| 302 | + |
|
| 303 | + // loop css data (raw data and files) |
|
| 304 | + foreach ($this->data as $source => $css) { |
|
| 305 | + /* |
|
| 306 | 306 | * Let's first take out strings & comments, since we can't just remove |
| 307 | 307 | * whitespace anywhere. If whitespace occurs inside a string, we should |
| 308 | 308 | * leave it alone. E.g.: |
| 309 | 309 | * p { content: "a test" } |
| 310 | 310 | */ |
| 311 | - $this->extractStrings(); |
|
| 312 | - $this->stripComments(); |
|
| 313 | - $css = $this->replace($css); |
|
| 311 | + $this->extractStrings(); |
|
| 312 | + $this->stripComments(); |
|
| 313 | + $css = $this->replace($css); |
|
| 314 | 314 | |
| 315 | - $css = $this->stripWhitespace($css); |
|
| 316 | - $css = $this->shortenHex($css); |
|
| 317 | - $css = $this->shortenZeroes($css); |
|
| 318 | - $css = $this->stripEmptyTags($css); |
|
| 315 | + $css = $this->stripWhitespace($css); |
|
| 316 | + $css = $this->shortenHex($css); |
|
| 317 | + $css = $this->shortenZeroes($css); |
|
| 318 | + $css = $this->stripEmptyTags($css); |
|
| 319 | 319 | |
| 320 | - // restore the string we've extracted earlier |
|
| 321 | - $css = $this->restoreExtractedData($css); |
|
| 320 | + // restore the string we've extracted earlier |
|
| 321 | + $css = $this->restoreExtractedData($css); |
|
| 322 | 322 | |
| 323 | - $source = is_int($source) ? '' : $source; |
|
| 324 | - $parents = $source ? array_merge($parents, array($source)) : $parents; |
|
| 325 | - $css = $this->combineImports($source, $css, $parents); |
|
| 326 | - $css = $this->importFiles($source, $css); |
|
| 323 | + $source = is_int($source) ? '' : $source; |
|
| 324 | + $parents = $source ? array_merge($parents, array($source)) : $parents; |
|
| 325 | + $css = $this->combineImports($source, $css, $parents); |
|
| 326 | + $css = $this->importFiles($source, $css); |
|
| 327 | 327 | |
| 328 | - /* |
|
| 328 | + /* |
|
| 329 | 329 | * If we'll save to a new path, we'll have to fix the relative paths |
| 330 | 330 | * to be relative no longer to the source file, but to the new path. |
| 331 | 331 | * If we don't write to a file, fall back to same path so no |
| 332 | 332 | * conversion happens (because we still want it to go through most |
| 333 | 333 | * of the move code...) |
| 334 | 334 | */ |
| 335 | - $converter = new Converter($source, $path ?: $source); |
|
| 336 | - $css = $this->move($converter, $css); |
|
| 337 | - |
|
| 338 | - // combine css |
|
| 339 | - $content .= $css; |
|
| 340 | - } |
|
| 341 | - |
|
| 342 | - $content = $this->moveImportsToTop($content); |
|
| 343 | - |
|
| 344 | - return $content; |
|
| 345 | - } |
|
| 346 | - |
|
| 347 | - /** |
|
| 348 | - * Moving a css file should update all relative urls. |
|
| 349 | - * Relative references (e.g. ../images/image.gif) in a certain css file, |
|
| 350 | - * will have to be updated when a file is being saved at another location |
|
| 351 | - * (e.g. ../../images/image.gif, if the new CSS file is 1 folder deeper). |
|
| 352 | - * |
|
| 353 | - * @param Converter $converter Relative path converter |
|
| 354 | - * @param string $content The CSS content to update relative urls for. |
|
| 355 | - * |
|
| 356 | - * @return string |
|
| 357 | - */ |
|
| 358 | - protected function move(Converter $converter, $content) |
|
| 359 | - { |
|
| 360 | - /* |
|
| 335 | + $converter = new Converter($source, $path ?: $source); |
|
| 336 | + $css = $this->move($converter, $css); |
|
| 337 | + |
|
| 338 | + // combine css |
|
| 339 | + $content .= $css; |
|
| 340 | + } |
|
| 341 | + |
|
| 342 | + $content = $this->moveImportsToTop($content); |
|
| 343 | + |
|
| 344 | + return $content; |
|
| 345 | + } |
|
| 346 | + |
|
| 347 | + /** |
|
| 348 | + * Moving a css file should update all relative urls. |
|
| 349 | + * Relative references (e.g. ../images/image.gif) in a certain css file, |
|
| 350 | + * will have to be updated when a file is being saved at another location |
|
| 351 | + * (e.g. ../../images/image.gif, if the new CSS file is 1 folder deeper). |
|
| 352 | + * |
|
| 353 | + * @param Converter $converter Relative path converter |
|
| 354 | + * @param string $content The CSS content to update relative urls for. |
|
| 355 | + * |
|
| 356 | + * @return string |
|
| 357 | + */ |
|
| 358 | + protected function move(Converter $converter, $content) |
|
| 359 | + { |
|
| 360 | + /* |
|
| 361 | 361 | * Relative path references will usually be enclosed by url(). @import |
| 362 | 362 | * is an exception, where url() is not necessary around the path (but is |
| 363 | 363 | * allowed). |
@@ -368,9 +368,9 @@ discard block |
||
| 368 | 368 | * recent PCRE version. That's why I'm doing 2 separate regular |
| 369 | 369 | * expressions & combining the matches after executing of both. |
| 370 | 370 | */ |
| 371 | - $relativeRegexes = array( |
|
| 372 | - // url(xxx) |
|
| 373 | - '/ |
|
| 371 | + $relativeRegexes = array( |
|
| 372 | + // url(xxx) |
|
| 373 | + '/ |
|
| 374 | 374 | # open url() |
| 375 | 375 | url\( |
| 376 | 376 | |
@@ -402,8 +402,8 @@ discard block |
||
| 402 | 402 | |
| 403 | 403 | /ix', |
| 404 | 404 | |
| 405 | - // @import "xxx" |
|
| 406 | - '/ |
|
| 405 | + // @import "xxx" |
|
| 406 | + '/ |
|
| 407 | 407 | # import statement |
| 408 | 408 | @import |
| 409 | 409 | |
@@ -432,167 +432,167 @@ discard block |
||
| 432 | 432 | (?P=quotes) |
| 433 | 433 | |
| 434 | 434 | /ix', |
| 435 | - ); |
|
| 436 | - |
|
| 437 | - // find all relative urls in css |
|
| 438 | - $matches = array(); |
|
| 439 | - foreach ($relativeRegexes as $relativeRegex) { |
|
| 440 | - if (preg_match_all($relativeRegex, $content, $regexMatches, PREG_SET_ORDER)) { |
|
| 441 | - $matches = array_merge($matches, $regexMatches); |
|
| 442 | - } |
|
| 443 | - } |
|
| 444 | - |
|
| 445 | - $search = array(); |
|
| 446 | - $replace = array(); |
|
| 447 | - |
|
| 448 | - // loop all urls |
|
| 449 | - foreach ($matches as $match) { |
|
| 450 | - // determine if it's a url() or an @import match |
|
| 451 | - $type = (strpos($match[0], '@import') === 0 ? 'import' : 'url'); |
|
| 452 | - |
|
| 453 | - // attempting to interpret GET-params makes no sense, so let's discard them for awhile |
|
| 454 | - $params = strrchr($match['path'], '?'); |
|
| 455 | - $url = $params ? substr($match['path'], 0, -strlen($params)) : $match['path']; |
|
| 456 | - |
|
| 457 | - // fix relative url |
|
| 458 | - $url = $converter->convert($url); |
|
| 459 | - |
|
| 460 | - // now that the path has been converted, re-apply GET-params |
|
| 461 | - $url .= $params; |
|
| 462 | - |
|
| 463 | - // build replacement |
|
| 464 | - $search[] = $match[0]; |
|
| 465 | - if ($type == 'url') { |
|
| 466 | - $replace[] = 'url('.$url.')'; |
|
| 467 | - } elseif ($type == 'import') { |
|
| 468 | - $replace[] = '@import "'.$url.'"'; |
|
| 469 | - } |
|
| 470 | - } |
|
| 471 | - |
|
| 472 | - // replace urls |
|
| 473 | - $content = str_replace($search, $replace, $content); |
|
| 474 | - |
|
| 475 | - return $content; |
|
| 476 | - } |
|
| 477 | - |
|
| 478 | - /** |
|
| 479 | - * Shorthand hex color codes. |
|
| 480 | - * #FF0000 -> #F00. |
|
| 481 | - * |
|
| 482 | - * @param string $content The CSS content to shorten the hex color codes for. |
|
| 483 | - * |
|
| 484 | - * @return string |
|
| 485 | - */ |
|
| 486 | - protected function shortenHex($content) |
|
| 487 | - { |
|
| 488 | - $content = preg_replace('/(?<![\'"])#([0-9a-z])\\1([0-9a-z])\\2([0-9a-z])\\3(?![\'"])/i', '#$1$2$3', $content); |
|
| 489 | - |
|
| 490 | - return $content; |
|
| 491 | - } |
|
| 492 | - |
|
| 493 | - /** |
|
| 494 | - * Shorthand 0 values to plain 0, instead of e.g. -0em. |
|
| 495 | - * |
|
| 496 | - * @param string $content The CSS content to shorten the zero values for. |
|
| 497 | - * |
|
| 498 | - * @return string |
|
| 499 | - */ |
|
| 500 | - protected function shortenZeroes($content) |
|
| 501 | - { |
|
| 502 | - // reusable bits of code throughout these regexes: |
|
| 503 | - // before & after are used to make sure we don't match lose unintended |
|
| 504 | - // 0-like values (e.g. in #000, or in http://url/1.0) |
|
| 505 | - // units can be stripped from 0 values, or used to recognize non 0 |
|
| 506 | - // values (where wa may be able to strip a .0 suffix) |
|
| 507 | - $before = '(?<=[:(, ])'; |
|
| 508 | - $after = '(?=[ ,);}])'; |
|
| 509 | - $units = '(em|ex|%|px|cm|mm|in|pt|pc|ch|rem|vh|vw|vmin|vmax|vm)'; |
|
| 510 | - |
|
| 511 | - // strip units after zeroes (0px -> 0) |
|
| 512 | - // NOTE: it should be safe to remove all units for a 0 value, but in |
|
| 513 | - // practice, Webkit (especially Safari) seems to stumble over at least |
|
| 514 | - // 0%, potentially other units as well. Only stripping 'px' for now. |
|
| 515 | - // @see https://github.com/matthiasmullie/minify/issues/60 |
|
| 516 | - $content = preg_replace('/'.$before.'(-?0*(\.0+)?)(?<=0)px'.$after.'/', '\\1', $content); |
|
| 517 | - |
|
| 518 | - // strip 0-digits (.0 -> 0) |
|
| 519 | - $content = preg_replace('/'.$before.'\.0+'.$units.'?'.$after.'/', '0\\1', $content); |
|
| 520 | - // strip trailing 0: 50.10 -> 50.1, 50.10px -> 50.1px |
|
| 521 | - $content = preg_replace('/'.$before.'(-?[0-9]+\.[0-9]+)0+'.$units.'?'.$after.'/', '\\1\\2', $content); |
|
| 522 | - // strip trailing 0: 50.00 -> 50, 50.00px -> 50px |
|
| 523 | - $content = preg_replace('/'.$before.'(-?[0-9]+)\.0+'.$units.'?'.$after.'/', '\\1\\2', $content); |
|
| 524 | - // strip leading 0: 0.1 -> .1, 01.1 -> 1.1 |
|
| 525 | - $content = preg_replace('/'.$before.'(-?)0+([0-9]*\.[0-9]+)'.$units.'?'.$after.'/', '\\1\\2\\3', $content); |
|
| 526 | - |
|
| 527 | - // strip negative zeroes (-0 -> 0) & truncate zeroes (00 -> 0) |
|
| 528 | - $content = preg_replace('/'.$before.'-?0+'.$units.'?'.$after.'/', '0\\1', $content); |
|
| 529 | - |
|
| 530 | - return $content; |
|
| 531 | - } |
|
| 532 | - |
|
| 533 | - /** |
|
| 534 | - * Strip comments from source code. |
|
| 535 | - * |
|
| 536 | - * @param string $content |
|
| 537 | - * |
|
| 538 | - * @return string |
|
| 539 | - */ |
|
| 540 | - protected function stripEmptyTags($content) |
|
| 541 | - { |
|
| 542 | - return preg_replace('/(^|\})[^\{\}]+\{\s*\}/', '\\1', $content); |
|
| 543 | - } |
|
| 544 | - |
|
| 545 | - /** |
|
| 546 | - * Strip comments from source code. |
|
| 547 | - */ |
|
| 548 | - protected function stripComments() |
|
| 549 | - { |
|
| 550 | - $this->registerPattern('/\/\*.*?\*\//s', ''); |
|
| 551 | - } |
|
| 552 | - |
|
| 553 | - /** |
|
| 554 | - * Strip whitespace. |
|
| 555 | - * |
|
| 556 | - * @param string $content The CSS content to strip the whitespace for. |
|
| 557 | - * |
|
| 558 | - * @return string |
|
| 559 | - */ |
|
| 560 | - protected function stripWhitespace($content) |
|
| 561 | - { |
|
| 562 | - // remove leading & trailing whitespace |
|
| 563 | - $content = preg_replace('/^\s*/m', '', $content); |
|
| 564 | - $content = preg_replace('/\s*$/m', '', $content); |
|
| 565 | - |
|
| 566 | - // replace newlines with a single space |
|
| 567 | - $content = preg_replace('/\s+/', ' ', $content); |
|
| 568 | - |
|
| 569 | - // remove whitespace around meta characters |
|
| 570 | - // inspired by stackoverflow.com/questions/15195750/minify-compress-css-with-regex |
|
| 571 | - $content = preg_replace('/\s*([\*$~^|]?+=|[{};,>~]|!important\b)\s*/', '$1', $content); |
|
| 572 | - $content = preg_replace('/([\[(:])\s+/', '$1', $content); |
|
| 573 | - $content = preg_replace('/\s+([\]\)])/', '$1', $content); |
|
| 574 | - $content = preg_replace('/\s+(:)(?![^\}]*\{)/', '$1', $content); |
|
| 575 | - |
|
| 576 | - // whitespace around + and - can only be stripped in selectors, like |
|
| 577 | - // :nth-child(3+2n), not in things like calc(3px + 2px) or shorthands |
|
| 578 | - // like 3px -2px |
|
| 579 | - $content = preg_replace('/\s*([+-])\s*(?=[^}]*{)/', '$1', $content); |
|
| 580 | - |
|
| 581 | - // remove semicolon/whitespace followed by closing bracket |
|
| 582 | - $content = str_replace(';}', '}', $content); |
|
| 583 | - |
|
| 584 | - return trim($content); |
|
| 585 | - } |
|
| 586 | - |
|
| 587 | - /** |
|
| 588 | - * Check if file is small enough to be imported. |
|
| 589 | - * |
|
| 590 | - * @param string $path The path to the file. |
|
| 591 | - * |
|
| 592 | - * @return bool |
|
| 593 | - */ |
|
| 594 | - protected function canImportBySize($path) |
|
| 595 | - { |
|
| 596 | - return ($size = @filesize($path)) && $size <= $this->maxImportSize * 1024; |
|
| 597 | - } |
|
| 435 | + ); |
|
| 436 | + |
|
| 437 | + // find all relative urls in css |
|
| 438 | + $matches = array(); |
|
| 439 | + foreach ($relativeRegexes as $relativeRegex) { |
|
| 440 | + if (preg_match_all($relativeRegex, $content, $regexMatches, PREG_SET_ORDER)) { |
|
| 441 | + $matches = array_merge($matches, $regexMatches); |
|
| 442 | + } |
|
| 443 | + } |
|
| 444 | + |
|
| 445 | + $search = array(); |
|
| 446 | + $replace = array(); |
|
| 447 | + |
|
| 448 | + // loop all urls |
|
| 449 | + foreach ($matches as $match) { |
|
| 450 | + // determine if it's a url() or an @import match |
|
| 451 | + $type = (strpos($match[0], '@import') === 0 ? 'import' : 'url'); |
|
| 452 | + |
|
| 453 | + // attempting to interpret GET-params makes no sense, so let's discard them for awhile |
|
| 454 | + $params = strrchr($match['path'], '?'); |
|
| 455 | + $url = $params ? substr($match['path'], 0, -strlen($params)) : $match['path']; |
|
| 456 | + |
|
| 457 | + // fix relative url |
|
| 458 | + $url = $converter->convert($url); |
|
| 459 | + |
|
| 460 | + // now that the path has been converted, re-apply GET-params |
|
| 461 | + $url .= $params; |
|
| 462 | + |
|
| 463 | + // build replacement |
|
| 464 | + $search[] = $match[0]; |
|
| 465 | + if ($type == 'url') { |
|
| 466 | + $replace[] = 'url('.$url.')'; |
|
| 467 | + } elseif ($type == 'import') { |
|
| 468 | + $replace[] = '@import "'.$url.'"'; |
|
| 469 | + } |
|
| 470 | + } |
|
| 471 | + |
|
| 472 | + // replace urls |
|
| 473 | + $content = str_replace($search, $replace, $content); |
|
| 474 | + |
|
| 475 | + return $content; |
|
| 476 | + } |
|
| 477 | + |
|
| 478 | + /** |
|
| 479 | + * Shorthand hex color codes. |
|
| 480 | + * #FF0000 -> #F00. |
|
| 481 | + * |
|
| 482 | + * @param string $content The CSS content to shorten the hex color codes for. |
|
| 483 | + * |
|
| 484 | + * @return string |
|
| 485 | + */ |
|
| 486 | + protected function shortenHex($content) |
|
| 487 | + { |
|
| 488 | + $content = preg_replace('/(?<![\'"])#([0-9a-z])\\1([0-9a-z])\\2([0-9a-z])\\3(?![\'"])/i', '#$1$2$3', $content); |
|
| 489 | + |
|
| 490 | + return $content; |
|
| 491 | + } |
|
| 492 | + |
|
| 493 | + /** |
|
| 494 | + * Shorthand 0 values to plain 0, instead of e.g. -0em. |
|
| 495 | + * |
|
| 496 | + * @param string $content The CSS content to shorten the zero values for. |
|
| 497 | + * |
|
| 498 | + * @return string |
|
| 499 | + */ |
|
| 500 | + protected function shortenZeroes($content) |
|
| 501 | + { |
|
| 502 | + // reusable bits of code throughout these regexes: |
|
| 503 | + // before & after are used to make sure we don't match lose unintended |
|
| 504 | + // 0-like values (e.g. in #000, or in http://url/1.0) |
|
| 505 | + // units can be stripped from 0 values, or used to recognize non 0 |
|
| 506 | + // values (where wa may be able to strip a .0 suffix) |
|
| 507 | + $before = '(?<=[:(, ])'; |
|
| 508 | + $after = '(?=[ ,);}])'; |
|
| 509 | + $units = '(em|ex|%|px|cm|mm|in|pt|pc|ch|rem|vh|vw|vmin|vmax|vm)'; |
|
| 510 | + |
|
| 511 | + // strip units after zeroes (0px -> 0) |
|
| 512 | + // NOTE: it should be safe to remove all units for a 0 value, but in |
|
| 513 | + // practice, Webkit (especially Safari) seems to stumble over at least |
|
| 514 | + // 0%, potentially other units as well. Only stripping 'px' for now. |
|
| 515 | + // @see https://github.com/matthiasmullie/minify/issues/60 |
|
| 516 | + $content = preg_replace('/'.$before.'(-?0*(\.0+)?)(?<=0)px'.$after.'/', '\\1', $content); |
|
| 517 | + |
|
| 518 | + // strip 0-digits (.0 -> 0) |
|
| 519 | + $content = preg_replace('/'.$before.'\.0+'.$units.'?'.$after.'/', '0\\1', $content); |
|
| 520 | + // strip trailing 0: 50.10 -> 50.1, 50.10px -> 50.1px |
|
| 521 | + $content = preg_replace('/'.$before.'(-?[0-9]+\.[0-9]+)0+'.$units.'?'.$after.'/', '\\1\\2', $content); |
|
| 522 | + // strip trailing 0: 50.00 -> 50, 50.00px -> 50px |
|
| 523 | + $content = preg_replace('/'.$before.'(-?[0-9]+)\.0+'.$units.'?'.$after.'/', '\\1\\2', $content); |
|
| 524 | + // strip leading 0: 0.1 -> .1, 01.1 -> 1.1 |
|
| 525 | + $content = preg_replace('/'.$before.'(-?)0+([0-9]*\.[0-9]+)'.$units.'?'.$after.'/', '\\1\\2\\3', $content); |
|
| 526 | + |
|
| 527 | + // strip negative zeroes (-0 -> 0) & truncate zeroes (00 -> 0) |
|
| 528 | + $content = preg_replace('/'.$before.'-?0+'.$units.'?'.$after.'/', '0\\1', $content); |
|
| 529 | + |
|
| 530 | + return $content; |
|
| 531 | + } |
|
| 532 | + |
|
| 533 | + /** |
|
| 534 | + * Strip comments from source code. |
|
| 535 | + * |
|
| 536 | + * @param string $content |
|
| 537 | + * |
|
| 538 | + * @return string |
|
| 539 | + */ |
|
| 540 | + protected function stripEmptyTags($content) |
|
| 541 | + { |
|
| 542 | + return preg_replace('/(^|\})[^\{\}]+\{\s*\}/', '\\1', $content); |
|
| 543 | + } |
|
| 544 | + |
|
| 545 | + /** |
|
| 546 | + * Strip comments from source code. |
|
| 547 | + */ |
|
| 548 | + protected function stripComments() |
|
| 549 | + { |
|
| 550 | + $this->registerPattern('/\/\*.*?\*\//s', ''); |
|
| 551 | + } |
|
| 552 | + |
|
| 553 | + /** |
|
| 554 | + * Strip whitespace. |
|
| 555 | + * |
|
| 556 | + * @param string $content The CSS content to strip the whitespace for. |
|
| 557 | + * |
|
| 558 | + * @return string |
|
| 559 | + */ |
|
| 560 | + protected function stripWhitespace($content) |
|
| 561 | + { |
|
| 562 | + // remove leading & trailing whitespace |
|
| 563 | + $content = preg_replace('/^\s*/m', '', $content); |
|
| 564 | + $content = preg_replace('/\s*$/m', '', $content); |
|
| 565 | + |
|
| 566 | + // replace newlines with a single space |
|
| 567 | + $content = preg_replace('/\s+/', ' ', $content); |
|
| 568 | + |
|
| 569 | + // remove whitespace around meta characters |
|
| 570 | + // inspired by stackoverflow.com/questions/15195750/minify-compress-css-with-regex |
|
| 571 | + $content = preg_replace('/\s*([\*$~^|]?+=|[{};,>~]|!important\b)\s*/', '$1', $content); |
|
| 572 | + $content = preg_replace('/([\[(:])\s+/', '$1', $content); |
|
| 573 | + $content = preg_replace('/\s+([\]\)])/', '$1', $content); |
|
| 574 | + $content = preg_replace('/\s+(:)(?![^\}]*\{)/', '$1', $content); |
|
| 575 | + |
|
| 576 | + // whitespace around + and - can only be stripped in selectors, like |
|
| 577 | + // :nth-child(3+2n), not in things like calc(3px + 2px) or shorthands |
|
| 578 | + // like 3px -2px |
|
| 579 | + $content = preg_replace('/\s*([+-])\s*(?=[^}]*{)/', '$1', $content); |
|
| 580 | + |
|
| 581 | + // remove semicolon/whitespace followed by closing bracket |
|
| 582 | + $content = str_replace(';}', '}', $content); |
|
| 583 | + |
|
| 584 | + return trim($content); |
|
| 585 | + } |
|
| 586 | + |
|
| 587 | + /** |
|
| 588 | + * Check if file is small enough to be imported. |
|
| 589 | + * |
|
| 590 | + * @param string $path The path to the file. |
|
| 591 | + * |
|
| 592 | + * @return bool |
|
| 593 | + */ |
|
| 594 | + protected function canImportBySize($path) |
|
| 595 | + { |
|
| 596 | + return ($size = @filesize($path)) && $size <= $this->maxImportSize * 1024; |
|
| 597 | + } |
|
| 598 | 598 | } |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | } |
| 84 | 84 | |
| 85 | 85 | // add to top |
| 86 | - $content = implode('', $matches[0]).$content; |
|
| 86 | + $content = implode('', $matches[0]) . $content; |
|
| 87 | 87 | }; |
| 88 | 88 | |
| 89 | 89 | return $content; |
@@ -208,7 +208,7 @@ discard block |
||
| 208 | 208 | // loop the matches |
| 209 | 209 | foreach ($matches as $match) { |
| 210 | 210 | // get the path for the file that will be imported |
| 211 | - $importPath = dirname($source).'/'.$match['path']; |
|
| 211 | + $importPath = dirname($source) . '/' . $match['path']; |
|
| 212 | 212 | |
| 213 | 213 | // only replace the import with the content if we can grab the |
| 214 | 214 | // content of the file |
@@ -216,7 +216,7 @@ discard block |
||
| 216 | 216 | // check if current file was not imported previously in the same |
| 217 | 217 | // import chain. |
| 218 | 218 | if (in_array($importPath, $parents)) { |
| 219 | - throw new FileImportException('Failed to import file "'.$importPath.'": circular reference detected.'); |
|
| 219 | + throw new FileImportException('Failed to import file "' . $importPath . '": circular reference detected.'); |
|
| 220 | 220 | } |
| 221 | 221 | |
| 222 | 222 | // grab referenced file & minify it (which may include importing |
@@ -226,7 +226,7 @@ discard block |
||
| 226 | 226 | |
| 227 | 227 | // check if this is only valid for certain media |
| 228 | 228 | if (!empty($match['media'])) { |
| 229 | - $importContent = '@media '.$match['media'].'{'.$importContent.'}'; |
|
| 229 | + $importContent = '@media ' . $match['media'] . '{' . $importContent . '}'; |
|
| 230 | 230 | } |
| 231 | 231 | |
| 232 | 232 | // add to replacement array |
@@ -255,7 +255,7 @@ discard block |
||
| 255 | 255 | protected function importFiles($source, $content) |
| 256 | 256 | { |
| 257 | 257 | $extensions = array_keys($this->importExtensions); |
| 258 | - $regex = '/url\((["\']?)((?!["\']?data:).*?\.('.implode('|', $extensions).'))\\1\)/i'; |
|
| 258 | + $regex = '/url\((["\']?)((?!["\']?data:).*?\.(' . implode('|', $extensions) . '))\\1\)/i'; |
|
| 259 | 259 | if ($extensions && preg_match_all($regex, $content, $matches, PREG_SET_ORDER)) { |
| 260 | 260 | $search = array(); |
| 261 | 261 | $replace = array(); |
@@ -264,7 +264,7 @@ discard block |
||
| 264 | 264 | foreach ($matches as $match) { |
| 265 | 265 | // get the path for the file that will be imported |
| 266 | 266 | $path = $match[2]; |
| 267 | - $path = dirname($source).'/'.$path; |
|
| 267 | + $path = dirname($source) . '/' . $path; |
|
| 268 | 268 | $extension = $match[3]; |
| 269 | 269 | |
| 270 | 270 | // only replace the import with the content if we're able to get |
@@ -276,7 +276,7 @@ discard block |
||
| 276 | 276 | |
| 277 | 277 | // build replacement |
| 278 | 278 | $search[] = $match[0]; |
| 279 | - $replace[] = 'url('.$this->importExtensions[$extension].';base64,'.$importContent.')'; |
|
| 279 | + $replace[] = 'url(' . $this->importExtensions[$extension] . ';base64,' . $importContent . ')'; |
|
| 280 | 280 | } |
| 281 | 281 | } |
| 282 | 282 | |
@@ -463,9 +463,9 @@ discard block |
||
| 463 | 463 | // build replacement |
| 464 | 464 | $search[] = $match[0]; |
| 465 | 465 | if ($type == 'url') { |
| 466 | - $replace[] = 'url('.$url.')'; |
|
| 466 | + $replace[] = 'url(' . $url . ')'; |
|
| 467 | 467 | } elseif ($type == 'import') { |
| 468 | - $replace[] = '@import "'.$url.'"'; |
|
| 468 | + $replace[] = '@import "' . $url . '"'; |
|
| 469 | 469 | } |
| 470 | 470 | } |
| 471 | 471 | |
@@ -513,19 +513,19 @@ discard block |
||
| 513 | 513 | // practice, Webkit (especially Safari) seems to stumble over at least |
| 514 | 514 | // 0%, potentially other units as well. Only stripping 'px' for now. |
| 515 | 515 | // @see https://github.com/matthiasmullie/minify/issues/60 |
| 516 | - $content = preg_replace('/'.$before.'(-?0*(\.0+)?)(?<=0)px'.$after.'/', '\\1', $content); |
|
| 516 | + $content = preg_replace('/' . $before . '(-?0*(\.0+)?)(?<=0)px' . $after . '/', '\\1', $content); |
|
| 517 | 517 | |
| 518 | 518 | // strip 0-digits (.0 -> 0) |
| 519 | - $content = preg_replace('/'.$before.'\.0+'.$units.'?'.$after.'/', '0\\1', $content); |
|
| 519 | + $content = preg_replace('/' . $before . '\.0+' . $units . '?' . $after . '/', '0\\1', $content); |
|
| 520 | 520 | // strip trailing 0: 50.10 -> 50.1, 50.10px -> 50.1px |
| 521 | - $content = preg_replace('/'.$before.'(-?[0-9]+\.[0-9]+)0+'.$units.'?'.$after.'/', '\\1\\2', $content); |
|
| 521 | + $content = preg_replace('/' . $before . '(-?[0-9]+\.[0-9]+)0+' . $units . '?' . $after . '/', '\\1\\2', $content); |
|
| 522 | 522 | // strip trailing 0: 50.00 -> 50, 50.00px -> 50px |
| 523 | - $content = preg_replace('/'.$before.'(-?[0-9]+)\.0+'.$units.'?'.$after.'/', '\\1\\2', $content); |
|
| 523 | + $content = preg_replace('/' . $before . '(-?[0-9]+)\.0+' . $units . '?' . $after . '/', '\\1\\2', $content); |
|
| 524 | 524 | // strip leading 0: 0.1 -> .1, 01.1 -> 1.1 |
| 525 | - $content = preg_replace('/'.$before.'(-?)0+([0-9]*\.[0-9]+)'.$units.'?'.$after.'/', '\\1\\2\\3', $content); |
|
| 525 | + $content = preg_replace('/' . $before . '(-?)0+([0-9]*\.[0-9]+)' . $units . '?' . $after . '/', '\\1\\2\\3', $content); |
|
| 526 | 526 | |
| 527 | 527 | // strip negative zeroes (-0 -> 0) & truncate zeroes (00 -> 0) |
| 528 | - $content = preg_replace('/'.$before.'-?0+'.$units.'?'.$after.'/', '0\\1', $content); |
|
| 528 | + $content = preg_replace('/' . $before . '-?0+' . $units . '?' . $after . '/', '0\\1', $content); |
|
| 529 | 529 | |
| 530 | 530 | return $content; |
| 531 | 531 | } |
@@ -16,326 +16,326 @@ discard block |
||
| 16 | 16 | */ |
| 17 | 17 | abstract class Minify |
| 18 | 18 | { |
| 19 | - /** |
|
| 20 | - * The data to be minified. |
|
| 21 | - * |
|
| 22 | - * @var string[] |
|
| 23 | - */ |
|
| 24 | - protected $data = array(); |
|
| 25 | - |
|
| 26 | - /** |
|
| 27 | - * Array of patterns to match. |
|
| 28 | - * |
|
| 29 | - * @var string[] |
|
| 30 | - */ |
|
| 31 | - protected $patterns = array(); |
|
| 32 | - |
|
| 33 | - /** |
|
| 34 | - * This array will hold content of strings and regular expressions that have |
|
| 35 | - * been extracted from the JS source code, so we can reliably match "code", |
|
| 36 | - * without having to worry about potential "code-like" characters inside. |
|
| 37 | - * |
|
| 38 | - * @var string[] |
|
| 39 | - */ |
|
| 40 | - public $extracted = array(); |
|
| 41 | - |
|
| 42 | - /** |
|
| 43 | - * Init the minify class - optionally, code may be passed along already. |
|
| 44 | - */ |
|
| 45 | - public function __construct(/* $data = null, ... */) |
|
| 46 | - { |
|
| 47 | - // it's possible to add the source through the constructor as well ;) |
|
| 48 | - if (func_num_args()) { |
|
| 49 | - call_user_func_array(array($this, 'add'), func_get_args()); |
|
| 50 | - } |
|
| 51 | - } |
|
| 52 | - |
|
| 53 | - /** |
|
| 54 | - * Add a file or straight-up code to be minified. |
|
| 55 | - * |
|
| 56 | - * @param string $data |
|
| 57 | - */ |
|
| 58 | - public function add($data /* $data = null, ... */) |
|
| 59 | - { |
|
| 60 | - // bogus "usage" of parameter $data: scrutinizer warns this variable is |
|
| 61 | - // not used (we're using func_get_args instead to support overloading), |
|
| 62 | - // but it still needs to be defined because it makes no sense to have |
|
| 63 | - // this function without argument :) |
|
| 64 | - $args = array($data) + func_get_args(); |
|
| 65 | - |
|
| 66 | - // this method can be overloaded |
|
| 67 | - foreach ($args as $data) { |
|
| 68 | - // redefine var |
|
| 69 | - $data = (string) $data; |
|
| 70 | - |
|
| 71 | - // load data |
|
| 72 | - $value = $this->load($data); |
|
| 73 | - $key = ($data != $value) ? $data : count($this->data); |
|
| 74 | - |
|
| 75 | - // store data |
|
| 76 | - $this->data[$key] = $value; |
|
| 77 | - } |
|
| 78 | - } |
|
| 79 | - |
|
| 80 | - /** |
|
| 81 | - * Minify the data & (optionally) saves it to a file. |
|
| 82 | - * |
|
| 83 | - * @param string[optional] $path Path to write the data to. |
|
| 84 | - * |
|
| 85 | - * @return string The minified data. |
|
| 86 | - */ |
|
| 87 | - public function minify($path = null) |
|
| 88 | - { |
|
| 89 | - $content = $this->execute($path); |
|
| 90 | - |
|
| 91 | - // save to path |
|
| 92 | - if ($path !== null) { |
|
| 93 | - $this->save($content, $path); |
|
| 94 | - } |
|
| 95 | - |
|
| 96 | - return $content; |
|
| 97 | - } |
|
| 98 | - |
|
| 99 | - /** |
|
| 100 | - * Minify & gzip the data & (optionally) saves it to a file. |
|
| 101 | - * |
|
| 102 | - * @param string[optional] $path Path to write the data to. |
|
| 103 | - * @param int[optional] $level Compression level, from 0 to 9. |
|
| 104 | - * |
|
| 105 | - * @return string The minified & gzipped data. |
|
| 106 | - */ |
|
| 107 | - public function gzip($path = null, $level = 9) |
|
| 108 | - { |
|
| 109 | - $content = $this->execute($path); |
|
| 110 | - $content = gzencode($content, $level, FORCE_GZIP); |
|
| 111 | - |
|
| 112 | - // save to path |
|
| 113 | - if ($path !== null) { |
|
| 114 | - $this->save($content, $path); |
|
| 115 | - } |
|
| 116 | - |
|
| 117 | - return $content; |
|
| 118 | - } |
|
| 119 | - |
|
| 120 | - /** |
|
| 121 | - * Minify the data & write it to a CacheItemInterface object. |
|
| 122 | - * |
|
| 123 | - * @param CacheItemInterface $item Cache item to write the data to. |
|
| 124 | - * |
|
| 125 | - * @return CacheItemInterface Cache item with the minifier data. |
|
| 126 | - */ |
|
| 127 | - public function cache(CacheItemInterface $item) |
|
| 128 | - { |
|
| 129 | - $content = $this->execute(); |
|
| 130 | - $item->set($content); |
|
| 131 | - |
|
| 132 | - return $item; |
|
| 133 | - } |
|
| 134 | - |
|
| 135 | - /** |
|
| 136 | - * Minify the data. |
|
| 137 | - * |
|
| 138 | - * @param string[optional] $path Path to write the data to. |
|
| 139 | - * |
|
| 140 | - * @return string The minified data. |
|
| 141 | - */ |
|
| 142 | - abstract public function execute($path = null); |
|
| 143 | - |
|
| 144 | - /** |
|
| 145 | - * Load data. |
|
| 146 | - * |
|
| 147 | - * @param string $data Either a path to a file or the content itself. |
|
| 148 | - * |
|
| 149 | - * @return string |
|
| 150 | - */ |
|
| 151 | - protected function load($data) |
|
| 152 | - { |
|
| 153 | - // check if the data is a file |
|
| 154 | - if ($this->canImportFile($data)) { |
|
| 155 | - $data = file_get_contents($data); |
|
| 156 | - |
|
| 157 | - // strip BOM, if any |
|
| 158 | - if (substr($data, 0, 3) == "\xef\xbb\xbf") { |
|
| 159 | - $data = substr($data, 3); |
|
| 160 | - } |
|
| 161 | - } |
|
| 162 | - |
|
| 163 | - return $data; |
|
| 164 | - } |
|
| 165 | - |
|
| 166 | - /** |
|
| 167 | - * Save to file. |
|
| 168 | - * |
|
| 169 | - * @param string $content The minified data. |
|
| 170 | - * @param string $path The path to save the minified data to. |
|
| 171 | - * |
|
| 172 | - * @throws IOException |
|
| 173 | - */ |
|
| 174 | - protected function save($content, $path) |
|
| 175 | - { |
|
| 176 | - $handler = $this->openFileForWriting($path); |
|
| 177 | - |
|
| 178 | - $this->writeToFile($handler, $content); |
|
| 179 | - |
|
| 180 | - @fclose($handler); |
|
| 181 | - } |
|
| 182 | - |
|
| 183 | - /** |
|
| 184 | - * Register a pattern to execute against the source content. |
|
| 185 | - * |
|
| 186 | - * @param string $pattern PCRE pattern. |
|
| 187 | - * @param string|callable $replacement Replacement value for matched pattern. |
|
| 188 | - */ |
|
| 189 | - protected function registerPattern($pattern, $replacement = '') |
|
| 190 | - { |
|
| 191 | - // study the pattern, we'll execute it more than once |
|
| 192 | - $pattern .= 'S'; |
|
| 193 | - |
|
| 194 | - $this->patterns[] = array($pattern, $replacement); |
|
| 195 | - } |
|
| 196 | - |
|
| 197 | - /** |
|
| 198 | - * We can't "just" run some regular expressions against JavaScript: it's a |
|
| 199 | - * complex language. E.g. having an occurrence of // xyz would be a comment, |
|
| 200 | - * unless it's used within a string. Of you could have something that looks |
|
| 201 | - * like a 'string', but inside a comment. |
|
| 202 | - * The only way to accurately replace these pieces is to traverse the JS one |
|
| 203 | - * character at a time and try to find whatever starts first. |
|
| 204 | - * |
|
| 205 | - * @param string $content The content to replace patterns in. |
|
| 206 | - * |
|
| 207 | - * @return string The (manipulated) content. |
|
| 208 | - */ |
|
| 209 | - protected function replace($content) |
|
| 210 | - { |
|
| 211 | - $processed = ''; |
|
| 212 | - $positions = array_fill(0, count($this->patterns), -1); |
|
| 213 | - $matches = array(); |
|
| 214 | - |
|
| 215 | - while ($content) { |
|
| 216 | - // find first match for all patterns |
|
| 217 | - foreach ($this->patterns as $i => $pattern) { |
|
| 218 | - list($pattern, $replacement) = $pattern; |
|
| 219 | - |
|
| 220 | - // no need to re-run matches that are still in the part of the |
|
| 221 | - // content that hasn't been processed |
|
| 222 | - if ($positions[$i] >= 0) { |
|
| 223 | - continue; |
|
| 224 | - } |
|
| 225 | - |
|
| 226 | - $match = null; |
|
| 227 | - if (preg_match($pattern, $content, $match)) { |
|
| 228 | - $matches[$i] = $match; |
|
| 229 | - |
|
| 230 | - // we'll store the match position as well; that way, we |
|
| 231 | - // don't have to redo all preg_matches after changing only |
|
| 232 | - // the first (we'll still know where those others are) |
|
| 233 | - $positions[$i] = strpos($content, $match[0]); |
|
| 234 | - } else { |
|
| 235 | - // if the pattern couldn't be matched, there's no point in |
|
| 236 | - // executing it again in later runs on this same content; |
|
| 237 | - // ignore this one until we reach end of content |
|
| 238 | - unset($matches[$i]); |
|
| 239 | - $positions[$i] = strlen($content); |
|
| 240 | - } |
|
| 241 | - } |
|
| 242 | - |
|
| 243 | - // no more matches to find: everything's been processed, break out |
|
| 244 | - if (!$matches) { |
|
| 245 | - $processed .= $content; |
|
| 246 | - break; |
|
| 247 | - } |
|
| 248 | - |
|
| 249 | - // see which of the patterns actually found the first thing (we'll |
|
| 250 | - // only want to execute that one, since we're unsure if what the |
|
| 251 | - // other found was not inside what the first found) |
|
| 252 | - $discardLength = min($positions); |
|
| 253 | - $firstPattern = array_search($discardLength, $positions); |
|
| 254 | - $match = $matches[$firstPattern][0]; |
|
| 255 | - |
|
| 256 | - // execute the pattern that matches earliest in the content string |
|
| 257 | - list($pattern, $replacement) = $this->patterns[$firstPattern]; |
|
| 258 | - $replacement = $this->replacePattern($pattern, $replacement, $content); |
|
| 259 | - |
|
| 260 | - // figure out which part of the string was unmatched; that's the |
|
| 261 | - // part we'll execute the patterns on again next |
|
| 262 | - $content = substr($content, $discardLength); |
|
| 263 | - $unmatched = (string) substr($content, strpos($content, $match) + strlen($match)); |
|
| 264 | - |
|
| 265 | - // move the replaced part to $processed and prepare $content to |
|
| 266 | - // again match batch of patterns against |
|
| 267 | - $processed .= substr($replacement, 0, strlen($replacement) - strlen($unmatched)); |
|
| 268 | - $content = $unmatched; |
|
| 269 | - |
|
| 270 | - // first match has been replaced & that content is to be left alone, |
|
| 271 | - // the next matches will start after this replacement, so we should |
|
| 272 | - // fix their offsets |
|
| 273 | - foreach ($positions as $i => $position) { |
|
| 274 | - $positions[$i] -= $discardLength + strlen($match); |
|
| 275 | - } |
|
| 276 | - } |
|
| 277 | - |
|
| 278 | - return $processed; |
|
| 279 | - } |
|
| 280 | - |
|
| 281 | - /** |
|
| 282 | - * This is where a pattern is matched against $content and the matches |
|
| 283 | - * are replaced by their respective value. |
|
| 284 | - * This function will be called plenty of times, where $content will always |
|
| 285 | - * move up 1 character. |
|
| 286 | - * |
|
| 287 | - * @param string $pattern Pattern to match. |
|
| 288 | - * @param string|callable $replacement Replacement value. |
|
| 289 | - * @param string $content Content to match pattern against. |
|
| 290 | - * |
|
| 291 | - * @return string |
|
| 292 | - */ |
|
| 293 | - protected function replacePattern($pattern, $replacement, $content) |
|
| 294 | - { |
|
| 295 | - if (is_callable($replacement)) { |
|
| 296 | - return preg_replace_callback($pattern, $replacement, $content, 1, $count); |
|
| 297 | - } else { |
|
| 298 | - return preg_replace($pattern, $replacement, $content, 1, $count); |
|
| 299 | - } |
|
| 300 | - } |
|
| 301 | - |
|
| 302 | - /** |
|
| 303 | - * Strings are a pattern we need to match, in order to ignore potential |
|
| 304 | - * code-like content inside them, but we just want all of the string |
|
| 305 | - * content to remain untouched. |
|
| 306 | - * |
|
| 307 | - * This method will replace all string content with simple STRING# |
|
| 308 | - * placeholder text, so we've rid all strings from characters that may be |
|
| 309 | - * misinterpreted. Original string content will be saved in $this->extracted |
|
| 310 | - * and after doing all other minifying, we can restore the original content |
|
| 311 | - * via restoreStrings(). |
|
| 312 | - * |
|
| 313 | - * @param string[optional] $chars |
|
| 314 | - */ |
|
| 315 | - protected function extractStrings($chars = '\'"') |
|
| 316 | - { |
|
| 317 | - // PHP only supports $this inside anonymous functions since 5.4 |
|
| 318 | - $minifier = $this; |
|
| 319 | - $callback = function ($match) use ($minifier) { |
|
| 320 | - // check the second index here, because the first always contains a quote |
|
| 321 | - if (!$match[2]) { |
|
| 322 | - /* |
|
| 19 | + /** |
|
| 20 | + * The data to be minified. |
|
| 21 | + * |
|
| 22 | + * @var string[] |
|
| 23 | + */ |
|
| 24 | + protected $data = array(); |
|
| 25 | + |
|
| 26 | + /** |
|
| 27 | + * Array of patterns to match. |
|
| 28 | + * |
|
| 29 | + * @var string[] |
|
| 30 | + */ |
|
| 31 | + protected $patterns = array(); |
|
| 32 | + |
|
| 33 | + /** |
|
| 34 | + * This array will hold content of strings and regular expressions that have |
|
| 35 | + * been extracted from the JS source code, so we can reliably match "code", |
|
| 36 | + * without having to worry about potential "code-like" characters inside. |
|
| 37 | + * |
|
| 38 | + * @var string[] |
|
| 39 | + */ |
|
| 40 | + public $extracted = array(); |
|
| 41 | + |
|
| 42 | + /** |
|
| 43 | + * Init the minify class - optionally, code may be passed along already. |
|
| 44 | + */ |
|
| 45 | + public function __construct(/* $data = null, ... */) |
|
| 46 | + { |
|
| 47 | + // it's possible to add the source through the constructor as well ;) |
|
| 48 | + if (func_num_args()) { |
|
| 49 | + call_user_func_array(array($this, 'add'), func_get_args()); |
|
| 50 | + } |
|
| 51 | + } |
|
| 52 | + |
|
| 53 | + /** |
|
| 54 | + * Add a file or straight-up code to be minified. |
|
| 55 | + * |
|
| 56 | + * @param string $data |
|
| 57 | + */ |
|
| 58 | + public function add($data /* $data = null, ... */) |
|
| 59 | + { |
|
| 60 | + // bogus "usage" of parameter $data: scrutinizer warns this variable is |
|
| 61 | + // not used (we're using func_get_args instead to support overloading), |
|
| 62 | + // but it still needs to be defined because it makes no sense to have |
|
| 63 | + // this function without argument :) |
|
| 64 | + $args = array($data) + func_get_args(); |
|
| 65 | + |
|
| 66 | + // this method can be overloaded |
|
| 67 | + foreach ($args as $data) { |
|
| 68 | + // redefine var |
|
| 69 | + $data = (string) $data; |
|
| 70 | + |
|
| 71 | + // load data |
|
| 72 | + $value = $this->load($data); |
|
| 73 | + $key = ($data != $value) ? $data : count($this->data); |
|
| 74 | + |
|
| 75 | + // store data |
|
| 76 | + $this->data[$key] = $value; |
|
| 77 | + } |
|
| 78 | + } |
|
| 79 | + |
|
| 80 | + /** |
|
| 81 | + * Minify the data & (optionally) saves it to a file. |
|
| 82 | + * |
|
| 83 | + * @param string[optional] $path Path to write the data to. |
|
| 84 | + * |
|
| 85 | + * @return string The minified data. |
|
| 86 | + */ |
|
| 87 | + public function minify($path = null) |
|
| 88 | + { |
|
| 89 | + $content = $this->execute($path); |
|
| 90 | + |
|
| 91 | + // save to path |
|
| 92 | + if ($path !== null) { |
|
| 93 | + $this->save($content, $path); |
|
| 94 | + } |
|
| 95 | + |
|
| 96 | + return $content; |
|
| 97 | + } |
|
| 98 | + |
|
| 99 | + /** |
|
| 100 | + * Minify & gzip the data & (optionally) saves it to a file. |
|
| 101 | + * |
|
| 102 | + * @param string[optional] $path Path to write the data to. |
|
| 103 | + * @param int[optional] $level Compression level, from 0 to 9. |
|
| 104 | + * |
|
| 105 | + * @return string The minified & gzipped data. |
|
| 106 | + */ |
|
| 107 | + public function gzip($path = null, $level = 9) |
|
| 108 | + { |
|
| 109 | + $content = $this->execute($path); |
|
| 110 | + $content = gzencode($content, $level, FORCE_GZIP); |
|
| 111 | + |
|
| 112 | + // save to path |
|
| 113 | + if ($path !== null) { |
|
| 114 | + $this->save($content, $path); |
|
| 115 | + } |
|
| 116 | + |
|
| 117 | + return $content; |
|
| 118 | + } |
|
| 119 | + |
|
| 120 | + /** |
|
| 121 | + * Minify the data & write it to a CacheItemInterface object. |
|
| 122 | + * |
|
| 123 | + * @param CacheItemInterface $item Cache item to write the data to. |
|
| 124 | + * |
|
| 125 | + * @return CacheItemInterface Cache item with the minifier data. |
|
| 126 | + */ |
|
| 127 | + public function cache(CacheItemInterface $item) |
|
| 128 | + { |
|
| 129 | + $content = $this->execute(); |
|
| 130 | + $item->set($content); |
|
| 131 | + |
|
| 132 | + return $item; |
|
| 133 | + } |
|
| 134 | + |
|
| 135 | + /** |
|
| 136 | + * Minify the data. |
|
| 137 | + * |
|
| 138 | + * @param string[optional] $path Path to write the data to. |
|
| 139 | + * |
|
| 140 | + * @return string The minified data. |
|
| 141 | + */ |
|
| 142 | + abstract public function execute($path = null); |
|
| 143 | + |
|
| 144 | + /** |
|
| 145 | + * Load data. |
|
| 146 | + * |
|
| 147 | + * @param string $data Either a path to a file or the content itself. |
|
| 148 | + * |
|
| 149 | + * @return string |
|
| 150 | + */ |
|
| 151 | + protected function load($data) |
|
| 152 | + { |
|
| 153 | + // check if the data is a file |
|
| 154 | + if ($this->canImportFile($data)) { |
|
| 155 | + $data = file_get_contents($data); |
|
| 156 | + |
|
| 157 | + // strip BOM, if any |
|
| 158 | + if (substr($data, 0, 3) == "\xef\xbb\xbf") { |
|
| 159 | + $data = substr($data, 3); |
|
| 160 | + } |
|
| 161 | + } |
|
| 162 | + |
|
| 163 | + return $data; |
|
| 164 | + } |
|
| 165 | + |
|
| 166 | + /** |
|
| 167 | + * Save to file. |
|
| 168 | + * |
|
| 169 | + * @param string $content The minified data. |
|
| 170 | + * @param string $path The path to save the minified data to. |
|
| 171 | + * |
|
| 172 | + * @throws IOException |
|
| 173 | + */ |
|
| 174 | + protected function save($content, $path) |
|
| 175 | + { |
|
| 176 | + $handler = $this->openFileForWriting($path); |
|
| 177 | + |
|
| 178 | + $this->writeToFile($handler, $content); |
|
| 179 | + |
|
| 180 | + @fclose($handler); |
|
| 181 | + } |
|
| 182 | + |
|
| 183 | + /** |
|
| 184 | + * Register a pattern to execute against the source content. |
|
| 185 | + * |
|
| 186 | + * @param string $pattern PCRE pattern. |
|
| 187 | + * @param string|callable $replacement Replacement value for matched pattern. |
|
| 188 | + */ |
|
| 189 | + protected function registerPattern($pattern, $replacement = '') |
|
| 190 | + { |
|
| 191 | + // study the pattern, we'll execute it more than once |
|
| 192 | + $pattern .= 'S'; |
|
| 193 | + |
|
| 194 | + $this->patterns[] = array($pattern, $replacement); |
|
| 195 | + } |
|
| 196 | + |
|
| 197 | + /** |
|
| 198 | + * We can't "just" run some regular expressions against JavaScript: it's a |
|
| 199 | + * complex language. E.g. having an occurrence of // xyz would be a comment, |
|
| 200 | + * unless it's used within a string. Of you could have something that looks |
|
| 201 | + * like a 'string', but inside a comment. |
|
| 202 | + * The only way to accurately replace these pieces is to traverse the JS one |
|
| 203 | + * character at a time and try to find whatever starts first. |
|
| 204 | + * |
|
| 205 | + * @param string $content The content to replace patterns in. |
|
| 206 | + * |
|
| 207 | + * @return string The (manipulated) content. |
|
| 208 | + */ |
|
| 209 | + protected function replace($content) |
|
| 210 | + { |
|
| 211 | + $processed = ''; |
|
| 212 | + $positions = array_fill(0, count($this->patterns), -1); |
|
| 213 | + $matches = array(); |
|
| 214 | + |
|
| 215 | + while ($content) { |
|
| 216 | + // find first match for all patterns |
|
| 217 | + foreach ($this->patterns as $i => $pattern) { |
|
| 218 | + list($pattern, $replacement) = $pattern; |
|
| 219 | + |
|
| 220 | + // no need to re-run matches that are still in the part of the |
|
| 221 | + // content that hasn't been processed |
|
| 222 | + if ($positions[$i] >= 0) { |
|
| 223 | + continue; |
|
| 224 | + } |
|
| 225 | + |
|
| 226 | + $match = null; |
|
| 227 | + if (preg_match($pattern, $content, $match)) { |
|
| 228 | + $matches[$i] = $match; |
|
| 229 | + |
|
| 230 | + // we'll store the match position as well; that way, we |
|
| 231 | + // don't have to redo all preg_matches after changing only |
|
| 232 | + // the first (we'll still know where those others are) |
|
| 233 | + $positions[$i] = strpos($content, $match[0]); |
|
| 234 | + } else { |
|
| 235 | + // if the pattern couldn't be matched, there's no point in |
|
| 236 | + // executing it again in later runs on this same content; |
|
| 237 | + // ignore this one until we reach end of content |
|
| 238 | + unset($matches[$i]); |
|
| 239 | + $positions[$i] = strlen($content); |
|
| 240 | + } |
|
| 241 | + } |
|
| 242 | + |
|
| 243 | + // no more matches to find: everything's been processed, break out |
|
| 244 | + if (!$matches) { |
|
| 245 | + $processed .= $content; |
|
| 246 | + break; |
|
| 247 | + } |
|
| 248 | + |
|
| 249 | + // see which of the patterns actually found the first thing (we'll |
|
| 250 | + // only want to execute that one, since we're unsure if what the |
|
| 251 | + // other found was not inside what the first found) |
|
| 252 | + $discardLength = min($positions); |
|
| 253 | + $firstPattern = array_search($discardLength, $positions); |
|
| 254 | + $match = $matches[$firstPattern][0]; |
|
| 255 | + |
|
| 256 | + // execute the pattern that matches earliest in the content string |
|
| 257 | + list($pattern, $replacement) = $this->patterns[$firstPattern]; |
|
| 258 | + $replacement = $this->replacePattern($pattern, $replacement, $content); |
|
| 259 | + |
|
| 260 | + // figure out which part of the string was unmatched; that's the |
|
| 261 | + // part we'll execute the patterns on again next |
|
| 262 | + $content = substr($content, $discardLength); |
|
| 263 | + $unmatched = (string) substr($content, strpos($content, $match) + strlen($match)); |
|
| 264 | + |
|
| 265 | + // move the replaced part to $processed and prepare $content to |
|
| 266 | + // again match batch of patterns against |
|
| 267 | + $processed .= substr($replacement, 0, strlen($replacement) - strlen($unmatched)); |
|
| 268 | + $content = $unmatched; |
|
| 269 | + |
|
| 270 | + // first match has been replaced & that content is to be left alone, |
|
| 271 | + // the next matches will start after this replacement, so we should |
|
| 272 | + // fix their offsets |
|
| 273 | + foreach ($positions as $i => $position) { |
|
| 274 | + $positions[$i] -= $discardLength + strlen($match); |
|
| 275 | + } |
|
| 276 | + } |
|
| 277 | + |
|
| 278 | + return $processed; |
|
| 279 | + } |
|
| 280 | + |
|
| 281 | + /** |
|
| 282 | + * This is where a pattern is matched against $content and the matches |
|
| 283 | + * are replaced by their respective value. |
|
| 284 | + * This function will be called plenty of times, where $content will always |
|
| 285 | + * move up 1 character. |
|
| 286 | + * |
|
| 287 | + * @param string $pattern Pattern to match. |
|
| 288 | + * @param string|callable $replacement Replacement value. |
|
| 289 | + * @param string $content Content to match pattern against. |
|
| 290 | + * |
|
| 291 | + * @return string |
|
| 292 | + */ |
|
| 293 | + protected function replacePattern($pattern, $replacement, $content) |
|
| 294 | + { |
|
| 295 | + if (is_callable($replacement)) { |
|
| 296 | + return preg_replace_callback($pattern, $replacement, $content, 1, $count); |
|
| 297 | + } else { |
|
| 298 | + return preg_replace($pattern, $replacement, $content, 1, $count); |
|
| 299 | + } |
|
| 300 | + } |
|
| 301 | + |
|
| 302 | + /** |
|
| 303 | + * Strings are a pattern we need to match, in order to ignore potential |
|
| 304 | + * code-like content inside them, but we just want all of the string |
|
| 305 | + * content to remain untouched. |
|
| 306 | + * |
|
| 307 | + * This method will replace all string content with simple STRING# |
|
| 308 | + * placeholder text, so we've rid all strings from characters that may be |
|
| 309 | + * misinterpreted. Original string content will be saved in $this->extracted |
|
| 310 | + * and after doing all other minifying, we can restore the original content |
|
| 311 | + * via restoreStrings(). |
|
| 312 | + * |
|
| 313 | + * @param string[optional] $chars |
|
| 314 | + */ |
|
| 315 | + protected function extractStrings($chars = '\'"') |
|
| 316 | + { |
|
| 317 | + // PHP only supports $this inside anonymous functions since 5.4 |
|
| 318 | + $minifier = $this; |
|
| 319 | + $callback = function ($match) use ($minifier) { |
|
| 320 | + // check the second index here, because the first always contains a quote |
|
| 321 | + if (!$match[2]) { |
|
| 322 | + /* |
|
| 323 | 323 | * Empty strings need no placeholder; they can't be confused for |
| 324 | 324 | * anything else anyway. |
| 325 | 325 | * But we still needed to match them, for the extraction routine |
| 326 | 326 | * to skip over this particular string. |
| 327 | 327 | */ |
| 328 | - return $match[0]; |
|
| 329 | - } |
|
| 328 | + return $match[0]; |
|
| 329 | + } |
|
| 330 | 330 | |
| 331 | - $count = count($minifier->extracted); |
|
| 332 | - $placeholder = $match[1].$count.$match[1]; |
|
| 333 | - $minifier->extracted[$placeholder] = $match[1].$match[2].$match[1]; |
|
| 331 | + $count = count($minifier->extracted); |
|
| 332 | + $placeholder = $match[1].$count.$match[1]; |
|
| 333 | + $minifier->extracted[$placeholder] = $match[1].$match[2].$match[1]; |
|
| 334 | 334 | |
| 335 | - return $placeholder; |
|
| 336 | - }; |
|
| 335 | + return $placeholder; |
|
| 336 | + }; |
|
| 337 | 337 | |
| 338 | - /* |
|
| 338 | + /* |
|
| 339 | 339 | * The \\ messiness explained: |
| 340 | 340 | * * Don't count ' or " as end-of-string if it's escaped (has backslash |
| 341 | 341 | * in front of it) |
@@ -347,75 +347,75 @@ discard block |
||
| 347 | 347 | * considered as escape-char (times 2) and to get it in the regex, |
| 348 | 348 | * escaped (times 2) |
| 349 | 349 | */ |
| 350 | - $this->registerPattern('/(['.$chars.'])(.*?(?<!\\\\)(\\\\\\\\)*+)\\1/s', $callback); |
|
| 351 | - } |
|
| 352 | - |
|
| 353 | - /** |
|
| 354 | - * This method will restore all extracted data (strings, regexes) that were |
|
| 355 | - * replaced with placeholder text in extract*(). The original content was |
|
| 356 | - * saved in $this->extracted. |
|
| 357 | - * |
|
| 358 | - * @param string $content |
|
| 359 | - * |
|
| 360 | - * @return string |
|
| 361 | - */ |
|
| 362 | - protected function restoreExtractedData($content) |
|
| 363 | - { |
|
| 364 | - if (!$this->extracted) { |
|
| 365 | - // nothing was extracted, nothing to restore |
|
| 366 | - return $content; |
|
| 367 | - } |
|
| 368 | - |
|
| 369 | - $content = strtr($content, $this->extracted); |
|
| 370 | - |
|
| 371 | - $this->extracted = array(); |
|
| 372 | - |
|
| 373 | - return $content; |
|
| 374 | - } |
|
| 375 | - |
|
| 376 | - /** |
|
| 377 | - * Check if the path is a regular file and can be read. |
|
| 378 | - * |
|
| 379 | - * @param string $path |
|
| 380 | - * |
|
| 381 | - * @return bool |
|
| 382 | - */ |
|
| 383 | - protected function canImportFile($path) |
|
| 384 | - { |
|
| 385 | - return strlen($path) < PHP_MAXPATHLEN && is_file($path) && is_readable($path); |
|
| 386 | - } |
|
| 387 | - |
|
| 388 | - /** |
|
| 389 | - * Attempts to open file specified by $path for writing. |
|
| 390 | - * |
|
| 391 | - * @param string $path The path to the file. |
|
| 392 | - * |
|
| 393 | - * @return resource Specifier for the target file. |
|
| 394 | - * |
|
| 395 | - * @throws IOException |
|
| 396 | - */ |
|
| 397 | - protected function openFileForWriting($path) |
|
| 398 | - { |
|
| 399 | - if (($handler = @fopen($path, 'w')) === false) { |
|
| 400 | - throw new IOException('The file "'.$path.'" could not be opened for writing. Check if PHP has enough permissions.'); |
|
| 401 | - } |
|
| 402 | - |
|
| 403 | - return $handler; |
|
| 404 | - } |
|
| 405 | - |
|
| 406 | - /** |
|
| 407 | - * Attempts to write $content to the file specified by $handler. $path is used for printing exceptions. |
|
| 408 | - * |
|
| 409 | - * @param resource $handler The resource to write to. |
|
| 410 | - * @param string $content The content to write. |
|
| 411 | - * @param string $path The path to the file (for exception printing only). |
|
| 412 | - * |
|
| 413 | - * @throws IOException |
|
| 414 | - */ |
|
| 415 | - protected function writeToFile($handler, $content, $path = '') |
|
| 416 | - { |
|
| 417 | - if (($result = @fwrite($handler, $content)) === false || ($result < strlen($content))) { |
|
| 418 | - throw new IOException('The file "'.$path.'" could not be written to. Check your disk space and file permissions.'); |
|
| 419 | - } |
|
| 420 | - } |
|
| 350 | + $this->registerPattern('/(['.$chars.'])(.*?(?<!\\\\)(\\\\\\\\)*+)\\1/s', $callback); |
|
| 351 | + } |
|
| 352 | + |
|
| 353 | + /** |
|
| 354 | + * This method will restore all extracted data (strings, regexes) that were |
|
| 355 | + * replaced with placeholder text in extract*(). The original content was |
|
| 356 | + * saved in $this->extracted. |
|
| 357 | + * |
|
| 358 | + * @param string $content |
|
| 359 | + * |
|
| 360 | + * @return string |
|
| 361 | + */ |
|
| 362 | + protected function restoreExtractedData($content) |
|
| 363 | + { |
|
| 364 | + if (!$this->extracted) { |
|
| 365 | + // nothing was extracted, nothing to restore |
|
| 366 | + return $content; |
|
| 367 | + } |
|
| 368 | + |
|
| 369 | + $content = strtr($content, $this->extracted); |
|
| 370 | + |
|
| 371 | + $this->extracted = array(); |
|
| 372 | + |
|
| 373 | + return $content; |
|
| 374 | + } |
|
| 375 | + |
|
| 376 | + /** |
|
| 377 | + * Check if the path is a regular file and can be read. |
|
| 378 | + * |
|
| 379 | + * @param string $path |
|
| 380 | + * |
|
| 381 | + * @return bool |
|
| 382 | + */ |
|
| 383 | + protected function canImportFile($path) |
|
| 384 | + { |
|
| 385 | + return strlen($path) < PHP_MAXPATHLEN && is_file($path) && is_readable($path); |
|
| 386 | + } |
|
| 387 | + |
|
| 388 | + /** |
|
| 389 | + * Attempts to open file specified by $path for writing. |
|
| 390 | + * |
|
| 391 | + * @param string $path The path to the file. |
|
| 392 | + * |
|
| 393 | + * @return resource Specifier for the target file. |
|
| 394 | + * |
|
| 395 | + * @throws IOException |
|
| 396 | + */ |
|
| 397 | + protected function openFileForWriting($path) |
|
| 398 | + { |
|
| 399 | + if (($handler = @fopen($path, 'w')) === false) { |
|
| 400 | + throw new IOException('The file "'.$path.'" could not be opened for writing. Check if PHP has enough permissions.'); |
|
| 401 | + } |
|
| 402 | + |
|
| 403 | + return $handler; |
|
| 404 | + } |
|
| 405 | + |
|
| 406 | + /** |
|
| 407 | + * Attempts to write $content to the file specified by $handler. $path is used for printing exceptions. |
|
| 408 | + * |
|
| 409 | + * @param resource $handler The resource to write to. |
|
| 410 | + * @param string $content The content to write. |
|
| 411 | + * @param string $path The path to the file (for exception printing only). |
|
| 412 | + * |
|
| 413 | + * @throws IOException |
|
| 414 | + */ |
|
| 415 | + protected function writeToFile($handler, $content, $path = '') |
|
| 416 | + { |
|
| 417 | + if (($result = @fwrite($handler, $content)) === false || ($result < strlen($content))) { |
|
| 418 | + throw new IOException('The file "'.$path.'" could not be written to. Check your disk space and file permissions.'); |
|
| 419 | + } |
|
| 420 | + } |
|
| 421 | 421 | } |
@@ -316,7 +316,7 @@ discard block |
||
| 316 | 316 | { |
| 317 | 317 | // PHP only supports $this inside anonymous functions since 5.4 |
| 318 | 318 | $minifier = $this; |
| 319 | - $callback = function ($match) use ($minifier) { |
|
| 319 | + $callback = function($match) use ($minifier) { |
|
| 320 | 320 | // check the second index here, because the first always contains a quote |
| 321 | 321 | if (!$match[2]) { |
| 322 | 322 | /* |
@@ -329,8 +329,8 @@ discard block |
||
| 329 | 329 | } |
| 330 | 330 | |
| 331 | 331 | $count = count($minifier->extracted); |
| 332 | - $placeholder = $match[1].$count.$match[1]; |
|
| 333 | - $minifier->extracted[$placeholder] = $match[1].$match[2].$match[1]; |
|
| 332 | + $placeholder = $match[1] . $count . $match[1]; |
|
| 333 | + $minifier->extracted[$placeholder] = $match[1] . $match[2] . $match[1]; |
|
| 334 | 334 | |
| 335 | 335 | return $placeholder; |
| 336 | 336 | }; |
@@ -347,7 +347,7 @@ discard block |
||
| 347 | 347 | * considered as escape-char (times 2) and to get it in the regex, |
| 348 | 348 | * escaped (times 2) |
| 349 | 349 | */ |
| 350 | - $this->registerPattern('/(['.$chars.'])(.*?(?<!\\\\)(\\\\\\\\)*+)\\1/s', $callback); |
|
| 350 | + $this->registerPattern('/([' . $chars . '])(.*?(?<!\\\\)(\\\\\\\\)*+)\\1/s', $callback); |
|
| 351 | 351 | } |
| 352 | 352 | |
| 353 | 353 | /** |
@@ -397,7 +397,7 @@ discard block |
||
| 397 | 397 | protected function openFileForWriting($path) |
| 398 | 398 | { |
| 399 | 399 | if (($handler = @fopen($path, 'w')) === false) { |
| 400 | - throw new IOException('The file "'.$path.'" could not be opened for writing. Check if PHP has enough permissions.'); |
|
| 400 | + throw new IOException('The file "' . $path . '" could not be opened for writing. Check if PHP has enough permissions.'); |
|
| 401 | 401 | } |
| 402 | 402 | |
| 403 | 403 | return $handler; |
@@ -415,7 +415,7 @@ discard block |
||
| 415 | 415 | protected function writeToFile($handler, $content, $path = '') |
| 416 | 416 | { |
| 417 | 417 | if (($result = @fwrite($handler, $content)) === false || ($result < strlen($content))) { |
| 418 | - throw new IOException('The file "'.$path.'" could not be written to. Check your disk space and file permissions.'); |
|
| 418 | + throw new IOException('The file "' . $path . '" could not be written to. Check your disk space and file permissions.'); |
|
| 419 | 419 | } |
| 420 | 420 | } |
| 421 | 421 | } |
@@ -360,7 +360,7 @@ discard block |
||
| 360 | 360 | ) |
| 361 | 361 | ); |
| 362 | 362 | $context['messages'] = array(); |
| 363 | - for ($counter = 0; $row = $smcFunc['db_fetch_assoc']($request); $counter ++) |
|
| 363 | + for ($counter = 0; $row = $smcFunc['db_fetch_assoc']($request); $counter++) |
|
| 364 | 364 | { |
| 365 | 365 | censorText($row['subject']); |
| 366 | 366 | censorText($row['body']); |
@@ -400,7 +400,7 @@ discard block |
||
| 400 | 400 | ) |
| 401 | 401 | ); |
| 402 | 402 | $context['messages'] = array(); |
| 403 | - for ($counter = 0; $row = $smcFunc['db_fetch_assoc']($request); $counter ++) |
|
| 403 | + for ($counter = 0; $row = $smcFunc['db_fetch_assoc']($request); $counter++) |
|
| 404 | 404 | { |
| 405 | 405 | censorText($row['subject']); |
| 406 | 406 | censorText($row['body']); |
@@ -1098,7 +1098,7 @@ discard block |
||
| 1098 | 1098 | $firstTopic = $row['id_topic']; |
| 1099 | 1099 | |
| 1100 | 1100 | // Lowest topic id gets selected as surviving topic id. We need to store this board so we can adjust the topic count (This one will not have a redirect topic) |
| 1101 | - if($row['id_topic'] < $lowestTopicId || empty($lowestTopicId) ) |
|
| 1101 | + if ($row['id_topic'] < $lowestTopicId || empty($lowestTopicId)) |
|
| 1102 | 1102 | { |
| 1103 | 1103 | $lowestTopicId = $row['id_topic']; |
| 1104 | 1104 | $lowestTopicBoard = $row['id_board']; |
@@ -1404,7 +1404,7 @@ discard block |
||
| 1404 | 1404 | } |
| 1405 | 1405 | |
| 1406 | 1406 | // Update subject search index |
| 1407 | - updateStats('subject',$this_old_topic,$redirect_subject); |
|
| 1407 | + updateStats('subject', $this_old_topic, $redirect_subject); |
|
| 1408 | 1408 | } |
| 1409 | 1409 | } |
| 1410 | 1410 | |
@@ -15,8 +15,9 @@ discard block |
||
| 15 | 15 | * Original module by Mach8 - We'll never forget you. |
| 16 | 16 | */ |
| 17 | 17 | |
| 18 | -if (!defined('SMF')) |
|
| 18 | +if (!defined('SMF')) { |
|
| 19 | 19 | die('No direct access...'); |
| 20 | +} |
|
| 20 | 21 | |
| 21 | 22 | /** |
| 22 | 23 | * splits a topic into two topics. |
@@ -30,15 +31,17 @@ discard block |
||
| 30 | 31 | global $topic, $sourcedir; |
| 31 | 32 | |
| 32 | 33 | // And... which topic were you splitting, again? |
| 33 | - if (empty($topic)) |
|
| 34 | - fatal_lang_error('numbers_one_to_nine', false); |
|
| 34 | + if (empty($topic)) { |
|
| 35 | + fatal_lang_error('numbers_one_to_nine', false); |
|
| 36 | + } |
|
| 35 | 37 | |
| 36 | 38 | // Are you allowed to split topics? |
| 37 | 39 | isAllowedTo('split_any'); |
| 38 | 40 | |
| 39 | 41 | // Load up the "dependencies" - the template, getMsgMemberID(), and sendNotifications(). |
| 40 | - if (!isset($_REQUEST['xml'])) |
|
| 41 | - loadTemplate('SplitTopics'); |
|
| 42 | + if (!isset($_REQUEST['xml'])) { |
|
| 43 | + loadTemplate('SplitTopics'); |
|
| 44 | + } |
|
| 42 | 45 | require_once($sourcedir . '/Subs-Boards.php'); |
| 43 | 46 | require_once($sourcedir . '/Subs-Post.php'); |
| 44 | 47 | |
@@ -50,12 +53,12 @@ discard block |
||
| 50 | 53 | ); |
| 51 | 54 | |
| 52 | 55 | // ?action=splittopics;sa=LETSBREAKIT won't work, sorry. |
| 53 | - if (empty($_REQUEST['sa']) || !isset($subActions[$_REQUEST['sa']])) |
|
| 54 | - SplitIndex(); |
|
| 55 | - |
|
| 56 | - else |
|
| 57 | - call_helper($subActions[$_REQUEST['sa']]); |
|
| 58 | -} |
|
| 56 | + if (empty($_REQUEST['sa']) || !isset($subActions[$_REQUEST['sa']])) { |
|
| 57 | + SplitIndex(); |
|
| 58 | + } else { |
|
| 59 | + call_helper($subActions[$_REQUEST['sa']]); |
|
| 60 | + } |
|
| 61 | + } |
|
| 59 | 62 | |
| 60 | 63 | /** |
| 61 | 64 | * screen shown before the actual split. |
@@ -71,8 +74,9 @@ discard block |
||
| 71 | 74 | global $txt, $topic, $context, $smcFunc, $modSettings; |
| 72 | 75 | |
| 73 | 76 | // Validate "at". |
| 74 | - if (empty($_GET['at'])) |
|
| 75 | - fatal_lang_error('numbers_one_to_nine', false); |
|
| 77 | + if (empty($_GET['at'])) { |
|
| 78 | + fatal_lang_error('numbers_one_to_nine', false); |
|
| 79 | + } |
|
| 76 | 80 | $_GET['at'] = (int) $_GET['at']; |
| 77 | 81 | |
| 78 | 82 | // Retrieve the subject and stuff of the specific topic/message. |
@@ -89,26 +93,31 @@ discard block |
||
| 89 | 93 | 'split_at' => $_GET['at'], |
| 90 | 94 | ) |
| 91 | 95 | ); |
| 92 | - if ($smcFunc['db_num_rows']($request) == 0) |
|
| 93 | - fatal_lang_error('cant_find_messages'); |
|
| 96 | + if ($smcFunc['db_num_rows']($request) == 0) { |
|
| 97 | + fatal_lang_error('cant_find_messages'); |
|
| 98 | + } |
|
| 94 | 99 | list ($_REQUEST['subname'], $num_replies, $unapproved_posts, $id_first_msg, $approved) = $smcFunc['db_fetch_row']($request); |
| 95 | 100 | $smcFunc['db_free_result']($request); |
| 96 | 101 | |
| 97 | 102 | // If not approved validate they can see it. |
| 98 | - if ($modSettings['postmod_active'] && !$approved) |
|
| 99 | - isAllowedTo('approve_posts'); |
|
| 103 | + if ($modSettings['postmod_active'] && !$approved) { |
|
| 104 | + isAllowedTo('approve_posts'); |
|
| 105 | + } |
|
| 100 | 106 | |
| 101 | 107 | // If this topic has unapproved posts, we need to count them too... |
| 102 | - if ($modSettings['postmod_active'] && allowedTo('approve_posts')) |
|
| 103 | - $num_replies += $unapproved_posts - ($approved ? 0 : 1); |
|
| 108 | + if ($modSettings['postmod_active'] && allowedTo('approve_posts')) { |
|
| 109 | + $num_replies += $unapproved_posts - ($approved ? 0 : 1); |
|
| 110 | + } |
|
| 104 | 111 | |
| 105 | 112 | // Check if there is more than one message in the topic. (there should be.) |
| 106 | - if ($num_replies < 1) |
|
| 107 | - fatal_lang_error('topic_one_post', false); |
|
| 113 | + if ($num_replies < 1) { |
|
| 114 | + fatal_lang_error('topic_one_post', false); |
|
| 115 | + } |
|
| 108 | 116 | |
| 109 | 117 | // Check if this is the first message in the topic (if so, the first and second option won't be available) |
| 110 | - if ($id_first_msg == $_GET['at']) |
|
| 111 | - return SplitSelectTopics(); |
|
| 118 | + if ($id_first_msg == $_GET['at']) { |
|
| 119 | + return SplitSelectTopics(); |
|
| 120 | + } |
|
| 112 | 121 | |
| 113 | 122 | // Basic template information.... |
| 114 | 123 | $context['message'] = array( |
@@ -137,8 +146,9 @@ discard block |
||
| 137 | 146 | checkSession(); |
| 138 | 147 | |
| 139 | 148 | // Clean up the subject. |
| 140 | - if (!isset($_POST['subname']) || $_POST['subname'] == '') |
|
| 141 | - $_POST['subname'] = $txt['new_topic']; |
|
| 149 | + if (!isset($_POST['subname']) || $_POST['subname'] == '') { |
|
| 150 | + $_POST['subname'] = $txt['new_topic']; |
|
| 151 | + } |
|
| 142 | 152 | |
| 143 | 153 | // Redirect to the selector if they chose selective. |
| 144 | 154 | if ($_POST['step2'] == 'selective') |
@@ -163,16 +173,19 @@ discard block |
||
| 163 | 173 | 'split_at' => $_POST['at'], |
| 164 | 174 | ) |
| 165 | 175 | ); |
| 166 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
| 167 | - $messagesToBeSplit[] = $row['id_msg']; |
|
| 176 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
| 177 | + $messagesToBeSplit[] = $row['id_msg']; |
|
| 178 | + } |
|
| 168 | 179 | $smcFunc['db_free_result']($request); |
| 169 | 180 | } |
| 170 | 181 | // Only the selected message has to be split. That should be easy. |
| 171 | - elseif ($_POST['step2'] == 'onlythis') |
|
| 172 | - $messagesToBeSplit[] = $_POST['at']; |
|
| 182 | + elseif ($_POST['step2'] == 'onlythis') { |
|
| 183 | + $messagesToBeSplit[] = $_POST['at']; |
|
| 184 | + } |
|
| 173 | 185 | // There's another action?! |
| 174 | - else |
|
| 175 | - fatal_lang_error('no_access', false); |
|
| 186 | + else { |
|
| 187 | + fatal_lang_error('no_access', false); |
|
| 188 | + } |
|
| 176 | 189 | |
| 177 | 190 | $context['old_topic'] = $topic; |
| 178 | 191 | $context['new_topic'] = splitTopic($topic, $messagesToBeSplit, $_POST['subname']); |
@@ -199,8 +212,9 @@ discard block |
||
| 199 | 212 | $_SESSION['split_selection'][$topic] = empty($_SESSION['split_selection'][$topic]) ? array() : $_SESSION['split_selection'][$topic]; |
| 200 | 213 | |
| 201 | 214 | // This is a special case for split topics from quick-moderation checkboxes |
| 202 | - if (isset($_REQUEST['subname_enc'])) |
|
| 203 | - $_REQUEST['subname'] = urldecode($_REQUEST['subname_enc']); |
|
| 215 | + if (isset($_REQUEST['subname_enc'])) { |
|
| 216 | + $_REQUEST['subname'] = urldecode($_REQUEST['subname_enc']); |
|
| 217 | + } |
|
| 204 | 218 | |
| 205 | 219 | $context['not_selected'] = array( |
| 206 | 220 | 'num_messages' => 0, |
@@ -252,10 +266,12 @@ discard block |
||
| 252 | 266 | ) |
| 253 | 267 | ); |
| 254 | 268 | // You can't split the last message off. |
| 255 | - if (empty($context['not_selected']['start']) && $smcFunc['db_num_rows']($request) <= 1 && $_REQUEST['move'] == 'down') |
|
| 256 | - $_REQUEST['move'] = ''; |
|
| 257 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
| 258 | - $original_msgs['not_selected'][] = $row['id_msg']; |
|
| 269 | + if (empty($context['not_selected']['start']) && $smcFunc['db_num_rows']($request) <= 1 && $_REQUEST['move'] == 'down') { |
|
| 270 | + $_REQUEST['move'] = ''; |
|
| 271 | + } |
|
| 272 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
| 273 | + $original_msgs['not_selected'][] = $row['id_msg']; |
|
| 274 | + } |
|
| 259 | 275 | $smcFunc['db_free_result']($request); |
| 260 | 276 | if (!empty($_SESSION['split_selection'][$topic])) |
| 261 | 277 | { |
@@ -275,8 +291,9 @@ discard block |
||
| 275 | 291 | 'messages_per_page' => $context['messages_per_page'], |
| 276 | 292 | ) |
| 277 | 293 | ); |
| 278 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
| 279 | - $original_msgs['selected'][] = $row['id_msg']; |
|
| 294 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
| 295 | + $original_msgs['selected'][] = $row['id_msg']; |
|
| 296 | + } |
|
| 280 | 297 | $smcFunc['db_free_result']($request); |
| 281 | 298 | } |
| 282 | 299 | } |
@@ -286,12 +303,13 @@ discard block |
||
| 286 | 303 | { |
| 287 | 304 | $_REQUEST['msg'] = (int) $_REQUEST['msg']; |
| 288 | 305 | |
| 289 | - if ($_REQUEST['move'] == 'reset') |
|
| 290 | - $_SESSION['split_selection'][$topic] = array(); |
|
| 291 | - elseif ($_REQUEST['move'] == 'up') |
|
| 292 | - $_SESSION['split_selection'][$topic] = array_diff($_SESSION['split_selection'][$topic], array($_REQUEST['msg'])); |
|
| 293 | - else |
|
| 294 | - $_SESSION['split_selection'][$topic][] = $_REQUEST['msg']; |
|
| 306 | + if ($_REQUEST['move'] == 'reset') { |
|
| 307 | + $_SESSION['split_selection'][$topic] = array(); |
|
| 308 | + } elseif ($_REQUEST['move'] == 'up') { |
|
| 309 | + $_SESSION['split_selection'][$topic] = array_diff($_SESSION['split_selection'][$topic], array($_REQUEST['msg'])); |
|
| 310 | + } else { |
|
| 311 | + $_SESSION['split_selection'][$topic][] = $_REQUEST['msg']; |
|
| 312 | + } |
|
| 295 | 313 | } |
| 296 | 314 | |
| 297 | 315 | // Make sure the selection is still accurate. |
@@ -310,8 +328,9 @@ discard block |
||
| 310 | 328 | ) |
| 311 | 329 | ); |
| 312 | 330 | $_SESSION['split_selection'][$topic] = array(); |
| 313 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
| 314 | - $_SESSION['split_selection'][$topic][] = $row['id_msg']; |
|
| 331 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
| 332 | + $_SESSION['split_selection'][$topic][] = $row['id_msg']; |
|
| 333 | + } |
|
| 315 | 334 | $smcFunc['db_free_result']($request); |
| 316 | 335 | } |
| 317 | 336 | |
@@ -328,13 +347,15 @@ discard block |
||
| 328 | 347 | 'is_approved' => 1, |
| 329 | 348 | ) |
| 330 | 349 | ); |
| 331 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
| 332 | - $context[empty($row['is_selected']) || $row['is_selected'] == 'f' ? 'not_selected' : 'selected']['num_messages'] = $row['num_messages']; |
|
| 350 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
| 351 | + $context[empty($row['is_selected']) || $row['is_selected'] == 'f' ? 'not_selected' : 'selected']['num_messages'] = $row['num_messages']; |
|
| 352 | + } |
|
| 333 | 353 | $smcFunc['db_free_result']($request); |
| 334 | 354 | |
| 335 | 355 | // Fix an oversized starting page (to make sure both pageindexes are properly set). |
| 336 | - if ($context['selected']['start'] >= $context['selected']['num_messages']) |
|
| 337 | - $context['selected']['start'] = $context['selected']['num_messages'] <= $context['messages_per_page'] ? 0 : ($context['selected']['num_messages'] - (($context['selected']['num_messages'] % $context['messages_per_page']) == 0 ? $context['messages_per_page'] : ($context['selected']['num_messages'] % $context['messages_per_page']))); |
|
| 356 | + if ($context['selected']['start'] >= $context['selected']['num_messages']) { |
|
| 357 | + $context['selected']['start'] = $context['selected']['num_messages'] <= $context['messages_per_page'] ? 0 : ($context['selected']['num_messages'] - (($context['selected']['num_messages'] % $context['messages_per_page']) == 0 ? $context['messages_per_page'] : ($context['selected']['num_messages'] % $context['messages_per_page']))); |
|
| 358 | + } |
|
| 338 | 359 | |
| 339 | 360 | // Build a page list of the not-selected topics... |
| 340 | 361 | $context['not_selected']['page_index'] = constructPageIndex($scripturl . '?action=splittopics;sa=selectTopics;subname=' . strtr(urlencode($_REQUEST['subname']), array('%' => '%%')) . ';topic=' . $topic . '.%1$d;start2=' . $context['selected']['start'], $context['not_selected']['start'], $context['not_selected']['num_messages'], $context['messages_per_page'], true); |
@@ -434,11 +455,12 @@ discard block |
||
| 434 | 455 | ); |
| 435 | 456 | |
| 436 | 457 | $context['changes'] = array(); |
| 437 | - foreach ($changes as $change_type => $change_array) |
|
| 438 | - foreach ($change_array as $section => $msg_array) |
|
| 458 | + foreach ($changes as $change_type => $change_array) { |
|
| 459 | + foreach ($change_array as $section => $msg_array) |
|
| 439 | 460 | { |
| 440 | 461 | if (empty($msg_array)) |
| 441 | 462 | continue; |
| 463 | + } |
|
| 442 | 464 | |
| 443 | 465 | foreach ($msg_array as $id_msg) |
| 444 | 466 | { |
@@ -447,8 +469,9 @@ discard block |
||
| 447 | 469 | 'type' => $change_type, |
| 448 | 470 | 'section' => $section, |
| 449 | 471 | ); |
| 450 | - if ($change_type == 'insert') |
|
| 451 | - $context['changes']['insert' . $id_msg]['insert_value'] = $context[$section]['messages'][$id_msg]; |
|
| 472 | + if ($change_type == 'insert') { |
|
| 473 | + $context['changes']['insert' . $id_msg]['insert_value'] = $context[$section]['messages'][$id_msg]; |
|
| 474 | + } |
|
| 452 | 475 | } |
| 453 | 476 | } |
| 454 | 477 | } |
@@ -468,12 +491,14 @@ discard block |
||
| 468 | 491 | checkSession(); |
| 469 | 492 | |
| 470 | 493 | // Default the subject in case it's blank. |
| 471 | - if (!isset($_POST['subname']) || $_POST['subname'] == '') |
|
| 472 | - $_POST['subname'] = $txt['new_topic']; |
|
| 494 | + if (!isset($_POST['subname']) || $_POST['subname'] == '') { |
|
| 495 | + $_POST['subname'] = $txt['new_topic']; |
|
| 496 | + } |
|
| 473 | 497 | |
| 474 | 498 | // You must've selected some messages! Can't split out none! |
| 475 | - if (empty($_SESSION['split_selection'][$topic])) |
|
| 476 | - fatal_lang_error('no_posts_selected', false); |
|
| 499 | + if (empty($_SESSION['split_selection'][$topic])) { |
|
| 500 | + fatal_lang_error('no_posts_selected', false); |
|
| 501 | + } |
|
| 477 | 502 | |
| 478 | 503 | $context['old_topic'] = $topic; |
| 479 | 504 | $context['new_topic'] = splitTopic($topic, $_SESSION['split_selection'][$topic], $_POST['subname']); |
@@ -499,8 +524,9 @@ discard block |
||
| 499 | 524 | global $smcFunc, $txt, $sourcedir; |
| 500 | 525 | |
| 501 | 526 | // Nothing to split? |
| 502 | - if (empty($splitMessages)) |
|
| 503 | - fatal_lang_error('no_posts_selected', false); |
|
| 527 | + if (empty($splitMessages)) { |
|
| 528 | + fatal_lang_error('no_posts_selected', false); |
|
| 529 | + } |
|
| 504 | 530 | |
| 505 | 531 | // Get some board info. |
| 506 | 532 | $request = $smcFunc['db_query']('', ' |
@@ -532,8 +558,9 @@ discard block |
||
| 532 | 558 | ) |
| 533 | 559 | ); |
| 534 | 560 | // You can't select ALL the messages! |
| 535 | - if ($smcFunc['db_num_rows']($request) == 0) |
|
| 536 | - fatal_lang_error('selected_all_posts', false); |
|
| 561 | + if ($smcFunc['db_num_rows']($request) == 0) { |
|
| 562 | + fatal_lang_error('selected_all_posts', false); |
|
| 563 | + } |
|
| 537 | 564 | |
| 538 | 565 | $split1_first_msg = null; |
| 539 | 566 | $split1_last_msg = null; |
@@ -541,24 +568,27 @@ discard block |
||
| 541 | 568 | while ($row = $smcFunc['db_fetch_assoc']($request)) |
| 542 | 569 | { |
| 543 | 570 | // Get the right first and last message dependant on approved state... |
| 544 | - if (empty($split1_first_msg) || $row['myid_first_msg'] < $split1_first_msg) |
|
| 545 | - $split1_first_msg = $row['myid_first_msg']; |
|
| 546 | - if (empty($split1_last_msg) || $row['approved']) |
|
| 547 | - $split1_last_msg = $row['myid_last_msg']; |
|
| 571 | + if (empty($split1_first_msg) || $row['myid_first_msg'] < $split1_first_msg) { |
|
| 572 | + $split1_first_msg = $row['myid_first_msg']; |
|
| 573 | + } |
|
| 574 | + if (empty($split1_last_msg) || $row['approved']) { |
|
| 575 | + $split1_last_msg = $row['myid_last_msg']; |
|
| 576 | + } |
|
| 548 | 577 | |
| 549 | 578 | // Get the counts correct... |
| 550 | 579 | if ($row['approved']) |
| 551 | 580 | { |
| 552 | 581 | $split1_replies = $row['message_count'] - 1; |
| 553 | 582 | $split1_unapprovedposts = 0; |
| 554 | - } |
|
| 555 | - else |
|
| 583 | + } else |
|
| 556 | 584 | { |
| 557 | - if (!isset($split1_replies)) |
|
| 558 | - $split1_replies = 0; |
|
| 585 | + if (!isset($split1_replies)) { |
|
| 586 | + $split1_replies = 0; |
|
| 587 | + } |
|
| 559 | 588 | // If the topic isn't approved then num replies must go up by one... as first post wouldn't be counted. |
| 560 | - elseif (!$split1_approved) |
|
| 561 | - $split1_replies++; |
|
| 589 | + elseif (!$split1_approved) { |
|
| 590 | + $split1_replies++; |
|
| 591 | + } |
|
| 562 | 592 | |
| 563 | 593 | $split1_unapprovedposts = $row['message_count']; |
| 564 | 594 | } |
@@ -584,10 +614,12 @@ discard block |
||
| 584 | 614 | while ($row = $smcFunc['db_fetch_assoc']($request)) |
| 585 | 615 | { |
| 586 | 616 | // As before get the right first and last message dependant on approved state... |
| 587 | - if (empty($split2_first_msg) || $row['myid_first_msg'] < $split2_first_msg) |
|
| 588 | - $split2_first_msg = $row['myid_first_msg']; |
|
| 589 | - if (empty($split2_last_msg) || $row['approved']) |
|
| 590 | - $split2_last_msg = $row['myid_last_msg']; |
|
| 617 | + if (empty($split2_first_msg) || $row['myid_first_msg'] < $split2_first_msg) { |
|
| 618 | + $split2_first_msg = $row['myid_first_msg']; |
|
| 619 | + } |
|
| 620 | + if (empty($split2_last_msg) || $row['approved']) { |
|
| 621 | + $split2_last_msg = $row['myid_last_msg']; |
|
| 622 | + } |
|
| 591 | 623 | |
| 592 | 624 | // Then do the counts again... |
| 593 | 625 | if ($row['approved']) |
@@ -595,18 +627,20 @@ discard block |
||
| 595 | 627 | $split2_approved = true; |
| 596 | 628 | $split2_replies = $row['message_count'] - 1; |
| 597 | 629 | $split2_unapprovedposts = 0; |
| 598 | - } |
|
| 599 | - else |
|
| 630 | + } else |
|
| 600 | 631 | { |
| 601 | 632 | // Should this one be approved?? |
| 602 | - if ($split2_first_msg == $row['myid_first_msg']) |
|
| 603 | - $split2_approved = false; |
|
| 633 | + if ($split2_first_msg == $row['myid_first_msg']) { |
|
| 634 | + $split2_approved = false; |
|
| 635 | + } |
|
| 604 | 636 | |
| 605 | - if (!isset($split2_replies)) |
|
| 606 | - $split2_replies = 0; |
|
| 637 | + if (!isset($split2_replies)) { |
|
| 638 | + $split2_replies = 0; |
|
| 639 | + } |
|
| 607 | 640 | // As before, fix number of replies. |
| 608 | - elseif (!$split2_approved) |
|
| 609 | - $split2_replies++; |
|
| 641 | + elseif (!$split2_approved) { |
|
| 642 | + $split2_replies++; |
|
| 643 | + } |
|
| 610 | 644 | |
| 611 | 645 | $split2_unapprovedposts = $row['message_count']; |
| 612 | 646 | } |
@@ -616,12 +650,14 @@ discard block |
||
| 616 | 650 | $split2_lastMem = getMsgMemberID($split2_last_msg); |
| 617 | 651 | |
| 618 | 652 | // No database changes yet, so let's double check to see if everything makes at least a little sense. |
| 619 | - if ($split1_first_msg <= 0 || $split1_last_msg <= 0 || $split2_first_msg <= 0 || $split2_last_msg <= 0 || $split1_replies < 0 || $split2_replies < 0 || $split1_unapprovedposts < 0 || $split2_unapprovedposts < 0 || !isset($split1_approved) || !isset($split2_approved)) |
|
| 620 | - fatal_lang_error('cant_find_messages'); |
|
| 653 | + if ($split1_first_msg <= 0 || $split1_last_msg <= 0 || $split2_first_msg <= 0 || $split2_last_msg <= 0 || $split1_replies < 0 || $split2_replies < 0 || $split1_unapprovedposts < 0 || $split2_unapprovedposts < 0 || !isset($split1_approved) || !isset($split2_approved)) { |
|
| 654 | + fatal_lang_error('cant_find_messages'); |
|
| 655 | + } |
|
| 621 | 656 | |
| 622 | 657 | // You cannot split off the first message of a topic. |
| 623 | - if ($split1_first_msg > $split2_first_msg) |
|
| 624 | - fatal_lang_error('split_first_post', false); |
|
| 658 | + if ($split1_first_msg > $split2_first_msg) { |
|
| 659 | + fatal_lang_error('split_first_post', false); |
|
| 660 | + } |
|
| 625 | 661 | |
| 626 | 662 | // We're off to insert the new topic! Use 0 for now to avoid UNIQUE errors. |
| 627 | 663 | $smcFunc['db_insert']('', |
@@ -644,14 +680,16 @@ discard block |
||
| 644 | 680 | array('id_topic') |
| 645 | 681 | ); |
| 646 | 682 | $split2_ID_TOPIC = $smcFunc['db_insert_id']('{db_prefix}topics', 'id_topic'); |
| 647 | - if ($split2_ID_TOPIC <= 0) |
|
| 648 | - fatal_lang_error('cant_insert_topic'); |
|
| 683 | + if ($split2_ID_TOPIC <= 0) { |
|
| 684 | + fatal_lang_error('cant_insert_topic'); |
|
| 685 | + } |
|
| 649 | 686 | |
| 650 | 687 | // Move the messages over to the other topic. |
| 651 | 688 | $new_subject = strtr($smcFunc['htmltrim']($smcFunc['htmlspecialchars']($new_subject)), array("\r" => '', "\n" => '', "\t" => '')); |
| 652 | 689 | // Check the subject length. |
| 653 | - if ($smcFunc['strlen']($new_subject) > 100) |
|
| 654 | - $new_subject = $smcFunc['substr']($new_subject, 0, 100); |
|
| 690 | + if ($smcFunc['strlen']($new_subject) > 100) { |
|
| 691 | + $new_subject = $smcFunc['substr']($new_subject, 0, 100); |
|
| 692 | + } |
|
| 655 | 693 | // Valid subject? |
| 656 | 694 | if ($new_subject != '') |
| 657 | 695 | { |
@@ -722,8 +760,8 @@ discard block |
||
| 722 | 760 | ); |
| 723 | 761 | |
| 724 | 762 | // If the new topic isn't approved ensure the first message flags this just in case. |
| 725 | - if (!$split2_approved) |
|
| 726 | - $smcFunc['db_query']('', ' |
|
| 763 | + if (!$split2_approved) { |
|
| 764 | + $smcFunc['db_query']('', ' |
|
| 727 | 765 | UPDATE {db_prefix}messages |
| 728 | 766 | SET approved = {int:approved} |
| 729 | 767 | WHERE id_msg = {int:id_msg} |
@@ -734,6 +772,7 @@ discard block |
||
| 734 | 772 | 'id_topic' => $split2_ID_TOPIC, |
| 735 | 773 | ) |
| 736 | 774 | ); |
| 775 | + } |
|
| 737 | 776 | |
| 738 | 777 | // The board has more topics now (Or more unapproved ones!). |
| 739 | 778 | $smcFunc['db_query']('', ' |
@@ -760,8 +799,9 @@ discard block |
||
| 760 | 799 | if ($smcFunc['db_num_rows']($request) > 0) |
| 761 | 800 | { |
| 762 | 801 | $replaceEntries = array(); |
| 763 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
| 764 | - $replaceEntries[] = array($row['id_member'], $split2_ID_TOPIC, $row['id_msg'], $row['unwatched']); |
|
| 802 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
| 803 | + $replaceEntries[] = array($row['id_member'], $split2_ID_TOPIC, $row['id_msg'], $row['unwatched']); |
|
| 804 | + } |
|
| 765 | 805 | |
| 766 | 806 | $smcFunc['db_insert']('ignore', |
| 767 | 807 | '{db_prefix}log_topics', |
@@ -785,8 +825,9 @@ discard block |
||
| 785 | 825 | // If there's a search index that needs updating, update it... |
| 786 | 826 | require_once($sourcedir . '/Search.php'); |
| 787 | 827 | $searchAPI = findSearchAPI(); |
| 788 | - if (is_callable(array($searchAPI, 'topicSplit'))) |
|
| 789 | - $searchAPI->topicSplit($split2_ID_TOPIC, $splitMessages); |
|
| 828 | + if (is_callable(array($searchAPI, 'topicSplit'))) { |
|
| 829 | + $searchAPI->topicSplit($split2_ID_TOPIC, $splitMessages); |
|
| 830 | + } |
|
| 790 | 831 | |
| 791 | 832 | // Return the ID of the newly created topic. |
| 792 | 833 | return $split2_ID_TOPIC; |
@@ -812,12 +853,12 @@ discard block |
||
| 812 | 853 | ); |
| 813 | 854 | |
| 814 | 855 | // ?action=mergetopics;sa=LETSBREAKIT won't work, sorry. |
| 815 | - if (empty($_REQUEST['sa']) || !isset($subActions[$_REQUEST['sa']])) |
|
| 816 | - MergeIndex(); |
|
| 817 | - |
|
| 818 | - else |
|
| 819 | - call_helper($subActions[$_REQUEST['sa']]); |
|
| 820 | -} |
|
| 856 | + if (empty($_REQUEST['sa']) || !isset($subActions[$_REQUEST['sa']])) { |
|
| 857 | + MergeIndex(); |
|
| 858 | + } else { |
|
| 859 | + call_helper($subActions[$_REQUEST['sa']]); |
|
| 860 | + } |
|
| 861 | + } |
|
| 821 | 862 | |
| 822 | 863 | /** |
| 823 | 864 | * allows to pick a topic to merge the current topic with. |
@@ -831,8 +872,9 @@ discard block |
||
| 831 | 872 | global $txt, $board, $context, $smcFunc, $sourcedir; |
| 832 | 873 | global $scripturl, $modSettings; |
| 833 | 874 | |
| 834 | - if (!isset($_GET['from'])) |
|
| 835 | - fatal_lang_error('no_access', false); |
|
| 875 | + if (!isset($_GET['from'])) { |
|
| 876 | + fatal_lang_error('no_access', false); |
|
| 877 | + } |
|
| 836 | 878 | $_GET['from'] = (int) $_GET['from']; |
| 837 | 879 | |
| 838 | 880 | $_REQUEST['targetboard'] = isset($_REQUEST['targetboard']) ? (int) $_REQUEST['targetboard'] : $board; |
@@ -843,9 +885,9 @@ discard block |
||
| 843 | 885 | { |
| 844 | 886 | $can_approve_boards = boardsAllowedTo('approve_posts'); |
| 845 | 887 | $onlyApproved = $can_approve_boards !== array(0) && !in_array($_REQUEST['targetboard'], $can_approve_boards); |
| 888 | + } else { |
|
| 889 | + $onlyApproved = false; |
|
| 846 | 890 | } |
| 847 | - else |
|
| 848 | - $onlyApproved = false; |
|
| 849 | 891 | |
| 850 | 892 | // How many topics are on this board? (used for paging.) |
| 851 | 893 | $request = $smcFunc['db_query']('', ' |
@@ -879,8 +921,9 @@ discard block |
||
| 879 | 921 | 'is_approved' => 1, |
| 880 | 922 | ) |
| 881 | 923 | ); |
| 882 | - if ($smcFunc['db_num_rows']($request) == 0) |
|
| 883 | - fatal_lang_error('no_board'); |
|
| 924 | + if ($smcFunc['db_num_rows']($request) == 0) { |
|
| 925 | + fatal_lang_error('no_board'); |
|
| 926 | + } |
|
| 884 | 927 | list ($subject) = $smcFunc['db_fetch_row']($request); |
| 885 | 928 | $smcFunc['db_free_result']($request); |
| 886 | 929 | |
@@ -893,8 +936,9 @@ discard block |
||
| 893 | 936 | // Check which boards you have merge permissions on. |
| 894 | 937 | $merge_boards = boardsAllowedTo('merge_any'); |
| 895 | 938 | |
| 896 | - if (empty($merge_boards)) |
|
| 897 | - fatal_lang_error('cannot_merge_any', 'user'); |
|
| 939 | + if (empty($merge_boards)) { |
|
| 940 | + fatal_lang_error('cannot_merge_any', 'user'); |
|
| 941 | + } |
|
| 898 | 942 | |
| 899 | 943 | // No sense in loading this if you can only merge on this board |
| 900 | 944 | if (count($merge_boards) > 1 || in_array(0, $merge_boards)) |
@@ -908,8 +952,9 @@ discard block |
||
| 908 | 952 | ); |
| 909 | 953 | |
| 910 | 954 | // Only include these boards in the list (0 means you're an admin') |
| 911 | - if (!in_array(0, $merge_boards)) |
|
| 912 | - $options['included_boards'] = $merge_boards; |
|
| 955 | + if (!in_array(0, $merge_boards)) { |
|
| 956 | + $options['included_boards'] = $merge_boards; |
|
| 957 | + } |
|
| 913 | 958 | |
| 914 | 959 | $context['merge_categories'] = getBoardList($options); |
| 915 | 960 | } |
@@ -955,8 +1000,9 @@ discard block |
||
| 955 | 1000 | } |
| 956 | 1001 | $smcFunc['db_free_result']($request); |
| 957 | 1002 | |
| 958 | - if (empty($context['topics']) && count($merge_boards) <= 1 && !in_array(0, $merge_boards)) |
|
| 959 | - fatal_lang_error('merge_need_more_topics'); |
|
| 1003 | + if (empty($context['topics']) && count($merge_boards) <= 1 && !in_array(0, $merge_boards)) { |
|
| 1004 | + fatal_lang_error('merge_need_more_topics'); |
|
| 1005 | + } |
|
| 960 | 1006 | |
| 961 | 1007 | $context['sub_template'] = 'merge'; |
| 962 | 1008 | } |
@@ -986,24 +1032,29 @@ discard block |
||
| 986 | 1032 | checkSession('request'); |
| 987 | 1033 | |
| 988 | 1034 | // Handle URLs from MergeIndex. |
| 989 | - if (!empty($_GET['from']) && !empty($_GET['to'])) |
|
| 990 | - $topics = array((int) $_GET['from'], (int) $_GET['to']); |
|
| 1035 | + if (!empty($_GET['from']) && !empty($_GET['to'])) { |
|
| 1036 | + $topics = array((int) $_GET['from'], (int) $_GET['to']); |
|
| 1037 | + } |
|
| 991 | 1038 | |
| 992 | 1039 | // If we came from a form, the topic IDs came by post. |
| 993 | - if (!empty($_POST['topics']) && is_array($_POST['topics'])) |
|
| 994 | - $topics = $_POST['topics']; |
|
| 1040 | + if (!empty($_POST['topics']) && is_array($_POST['topics'])) { |
|
| 1041 | + $topics = $_POST['topics']; |
|
| 1042 | + } |
|
| 995 | 1043 | |
| 996 | 1044 | // There's nothing to merge with just one topic... |
| 997 | - if (empty($topics) || !is_array($topics) || count($topics) == 1) |
|
| 998 | - fatal_lang_error('merge_need_more_topics'); |
|
| 1045 | + if (empty($topics) || !is_array($topics) || count($topics) == 1) { |
|
| 1046 | + fatal_lang_error('merge_need_more_topics'); |
|
| 1047 | + } |
|
| 999 | 1048 | |
| 1000 | 1049 | // Make sure every topic is numeric, or some nasty things could be done with the DB. |
| 1001 | - foreach ($topics as $id => $topic) |
|
| 1002 | - $topics[$id] = (int) $topic; |
|
| 1050 | + foreach ($topics as $id => $topic) { |
|
| 1051 | + $topics[$id] = (int) $topic; |
|
| 1052 | + } |
|
| 1003 | 1053 | |
| 1004 | 1054 | // Joy of all joys, make sure they're not messing about with unapproved topics they can't see :P |
| 1005 | - if ($modSettings['postmod_active']) |
|
| 1006 | - $can_approve_boards = boardsAllowedTo('approve_posts'); |
|
| 1055 | + if ($modSettings['postmod_active']) { |
|
| 1056 | + $can_approve_boards = boardsAllowedTo('approve_posts'); |
|
| 1057 | + } |
|
| 1007 | 1058 | |
| 1008 | 1059 | // Get info about the topics and polls that will be merged. |
| 1009 | 1060 | $request = $smcFunc['db_query']('', ' |
@@ -1024,8 +1075,9 @@ discard block |
||
| 1024 | 1075 | 'limit' => count($topics), |
| 1025 | 1076 | ) |
| 1026 | 1077 | ); |
| 1027 | - if ($smcFunc['db_num_rows']($request) < 2) |
|
| 1028 | - fatal_lang_error('no_topic_id'); |
|
| 1078 | + if ($smcFunc['db_num_rows']($request) < 2) { |
|
| 1079 | + fatal_lang_error('no_topic_id'); |
|
| 1080 | + } |
|
| 1029 | 1081 | $num_views = 0; |
| 1030 | 1082 | $is_sticky = 0; |
| 1031 | 1083 | $boardTotals = array(); |
@@ -1038,34 +1090,38 @@ discard block |
||
| 1038 | 1090 | while ($row = $smcFunc['db_fetch_assoc']($request)) |
| 1039 | 1091 | { |
| 1040 | 1092 | // Sorry, redirection topics can't be merged |
| 1041 | - if (!empty($row['id_redirect_topic'])) |
|
| 1042 | - fatal_lang_error('cannot_merge_redirect', false); |
|
| 1093 | + if (!empty($row['id_redirect_topic'])) { |
|
| 1094 | + fatal_lang_error('cannot_merge_redirect', false); |
|
| 1095 | + } |
|
| 1043 | 1096 | |
| 1044 | 1097 | // Make a note for the board counts... |
| 1045 | - if (!isset($boardTotals[$row['id_board']])) |
|
| 1046 | - $boardTotals[$row['id_board']] = array( |
|
| 1098 | + if (!isset($boardTotals[$row['id_board']])) { |
|
| 1099 | + $boardTotals[$row['id_board']] = array( |
|
| 1047 | 1100 | 'posts' => 0, |
| 1048 | 1101 | 'topics' => 0, |
| 1049 | 1102 | 'unapproved_posts' => 0, |
| 1050 | 1103 | 'unapproved_topics' => 0 |
| 1051 | 1104 | ); |
| 1105 | + } |
|
| 1052 | 1106 | |
| 1053 | 1107 | // We can't see unapproved topics here? |
| 1054 | 1108 | if ($modSettings['postmod_active'] && !$row['approved'] && $can_approve_boards != array(0) && in_array($row['id_board'], $can_approve_boards)) |
| 1055 | 1109 | { |
| 1056 | 1110 | unset($topics[$row['id_topic']]); // If we can't see it, we should not merge it and not adjust counts! Instead skip it. |
| 1057 | 1111 | continue; |
| 1058 | - }elseif (!$row['approved']) |
|
| 1059 | - $boardTotals[$row['id_board']]['unapproved_topics']++; |
|
| 1060 | - else |
|
| 1061 | - $boardTotals[$row['id_board']]['topics']++; |
|
| 1112 | + } elseif (!$row['approved']) { |
|
| 1113 | + $boardTotals[$row['id_board']]['unapproved_topics']++; |
|
| 1114 | + } else { |
|
| 1115 | + $boardTotals[$row['id_board']]['topics']++; |
|
| 1116 | + } |
|
| 1062 | 1117 | |
| 1063 | 1118 | $boardTotals[$row['id_board']]['unapproved_posts'] += $row['unapproved_posts']; |
| 1064 | 1119 | $boardTotals[$row['id_board']]['posts'] += $row['num_replies'] + ($row['approved'] ? 1 : 0); |
| 1065 | 1120 | |
| 1066 | 1121 | // In the case of making a redirect, the topic count goes up by one due to the redirect topic. |
| 1067 | - if (isset($_POST['postRedirect'])) |
|
| 1068 | - $boardTotals[$row['id_board']]['topics']--; |
|
| 1122 | + if (isset($_POST['postRedirect'])) { |
|
| 1123 | + $boardTotals[$row['id_board']]['topics']--; |
|
| 1124 | + } |
|
| 1069 | 1125 | |
| 1070 | 1126 | $topic_data[$row['id_topic']] = array( |
| 1071 | 1127 | 'id' => $row['id_topic'], |
@@ -1091,11 +1147,13 @@ discard block |
||
| 1091 | 1147 | $boards[] = $row['id_board']; |
| 1092 | 1148 | |
| 1093 | 1149 | // If there's no poll, id_poll == 0... |
| 1094 | - if ($row['id_poll'] > 0) |
|
| 1095 | - $polls[] = $row['id_poll']; |
|
| 1150 | + if ($row['id_poll'] > 0) { |
|
| 1151 | + $polls[] = $row['id_poll']; |
|
| 1152 | + } |
|
| 1096 | 1153 | // Store the id_topic with the lowest id_first_msg. |
| 1097 | - if (empty($firstTopic)) |
|
| 1098 | - $firstTopic = $row['id_topic']; |
|
| 1154 | + if (empty($firstTopic)) { |
|
| 1155 | + $firstTopic = $row['id_topic']; |
|
| 1156 | + } |
|
| 1099 | 1157 | |
| 1100 | 1158 | // Lowest topic id gets selected as surviving topic id. We need to store this board so we can adjust the topic count (This one will not have a redirect topic) |
| 1101 | 1159 | if($row['id_topic'] < $lowestTopicId || empty($lowestTopicId) ) |
@@ -1109,11 +1167,13 @@ discard block |
||
| 1109 | 1167 | $smcFunc['db_free_result']($request); |
| 1110 | 1168 | |
| 1111 | 1169 | // If we didn't get any topics then they've been messing with unapproved stuff. |
| 1112 | - if (empty($topic_data)) |
|
| 1113 | - fatal_lang_error('no_topic_id'); |
|
| 1170 | + if (empty($topic_data)) { |
|
| 1171 | + fatal_lang_error('no_topic_id'); |
|
| 1172 | + } |
|
| 1114 | 1173 | |
| 1115 | - if (isset($_POST['postRedirect']) && !empty($lowestTopicBoard)) |
|
| 1116 | - $boardTotals[$lowestTopicBoard]['topics']++; |
|
| 1174 | + if (isset($_POST['postRedirect']) && !empty($lowestTopicBoard)) { |
|
| 1175 | + $boardTotals[$lowestTopicBoard]['topics']++; |
|
| 1176 | + } |
|
| 1117 | 1177 | |
| 1118 | 1178 | // Will this be approved? |
| 1119 | 1179 | $context['is_approved'] = $topic_data[$firstTopic]['approved']; |
@@ -1129,8 +1189,9 @@ discard block |
||
| 1129 | 1189 | |
| 1130 | 1190 | // Get the boards a user is allowed to merge in. |
| 1131 | 1191 | $merge_boards = boardsAllowedTo('merge_any'); |
| 1132 | - if (empty($merge_boards)) |
|
| 1133 | - fatal_lang_error('cannot_merge_any', 'user'); |
|
| 1192 | + if (empty($merge_boards)) { |
|
| 1193 | + fatal_lang_error('cannot_merge_any', 'user'); |
|
| 1194 | + } |
|
| 1134 | 1195 | |
| 1135 | 1196 | // Make sure they can see all boards.... |
| 1136 | 1197 | $request = $smcFunc['db_query']('', ' |
@@ -1147,8 +1208,9 @@ discard block |
||
| 1147 | 1208 | ) |
| 1148 | 1209 | ); |
| 1149 | 1210 | // If the number of boards that's in the output isn't exactly the same as we've put in there, you're in trouble. |
| 1150 | - if ($smcFunc['db_num_rows']($request) != count($boards)) |
|
| 1151 | - fatal_lang_error('no_board'); |
|
| 1211 | + if ($smcFunc['db_num_rows']($request) != count($boards)) { |
|
| 1212 | + fatal_lang_error('no_board'); |
|
| 1213 | + } |
|
| 1152 | 1214 | $smcFunc['db_free_result']($request); |
| 1153 | 1215 | |
| 1154 | 1216 | if (empty($_REQUEST['sa']) || $_REQUEST['sa'] == 'options') |
@@ -1167,8 +1229,8 @@ discard block |
||
| 1167 | 1229 | 'limit' => count($polls), |
| 1168 | 1230 | ) |
| 1169 | 1231 | ); |
| 1170 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
| 1171 | - $context['polls'][] = array( |
|
| 1232 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
| 1233 | + $context['polls'][] = array( |
|
| 1172 | 1234 | 'id' => $row['id_poll'], |
| 1173 | 1235 | 'topic' => array( |
| 1174 | 1236 | 'id' => $row['id_topic'], |
@@ -1177,6 +1239,7 @@ discard block |
||
| 1177 | 1239 | 'question' => $row['question'], |
| 1178 | 1240 | 'selected' => $row['id_topic'] == $firstTopic |
| 1179 | 1241 | ); |
| 1242 | + } |
|
| 1180 | 1243 | $smcFunc['db_free_result']($request); |
| 1181 | 1244 | } |
| 1182 | 1245 | if (count($boards) > 1) |
@@ -1192,18 +1255,20 @@ discard block |
||
| 1192 | 1255 | 'limit' => count($boards), |
| 1193 | 1256 | ) |
| 1194 | 1257 | ); |
| 1195 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
| 1196 | - $context['boards'][] = array( |
|
| 1258 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
| 1259 | + $context['boards'][] = array( |
|
| 1197 | 1260 | 'id' => $row['id_board'], |
| 1198 | 1261 | 'name' => $row['name'], |
| 1199 | 1262 | 'selected' => $row['id_board'] == $topic_data[$firstTopic]['board'] |
| 1200 | 1263 | ); |
| 1264 | + } |
|
| 1201 | 1265 | $smcFunc['db_free_result']($request); |
| 1202 | 1266 | } |
| 1203 | 1267 | |
| 1204 | 1268 | $context['topics'] = $topic_data; |
| 1205 | - foreach ($topic_data as $id => $topic) |
|
| 1206 | - $context['topics'][$id]['selected'] = $topic['id'] == $firstTopic; |
|
| 1269 | + foreach ($topic_data as $id => $topic) { |
|
| 1270 | + $context['topics'][$id]['selected'] = $topic['id'] == $firstTopic; |
|
| 1271 | + } |
|
| 1207 | 1272 | |
| 1208 | 1273 | $context['page_title'] = $txt['merge']; |
| 1209 | 1274 | $context['sub_template'] = 'merge_extra_options'; |
@@ -1212,13 +1277,15 @@ discard block |
||
| 1212 | 1277 | |
| 1213 | 1278 | // Determine target board. |
| 1214 | 1279 | $target_board = count($boards) > 1 ? (int) $_REQUEST['board'] : $boards[0]; |
| 1215 | - if (!in_array($target_board, $boards)) |
|
| 1216 | - fatal_lang_error('no_board'); |
|
| 1280 | + if (!in_array($target_board, $boards)) { |
|
| 1281 | + fatal_lang_error('no_board'); |
|
| 1282 | + } |
|
| 1217 | 1283 | |
| 1218 | 1284 | // Determine which poll will survive and which polls won't. |
| 1219 | 1285 | $target_poll = count($polls) > 1 ? (int) $_POST['poll'] : (count($polls) == 1 ? $polls[0] : 0); |
| 1220 | - if ($target_poll > 0 && !in_array($target_poll, $polls)) |
|
| 1221 | - fatal_lang_error('no_access', false); |
|
| 1286 | + if ($target_poll > 0 && !in_array($target_poll, $polls)) { |
|
| 1287 | + fatal_lang_error('no_access', false); |
|
| 1288 | + } |
|
| 1222 | 1289 | $deleted_polls = empty($target_poll) ? $polls : array_diff($polls, array($target_poll)); |
| 1223 | 1290 | |
| 1224 | 1291 | // Determine the subject of the newly merged topic - was a custom subject specified? |
@@ -1226,19 +1293,23 @@ discard block |
||
| 1226 | 1293 | { |
| 1227 | 1294 | $target_subject = strtr($smcFunc['htmltrim']($smcFunc['htmlspecialchars']($_POST['custom_subject'])), array("\r" => '', "\n" => '', "\t" => '')); |
| 1228 | 1295 | // Keep checking the length. |
| 1229 | - if ($smcFunc['strlen']($target_subject) > 100) |
|
| 1230 | - $target_subject = $smcFunc['substr']($target_subject, 0, 100); |
|
| 1296 | + if ($smcFunc['strlen']($target_subject) > 100) { |
|
| 1297 | + $target_subject = $smcFunc['substr']($target_subject, 0, 100); |
|
| 1298 | + } |
|
| 1231 | 1299 | |
| 1232 | 1300 | // Nothing left - odd but pick the first topics subject. |
| 1233 | - if ($target_subject == '') |
|
| 1234 | - $target_subject = $topic_data[$firstTopic]['subject']; |
|
| 1301 | + if ($target_subject == '') { |
|
| 1302 | + $target_subject = $topic_data[$firstTopic]['subject']; |
|
| 1303 | + } |
|
| 1235 | 1304 | } |
| 1236 | 1305 | // A subject was selected from the list. |
| 1237 | - elseif (!empty($topic_data[(int) $_POST['subject']]['subject'])) |
|
| 1238 | - $target_subject = $topic_data[(int) $_POST['subject']]['subject']; |
|
| 1306 | + elseif (!empty($topic_data[(int) $_POST['subject']]['subject'])) { |
|
| 1307 | + $target_subject = $topic_data[(int) $_POST['subject']]['subject']; |
|
| 1308 | + } |
|
| 1239 | 1309 | // Nothing worked? Just take the subject of the first message. |
| 1240 | - else |
|
| 1241 | - $target_subject = $topic_data[$firstTopic]['subject']; |
|
| 1310 | + else { |
|
| 1311 | + $target_subject = $topic_data[$firstTopic]['subject']; |
|
| 1312 | + } |
|
| 1242 | 1313 | |
| 1243 | 1314 | // Get the first and last message and the number of messages.... |
| 1244 | 1315 | $request = $smcFunc['db_query']('', ' |
@@ -1264,15 +1335,13 @@ discard block |
||
| 1264 | 1335 | { |
| 1265 | 1336 | $num_replies = $row['message_count'] - 1; |
| 1266 | 1337 | $num_unapproved = 0; |
| 1267 | - } |
|
| 1268 | - else |
|
| 1338 | + } else |
|
| 1269 | 1339 | { |
| 1270 | 1340 | $topic_approved = 0; |
| 1271 | 1341 | $num_replies = 0; |
| 1272 | 1342 | $num_unapproved = $row['message_count']; |
| 1273 | 1343 | } |
| 1274 | - } |
|
| 1275 | - else |
|
| 1344 | + } else |
|
| 1276 | 1345 | { |
| 1277 | 1346 | // If this has a lower first_msg then the first post is not approved and hence the number of replies was wrong! |
| 1278 | 1347 | if ($first_msg > $row['first_msg']) |
@@ -1318,8 +1387,9 @@ discard block |
||
| 1318 | 1387 | list ($member_started) = $smcFunc['db_fetch_row']($request); |
| 1319 | 1388 | list ($member_updated) = $smcFunc['db_fetch_row']($request); |
| 1320 | 1389 | // First and last message are the same, so only row was returned. |
| 1321 | - if ($member_updated === NULL) |
|
| 1322 | - $member_updated = $member_started; |
|
| 1390 | + if ($member_updated === NULL) { |
|
| 1391 | + $member_updated = $member_started; |
|
| 1392 | + } |
|
| 1323 | 1393 | |
| 1324 | 1394 | $smcFunc['db_free_result']($request); |
| 1325 | 1395 | |
@@ -1332,8 +1402,9 @@ discard block |
||
| 1332 | 1402 | array( |
| 1333 | 1403 | 'topic_list' => $topics, |
| 1334 | 1404 | )); |
| 1335 | - while ($row = $smcFunc['db_fetch_row']($request)) |
|
| 1336 | - $affected_msgs[] = $row[0]; |
|
| 1405 | + while ($row = $smcFunc['db_fetch_row']($request)) { |
|
| 1406 | + $affected_msgs[] = $row[0]; |
|
| 1407 | + } |
|
| 1337 | 1408 | $smcFunc['db_free_result']($request); |
| 1338 | 1409 | |
| 1339 | 1410 | // Assign the first topic ID to be the merged topic. |
@@ -1411,9 +1482,9 @@ discard block |
||
| 1411 | 1482 | // Grab the response prefix (like 'Re: ') in the default forum language. |
| 1412 | 1483 | if (!isset($context['response_prefix']) && !($context['response_prefix'] = cache_get_data('response_prefix'))) |
| 1413 | 1484 | { |
| 1414 | - if ($language === $user_info['language']) |
|
| 1415 | - $context['response_prefix'] = $txt['response_prefix']; |
|
| 1416 | - else |
|
| 1485 | + if ($language === $user_info['language']) { |
|
| 1486 | + $context['response_prefix'] = $txt['response_prefix']; |
|
| 1487 | + } else |
|
| 1417 | 1488 | { |
| 1418 | 1489 | loadLanguage('index', $language, false); |
| 1419 | 1490 | $context['response_prefix'] = $txt['response_prefix']; |
@@ -1493,8 +1564,9 @@ discard block |
||
| 1493 | 1564 | if ($smcFunc['db_num_rows']($request) > 0) |
| 1494 | 1565 | { |
| 1495 | 1566 | $replaceEntries = array(); |
| 1496 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
| 1497 | - $replaceEntries[] = array($row['id_member'], $id_topic, $row['new_id_msg'], $row['unwatched']); |
|
| 1567 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
| 1568 | + $replaceEntries[] = array($row['id_member'], $id_topic, $row['new_id_msg'], $row['unwatched']); |
|
| 1569 | + } |
|
| 1498 | 1570 | |
| 1499 | 1571 | $smcFunc['db_insert']('replace', |
| 1500 | 1572 | '{db_prefix}log_topics', |
@@ -1531,8 +1603,9 @@ discard block |
||
| 1531 | 1603 | if ($smcFunc['db_num_rows']($request) > 0) |
| 1532 | 1604 | { |
| 1533 | 1605 | $replaceEntries = array(); |
| 1534 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
| 1535 | - $replaceEntries[] = array($row['id_member'], $id_topic, 0, $row['sent']); |
|
| 1606 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
| 1607 | + $replaceEntries[] = array($row['id_member'], $id_topic, 0, $row['sent']); |
|
| 1608 | + } |
|
| 1536 | 1609 | |
| 1537 | 1610 | $smcFunc['db_insert']('replace', |
| 1538 | 1611 | '{db_prefix}log_notify', |
@@ -1707,8 +1780,9 @@ discard block |
||
| 1707 | 1780 | // If there's a search index that needs updating, update it... |
| 1708 | 1781 | require_once($sourcedir . '/Search.php'); |
| 1709 | 1782 | $searchAPI = findSearchAPI(); |
| 1710 | - if (is_callable(array($searchAPI, 'topicMerge'))) |
|
| 1711 | - $searchAPI->topicMerge($id_topic, $topics, $affected_msgs, empty($_POST['enforce_subject']) ? null : array($context['response_prefix'], $target_subject)); |
|
| 1783 | + if (is_callable(array($searchAPI, 'topicMerge'))) { |
|
| 1784 | + $searchAPI->topicMerge($id_topic, $topics, $affected_msgs, empty($_POST['enforce_subject']) ? null : array($context['response_prefix'], $target_subject)); |
|
| 1785 | + } |
|
| 1712 | 1786 | |
| 1713 | 1787 | // Send them to the all done page. |
| 1714 | 1788 | redirectexit('action=mergetopics;sa=done;to=' . $id_topic . ';targetboard=' . $target_board); |
@@ -842,7 +842,7 @@ |
||
| 842 | 842 | require_once($sourcedir . '/Subs-Boards.php'); |
| 843 | 843 | sortBoards($recycle_boards); |
| 844 | 844 | |
| 845 | - $recycle_boards = array('') + $recycle_boards; |
|
| 845 | + $recycle_boards = array('') + $recycle_boards; |
|
| 846 | 846 | |
| 847 | 847 | // Here and the board settings... |
| 848 | 848 | $config_vars = array( |
@@ -13,8 +13,9 @@ discard block |
||
| 13 | 13 | * @version 2.1 Beta 3 |
| 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 | * The main dispatcher; doesn't do anything, just delegates. |
@@ -92,18 +93,19 @@ discard block |
||
| 92 | 93 | checkSession('get'); |
| 93 | 94 | validateToken('admin-bm-' . (int) $_REQUEST['src_board'], 'request'); |
| 94 | 95 | |
| 95 | - if ($_REQUEST['move_to'] === 'top') |
|
| 96 | - $boardOptions = array( |
|
| 96 | + if ($_REQUEST['move_to'] === 'top') { |
|
| 97 | + $boardOptions = array( |
|
| 97 | 98 | 'move_to' => $_REQUEST['move_to'], |
| 98 | 99 | 'target_category' => (int) $_REQUEST['target_cat'], |
| 99 | 100 | 'move_first_child' => true, |
| 100 | 101 | ); |
| 101 | - else |
|
| 102 | - $boardOptions = array( |
|
| 102 | + } else { |
|
| 103 | + $boardOptions = array( |
|
| 103 | 104 | 'move_to' => $_REQUEST['move_to'], |
| 104 | 105 | 'target_board' => (int) $_REQUEST['target_board'], |
| 105 | 106 | 'move_first_child' => true, |
| 106 | 107 | ); |
| 108 | + } |
|
| 107 | 109 | modifyBoard((int) $_REQUEST['src_board'], $boardOptions); |
| 108 | 110 | } |
| 109 | 111 | |
@@ -148,15 +150,16 @@ discard block |
||
| 148 | 150 | $security = $context['session_var'] . '=' . $context['session_id'] . ';' . $context['admin-bm-' . $context['move_board'] . '_token_var'] . '=' . $context['admin-bm-' . $context['move_board'] . '_token']; |
| 149 | 151 | foreach ($boardList[$catid] as $boardid) |
| 150 | 152 | { |
| 151 | - if (!isset($context['categories'][$catid]['move_link'])) |
|
| 152 | - $context['categories'][$catid]['move_link'] = array( |
|
| 153 | + if (!isset($context['categories'][$catid]['move_link'])) { |
|
| 154 | + $context['categories'][$catid]['move_link'] = array( |
|
| 153 | 155 | 'child_level' => 0, |
| 154 | 156 | 'label' => $txt['mboards_order_before'] . ' \'' . $smcFunc['htmlspecialchars']($boards[$boardid]['name']) . '\'', |
| 155 | 157 | 'href' => $scripturl . '?action=admin;area=manageboards;sa=move;src_board=' . $context['move_board'] . ';target_board=' . $boardid . ';move_to=before;' . $security, |
| 156 | 158 | ); |
| 159 | + } |
|
| 157 | 160 | |
| 158 | - if (!$context['categories'][$catid]['boards'][$boardid]['move']) |
|
| 159 | - $context['categories'][$catid]['boards'][$boardid]['move_links'] = array( |
|
| 161 | + if (!$context['categories'][$catid]['boards'][$boardid]['move']) { |
|
| 162 | + $context['categories'][$catid]['boards'][$boardid]['move_links'] = array( |
|
| 160 | 163 | array( |
| 161 | 164 | 'child_level' => $boards[$boardid]['level'], |
| 162 | 165 | 'label' => $txt['mboards_order_after'] . '\'' . $smcFunc['htmlspecialchars']($boards[$boardid]['name']) . '\'', |
@@ -170,34 +173,39 @@ discard block |
||
| 170 | 173 | 'class' => 'here', |
| 171 | 174 | ), |
| 172 | 175 | ); |
| 176 | + } |
|
| 173 | 177 | |
| 174 | 178 | $difference = $boards[$boardid]['level'] - $prev_child_level; |
| 175 | - if ($difference == 1) |
|
| 176 | - array_push($stack, !empty($context['categories'][$catid]['boards'][$prev_board]['move_links']) ? array_shift($context['categories'][$catid]['boards'][$prev_board]['move_links']) : null); |
|
| 177 | - elseif ($difference < 0) |
|
| 179 | + if ($difference == 1) { |
|
| 180 | + array_push($stack, !empty($context['categories'][$catid]['boards'][$prev_board]['move_links']) ? array_shift($context['categories'][$catid]['boards'][$prev_board]['move_links']) : null); |
|
| 181 | + } elseif ($difference < 0) |
|
| 178 | 182 | { |
| 179 | - if (empty($context['categories'][$catid]['boards'][$prev_board]['move_links'])) |
|
| 180 | - $context['categories'][$catid]['boards'][$prev_board]['move_links'] = array(); |
|
| 181 | - for ($i = 0; $i < -$difference; $i++) |
|
| 182 | - if (($temp = array_pop($stack)) != null) |
|
| 183 | + if (empty($context['categories'][$catid]['boards'][$prev_board]['move_links'])) { |
|
| 184 | + $context['categories'][$catid]['boards'][$prev_board]['move_links'] = array(); |
|
| 185 | + } |
|
| 186 | + for ($i = 0; $i < -$difference; $i++) { |
|
| 187 | + if (($temp = array_pop($stack)) != null) |
|
| 183 | 188 | array_unshift($context['categories'][$catid]['boards'][$prev_board]['move_links'], $temp); |
| 189 | + } |
|
| 184 | 190 | } |
| 185 | 191 | |
| 186 | 192 | $prev_board = $boardid; |
| 187 | 193 | $prev_child_level = $boards[$boardid]['level']; |
| 188 | 194 | |
| 189 | 195 | } |
| 190 | - if (!empty($stack) && !empty($context['categories'][$catid]['boards'][$prev_board]['move_links'])) |
|
| 191 | - $context['categories'][$catid]['boards'][$prev_board]['move_links'] = array_merge($stack, $context['categories'][$catid]['boards'][$prev_board]['move_links']); |
|
| 192 | - elseif (!empty($stack)) |
|
| 193 | - $context['categories'][$catid]['boards'][$prev_board]['move_links'] = $stack; |
|
| 196 | + if (!empty($stack) && !empty($context['categories'][$catid]['boards'][$prev_board]['move_links'])) { |
|
| 197 | + $context['categories'][$catid]['boards'][$prev_board]['move_links'] = array_merge($stack, $context['categories'][$catid]['boards'][$prev_board]['move_links']); |
|
| 198 | + } elseif (!empty($stack)) { |
|
| 199 | + $context['categories'][$catid]['boards'][$prev_board]['move_links'] = $stack; |
|
| 200 | + } |
|
| 194 | 201 | |
| 195 | - if (empty($boardList[$catid])) |
|
| 196 | - $context['categories'][$catid]['move_link'] = array( |
|
| 202 | + if (empty($boardList[$catid])) { |
|
| 203 | + $context['categories'][$catid]['move_link'] = array( |
|
| 197 | 204 | 'child_level' => 0, |
| 198 | 205 | 'label' => $txt['mboards_order_before'] . ' \'' . $smcFunc['htmlspecialchars']($tree['node']['name']) . '\'', |
| 199 | 206 | 'href' => $scripturl . '?action=admin;area=manageboards;sa=move;src_board=' . $context['move_board'] . ';target_cat=' . $catid . ';move_to=top;' . $security, |
| 200 | 207 | ); |
| 208 | + } |
|
| 201 | 209 | } |
| 202 | 210 | } |
| 203 | 211 | |
@@ -253,9 +261,9 @@ discard block |
||
| 253 | 261 | ); |
| 254 | 262 | } |
| 255 | 263 | // Category doesn't exist, man... sorry. |
| 256 | - elseif (!isset($cat_tree[$_REQUEST['cat']])) |
|
| 257 | - redirectexit('action=admin;area=manageboards'); |
|
| 258 | - else |
|
| 264 | + elseif (!isset($cat_tree[$_REQUEST['cat']])) { |
|
| 265 | + redirectexit('action=admin;area=manageboards'); |
|
| 266 | + } else |
|
| 259 | 267 | { |
| 260 | 268 | $context['category'] = array( |
| 261 | 269 | 'id' => $_REQUEST['cat'], |
@@ -267,30 +275,31 @@ discard block |
||
| 267 | 275 | 'is_empty' => empty($cat_tree[$_REQUEST['cat']]['children']) |
| 268 | 276 | ); |
| 269 | 277 | |
| 270 | - foreach ($boardList[$_REQUEST['cat']] as $child_board) |
|
| 271 | - $context['category']['children'][] = str_repeat('-', $boards[$child_board]['level']) . ' ' . $boards[$child_board]['name']; |
|
| 278 | + foreach ($boardList[$_REQUEST['cat']] as $child_board) { |
|
| 279 | + $context['category']['children'][] = str_repeat('-', $boards[$child_board]['level']) . ' ' . $boards[$child_board]['name']; |
|
| 280 | + } |
|
| 272 | 281 | } |
| 273 | 282 | |
| 274 | 283 | $prevCat = 0; |
| 275 | 284 | foreach ($cat_tree as $catid => $tree) |
| 276 | 285 | { |
| 277 | - if ($catid == $_REQUEST['cat'] && $prevCat > 0) |
|
| 278 | - $context['category_order'][$prevCat]['selected'] = true; |
|
| 279 | - elseif ($catid != $_REQUEST['cat']) |
|
| 280 | - $context['category_order'][$catid] = array( |
|
| 286 | + if ($catid == $_REQUEST['cat'] && $prevCat > 0) { |
|
| 287 | + $context['category_order'][$prevCat]['selected'] = true; |
|
| 288 | + } elseif ($catid != $_REQUEST['cat']) { |
|
| 289 | + $context['category_order'][$catid] = array( |
|
| 281 | 290 | 'id' => $catid, |
| 282 | 291 | 'name' => $txt['mboards_order_after'] . $tree['node']['name'], |
| 283 | 292 | 'selected' => false, |
| 284 | 293 | 'true_name' => $tree['node']['name'] |
| 285 | 294 | ); |
| 295 | + } |
|
| 286 | 296 | $prevCat = $catid; |
| 287 | 297 | } |
| 288 | 298 | if (!isset($_REQUEST['delete'])) |
| 289 | 299 | { |
| 290 | 300 | $context['sub_template'] = 'modify_category'; |
| 291 | 301 | $context['page_title'] = $_REQUEST['sa'] == 'newcat' ? $txt['mboards_new_cat_name'] : $txt['catEdit']; |
| 292 | - } |
|
| 293 | - else |
|
| 302 | + } else |
|
| 294 | 303 | { |
| 295 | 304 | $context['sub_template'] = 'confirm_category_delete'; |
| 296 | 305 | $context['page_title'] = $txt['mboards_delete_cat']; |
@@ -327,8 +336,9 @@ discard block |
||
| 327 | 336 | { |
| 328 | 337 | $catOptions = array(); |
| 329 | 338 | |
| 330 | - if (isset($_POST['cat_order'])) |
|
| 331 | - $catOptions['move_after'] = (int) $_POST['cat_order']; |
|
| 339 | + if (isset($_POST['cat_order'])) { |
|
| 340 | + $catOptions['move_after'] = (int) $_POST['cat_order']; |
|
| 341 | + } |
|
| 332 | 342 | |
| 333 | 343 | // Change "This & That" to "This & That" but don't change "¢" to "&cent;"... |
| 334 | 344 | $catOptions['cat_name'] = parse_bbc($smcFunc['htmlspecialchars']($_POST['cat_name']), false, '', $context['description_allowed_tags']); |
@@ -336,10 +346,11 @@ discard block |
||
| 336 | 346 | |
| 337 | 347 | $catOptions['is_collapsible'] = isset($_POST['collapse']); |
| 338 | 348 | |
| 339 | - if (isset($_POST['add'])) |
|
| 340 | - createCategory($catOptions); |
|
| 341 | - else |
|
| 342 | - modifyCategory($_POST['cat'], $catOptions); |
|
| 349 | + if (isset($_POST['add'])) { |
|
| 350 | + createCategory($catOptions); |
|
| 351 | + } else { |
|
| 352 | + modifyCategory($_POST['cat'], $catOptions); |
|
| 353 | + } |
|
| 343 | 354 | } |
| 344 | 355 | // If they want to delete - first give them confirmation. |
| 345 | 356 | elseif (isset($_POST['delete']) && !isset($_POST['confirmation']) && !isset($_POST['empty'])) |
@@ -353,13 +364,14 @@ discard block |
||
| 353 | 364 | // First off - check if we are moving all the current boards first - before we start deleting! |
| 354 | 365 | if (isset($_POST['delete_action']) && $_POST['delete_action'] == 1) |
| 355 | 366 | { |
| 356 | - if (empty($_POST['cat_to'])) |
|
| 357 | - fatal_lang_error('mboards_delete_error'); |
|
| 367 | + if (empty($_POST['cat_to'])) { |
|
| 368 | + fatal_lang_error('mboards_delete_error'); |
|
| 369 | + } |
|
| 358 | 370 | |
| 359 | 371 | deleteCategories(array($_POST['cat']), (int) $_POST['cat_to']); |
| 372 | + } else { |
|
| 373 | + deleteCategories(array($_POST['cat'])); |
|
| 360 | 374 | } |
| 361 | - else |
|
| 362 | - deleteCategories(array($_POST['cat'])); |
|
| 363 | 375 | } |
| 364 | 376 | |
| 365 | 377 | redirectexit('action=admin;area=manageboards'); |
@@ -404,8 +416,9 @@ discard block |
||
| 404 | 416 | if ($_REQUEST['sa'] == 'newboard') |
| 405 | 417 | { |
| 406 | 418 | // Category doesn't exist, man... sorry. |
| 407 | - if (empty($_REQUEST['cat'])) |
|
| 408 | - redirectexit('action=admin;area=manageboards'); |
|
| 419 | + if (empty($_REQUEST['cat'])) { |
|
| 420 | + redirectexit('action=admin;area=manageboards'); |
|
| 421 | + } |
|
| 409 | 422 | |
| 410 | 423 | // Some things that need to be setup for a new board. |
| 411 | 424 | $curBoard = array( |
@@ -429,8 +442,7 @@ discard block |
||
| 429 | 442 | 'category' => (int) $_REQUEST['cat'], |
| 430 | 443 | 'no_children' => true, |
| 431 | 444 | ); |
| 432 | - } |
|
| 433 | - else |
|
| 445 | + } else |
|
| 434 | 446 | { |
| 435 | 447 | // Just some easy shortcuts. |
| 436 | 448 | $curBoard = &$boards[$_REQUEST['boardid']]; |
@@ -478,8 +490,9 @@ discard block |
||
| 478 | 490 | ); |
| 479 | 491 | while ($row = $smcFunc['db_fetch_assoc']($request)) |
| 480 | 492 | { |
| 481 | - if ($_REQUEST['sa'] == 'newboard' && $row['min_posts'] == -1) |
|
| 482 | - $curBoard['member_groups'][] = $row['id_group']; |
|
| 493 | + if ($_REQUEST['sa'] == 'newboard' && $row['min_posts'] == -1) { |
|
| 494 | + $curBoard['member_groups'][] = $row['id_group']; |
|
| 495 | + } |
|
| 483 | 496 | |
| 484 | 497 | $context['groups'][(int) $row['id_group']] = array( |
| 485 | 498 | 'id' => $row['id_group'], |
@@ -492,8 +505,9 @@ discard block |
||
| 492 | 505 | $smcFunc['db_free_result']($request); |
| 493 | 506 | |
| 494 | 507 | // Category doesn't exist, man... sorry. |
| 495 | - if (!isset($boardList[$curBoard['category']])) |
|
| 496 | - redirectexit('action=admin;area=manageboards'); |
|
| 508 | + if (!isset($boardList[$curBoard['category']])) { |
|
| 509 | + redirectexit('action=admin;area=manageboards'); |
|
| 510 | + } |
|
| 497 | 511 | |
| 498 | 512 | foreach ($boardList[$curBoard['category']] as $boardid) |
| 499 | 513 | { |
@@ -507,8 +521,7 @@ discard block |
||
| 507 | 521 | 'is_child' => false, |
| 508 | 522 | 'selected' => true |
| 509 | 523 | ); |
| 510 | - } |
|
| 511 | - else |
|
| 524 | + } else |
|
| 512 | 525 | { |
| 513 | 526 | $context['board_order'][] = array( |
| 514 | 527 | 'id' => $boardid, |
@@ -525,19 +538,21 @@ discard block |
||
| 525 | 538 | $context['can_move_children'] = false; |
| 526 | 539 | $context['children'] = $boards[$_REQUEST['boardid']]['tree']['children']; |
| 527 | 540 | |
| 528 | - foreach ($context['board_order'] as $lBoard) |
|
| 529 | - if ($lBoard['is_child'] == false && $lBoard['selected'] == false) |
|
| 541 | + foreach ($context['board_order'] as $lBoard) { |
|
| 542 | + if ($lBoard['is_child'] == false && $lBoard['selected'] == false) |
|
| 530 | 543 | $context['can_move_children'] = true; |
| 544 | + } |
|
| 531 | 545 | } |
| 532 | 546 | |
| 533 | 547 | // Get other available categories. |
| 534 | 548 | $context['categories'] = array(); |
| 535 | - foreach ($cat_tree as $catID => $tree) |
|
| 536 | - $context['categories'][] = array( |
|
| 549 | + foreach ($cat_tree as $catID => $tree) { |
|
| 550 | + $context['categories'][] = array( |
|
| 537 | 551 | 'id' => $catID == $curBoard['category'] ? 0 : $catID, |
| 538 | 552 | 'name' => $tree['node']['name'], |
| 539 | 553 | 'selected' => $catID == $curBoard['category'] |
| 540 | 554 | ); |
| 555 | + } |
|
| 541 | 556 | |
| 542 | 557 | $request = $smcFunc['db_query']('', ' |
| 543 | 558 | SELECT mem.id_member, mem.real_name |
@@ -549,14 +564,16 @@ discard block |
||
| 549 | 564 | ) |
| 550 | 565 | ); |
| 551 | 566 | $context['board']['moderators'] = array(); |
| 552 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
| 553 | - $context['board']['moderators'][$row['id_member']] = $row['real_name']; |
|
| 567 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
| 568 | + $context['board']['moderators'][$row['id_member']] = $row['real_name']; |
|
| 569 | + } |
|
| 554 | 570 | $smcFunc['db_free_result']($request); |
| 555 | 571 | |
| 556 | 572 | $context['board']['moderator_list'] = empty($context['board']['moderators']) ? '' : '"' . implode('", "', $context['board']['moderators']) . '"'; |
| 557 | 573 | |
| 558 | - if (!empty($context['board']['moderators'])) |
|
| 559 | - list ($context['board']['last_moderator_id']) = array_slice(array_keys($context['board']['moderators']), -1); |
|
| 574 | + if (!empty($context['board']['moderators'])) { |
|
| 575 | + list ($context['board']['last_moderator_id']) = array_slice(array_keys($context['board']['moderators']), -1); |
|
| 576 | + } |
|
| 560 | 577 | |
| 561 | 578 | // Get all the groups assigned as moderators |
| 562 | 579 | $request = $smcFunc['db_query']('', ' |
@@ -568,14 +585,16 @@ discard block |
||
| 568 | 585 | ) |
| 569 | 586 | ); |
| 570 | 587 | $context['board']['moderator_groups'] = array(); |
| 571 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
| 572 | - $context['board']['moderator_groups'][$row['id_group']] = $context['groups'][$row['id_group']]['name']; |
|
| 588 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
| 589 | + $context['board']['moderator_groups'][$row['id_group']] = $context['groups'][$row['id_group']]['name']; |
|
| 590 | + } |
|
| 573 | 591 | $smcFunc['db_free_result']($request); |
| 574 | 592 | |
| 575 | 593 | $context['board']['moderator_groups_list'] = empty($context['board']['moderator_groups']) ? '' : '"' . implode('", &qout;', $context['board']['moderator_groups']) . '"'; |
| 576 | 594 | |
| 577 | - if (!empty($context['board']['moderator_groups'])) |
|
| 578 | - list ($context['board']['last_moderator_group_id']) = array_slice(array_keys($context['board']['moderator_groups']), -1); |
|
| 595 | + if (!empty($context['board']['moderator_groups'])) { |
|
| 596 | + list ($context['board']['last_moderator_group_id']) = array_slice(array_keys($context['board']['moderator_groups']), -1); |
|
| 597 | + } |
|
| 579 | 598 | |
| 580 | 599 | // Get all the themes... |
| 581 | 600 | $request = $smcFunc['db_query']('', ' |
@@ -587,8 +606,9 @@ discard block |
||
| 587 | 606 | ) |
| 588 | 607 | ); |
| 589 | 608 | $context['themes'] = array(); |
| 590 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
| 591 | - $context['themes'][] = $row; |
|
| 609 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
| 610 | + $context['themes'][] = $row; |
|
| 611 | + } |
|
| 592 | 612 | $smcFunc['db_free_result']($request); |
| 593 | 613 | |
| 594 | 614 | if (!isset($_REQUEST['delete'])) |
@@ -596,8 +616,7 @@ discard block |
||
| 596 | 616 | $context['sub_template'] = 'modify_board'; |
| 597 | 617 | $context['page_title'] = $txt['boardsEdit']; |
| 598 | 618 | loadJavaScriptFile('suggest.js', array('defer' => false), 'smf_suggest'); |
| 599 | - } |
|
| 600 | - else |
|
| 619 | + } else |
|
| 601 | 620 | { |
| 602 | 621 | $context['sub_template'] = 'confirm_board_delete'; |
| 603 | 622 | $context['page_title'] = $txt['mboards_delete_board']; |
@@ -641,8 +660,9 @@ discard block |
||
| 641 | 660 | // Change the boardorder of this board? |
| 642 | 661 | elseif (!empty($_POST['placement']) && !empty($_POST['board_order'])) |
| 643 | 662 | { |
| 644 | - if (!in_array($_POST['placement'], array('before', 'after', 'child'))) |
|
| 645 | - fatal_lang_error('mangled_post', false); |
|
| 663 | + if (!in_array($_POST['placement'], array('before', 'after', 'child'))) { |
|
| 664 | + fatal_lang_error('mangled_post', false); |
|
| 665 | + } |
|
| 646 | 666 | |
| 647 | 667 | $boardOptions['move_to'] = $_POST['placement']; |
| 648 | 668 | $boardOptions['target_board'] = (int) $_POST['board_order']; |
@@ -655,13 +675,14 @@ discard block |
||
| 655 | 675 | $boardOptions['access_groups'] = array(); |
| 656 | 676 | $boardOptions['deny_groups'] = array(); |
| 657 | 677 | |
| 658 | - if (!empty($_POST['groups'])) |
|
| 659 | - foreach ($_POST['groups'] as $group => $action) |
|
| 678 | + if (!empty($_POST['groups'])) { |
|
| 679 | + foreach ($_POST['groups'] as $group => $action) |
|
| 660 | 680 | { |
| 661 | 681 | if ($action == 'allow') |
| 662 | 682 | $boardOptions['access_groups'][] = (int) $group; |
| 663 | - elseif ($action == 'deny') |
|
| 664 | - $boardOptions['deny_groups'][] = (int) $group; |
|
| 683 | + } elseif ($action == 'deny') { |
|
| 684 | + $boardOptions['deny_groups'][] = (int) $group; |
|
| 685 | + } |
|
| 665 | 686 | } |
| 666 | 687 | |
| 667 | 688 | // People with manage-boards are special. |
@@ -673,8 +694,9 @@ discard block |
||
| 673 | 694 | // Secondly, make sure those with super cow powers (like apt-get, or in this case manage boards) are upgraded. |
| 674 | 695 | $boardOptions['access_groups'] = array_unique(array_merge($boardOptions['access_groups'], $board_managers)); |
| 675 | 696 | |
| 676 | - if (strlen(implode(',', $boardOptions['access_groups'])) > 255 || strlen(implode(',', $boardOptions['deny_groups'])) > 255) |
|
| 677 | - fatal_lang_error('too_many_groups', false); |
|
| 697 | + if (strlen(implode(',', $boardOptions['access_groups'])) > 255 || strlen(implode(',', $boardOptions['deny_groups'])) > 255) { |
|
| 698 | + fatal_lang_error('too_many_groups', false); |
|
| 699 | + } |
|
| 678 | 700 | |
| 679 | 701 | // Do not allow HTML tags. Parse the string. |
| 680 | 702 | $boardOptions['board_name'] = parse_bbc($smcFunc['htmlspecialchars']($_POST['board_name']), false, '', $context['description_allowed_tags']); |
@@ -685,8 +707,9 @@ discard block |
||
| 685 | 707 | if (isset($_POST['moderator_list']) && is_array($_POST['moderator_list'])) |
| 686 | 708 | { |
| 687 | 709 | $moderators = array(); |
| 688 | - foreach ($_POST['moderator_list'] as $moderator) |
|
| 689 | - $moderators[(int) $moderator] = (int) $moderator; |
|
| 710 | + foreach ($_POST['moderator_list'] as $moderator) { |
|
| 711 | + $moderators[(int) $moderator] = (int) $moderator; |
|
| 712 | + } |
|
| 690 | 713 | $boardOptions['moderators'] = $moderators; |
| 691 | 714 | } |
| 692 | 715 | |
@@ -695,8 +718,9 @@ discard block |
||
| 695 | 718 | if (isset($_POST['moderator_group_list']) && is_array($_POST['moderator_group_list'])) |
| 696 | 719 | { |
| 697 | 720 | $moderator_groups = array(); |
| 698 | - foreach ($_POST['moderator_group_list'] as $moderator_group) |
|
| 699 | - $moderator_groups[(int) $moderator_group] = (int) $moderator_group; |
|
| 721 | + foreach ($_POST['moderator_group_list'] as $moderator_group) { |
|
| 722 | + $moderator_groups[(int) $moderator_group] = (int) $moderator_group; |
|
| 723 | + } |
|
| 700 | 724 | $boardOptions['moderator_groups'] = $moderator_groups; |
| 701 | 725 | } |
| 702 | 726 | |
@@ -722,56 +746,62 @@ discard block |
||
| 722 | 746 | $smcFunc['db_free_result']($request); |
| 723 | 747 | |
| 724 | 748 | // If we're turning redirection on check the board doesn't have posts in it - if it does don't make it a redirection board. |
| 725 | - if ($boardOptions['redirect'] && empty($oldRedirect) && $numPosts) |
|
| 726 | - unset($boardOptions['redirect']); |
|
| 749 | + if ($boardOptions['redirect'] && empty($oldRedirect) && $numPosts) { |
|
| 750 | + unset($boardOptions['redirect']); |
|
| 751 | + } |
|
| 727 | 752 | // Reset the redirection count when switching on/off. |
| 728 | - elseif (empty($boardOptions['redirect']) != empty($oldRedirect)) |
|
| 729 | - $boardOptions['num_posts'] = 0; |
|
| 753 | + elseif (empty($boardOptions['redirect']) != empty($oldRedirect)) { |
|
| 754 | + $boardOptions['num_posts'] = 0; |
|
| 755 | + } |
|
| 730 | 756 | // Resetting the count? |
| 731 | - elseif ($boardOptions['redirect'] && !empty($_POST['reset_redirect'])) |
|
| 732 | - $boardOptions['num_posts'] = 0; |
|
| 757 | + elseif ($boardOptions['redirect'] && !empty($_POST['reset_redirect'])) { |
|
| 758 | + $boardOptions['num_posts'] = 0; |
|
| 759 | + } |
|
| 733 | 760 | } |
| 734 | 761 | |
| 735 | 762 | // Create a new board... |
| 736 | 763 | if (isset($_POST['add'])) |
| 737 | 764 | { |
| 738 | 765 | // New boards by default go to the bottom of the category. |
| 739 | - if (empty($_POST['new_cat'])) |
|
| 740 | - $boardOptions['target_category'] = (int) $_POST['cur_cat']; |
|
| 741 | - if (!isset($boardOptions['move_to'])) |
|
| 742 | - $boardOptions['move_to'] = 'bottom'; |
|
| 766 | + if (empty($_POST['new_cat'])) { |
|
| 767 | + $boardOptions['target_category'] = (int) $_POST['cur_cat']; |
|
| 768 | + } |
|
| 769 | + if (!isset($boardOptions['move_to'])) { |
|
| 770 | + $boardOptions['move_to'] = 'bottom'; |
|
| 771 | + } |
|
| 743 | 772 | |
| 744 | 773 | createBoard($boardOptions); |
| 745 | 774 | } |
| 746 | 775 | |
| 747 | 776 | // ...or update an existing board. |
| 748 | - else |
|
| 749 | - modifyBoard($_POST['boardid'], $boardOptions); |
|
| 750 | - } |
|
| 751 | - elseif (isset($_POST['delete']) && !isset($_POST['confirmation']) && !isset($_POST['no_children'])) |
|
| 777 | + else { |
|
| 778 | + modifyBoard($_POST['boardid'], $boardOptions); |
|
| 779 | + } |
|
| 780 | + } elseif (isset($_POST['delete']) && !isset($_POST['confirmation']) && !isset($_POST['no_children'])) |
|
| 752 | 781 | { |
| 753 | 782 | EditBoard(); |
| 754 | 783 | return; |
| 755 | - } |
|
| 756 | - elseif (isset($_POST['delete'])) |
|
| 784 | + } elseif (isset($_POST['delete'])) |
|
| 757 | 785 | { |
| 758 | 786 | // First off - check if we are moving all the current child boards first - before we start deleting! |
| 759 | 787 | if (isset($_POST['delete_action']) && $_POST['delete_action'] == 1) |
| 760 | 788 | { |
| 761 | - if (empty($_POST['board_to'])) |
|
| 762 | - fatal_lang_error('mboards_delete_board_error'); |
|
| 789 | + if (empty($_POST['board_to'])) { |
|
| 790 | + fatal_lang_error('mboards_delete_board_error'); |
|
| 791 | + } |
|
| 763 | 792 | |
| 764 | 793 | deleteBoards(array($_POST['boardid']), (int) $_POST['board_to']); |
| 794 | + } else { |
|
| 795 | + deleteBoards(array($_POST['boardid']), 0); |
|
| 765 | 796 | } |
| 766 | - else |
|
| 767 | - deleteBoards(array($_POST['boardid']), 0); |
|
| 768 | 797 | } |
| 769 | 798 | |
| 770 | - if (isset($_REQUEST['rid']) && $_REQUEST['rid'] == 'permissions') |
|
| 771 | - redirectexit('action=admin;area=permissions;sa=board;' . $context['session_var'] . '=' . $context['session_id']); |
|
| 772 | - else |
|
| 773 | - redirectexit('action=admin;area=manageboards'); |
|
| 774 | -} |
|
| 799 | + if (isset($_REQUEST['rid']) && $_REQUEST['rid'] == 'permissions') { |
|
| 800 | + redirectexit('action=admin;area=permissions;sa=board;' . $context['session_var'] . '=' . $context['session_id']); |
|
| 801 | + } else { |
|
| 802 | + redirectexit('action=admin;area=manageboards'); |
|
| 803 | + } |
|
| 804 | + } |
|
| 775 | 805 | |
| 776 | 806 | /** |
| 777 | 807 | * Used to retrieve data for modifying a board category |
@@ -808,8 +838,9 @@ discard block |
||
| 808 | 838 | $smcFunc['db_free_result']($request); |
| 809 | 839 | |
| 810 | 840 | // This would probably never happen, but just to be sure. |
| 811 | - if ($cat .= $allowed_sa[1]) |
|
| 812 | - die(str_replace(',', ' to', $cat)); |
|
| 841 | + if ($cat .= $allowed_sa[1]) { |
|
| 842 | + die(str_replace(',', ' to', $cat)); |
|
| 843 | + } |
|
| 813 | 844 | |
| 814 | 845 | redirectexit(); |
| 815 | 846 | } |
@@ -835,8 +866,9 @@ discard block |
||
| 835 | 866 | 'empty_string' => '', |
| 836 | 867 | ) |
| 837 | 868 | ); |
| 838 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
| 839 | - $recycle_boards[$row['id_board']] = $row['cat_name'] . ' - ' . $row['board_name']; |
|
| 869 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
| 870 | + $recycle_boards[$row['id_board']] = $row['cat_name'] . ' - ' . $row['board_name']; |
|
| 871 | + } |
|
| 840 | 872 | $smcFunc['db_free_result']($request); |
| 841 | 873 | |
| 842 | 874 | require_once($sourcedir . '/Subs-Boards.php'); |
@@ -860,8 +892,9 @@ discard block |
||
| 860 | 892 | |
| 861 | 893 | call_integration_hook('integrate_modify_board_settings', array(&$config_vars)); |
| 862 | 894 | |
| 863 | - if ($return_config) |
|
| 864 | - return $config_vars; |
|
| 895 | + if ($return_config) { |
|
| 896 | + return $config_vars; |
|
| 897 | + } |
|
| 865 | 898 | |
| 866 | 899 | // Needed for the settings template. |
| 867 | 900 | require_once($sourcedir . '/ManageServer.php'); |
@@ -531,14 +531,14 @@ discard block |
||
| 531 | 531 | |
| 532 | 532 | $thisAction = array( |
| 533 | 533 | 'type' => $action['reverse'] ? $txt['execute_hook_remove'] : $txt['execute_hook_add'], |
| 534 | - 'action' => sprintf($txt['execute_hook_action'. ($action['reverse'] ? '_inverse' : '')], $smcFunc['htmlspecialchars']($action['hook'])), |
|
| 534 | + 'action' => sprintf($txt['execute_hook_action' . ($action['reverse'] ? '_inverse' : '')], $smcFunc['htmlspecialchars']($action['hook'])), |
|
| 535 | 535 | ); |
| 536 | 536 | } |
| 537 | 537 | elseif ($action['type'] == 'credits') |
| 538 | 538 | { |
| 539 | 539 | $thisAction = array( |
| 540 | 540 | 'type' => $txt['execute_credits_add'], |
| 541 | - 'action' => sprintf($txt['execute_credits_action'], $smcFunc['htmlspecialchars']($action['title'])), |
|
| 541 | + 'action' => sprintf($txt['execute_credits_action'], $smcFunc['htmlspecialchars']($action['title'])), |
|
| 542 | 542 | ); |
| 543 | 543 | } |
| 544 | 544 | elseif ($action['type'] == 'requires') |
@@ -654,7 +654,7 @@ discard block |
||
| 654 | 654 | if ($context['uninstalling']) |
| 655 | 655 | $file = in_array($action['type'], array('remove-dir', 'remove-file')) ? $action['filename'] : $packagesdir . '/temp/' . $context['base_path'] . $action['filename']; |
| 656 | 656 | else |
| 657 | - $file = $packagesdir . '/temp/' . $context['base_path'] . $action['filename']; |
|
| 657 | + $file = $packagesdir . '/temp/' . $context['base_path'] . $action['filename']; |
|
| 658 | 658 | } |
| 659 | 659 | |
| 660 | 660 | // Don't fail if a file/directory we're trying to create doesn't exist... |
@@ -758,7 +758,7 @@ discard block |
||
| 758 | 758 | $context['ftp_needed'] = !empty($ftp_status['files']['notwritable']) && !empty($context['package_ftp']); |
| 759 | 759 | } |
| 760 | 760 | |
| 761 | - $context['post_url'] = $scripturl .'?action=admin;area=packages;sa=' . ($context['uninstalling'] ? 'uninstall' : 'install') . ($context['ftp_needed'] ? '' : '2') . ';package=' . $context['filename'] . ';pid=' . $context['install_id']; |
|
| 761 | + $context['post_url'] = $scripturl . '?action=admin;area=packages;sa=' . ($context['uninstalling'] ? 'uninstall' : 'install') . ($context['ftp_needed'] ? '' : '2') . ';package=' . $context['filename'] . ';pid=' . $context['install_id']; |
|
| 762 | 762 | checkSubmitOnce('register'); |
| 763 | 763 | } |
| 764 | 764 | |
@@ -1180,7 +1180,7 @@ discard block |
||
| 1180 | 1180 | '{db_prefix}log_packages', |
| 1181 | 1181 | array( |
| 1182 | 1182 | 'filename' => 'string', 'name' => 'string', 'package_id' => 'string', 'version' => 'string', |
| 1183 | - 'id_member_installed' => 'int', 'member_installed' => 'string','time_installed' => 'int', |
|
| 1183 | + 'id_member_installed' => 'int', 'member_installed' => 'string', 'time_installed' => 'int', |
|
| 1184 | 1184 | 'install_state' => 'int', 'failed_steps' => 'string', 'themes_installed' => 'string', |
| 1185 | 1185 | 'member_removed' => 'int', 'db_changes' => 'string', 'credits' => 'string', |
| 1186 | 1186 | ), |
@@ -1383,7 +1383,7 @@ discard block |
||
| 1383 | 1383 | 'style' => 'width: 40px;', |
| 1384 | 1384 | ), |
| 1385 | 1385 | 'data' => array( |
| 1386 | - 'function' => function ($package_md5) use ($type, &$context) |
|
| 1386 | + 'function' => function($package_md5) use ($type, &$context) |
|
| 1387 | 1387 | { |
| 1388 | 1388 | if (isset($context['available_' . $type . ''][$package_md5])) |
| 1389 | 1389 | return $context['available_' . $type . ''][$package_md5]['sort_id']; |
@@ -1400,7 +1400,7 @@ discard block |
||
| 1400 | 1400 | 'style' => 'width: 25%;', |
| 1401 | 1401 | ), |
| 1402 | 1402 | 'data' => array( |
| 1403 | - 'function' => function ($package_md5) use ($type, &$context) |
|
| 1403 | + 'function' => function($package_md5) use ($type, &$context) |
|
| 1404 | 1404 | { |
| 1405 | 1405 | if (isset($context['available_' . $type . ''][$package_md5])) |
| 1406 | 1406 | return $context['available_' . $type . ''][$package_md5]['name']; |
@@ -1416,7 +1416,7 @@ discard block |
||
| 1416 | 1416 | 'value' => $txt['mod_version'], |
| 1417 | 1417 | ), |
| 1418 | 1418 | 'data' => array( |
| 1419 | - 'function' => function ($package_md5) use ($type, &$context) |
|
| 1419 | + 'function' => function($package_md5) use ($type, &$context) |
|
| 1420 | 1420 | { |
| 1421 | 1421 | if (isset($context['available_' . $type . ''][$package_md5])) |
| 1422 | 1422 | return $context['available_' . $type . ''][$package_md5]['version']; |
@@ -1432,7 +1432,7 @@ discard block |
||
| 1432 | 1432 | 'value' => $txt['mod_installed_time'], |
| 1433 | 1433 | ), |
| 1434 | 1434 | 'data' => array( |
| 1435 | - 'function' => function ($package_md5) use ($type, $txt, &$context) |
|
| 1435 | + 'function' => function($package_md5) use ($type, $txt, &$context) |
|
| 1436 | 1436 | { |
| 1437 | 1437 | if (isset($context['available_' . $type . ''][$package_md5])) |
| 1438 | 1438 | return !empty($context['available_' . $type . ''][$package_md5]['time_installed']) ? timeformat($context['available_' . $type . ''][$package_md5]['time_installed']) : $txt['not_applicable']; |
@@ -1449,7 +1449,7 @@ discard block |
||
| 1449 | 1449 | 'value' => '', |
| 1450 | 1450 | ), |
| 1451 | 1451 | 'data' => array( |
| 1452 | - 'function' => function ($package_md5) use ($type, &$context, $scripturl, $txt) |
|
| 1452 | + 'function' => function($package_md5) use ($type, &$context, $scripturl, $txt) |
|
| 1453 | 1453 | { |
| 1454 | 1454 | if (!isset($context['available_' . $type . ''][$package_md5])) |
| 1455 | 1455 | return ''; |
@@ -1734,7 +1734,7 @@ discard block |
||
| 1734 | 1734 | { |
| 1735 | 1735 | $sort_id['modification']++; |
| 1736 | 1736 | $sort_id['mod']++; |
| 1737 | - $packages['modification'][strtolower($packageInfo[$sort]) . '_' . $sort_id['mod']] = md5($package); |
|
| 1737 | + $packages['modification'][strtolower($packageInfo[$sort]) . '_' . $sort_id['mod']] = md5($package); |
|
| 1738 | 1738 | $context['available_modification'][md5($package)] = $packageInfo; |
| 1739 | 1739 | } |
| 1740 | 1740 | // Avatar package. |
@@ -13,8 +13,9 @@ discard block |
||
| 13 | 13 | * @version 2.1 Beta 3 |
| 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 | * This is the notoriously defunct package manager..... :/. |
@@ -57,10 +58,11 @@ discard block |
||
| 57 | 58 | ); |
| 58 | 59 | |
| 59 | 60 | // Work out exactly who it is we are calling. |
| 60 | - if (isset($_REQUEST['sa']) && isset($subActions[$_REQUEST['sa']])) |
|
| 61 | - $context['sub_action'] = $_REQUEST['sa']; |
|
| 62 | - else |
|
| 63 | - $context['sub_action'] = 'browse'; |
|
| 61 | + if (isset($_REQUEST['sa']) && isset($subActions[$_REQUEST['sa']])) { |
|
| 62 | + $context['sub_action'] = $_REQUEST['sa']; |
|
| 63 | + } else { |
|
| 64 | + $context['sub_action'] = 'browse'; |
|
| 65 | + } |
|
| 64 | 66 | |
| 65 | 67 | // Set up some tabs... |
| 66 | 68 | $context[$context['admin_menu_name']]['tab_data'] = array( |
@@ -82,8 +84,9 @@ discard block |
||
| 82 | 84 | ), |
| 83 | 85 | ); |
| 84 | 86 | |
| 85 | - if ($context['sub_action'] == 'browse') |
|
| 86 | - loadJavaScriptFile('suggest.js', array('defer' => false), 'smf_suggest'); |
|
| 87 | + if ($context['sub_action'] == 'browse') { |
|
| 88 | + loadJavaScriptFile('suggest.js', array('defer' => false), 'smf_suggest'); |
|
| 89 | + } |
|
| 87 | 90 | |
| 88 | 91 | call_integration_hook('integrate_manage_packages', array(&$subActions)); |
| 89 | 92 | |
@@ -99,8 +102,9 @@ discard block |
||
| 99 | 102 | global $boarddir, $txt, $context, $scripturl, $sourcedir, $packagesdir, $modSettings, $smcFunc, $settings; |
| 100 | 103 | |
| 101 | 104 | // You have to specify a file!! |
| 102 | - if (!isset($_REQUEST['package']) || $_REQUEST['package'] == '') |
|
| 103 | - redirectexit('action=admin;area=packages'); |
|
| 105 | + if (!isset($_REQUEST['package']) || $_REQUEST['package'] == '') { |
|
| 106 | + redirectexit('action=admin;area=packages'); |
|
| 107 | + } |
|
| 104 | 108 | $context['filename'] = preg_replace('~[\.]+~', '.', $_REQUEST['package']); |
| 105 | 109 | |
| 106 | 110 | // Do we have an existing id, for uninstalls and the like. |
@@ -112,8 +116,9 @@ discard block |
||
| 112 | 116 | create_chmod_control(); |
| 113 | 117 | |
| 114 | 118 | // Make sure temp directory exists and is empty. |
| 115 | - if (file_exists($packagesdir . '/temp')) |
|
| 116 | - deltree($packagesdir . '/temp', false); |
|
| 119 | + if (file_exists($packagesdir . '/temp')) { |
|
| 120 | + deltree($packagesdir . '/temp', false); |
|
| 121 | + } |
|
| 117 | 122 | |
| 118 | 123 | if (!mktree($packagesdir . '/temp', 0755)) |
| 119 | 124 | { |
@@ -124,8 +129,9 @@ discard block |
||
| 124 | 129 | create_chmod_control(array($packagesdir . '/temp/delme.tmp'), array('destination_url' => $scripturl . '?action=admin;area=packages;sa=' . $_REQUEST['sa'] . ';package=' . $_REQUEST['package'], 'crash_on_error' => true)); |
| 125 | 130 | |
| 126 | 131 | deltree($packagesdir . '/temp', false); |
| 127 | - if (!mktree($packagesdir . '/temp', 0777)) |
|
| 128 | - fatal_lang_error('package_cant_download', false); |
|
| 132 | + if (!mktree($packagesdir . '/temp', 0777)) { |
|
| 133 | + fatal_lang_error('package_cant_download', false); |
|
| 134 | + } |
|
| 129 | 135 | } |
| 130 | 136 | } |
| 131 | 137 | |
@@ -151,25 +157,26 @@ discard block |
||
| 151 | 157 | { |
| 152 | 158 | $context['extracted_files'] = read_tgz_file($packagesdir . '/' . $context['filename'], $packagesdir . '/temp'); |
| 153 | 159 | |
| 154 | - if ($context['extracted_files'] && !file_exists($packagesdir . '/temp/package-info.xml')) |
|
| 155 | - foreach ($context['extracted_files'] as $file) |
|
| 160 | + if ($context['extracted_files'] && !file_exists($packagesdir . '/temp/package-info.xml')) { |
|
| 161 | + foreach ($context['extracted_files'] as $file) |
|
| 156 | 162 | if (basename($file['filename']) == 'package-info.xml') |
| 157 | 163 | { |
| 158 | 164 | $context['base_path'] = dirname($file['filename']) . '/'; |
| 165 | + } |
|
| 159 | 166 | break; |
| 160 | 167 | } |
| 161 | 168 | |
| 162 | - if (!isset($context['base_path'])) |
|
| 163 | - $context['base_path'] = ''; |
|
| 164 | - } |
|
| 165 | - elseif (is_dir($packagesdir . '/' . $context['filename'])) |
|
| 169 | + if (!isset($context['base_path'])) { |
|
| 170 | + $context['base_path'] = ''; |
|
| 171 | + } |
|
| 172 | + } elseif (is_dir($packagesdir . '/' . $context['filename'])) |
|
| 166 | 173 | { |
| 167 | 174 | copytree($packagesdir . '/' . $context['filename'], $packagesdir . '/temp'); |
| 168 | 175 | $context['extracted_files'] = listtree($packagesdir . '/temp'); |
| 169 | 176 | $context['base_path'] = ''; |
| 177 | + } else { |
|
| 178 | + fatal_lang_error('no_access', false); |
|
| 170 | 179 | } |
| 171 | - else |
|
| 172 | - fatal_lang_error('no_access', false); |
|
| 173 | 180 | |
| 174 | 181 | // Load up any custom themes we may want to install into... |
| 175 | 182 | $request = $smcFunc['db_query']('', ' |
@@ -185,15 +192,17 @@ discard block |
||
| 185 | 192 | ) |
| 186 | 193 | ); |
| 187 | 194 | $theme_paths = array(); |
| 188 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
| 189 | - $theme_paths[$row['id_theme']][$row['variable']] = $row['value']; |
|
| 195 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
| 196 | + $theme_paths[$row['id_theme']][$row['variable']] = $row['value']; |
|
| 197 | + } |
|
| 190 | 198 | $smcFunc['db_free_result']($request); |
| 191 | 199 | |
| 192 | 200 | // Get the package info... |
| 193 | 201 | $packageInfo = getPackageInfo($context['filename']); |
| 194 | 202 | |
| 195 | - if (!is_array($packageInfo)) |
|
| 196 | - fatal_lang_error($packageInfo); |
|
| 203 | + if (!is_array($packageInfo)) { |
|
| 204 | + fatal_lang_error($packageInfo); |
|
| 205 | + } |
|
| 197 | 206 | |
| 198 | 207 | $packageInfo['filename'] = $context['filename']; |
| 199 | 208 | $context['package_name'] = isset($packageInfo['name']) ? $packageInfo['name'] : $context['filename']; |
@@ -227,18 +236,19 @@ discard block |
||
| 227 | 236 | $smcFunc['db_free_result']($request); |
| 228 | 237 | |
| 229 | 238 | $context['database_changes'] = array(); |
| 230 | - if (isset($packageInfo['uninstall']['database'])) |
|
| 231 | - $context['database_changes'][] = $txt['execute_database_changes'] . ' - ' . $packageInfo['uninstall']['database']; |
|
| 232 | - elseif (!empty($db_changes)) |
|
| 239 | + if (isset($packageInfo['uninstall']['database'])) { |
|
| 240 | + $context['database_changes'][] = $txt['execute_database_changes'] . ' - ' . $packageInfo['uninstall']['database']; |
|
| 241 | + } elseif (!empty($db_changes)) |
|
| 233 | 242 | { |
| 234 | 243 | foreach ($db_changes as $change) |
| 235 | 244 | { |
| 236 | - if (isset($change[2]) && isset($txt['package_db_' . $change[0]])) |
|
| 237 | - $context['database_changes'][] = sprintf($txt['package_db_' . $change[0]], $change[1], $change[2]); |
|
| 238 | - elseif (isset($txt['package_db_' . $change[0]])) |
|
| 239 | - $context['database_changes'][] = sprintf($txt['package_db_' . $change[0]], $change[1]); |
|
| 240 | - else |
|
| 241 | - $context['database_changes'][] = $change[0] . '-' . $change[1] . (isset($change[2]) ? '-' . $change[2] : ''); |
|
| 245 | + if (isset($change[2]) && isset($txt['package_db_' . $change[0]])) { |
|
| 246 | + $context['database_changes'][] = sprintf($txt['package_db_' . $change[0]], $change[1], $change[2]); |
|
| 247 | + } elseif (isset($txt['package_db_' . $change[0]])) { |
|
| 248 | + $context['database_changes'][] = sprintf($txt['package_db_' . $change[0]], $change[1]); |
|
| 249 | + } else { |
|
| 250 | + $context['database_changes'][] = $change[0] . '-' . $change[1] . (isset($change[2]) ? '-' . $change[2] : ''); |
|
| 251 | + } |
|
| 242 | 252 | } |
| 243 | 253 | } |
| 244 | 254 | |
@@ -265,31 +275,33 @@ discard block |
||
| 265 | 275 | $context['themes_locked'] = true; |
| 266 | 276 | |
| 267 | 277 | // Only let them uninstall themes it was installed into. |
| 268 | - foreach ($theme_paths as $id => $data) |
|
| 269 | - if ($id != 1 && !in_array($id, $old_themes)) |
|
| 278 | + foreach ($theme_paths as $id => $data) { |
|
| 279 | + if ($id != 1 && !in_array($id, $old_themes)) |
|
| 270 | 280 | unset($theme_paths[$id]); |
| 271 | - } |
|
| 272 | - elseif (isset($old_version) && $old_version != $packageInfo['version']) |
|
| 281 | + } |
|
| 282 | + } elseif (isset($old_version) && $old_version != $packageInfo['version']) |
|
| 273 | 283 | { |
| 274 | 284 | // Look for an upgrade... |
| 275 | 285 | $actions = parsePackageInfo($packageInfo['xml'], true, 'upgrade', $old_version); |
| 276 | 286 | |
| 277 | 287 | // There was no upgrade.... |
| 278 | - if (empty($actions)) |
|
| 279 | - $context['is_installed'] = true; |
|
| 280 | - else |
|
| 288 | + if (empty($actions)) { |
|
| 289 | + $context['is_installed'] = true; |
|
| 290 | + } else |
|
| 281 | 291 | { |
| 282 | 292 | // Otherwise they can only upgrade themes from the first time around. |
| 283 | - foreach ($theme_paths as $id => $data) |
|
| 284 | - if ($id != 1 && !in_array($id, $old_themes)) |
|
| 293 | + foreach ($theme_paths as $id => $data) { |
|
| 294 | + if ($id != 1 && !in_array($id, $old_themes)) |
|
| 285 | 295 | unset($theme_paths[$id]); |
| 296 | + } |
|
| 286 | 297 | } |
| 298 | + } elseif (isset($old_version) && $old_version == $packageInfo['version']) { |
|
| 299 | + $context['is_installed'] = true; |
|
| 287 | 300 | } |
| 288 | - elseif (isset($old_version) && $old_version == $packageInfo['version']) |
|
| 289 | - $context['is_installed'] = true; |
|
| 290 | 301 | |
| 291 | - if (!isset($old_version) || $context['is_installed']) |
|
| 292 | - $actions = parsePackageInfo($packageInfo['xml'], true, 'install'); |
|
| 302 | + if (!isset($old_version) || $context['is_installed']) { |
|
| 303 | + $actions = parsePackageInfo($packageInfo['xml'], true, 'install'); |
|
| 304 | + } |
|
| 293 | 305 | |
| 294 | 306 | $context['actions'] = array(); |
| 295 | 307 | $context['ftp_needed'] = false; |
@@ -297,8 +309,9 @@ discard block |
||
| 297 | 309 | $chmod_files = array(); |
| 298 | 310 | |
| 299 | 311 | // no actions found, return so we can display an error |
| 300 | - if (empty($actions)) |
|
| 301 | - return; |
|
| 312 | + if (empty($actions)) { |
|
| 313 | + return; |
|
| 314 | + } |
|
| 302 | 315 | |
| 303 | 316 | // This will hold data about anything that can be installed in other themes. |
| 304 | 317 | $themeFinds = array( |
@@ -317,14 +330,14 @@ discard block |
||
| 317 | 330 | { |
| 318 | 331 | $chmod_files[] = $action['filename']; |
| 319 | 332 | continue; |
| 320 | - } |
|
| 321 | - elseif ($action['type'] == 'readme' || $action['type'] == 'license') |
|
| 333 | + } elseif ($action['type'] == 'readme' || $action['type'] == 'license') |
|
| 322 | 334 | { |
| 323 | 335 | $type = 'package_' . $action['type']; |
| 324 | - if (file_exists($packagesdir . '/temp/' . $context['base_path'] . $action['filename'])) |
|
| 325 | - $context[$type] = $smcFunc['htmlspecialchars'](trim(file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $action['filename']), "\n\r")); |
|
| 326 | - elseif (file_exists($action['filename'])) |
|
| 327 | - $context[$type] = $smcFunc['htmlspecialchars'](trim(file_get_contents($action['filename']), "\n\r")); |
|
| 336 | + if (file_exists($packagesdir . '/temp/' . $context['base_path'] . $action['filename'])) { |
|
| 337 | + $context[$type] = $smcFunc['htmlspecialchars'](trim(file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $action['filename']), "\n\r")); |
|
| 338 | + } elseif (file_exists($action['filename'])) { |
|
| 339 | + $context[$type] = $smcFunc['htmlspecialchars'](trim(file_get_contents($action['filename']), "\n\r")); |
|
| 340 | + } |
|
| 328 | 341 | |
| 329 | 342 | if (!empty($action['parse_bbc'])) |
| 330 | 343 | { |
@@ -332,24 +345,24 @@ discard block |
||
| 332 | 345 | $context[$type] = preg_replace('~\[[/]?html\]~i', '', $context[$type]); |
| 333 | 346 | preparsecode($context[$type]); |
| 334 | 347 | $context[$type] = parse_bbc($context[$type]); |
| 348 | + } else { |
|
| 349 | + $context[$type] = nl2br($context[$type]); |
|
| 335 | 350 | } |
| 336 | - else |
|
| 337 | - $context[$type] = nl2br($context[$type]); |
|
| 338 | 351 | |
| 339 | 352 | continue; |
| 340 | 353 | } |
| 341 | 354 | // Don't show redirects. |
| 342 | - elseif ($action['type'] == 'redirect') |
|
| 343 | - continue; |
|
| 344 | - elseif ($action['type'] == 'error') |
|
| 355 | + elseif ($action['type'] == 'redirect') { |
|
| 356 | + continue; |
|
| 357 | + } elseif ($action['type'] == 'error') |
|
| 345 | 358 | { |
| 346 | 359 | $context['has_failure'] = true; |
| 347 | - if (isset($action['error_msg']) && isset($action['error_var'])) |
|
| 348 | - $context['failure_details'] = sprintf($txt['package_will_fail_' . $action['error_msg']], $action['error_var']); |
|
| 349 | - elseif (isset($action['error_msg'])) |
|
| 350 | - $context['failure_details'] = isset($txt['package_will_fail_' . $action['error_msg']]) ? $txt['package_will_fail_' . $action['error_msg']] : $action['error_msg']; |
|
| 351 | - } |
|
| 352 | - elseif ($action['type'] == 'modification') |
|
| 360 | + if (isset($action['error_msg']) && isset($action['error_var'])) { |
|
| 361 | + $context['failure_details'] = sprintf($txt['package_will_fail_' . $action['error_msg']], $action['error_var']); |
|
| 362 | + } elseif (isset($action['error_msg'])) { |
|
| 363 | + $context['failure_details'] = isset($txt['package_will_fail_' . $action['error_msg']]) ? $txt['package_will_fail_' . $action['error_msg']] : $action['error_msg']; |
|
| 364 | + } |
|
| 365 | + } elseif ($action['type'] == 'modification') |
|
| 353 | 366 | { |
| 354 | 367 | if (!file_exists($packagesdir . '/temp/' . $context['base_path'] . $action['filename'])) |
| 355 | 368 | { |
@@ -361,52 +374,54 @@ discard block |
||
| 361 | 374 | 'description' => $txt['package_action_missing'], |
| 362 | 375 | 'failed' => true, |
| 363 | 376 | ); |
| 364 | - } |
|
| 365 | - else |
|
| 377 | + } else |
|
| 366 | 378 | { |
| 367 | 379 | |
| 368 | - if ($action['boardmod']) |
|
| 369 | - $mod_actions = parseBoardMod(@file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $action['filename']), true, $action['reverse'], $theme_paths); |
|
| 370 | - else |
|
| 371 | - $mod_actions = parseModification(@file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $action['filename']), true, $action['reverse'], $theme_paths); |
|
| 380 | + if ($action['boardmod']) { |
|
| 381 | + $mod_actions = parseBoardMod(@file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $action['filename']), true, $action['reverse'], $theme_paths); |
|
| 382 | + } else { |
|
| 383 | + $mod_actions = parseModification(@file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $action['filename']), true, $action['reverse'], $theme_paths); |
|
| 384 | + } |
|
| 372 | 385 | |
| 373 | - if (count($mod_actions) == 1 && isset($mod_actions[0]) && $mod_actions[0]['type'] == 'error' && $mod_actions[0]['filename'] == '-') |
|
| 374 | - $mod_actions[0]['filename'] = $action['filename']; |
|
| 386 | + if (count($mod_actions) == 1 && isset($mod_actions[0]) && $mod_actions[0]['type'] == 'error' && $mod_actions[0]['filename'] == '-') { |
|
| 387 | + $mod_actions[0]['filename'] = $action['filename']; |
|
| 388 | + } |
|
| 375 | 389 | |
| 376 | 390 | foreach ($mod_actions as $key => $mod_action) |
| 377 | 391 | { |
| 378 | 392 | // Lets get the last section of the file name. |
| 379 | - if (isset($mod_action['filename']) && substr($mod_action['filename'], -13) != '.template.php') |
|
| 380 | - $actual_filename = strtolower(substr(strrchr($mod_action['filename'], '/'), 1) . '||' . $action['filename']); |
|
| 381 | - elseif (isset($mod_action['filename']) && preg_match('~([\w]*)/([\w]*)\.template\.php$~', $mod_action['filename'], $matches)) |
|
| 382 | - $actual_filename = strtolower($matches[1] . '/' . $matches[2] . '.template.php' . '||' . $action['filename']); |
|
| 383 | - else |
|
| 384 | - $actual_filename = $key; |
|
| 385 | - |
|
| 386 | - if ($mod_action['type'] == 'opened') |
|
| 387 | - $failed = false; |
|
| 388 | - elseif ($mod_action['type'] == 'failure') |
|
| 393 | + if (isset($mod_action['filename']) && substr($mod_action['filename'], -13) != '.template.php') { |
|
| 394 | + $actual_filename = strtolower(substr(strrchr($mod_action['filename'], '/'), 1) . '||' . $action['filename']); |
|
| 395 | + } elseif (isset($mod_action['filename']) && preg_match('~([\w]*)/([\w]*)\.template\.php$~', $mod_action['filename'], $matches)) { |
|
| 396 | + $actual_filename = strtolower($matches[1] . '/' . $matches[2] . '.template.php' . '||' . $action['filename']); |
|
| 397 | + } else { |
|
| 398 | + $actual_filename = $key; |
|
| 399 | + } |
|
| 400 | + |
|
| 401 | + if ($mod_action['type'] == 'opened') { |
|
| 402 | + $failed = false; |
|
| 403 | + } elseif ($mod_action['type'] == 'failure') |
|
| 389 | 404 | { |
| 390 | - if (empty($mod_action['is_custom'])) |
|
| 391 | - $context['has_failure'] = true; |
|
| 405 | + if (empty($mod_action['is_custom'])) { |
|
| 406 | + $context['has_failure'] = true; |
|
| 407 | + } |
|
| 392 | 408 | $failed = true; |
| 393 | - } |
|
| 394 | - elseif ($mod_action['type'] == 'chmod') |
|
| 409 | + } elseif ($mod_action['type'] == 'chmod') |
|
| 395 | 410 | { |
| 396 | 411 | $chmod_files[] = $mod_action['filename']; |
| 397 | - } |
|
| 398 | - elseif ($mod_action['type'] == 'saved') |
|
| 412 | + } elseif ($mod_action['type'] == 'saved') |
|
| 399 | 413 | { |
| 400 | 414 | if (!empty($mod_action['is_custom'])) |
| 401 | 415 | { |
| 402 | - if (!isset($context['theme_actions'][$mod_action['is_custom']])) |
|
| 403 | - $context['theme_actions'][$mod_action['is_custom']] = array( |
|
| 416 | + if (!isset($context['theme_actions'][$mod_action['is_custom']])) { |
|
| 417 | + $context['theme_actions'][$mod_action['is_custom']] = array( |
|
| 404 | 418 | 'name' => $theme_paths[$mod_action['is_custom']]['name'], |
| 405 | 419 | 'actions' => array(), |
| 406 | 420 | 'has_failure' => $failed, |
| 407 | 421 | ); |
| 408 | - else |
|
| 409 | - $context['theme_actions'][$mod_action['is_custom']]['has_failure'] |= $failed; |
|
| 422 | + } else { |
|
| 423 | + $context['theme_actions'][$mod_action['is_custom']]['has_failure'] |= $failed; |
|
| 424 | + } |
|
| 410 | 425 | |
| 411 | 426 | $context['theme_actions'][$mod_action['is_custom']]['actions'][$actual_filename] = array( |
| 412 | 427 | 'type' => $txt['execute_modification'], |
@@ -414,8 +429,7 @@ discard block |
||
| 414 | 429 | 'description' => $failed ? $txt['package_action_failure'] : $txt['package_action_success'], |
| 415 | 430 | 'failed' => $failed, |
| 416 | 431 | ); |
| 417 | - } |
|
| 418 | - elseif (!isset($context['actions'][$actual_filename])) |
|
| 432 | + } elseif (!isset($context['actions'][$actual_filename])) |
|
| 419 | 433 | { |
| 420 | 434 | $context['actions'][$actual_filename] = array( |
| 421 | 435 | 'type' => $txt['execute_modification'], |
@@ -423,22 +437,19 @@ discard block |
||
| 423 | 437 | 'description' => $failed ? $txt['package_action_failure'] : $txt['package_action_success'], |
| 424 | 438 | 'failed' => $failed, |
| 425 | 439 | ); |
| 426 | - } |
|
| 427 | - else |
|
| 440 | + } else |
|
| 428 | 441 | { |
| 429 | 442 | $context['actions'][$actual_filename]['failed'] |= $failed; |
| 430 | 443 | $context['actions'][$actual_filename]['description'] = $context['actions'][$actual_filename]['failed'] ? $txt['package_action_failure'] : $txt['package_action_success']; |
| 431 | 444 | } |
| 432 | - } |
|
| 433 | - elseif ($mod_action['type'] == 'skipping') |
|
| 445 | + } elseif ($mod_action['type'] == 'skipping') |
|
| 434 | 446 | { |
| 435 | 447 | $context['actions'][$actual_filename] = array( |
| 436 | 448 | 'type' => $txt['execute_modification'], |
| 437 | 449 | 'action' => $smcFunc['htmlspecialchars'](strtr($mod_action['filename'], array($boarddir => '.'))), |
| 438 | 450 | 'description' => $txt['package_action_skipping'] |
| 439 | 451 | ); |
| 440 | - } |
|
| 441 | - elseif ($mod_action['type'] == 'missing' && empty($mod_action['is_custom'])) |
|
| 452 | + } elseif ($mod_action['type'] == 'missing' && empty($mod_action['is_custom'])) |
|
| 442 | 453 | { |
| 443 | 454 | $context['has_failure'] = true; |
| 444 | 455 | $context['actions'][$actual_filename] = array( |
@@ -447,32 +458,33 @@ discard block |
||
| 447 | 458 | 'description' => $txt['package_action_missing'], |
| 448 | 459 | 'failed' => true, |
| 449 | 460 | ); |
| 450 | - } |
|
| 451 | - elseif ($mod_action['type'] == 'error') |
|
| 452 | - $context['actions'][$actual_filename] = array( |
|
| 461 | + } elseif ($mod_action['type'] == 'error') { |
|
| 462 | + $context['actions'][$actual_filename] = array( |
|
| 453 | 463 | 'type' => $txt['execute_modification'], |
| 454 | 464 | 'action' => $smcFunc['htmlspecialchars'](strtr($mod_action['filename'], array($boarddir => '.'))), |
| 455 | 465 | 'description' => $txt['package_action_error'], |
| 456 | 466 | 'failed' => true, |
| 457 | 467 | ); |
| 468 | + } |
|
| 458 | 469 | } |
| 459 | 470 | |
| 460 | 471 | // We need to loop again just to get the operations down correctly. |
| 461 | 472 | foreach ($mod_actions as $operation_key => $mod_action) |
| 462 | 473 | { |
| 463 | 474 | // Lets get the last section of the file name. |
| 464 | - if (isset($mod_action['filename']) && substr($mod_action['filename'], -13) != '.template.php') |
|
| 465 | - $actual_filename = strtolower(substr(strrchr($mod_action['filename'], '/'), 1) . '||' . $action['filename']); |
|
| 466 | - elseif (isset($mod_action['filename']) && preg_match('~([\w]*)/([\w]*)\.template\.php$~', $mod_action['filename'], $matches)) |
|
| 467 | - $actual_filename = strtolower($matches[1] . '/' . $matches[2] . '.template.php' . '||' . $action['filename']); |
|
| 468 | - else |
|
| 469 | - $actual_filename = $key; |
|
| 475 | + if (isset($mod_action['filename']) && substr($mod_action['filename'], -13) != '.template.php') { |
|
| 476 | + $actual_filename = strtolower(substr(strrchr($mod_action['filename'], '/'), 1) . '||' . $action['filename']); |
|
| 477 | + } elseif (isset($mod_action['filename']) && preg_match('~([\w]*)/([\w]*)\.template\.php$~', $mod_action['filename'], $matches)) { |
|
| 478 | + $actual_filename = strtolower($matches[1] . '/' . $matches[2] . '.template.php' . '||' . $action['filename']); |
|
| 479 | + } else { |
|
| 480 | + $actual_filename = $key; |
|
| 481 | + } |
|
| 470 | 482 | |
| 471 | 483 | // We just need it for actual parse changes. |
| 472 | 484 | if (!in_array($mod_action['type'], array('error', 'result', 'opened', 'saved', 'end', 'missing', 'skipping', 'chmod'))) |
| 473 | 485 | { |
| 474 | - if (empty($mod_action['is_custom'])) |
|
| 475 | - $context['actions'][$actual_filename]['operations'][] = array( |
|
| 486 | + if (empty($mod_action['is_custom'])) { |
|
| 487 | + $context['actions'][$actual_filename]['operations'][] = array( |
|
| 476 | 488 | 'type' => $txt['execute_modification'], |
| 477 | 489 | 'action' => $smcFunc['htmlspecialchars'](strtr($mod_action['filename'], array($boarddir => '.'))), |
| 478 | 490 | 'description' => $mod_action['failed'] ? $txt['package_action_failure'] : $txt['package_action_success'], |
@@ -483,10 +495,11 @@ discard block |
||
| 483 | 495 | 'failed' => $mod_action['failed'], |
| 484 | 496 | 'ignore_failure' => !empty($mod_action['ignore_failure']), |
| 485 | 497 | ); |
| 498 | + } |
|
| 486 | 499 | |
| 487 | 500 | // Themes are under the saved type. |
| 488 | - if (isset($mod_action['is_custom']) && isset($context['theme_actions'][$mod_action['is_custom']])) |
|
| 489 | - $context['theme_actions'][$mod_action['is_custom']]['actions'][$actual_filename]['operations'][] = array( |
|
| 501 | + if (isset($mod_action['is_custom']) && isset($context['theme_actions'][$mod_action['is_custom']])) { |
|
| 502 | + $context['theme_actions'][$mod_action['is_custom']]['actions'][$actual_filename]['operations'][] = array( |
|
| 490 | 503 | 'type' => $txt['execute_modification'], |
| 491 | 504 | 'action' => $smcFunc['htmlspecialchars'](strtr($mod_action['filename'], array($boarddir => '.'))), |
| 492 | 505 | 'description' => $mod_action['failed'] ? $txt['package_action_failure'] : $txt['package_action_success'], |
@@ -497,59 +510,55 @@ discard block |
||
| 497 | 510 | 'failed' => $mod_action['failed'], |
| 498 | 511 | 'ignore_failure' => !empty($mod_action['ignore_failure']), |
| 499 | 512 | ); |
| 513 | + } |
|
| 500 | 514 | } |
| 501 | 515 | } |
| 502 | 516 | } |
| 503 | - } |
|
| 504 | - elseif ($action['type'] == 'code') |
|
| 517 | + } elseif ($action['type'] == 'code') |
|
| 505 | 518 | { |
| 506 | 519 | $thisAction = array( |
| 507 | 520 | 'type' => $txt['execute_code'], |
| 508 | 521 | 'action' => $smcFunc['htmlspecialchars']($action['filename']), |
| 509 | 522 | ); |
| 510 | - } |
|
| 511 | - elseif ($action['type'] == 'database') |
|
| 523 | + } elseif ($action['type'] == 'database') |
|
| 512 | 524 | { |
| 513 | 525 | $thisAction = array( |
| 514 | 526 | 'type' => $txt['execute_database_changes'], |
| 515 | 527 | 'action' => $smcFunc['htmlspecialchars']($action['filename']), |
| 516 | 528 | ); |
| 517 | - } |
|
| 518 | - elseif (in_array($action['type'], array('create-dir', 'create-file'))) |
|
| 529 | + } elseif (in_array($action['type'], array('create-dir', 'create-file'))) |
|
| 519 | 530 | { |
| 520 | 531 | $thisAction = array( |
| 521 | 532 | 'type' => $txt['package_create'] . ' ' . ($action['type'] == 'create-dir' ? $txt['package_tree'] : $txt['package_file']), |
| 522 | 533 | 'action' => $smcFunc['htmlspecialchars'](strtr($action['destination'], array($boarddir => '.'))) |
| 523 | 534 | ); |
| 524 | - } |
|
| 525 | - elseif ($action['type'] == 'hook') |
|
| 535 | + } elseif ($action['type'] == 'hook') |
|
| 526 | 536 | { |
| 527 | 537 | $action['description'] = !isset($action['hook'], $action['function']) ? $txt['package_action_failure'] : $txt['package_action_success']; |
| 528 | 538 | |
| 529 | - if (!isset($action['hook'], $action['function'])) |
|
| 530 | - $context['has_failure'] = true; |
|
| 539 | + if (!isset($action['hook'], $action['function'])) { |
|
| 540 | + $context['has_failure'] = true; |
|
| 541 | + } |
|
| 531 | 542 | |
| 532 | 543 | $thisAction = array( |
| 533 | 544 | 'type' => $action['reverse'] ? $txt['execute_hook_remove'] : $txt['execute_hook_add'], |
| 534 | 545 | 'action' => sprintf($txt['execute_hook_action'. ($action['reverse'] ? '_inverse' : '')], $smcFunc['htmlspecialchars']($action['hook'])), |
| 535 | 546 | ); |
| 536 | - } |
|
| 537 | - elseif ($action['type'] == 'credits') |
|
| 547 | + } elseif ($action['type'] == 'credits') |
|
| 538 | 548 | { |
| 539 | 549 | $thisAction = array( |
| 540 | 550 | 'type' => $txt['execute_credits_add'], |
| 541 | 551 | 'action' => sprintf($txt['execute_credits_action'], $smcFunc['htmlspecialchars']($action['title'])), |
| 542 | 552 | ); |
| 543 | - } |
|
| 544 | - elseif ($action['type'] == 'requires') |
|
| 553 | + } elseif ($action['type'] == 'requires') |
|
| 545 | 554 | { |
| 546 | 555 | $installed = false; |
| 547 | 556 | $version = true; |
| 548 | 557 | |
| 549 | 558 | // package missing required values? |
| 550 | - if (!isset($action['id'])) |
|
| 551 | - $context['has_failure'] = true; |
|
| 552 | - else |
|
| 559 | + if (!isset($action['id'])) { |
|
| 560 | + $context['has_failure'] = true; |
|
| 561 | + } else |
|
| 553 | 562 | { |
| 554 | 563 | // See if this dependancy is installed |
| 555 | 564 | $request = $smcFunc['db_query']('', ' |
@@ -565,8 +574,9 @@ discard block |
||
| 565 | 574 | ) |
| 566 | 575 | ); |
| 567 | 576 | $installed = ($smcFunc['db_num_rows']($request) !== 0); |
| 568 | - if ($installed) |
|
| 569 | - list ($version) = $smcFunc['db_fetch_row']($request); |
|
| 577 | + if ($installed) { |
|
| 578 | + list ($version) = $smcFunc['db_fetch_row']($request); |
|
| 579 | + } |
|
| 570 | 580 | $smcFunc['db_free_result']($request); |
| 571 | 581 | |
| 572 | 582 | // do a version level check (if requested) in the most basic way |
@@ -581,8 +591,7 @@ discard block |
||
| 581 | 591 | 'type' => $txt['package_requires'], |
| 582 | 592 | 'action' => $txt['package_check_for'] . ' ' . $action['id'] . (isset($action['version']) ? (' / ' . ($version ? $action['version'] : '<span class="error">' . $action['version'] . '</span>')) : ''), |
| 583 | 593 | ); |
| 584 | - } |
|
| 585 | - elseif (in_array($action['type'], array('require-dir', 'require-file'))) |
|
| 594 | + } elseif (in_array($action['type'], array('require-dir', 'require-file'))) |
|
| 586 | 595 | { |
| 587 | 596 | // Do this one... |
| 588 | 597 | $thisAction = array( |
@@ -596,26 +605,29 @@ discard block |
||
| 596 | 605 | // Is the action already stated? |
| 597 | 606 | $theme_action = !empty($action['theme_action']) && in_array($action['theme_action'], array('no', 'yes', 'auto')) ? $action['theme_action'] : 'auto'; |
| 598 | 607 | // If it's not auto do we think we have something we can act upon? |
| 599 | - if ($theme_action != 'auto' && !in_array($matches[1], array('languagedir', 'languages_dir', 'imagesdir', 'themedir'))) |
|
| 600 | - $theme_action = ''; |
|
| 608 | + if ($theme_action != 'auto' && !in_array($matches[1], array('languagedir', 'languages_dir', 'imagesdir', 'themedir'))) { |
|
| 609 | + $theme_action = ''; |
|
| 610 | + } |
|
| 601 | 611 | // ... or if it's auto do we even want to do anything? |
| 602 | - elseif ($theme_action == 'auto' && $matches[1] != 'imagesdir') |
|
| 603 | - $theme_action = ''; |
|
| 612 | + elseif ($theme_action == 'auto' && $matches[1] != 'imagesdir') { |
|
| 613 | + $theme_action = ''; |
|
| 614 | + } |
|
| 604 | 615 | |
| 605 | 616 | // So, we still want to do something? |
| 606 | - if ($theme_action != '') |
|
| 607 | - $themeFinds['candidates'][] = $action; |
|
| 617 | + if ($theme_action != '') { |
|
| 618 | + $themeFinds['candidates'][] = $action; |
|
| 619 | + } |
|
| 608 | 620 | // Otherwise is this is going into another theme record it. |
| 609 | - elseif ($matches[1] == 'themes_dir') |
|
| 610 | - $themeFinds['other_themes'][] = strtolower(strtr(parse_path($action['unparsed_destination']), array('\\' => '/')) . '/' . basename($action['filename'])); |
|
| 621 | + elseif ($matches[1] == 'themes_dir') { |
|
| 622 | + $themeFinds['other_themes'][] = strtolower(strtr(parse_path($action['unparsed_destination']), array('\\' => '/')) . '/' . basename($action['filename'])); |
|
| 623 | + } |
|
| 611 | 624 | } |
| 612 | - } |
|
| 613 | - elseif (in_array($action['type'], array('move-dir', 'move-file'))) |
|
| 614 | - $thisAction = array( |
|
| 625 | + } elseif (in_array($action['type'], array('move-dir', 'move-file'))) { |
|
| 626 | + $thisAction = array( |
|
| 615 | 627 | 'type' => $txt['package_move'] . ' ' . ($action['type'] == 'move-dir' ? $txt['package_tree'] : $txt['package_file']), |
| 616 | 628 | 'action' => $smcFunc['htmlspecialchars'](strtr($action['source'], array($boarddir => '.'))) . ' => ' . $smcFunc['htmlspecialchars'](strtr($action['destination'], array($boarddir => '.'))) |
| 617 | 629 | ); |
| 618 | - elseif (in_array($action['type'], array('remove-dir', 'remove-file'))) |
|
| 630 | + } elseif (in_array($action['type'], array('remove-dir', 'remove-file'))) |
|
| 619 | 631 | { |
| 620 | 632 | $thisAction = array( |
| 621 | 633 | 'type' => $txt['package_delete'] . ' ' . ($action['type'] == 'remove-dir' ? $txt['package_tree'] : $txt['package_file']), |
@@ -631,30 +643,36 @@ discard block |
||
| 631 | 643 | $action['unparsed_destination'] = $action['unparsed_filename']; |
| 632 | 644 | |
| 633 | 645 | // If it's not auto do we think we have something we can act upon? |
| 634 | - if ($theme_action != 'auto' && !in_array($matches[1], array('languagedir', 'languages_dir', 'imagesdir', 'themedir'))) |
|
| 635 | - $theme_action = ''; |
|
| 646 | + if ($theme_action != 'auto' && !in_array($matches[1], array('languagedir', 'languages_dir', 'imagesdir', 'themedir'))) { |
|
| 647 | + $theme_action = ''; |
|
| 648 | + } |
|
| 636 | 649 | // ... or if it's auto do we even want to do anything? |
| 637 | - elseif ($theme_action == 'auto' && $matches[1] != 'imagesdir') |
|
| 638 | - $theme_action = ''; |
|
| 650 | + elseif ($theme_action == 'auto' && $matches[1] != 'imagesdir') { |
|
| 651 | + $theme_action = ''; |
|
| 652 | + } |
|
| 639 | 653 | |
| 640 | 654 | // So, we still want to do something? |
| 641 | - if ($theme_action != '') |
|
| 642 | - $themeFinds['candidates'][] = $action; |
|
| 655 | + if ($theme_action != '') { |
|
| 656 | + $themeFinds['candidates'][] = $action; |
|
| 657 | + } |
|
| 643 | 658 | // Otherwise is this is going into another theme record it. |
| 644 | - elseif ($matches[1] == 'themes_dir') |
|
| 645 | - $themeFinds['other_themes'][] = strtolower(strtr(parse_path($action['unparsed_filename']), array('\\' => '/')) . '/' . basename($action['filename'])); |
|
| 659 | + elseif ($matches[1] == 'themes_dir') { |
|
| 660 | + $themeFinds['other_themes'][] = strtolower(strtr(parse_path($action['unparsed_filename']), array('\\' => '/')) . '/' . basename($action['filename'])); |
|
| 661 | + } |
|
| 646 | 662 | } |
| 647 | 663 | } |
| 648 | 664 | |
| 649 | - if (empty($thisAction)) |
|
| 650 | - continue; |
|
| 665 | + if (empty($thisAction)) { |
|
| 666 | + continue; |
|
| 667 | + } |
|
| 651 | 668 | |
| 652 | 669 | if (!in_array($action['type'], array('hook', 'credits'))) |
| 653 | 670 | { |
| 654 | - if ($context['uninstalling']) |
|
| 655 | - $file = in_array($action['type'], array('remove-dir', 'remove-file')) ? $action['filename'] : $packagesdir . '/temp/' . $context['base_path'] . $action['filename']; |
|
| 656 | - else |
|
| 657 | - $file = $packagesdir . '/temp/' . $context['base_path'] . $action['filename']; |
|
| 671 | + if ($context['uninstalling']) { |
|
| 672 | + $file = in_array($action['type'], array('remove-dir', 'remove-file')) ? $action['filename'] : $packagesdir . '/temp/' . $context['base_path'] . $action['filename']; |
|
| 673 | + } else { |
|
| 674 | + $file = $packagesdir . '/temp/' . $context['base_path'] . $action['filename']; |
|
| 675 | + } |
|
| 658 | 676 | } |
| 659 | 677 | |
| 660 | 678 | // Don't fail if a file/directory we're trying to create doesn't exist... |
@@ -669,8 +687,9 @@ discard block |
||
| 669 | 687 | } |
| 670 | 688 | |
| 671 | 689 | // @todo None given? |
| 672 | - if (empty($thisAction['description'])) |
|
| 673 | - $thisAction['description'] = isset($action['description']) ? $action['description'] : ''; |
|
| 690 | + if (empty($thisAction['description'])) { |
|
| 691 | + $thisAction['description'] = isset($action['description']) ? $action['description'] : ''; |
|
| 692 | + } |
|
| 674 | 693 | |
| 675 | 694 | $context['actions'][] = $thisAction; |
| 676 | 695 | } |
@@ -683,18 +702,21 @@ discard block |
||
| 683 | 702 | // Get the part of the file we'll be dealing with. |
| 684 | 703 | preg_match('~^\$(languagedir|languages_dir|imagesdir|themedir)(\\|/)*(.+)*~i', $action_data['unparsed_destination'], $matches); |
| 685 | 704 | |
| 686 | - if ($matches[1] == 'imagesdir') |
|
| 687 | - $path = '/' . basename($settings['default_images_url']); |
|
| 688 | - elseif ($matches[1] == 'languagedir' || $matches[1] == 'languages_dir') |
|
| 689 | - $path = '/languages'; |
|
| 690 | - else |
|
| 691 | - $path = ''; |
|
| 705 | + if ($matches[1] == 'imagesdir') { |
|
| 706 | + $path = '/' . basename($settings['default_images_url']); |
|
| 707 | + } elseif ($matches[1] == 'languagedir' || $matches[1] == 'languages_dir') { |
|
| 708 | + $path = '/languages'; |
|
| 709 | + } else { |
|
| 710 | + $path = ''; |
|
| 711 | + } |
|
| 692 | 712 | |
| 693 | - if (!empty($matches[3])) |
|
| 694 | - $path .= $matches[3]; |
|
| 713 | + if (!empty($matches[3])) { |
|
| 714 | + $path .= $matches[3]; |
|
| 715 | + } |
|
| 695 | 716 | |
| 696 | - if (!$context['uninstalling']) |
|
| 697 | - $path .= '/' . basename($action_data['filename']); |
|
| 717 | + if (!$context['uninstalling']) { |
|
| 718 | + $path .= '/' . basename($action_data['filename']); |
|
| 719 | + } |
|
| 698 | 720 | |
| 699 | 721 | // Loop through each custom theme to note it's candidacy! |
| 700 | 722 | foreach ($theme_paths as $id => $theme_data) |
@@ -710,36 +732,40 @@ discard block |
||
| 710 | 732 | if (!mktree(dirname($real_path), false)) |
| 711 | 733 | { |
| 712 | 734 | $temp = dirname($real_path); |
| 713 | - while (!file_exists($temp) && strlen($temp) > 1) |
|
| 714 | - $temp = dirname($temp); |
|
| 735 | + while (!file_exists($temp) && strlen($temp) > 1) { |
|
| 736 | + $temp = dirname($temp); |
|
| 737 | + } |
|
| 715 | 738 | $chmod_files[] = $temp; |
| 716 | 739 | } |
| 717 | 740 | |
| 718 | - if ($action_data['type'] == 'require-dir' && !is_writable($real_path) && (file_exists($real_path) || !is_writable(dirname($real_path)))) |
|
| 719 | - $chmod_files[] = $real_path; |
|
| 741 | + if ($action_data['type'] == 'require-dir' && !is_writable($real_path) && (file_exists($real_path) || !is_writable(dirname($real_path)))) { |
|
| 742 | + $chmod_files[] = $real_path; |
|
| 743 | + } |
|
| 720 | 744 | |
| 721 | - if (!isset($context['theme_actions'][$id])) |
|
| 722 | - $context['theme_actions'][$id] = array( |
|
| 745 | + if (!isset($context['theme_actions'][$id])) { |
|
| 746 | + $context['theme_actions'][$id] = array( |
|
| 723 | 747 | 'name' => $theme_data['name'], |
| 724 | 748 | 'actions' => array(), |
| 725 | 749 | ); |
| 750 | + } |
|
| 726 | 751 | |
| 727 | - if ($context['uninstalling']) |
|
| 728 | - $context['theme_actions'][$id]['actions'][] = array( |
|
| 752 | + if ($context['uninstalling']) { |
|
| 753 | + $context['theme_actions'][$id]['actions'][] = array( |
|
| 729 | 754 | 'type' => $txt['package_delete'] . ' ' . ($action_data['type'] == 'require-dir' ? $txt['package_tree'] : $txt['package_file']), |
| 730 | 755 | 'action' => strtr($real_path, array('\\' => '/', $boarddir => '.')), |
| 731 | 756 | 'description' => '', |
| 732 | 757 | 'value' => base64_encode(json_encode(array('type' => $action_data['type'], 'orig' => $action_data['filename'], 'future' => $real_path, 'id' => $id))), |
| 733 | 758 | 'not_mod' => true, |
| 734 | 759 | ); |
| 735 | - else |
|
| 736 | - $context['theme_actions'][$id]['actions'][] = array( |
|
| 760 | + } else { |
|
| 761 | + $context['theme_actions'][$id]['actions'][] = array( |
|
| 737 | 762 | 'type' => $txt['package_extract'] . ' ' . ($action_data['type'] == 'require-dir' ? $txt['package_tree'] : $txt['package_file']), |
| 738 | 763 | 'action' => strtr($real_path, array('\\' => '/', $boarddir => '.')), |
| 739 | 764 | 'description' => '', |
| 740 | 765 | 'value' => base64_encode(json_encode(array('type' => $action_data['type'], 'orig' => $action_data['destination'], 'future' => $real_path, 'id' => $id))), |
| 741 | 766 | 'not_mod' => true, |
| 742 | 767 | ); |
| 768 | + } |
|
| 743 | 769 | } |
| 744 | 770 | } |
| 745 | 771 | } |
@@ -749,8 +775,9 @@ discard block |
||
| 749 | 775 | // Trash the cache... which will also check permissions for us! |
| 750 | 776 | package_flush_cache(true); |
| 751 | 777 | |
| 752 | - if (file_exists($packagesdir . '/temp')) |
|
| 753 | - deltree($packagesdir . '/temp'); |
|
| 778 | + if (file_exists($packagesdir . '/temp')) { |
|
| 779 | + deltree($packagesdir . '/temp'); |
|
| 780 | + } |
|
| 754 | 781 | |
| 755 | 782 | if (!empty($chmod_files)) |
| 756 | 783 | { |
@@ -775,8 +802,9 @@ discard block |
||
| 775 | 802 | checkSession(); |
| 776 | 803 | |
| 777 | 804 | // If there's no file, what are we installing? |
| 778 | - if (!isset($_REQUEST['package']) || $_REQUEST['package'] == '') |
|
| 779 | - redirectexit('action=admin;area=packages'); |
|
| 805 | + if (!isset($_REQUEST['package']) || $_REQUEST['package'] == '') { |
|
| 806 | + redirectexit('action=admin;area=packages'); |
|
| 807 | + } |
|
| 780 | 808 | $context['filename'] = $_REQUEST['package']; |
| 781 | 809 | |
| 782 | 810 | // If this is an uninstall, we'll have an id. |
@@ -797,51 +825,55 @@ discard block |
||
| 797 | 825 | |
| 798 | 826 | $context['sub_template'] = 'extract_package'; |
| 799 | 827 | |
| 800 | - if (!file_exists($packagesdir . '/' . $context['filename'])) |
|
| 801 | - fatal_lang_error('package_no_file', false); |
|
| 828 | + if (!file_exists($packagesdir . '/' . $context['filename'])) { |
|
| 829 | + fatal_lang_error('package_no_file', false); |
|
| 830 | + } |
|
| 802 | 831 | |
| 803 | 832 | // Load up the package FTP information? |
| 804 | 833 | create_chmod_control(array(), array('destination_url' => $scripturl . '?action=admin;area=packages;sa=' . $_REQUEST['sa'] . ';package=' . $_REQUEST['package'])); |
| 805 | 834 | |
| 806 | 835 | // Make sure temp directory exists and is empty! |
| 807 | - if (file_exists($packagesdir . '/temp')) |
|
| 808 | - deltree($packagesdir . '/temp', false); |
|
| 809 | - else |
|
| 810 | - mktree($packagesdir . '/temp', 0777); |
|
| 836 | + if (file_exists($packagesdir . '/temp')) { |
|
| 837 | + deltree($packagesdir . '/temp', false); |
|
| 838 | + } else { |
|
| 839 | + mktree($packagesdir . '/temp', 0777); |
|
| 840 | + } |
|
| 811 | 841 | |
| 812 | 842 | // Let the unpacker do the work. |
| 813 | 843 | if (is_file($packagesdir . '/' . $context['filename'])) |
| 814 | 844 | { |
| 815 | 845 | $context['extracted_files'] = read_tgz_file($packagesdir . '/' . $context['filename'], $packagesdir . '/temp'); |
| 816 | 846 | |
| 817 | - if (!file_exists($packagesdir . '/temp/package-info.xml')) |
|
| 818 | - foreach ($context['extracted_files'] as $file) |
|
| 847 | + if (!file_exists($packagesdir . '/temp/package-info.xml')) { |
|
| 848 | + foreach ($context['extracted_files'] as $file) |
|
| 819 | 849 | if (basename($file['filename']) == 'package-info.xml') |
| 820 | 850 | { |
| 821 | 851 | $context['base_path'] = dirname($file['filename']) . '/'; |
| 852 | + } |
|
| 822 | 853 | break; |
| 823 | 854 | } |
| 824 | 855 | |
| 825 | - if (!isset($context['base_path'])) |
|
| 826 | - $context['base_path'] = ''; |
|
| 827 | - } |
|
| 828 | - elseif (is_dir($packagesdir . '/' . $context['filename'])) |
|
| 856 | + if (!isset($context['base_path'])) { |
|
| 857 | + $context['base_path'] = ''; |
|
| 858 | + } |
|
| 859 | + } elseif (is_dir($packagesdir . '/' . $context['filename'])) |
|
| 829 | 860 | { |
| 830 | 861 | copytree($packagesdir . '/' . $context['filename'], $packagesdir . '/temp'); |
| 831 | 862 | $context['extracted_files'] = listtree($packagesdir . '/temp'); |
| 832 | 863 | $context['base_path'] = ''; |
| 864 | + } else { |
|
| 865 | + fatal_lang_error('no_access', false); |
|
| 833 | 866 | } |
| 834 | - else |
|
| 835 | - fatal_lang_error('no_access', false); |
|
| 836 | 867 | |
| 837 | 868 | // Are we installing this into any custom themes? |
| 838 | 869 | $custom_themes = array(1); |
| 839 | 870 | $known_themes = explode(',', $modSettings['knownThemes']); |
| 840 | 871 | if (!empty($_POST['custom_theme'])) |
| 841 | 872 | { |
| 842 | - foreach ($_POST['custom_theme'] as $tid) |
|
| 843 | - if (in_array($tid, $known_themes)) |
|
| 873 | + foreach ($_POST['custom_theme'] as $tid) { |
|
| 874 | + if (in_array($tid, $known_themes)) |
|
| 844 | 875 | $custom_themes[] = (int) $tid; |
| 876 | + } |
|
| 845 | 877 | } |
| 846 | 878 | |
| 847 | 879 | // Now load up the paths of the themes that we need to know about. |
@@ -858,8 +890,9 @@ discard block |
||
| 858 | 890 | ); |
| 859 | 891 | $theme_paths = array(); |
| 860 | 892 | $themes_installed = array(1); |
| 861 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
| 862 | - $theme_paths[$row['id_theme']][$row['variable']] = $row['value']; |
|
| 893 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
| 894 | + $theme_paths[$row['id_theme']][$row['variable']] = $row['value']; |
|
| 895 | + } |
|
| 863 | 896 | $smcFunc['db_free_result']($request); |
| 864 | 897 | |
| 865 | 898 | // Are there any theme copying that we want to take place? |
@@ -871,11 +904,13 @@ discard block |
||
| 871 | 904 | { |
| 872 | 905 | foreach ($_POST['theme_changes'] as $change) |
| 873 | 906 | { |
| 874 | - if (empty($change)) |
|
| 875 | - continue; |
|
| 907 | + if (empty($change)) { |
|
| 908 | + continue; |
|
| 909 | + } |
|
| 876 | 910 | $theme_data = smf_json_decode(base64_decode($change), true); |
| 877 | - if (empty($theme_data['type'])) |
|
| 878 | - continue; |
|
| 911 | + if (empty($theme_data['type'])) { |
|
| 912 | + continue; |
|
| 913 | + } |
|
| 879 | 914 | |
| 880 | 915 | $themes_installed[] = $theme_data['id']; |
| 881 | 916 | $context['theme_copies'][$theme_data['type']][$theme_data['orig']][] = $theme_data['future']; |
@@ -884,8 +919,9 @@ discard block |
||
| 884 | 919 | |
| 885 | 920 | // Get the package info... |
| 886 | 921 | $packageInfo = getPackageInfo($context['filename']); |
| 887 | - if (!is_array($packageInfo)) |
|
| 888 | - fatal_lang_error($packageInfo); |
|
| 922 | + if (!is_array($packageInfo)) { |
|
| 923 | + fatal_lang_error($packageInfo); |
|
| 924 | + } |
|
| 889 | 925 | |
| 890 | 926 | $packageInfo['filename'] = $context['filename']; |
| 891 | 927 | |
@@ -897,8 +933,9 @@ discard block |
||
| 897 | 933 | { |
| 898 | 934 | $_SESSION['last_backup_for'] = $context['filename'] . ($context['uninstalling'] ? '$$' : '$'); |
| 899 | 935 | $result = package_create_backup(($context['uninstalling'] ? 'backup_' : 'before_') . strtok($context['filename'], '.')); |
| 900 | - if (!$result) |
|
| 901 | - fatal_lang_error('could_not_package_backup', false); |
|
| 936 | + if (!$result) { |
|
| 937 | + fatal_lang_error('could_not_package_backup', false); |
|
| 938 | + } |
|
| 902 | 939 | } |
| 903 | 940 | |
| 904 | 941 | // The mod isn't installed.... unless proven otherwise. |
@@ -938,35 +975,38 @@ discard block |
||
| 938 | 975 | $install_log = parsePackageInfo($packageInfo['xml'], false, 'uninstall'); |
| 939 | 976 | |
| 940 | 977 | // Gadzooks! There's no uninstaller at all!? |
| 941 | - if (empty($install_log)) |
|
| 942 | - fatal_lang_error('package_uninstall_cannot', false); |
|
| 978 | + if (empty($install_log)) { |
|
| 979 | + fatal_lang_error('package_uninstall_cannot', false); |
|
| 980 | + } |
|
| 943 | 981 | |
| 944 | 982 | // They can only uninstall from what it was originally installed into. |
| 945 | - foreach ($theme_paths as $id => $data) |
|
| 946 | - if ($id != 1 && !in_array($id, $old_themes)) |
|
| 983 | + foreach ($theme_paths as $id => $data) { |
|
| 984 | + if ($id != 1 && !in_array($id, $old_themes)) |
|
| 947 | 985 | unset($theme_paths[$id]); |
| 948 | - } |
|
| 949 | - elseif (isset($old_version) && $old_version != $packageInfo['version']) |
|
| 986 | + } |
|
| 987 | + } elseif (isset($old_version) && $old_version != $packageInfo['version']) |
|
| 950 | 988 | { |
| 951 | 989 | // Look for an upgrade... |
| 952 | 990 | $install_log = parsePackageInfo($packageInfo['xml'], false, 'upgrade', $old_version); |
| 953 | 991 | |
| 954 | 992 | // There was no upgrade.... |
| 955 | - if (empty($install_log)) |
|
| 956 | - $context['is_installed'] = true; |
|
| 957 | - else |
|
| 993 | + if (empty($install_log)) { |
|
| 994 | + $context['is_installed'] = true; |
|
| 995 | + } else |
|
| 958 | 996 | { |
| 959 | 997 | // Upgrade previous themes only! |
| 960 | - foreach ($theme_paths as $id => $data) |
|
| 961 | - if ($id != 1 && !in_array($id, $old_themes)) |
|
| 998 | + foreach ($theme_paths as $id => $data) { |
|
| 999 | + if ($id != 1 && !in_array($id, $old_themes)) |
|
| 962 | 1000 | unset($theme_paths[$id]); |
| 1001 | + } |
|
| 963 | 1002 | } |
| 1003 | + } elseif (isset($old_version) && $old_version == $packageInfo['version']) { |
|
| 1004 | + $context['is_installed'] = true; |
|
| 964 | 1005 | } |
| 965 | - elseif (isset($old_version) && $old_version == $packageInfo['version']) |
|
| 966 | - $context['is_installed'] = true; |
|
| 967 | 1006 | |
| 968 | - if (!isset($old_version) || $context['is_installed']) |
|
| 969 | - $install_log = parsePackageInfo($packageInfo['xml'], false, 'install'); |
|
| 1007 | + if (!isset($old_version) || $context['is_installed']) { |
|
| 1008 | + $install_log = parsePackageInfo($packageInfo['xml'], false, 'install'); |
|
| 1009 | + } |
|
| 970 | 1010 | |
| 971 | 1011 | $context['install_finished'] = false; |
| 972 | 1012 | |
@@ -983,37 +1023,39 @@ discard block |
||
| 983 | 1023 | |
| 984 | 1024 | if ($action['type'] == 'modification' && !empty($action['filename'])) |
| 985 | 1025 | { |
| 986 | - if ($action['boardmod']) |
|
| 987 | - $mod_actions = parseBoardMod(file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $action['filename']), false, $action['reverse'], $theme_paths); |
|
| 988 | - else |
|
| 989 | - $mod_actions = parseModification(file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $action['filename']), false, $action['reverse'], $theme_paths); |
|
| 1026 | + if ($action['boardmod']) { |
|
| 1027 | + $mod_actions = parseBoardMod(file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $action['filename']), false, $action['reverse'], $theme_paths); |
|
| 1028 | + } else { |
|
| 1029 | + $mod_actions = parseModification(file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $action['filename']), false, $action['reverse'], $theme_paths); |
|
| 1030 | + } |
|
| 990 | 1031 | |
| 991 | 1032 | // Any errors worth noting? |
| 992 | 1033 | foreach ($mod_actions as $key => $action) |
| 993 | 1034 | { |
| 994 | - if ($action['type'] == 'failure') |
|
| 995 | - $failed_steps[] = array( |
|
| 1035 | + if ($action['type'] == 'failure') { |
|
| 1036 | + $failed_steps[] = array( |
|
| 996 | 1037 | 'file' => $action['filename'], |
| 997 | 1038 | 'large_step' => $failed_count, |
| 998 | 1039 | 'sub_step' => $key, |
| 999 | 1040 | 'theme' => 1, |
| 1000 | 1041 | ); |
| 1042 | + } |
|
| 1001 | 1043 | |
| 1002 | 1044 | // Gather the themes we installed into. |
| 1003 | - if (!empty($action['is_custom'])) |
|
| 1004 | - $themes_installed[] = $action['is_custom']; |
|
| 1045 | + if (!empty($action['is_custom'])) { |
|
| 1046 | + $themes_installed[] = $action['is_custom']; |
|
| 1047 | + } |
|
| 1005 | 1048 | } |
| 1006 | - } |
|
| 1007 | - elseif ($action['type'] == 'code' && !empty($action['filename'])) |
|
| 1049 | + } elseif ($action['type'] == 'code' && !empty($action['filename'])) |
|
| 1008 | 1050 | { |
| 1009 | 1051 | // This is just here as reference for what is available. |
| 1010 | 1052 | global $txt, $boarddir, $sourcedir, $modSettings, $context, $settings, $forum_version, $smcFunc; |
| 1011 | 1053 | |
| 1012 | 1054 | // Now include the file and be done with it ;). |
| 1013 | - if (file_exists($packagesdir . '/temp/' . $context['base_path'] . $action['filename'])) |
|
| 1014 | - require($packagesdir . '/temp/' . $context['base_path'] . $action['filename']); |
|
| 1015 | - } |
|
| 1016 | - elseif ($action['type'] == 'credits') |
|
| 1055 | + if (file_exists($packagesdir . '/temp/' . $context['base_path'] . $action['filename'])) { |
|
| 1056 | + require($packagesdir . '/temp/' . $context['base_path'] . $action['filename']); |
|
| 1057 | + } |
|
| 1058 | + } elseif ($action['type'] == 'credits') |
|
| 1017 | 1059 | { |
| 1018 | 1060 | // Time to build the billboard |
| 1019 | 1061 | $credits_tag = array( |
@@ -1023,13 +1065,13 @@ discard block |
||
| 1023 | 1065 | 'copyright' => $action['copyright'], |
| 1024 | 1066 | 'title' => $action['title'], |
| 1025 | 1067 | ); |
| 1026 | - } |
|
| 1027 | - elseif ($action['type'] == 'hook' && isset($action['hook'], $action['function'])) |
|
| 1068 | + } elseif ($action['type'] == 'hook' && isset($action['hook'], $action['function'])) |
|
| 1028 | 1069 | { |
| 1029 | - if ($action['reverse']) |
|
| 1030 | - remove_integration_function($action['hook'], $action['function'], true, $action['include_file'], $action['object']); |
|
| 1031 | - else |
|
| 1032 | - add_integration_function($action['hook'], $action['function'], true, $action['include_file'], $action['object']); |
|
| 1070 | + if ($action['reverse']) { |
|
| 1071 | + remove_integration_function($action['hook'], $action['function'], true, $action['include_file'], $action['object']); |
|
| 1072 | + } else { |
|
| 1073 | + add_integration_function($action['hook'], $action['function'], true, $action['include_file'], $action['object']); |
|
| 1074 | + } |
|
| 1033 | 1075 | } |
| 1034 | 1076 | // Only do the database changes on uninstall if requested. |
| 1035 | 1077 | elseif ($action['type'] == 'database' && !empty($action['filename']) && (!$context['uninstalling'] || !empty($_POST['do_db_changes']))) |
@@ -1042,8 +1084,9 @@ discard block |
||
| 1042 | 1084 | db_extend('packages'); |
| 1043 | 1085 | |
| 1044 | 1086 | // Let the file work its magic ;) |
| 1045 | - if (file_exists($packagesdir . '/temp/' . $context['base_path'] . $action['filename'])) |
|
| 1046 | - require($packagesdir . '/temp/' . $context['base_path'] . $action['filename']); |
|
| 1087 | + if (file_exists($packagesdir . '/temp/' . $context['base_path'] . $action['filename'])) { |
|
| 1088 | + require($packagesdir . '/temp/' . $context['base_path'] . $action['filename']); |
|
| 1089 | + } |
|
| 1047 | 1090 | } |
| 1048 | 1091 | // Handle a redirect... |
| 1049 | 1092 | elseif ($action['type'] == 'redirect' && !empty($action['redirect_url'])) |
@@ -1125,8 +1168,9 @@ discard block |
||
| 1125 | 1168 | reloadSettings(); |
| 1126 | 1169 | |
| 1127 | 1170 | // Any db changes from older version? |
| 1128 | - if (!empty($old_db_changes)) |
|
| 1129 | - $db_package_log = empty($db_package_log) ? $old_db_changes : array_merge($old_db_changes, $db_package_log); |
|
| 1171 | + if (!empty($old_db_changes)) { |
|
| 1172 | + $db_package_log = empty($db_package_log) ? $old_db_changes : array_merge($old_db_changes, $db_package_log); |
|
| 1173 | + } |
|
| 1130 | 1174 | |
| 1131 | 1175 | // If there are some database changes we might want to remove then filter them out. |
| 1132 | 1176 | if (!empty($db_package_log)) |
@@ -1142,22 +1186,24 @@ discard block |
||
| 1142 | 1186 | */ |
| 1143 | 1187 | function sort_table_first($a, $b) |
| 1144 | 1188 | { |
| 1145 | - if ($a[0] == $b[0]) |
|
| 1146 | - return 0; |
|
| 1189 | + if ($a[0] == $b[0]) { |
|
| 1190 | + return 0; |
|
| 1191 | + } |
|
| 1147 | 1192 | return $a[0] == 'remove_table' ? -1 : 1; |
| 1148 | 1193 | } |
| 1149 | 1194 | usort($db_package_log, 'sort_table_first'); |
| 1150 | 1195 | foreach ($db_package_log as $k => $log) |
| 1151 | 1196 | { |
| 1152 | - if ($log[0] == 'remove_table') |
|
| 1153 | - $tables[] = $log[1]; |
|
| 1154 | - elseif (in_array($log[1], $tables)) |
|
| 1155 | - unset($db_package_log[$k]); |
|
| 1197 | + if ($log[0] == 'remove_table') { |
|
| 1198 | + $tables[] = $log[1]; |
|
| 1199 | + } elseif (in_array($log[1], $tables)) { |
|
| 1200 | + unset($db_package_log[$k]); |
|
| 1201 | + } |
|
| 1156 | 1202 | } |
| 1157 | 1203 | $db_changes = json_encode($db_package_log); |
| 1204 | + } else { |
|
| 1205 | + $db_changes = ''; |
|
| 1158 | 1206 | } |
| 1159 | - else |
|
| 1160 | - $db_changes = ''; |
|
| 1161 | 1207 | |
| 1162 | 1208 | // What themes did we actually install? |
| 1163 | 1209 | $themes_installed = array_unique($themes_installed); |
@@ -1206,18 +1252,20 @@ discard block |
||
| 1206 | 1252 | |
| 1207 | 1253 | foreach ($db_changes as $change) |
| 1208 | 1254 | { |
| 1209 | - if ($change[0] == 'remove_table' && isset($change[1])) |
|
| 1210 | - $smcFunc['db_drop_table']($change[1]); |
|
| 1211 | - elseif ($change[0] == 'remove_column' && isset($change[2])) |
|
| 1212 | - $smcFunc['db_remove_column']($change[1], $change[2]); |
|
| 1213 | - elseif ($change[0] == 'remove_index' && isset($change[2])) |
|
| 1214 | - $smcFunc['db_remove_index']($change[1], $change[2]); |
|
| 1255 | + if ($change[0] == 'remove_table' && isset($change[1])) { |
|
| 1256 | + $smcFunc['db_drop_table']($change[1]); |
|
| 1257 | + } elseif ($change[0] == 'remove_column' && isset($change[2])) { |
|
| 1258 | + $smcFunc['db_remove_column']($change[1], $change[2]); |
|
| 1259 | + } elseif ($change[0] == 'remove_index' && isset($change[2])) { |
|
| 1260 | + $smcFunc['db_remove_index']($change[1], $change[2]); |
|
| 1261 | + } |
|
| 1215 | 1262 | } |
| 1216 | 1263 | } |
| 1217 | 1264 | |
| 1218 | 1265 | // Clean house... get rid of the evidence ;). |
| 1219 | - if (file_exists($packagesdir . '/temp')) |
|
| 1220 | - deltree($packagesdir . '/temp'); |
|
| 1266 | + if (file_exists($packagesdir . '/temp')) { |
|
| 1267 | + deltree($packagesdir . '/temp'); |
|
| 1268 | + } |
|
| 1221 | 1269 | |
| 1222 | 1270 | // Log what we just did. |
| 1223 | 1271 | logAction($context['uninstalling'] ? 'uninstall_package' : (!empty($is_upgrade) ? 'upgrade_package' : 'install_package'), array('package' => $smcFunc['htmlspecialchars']($packageInfo['name']), 'version' => $smcFunc['htmlspecialchars']($packageInfo['version'])), 'admin'); |
@@ -1239,8 +1287,9 @@ discard block |
||
| 1239 | 1287 | require_once($sourcedir . '/Subs-Package.php'); |
| 1240 | 1288 | |
| 1241 | 1289 | // No package? Show him or her the door. |
| 1242 | - if (!isset($_REQUEST['package']) || $_REQUEST['package'] == '') |
|
| 1243 | - redirectexit('action=admin;area=packages'); |
|
| 1290 | + if (!isset($_REQUEST['package']) || $_REQUEST['package'] == '') { |
|
| 1291 | + redirectexit('action=admin;area=packages'); |
|
| 1292 | + } |
|
| 1244 | 1293 | |
| 1245 | 1294 | $context['linktree'][] = array( |
| 1246 | 1295 | 'url' => $scripturl . '?action=admin;area=packages;sa=list;package=' . $_REQUEST['package'], |
@@ -1253,11 +1302,12 @@ discard block |
||
| 1253 | 1302 | $context['filename'] = $_REQUEST['package']; |
| 1254 | 1303 | |
| 1255 | 1304 | // Let the unpacker do the work. |
| 1256 | - if (is_file($packagesdir . '/' . $context['filename'])) |
|
| 1257 | - $context['files'] = read_tgz_file($packagesdir . '/' . $context['filename'], null); |
|
| 1258 | - elseif (is_dir($packagesdir . '/' . $context['filename'])) |
|
| 1259 | - $context['files'] = listtree($packagesdir . '/' . $context['filename']); |
|
| 1260 | -} |
|
| 1305 | + if (is_file($packagesdir . '/' . $context['filename'])) { |
|
| 1306 | + $context['files'] = read_tgz_file($packagesdir . '/' . $context['filename'], null); |
|
| 1307 | + } elseif (is_dir($packagesdir . '/' . $context['filename'])) { |
|
| 1308 | + $context['files'] = listtree($packagesdir . '/' . $context['filename']); |
|
| 1309 | + } |
|
| 1310 | + } |
|
| 1261 | 1311 | |
| 1262 | 1312 | /** |
| 1263 | 1313 | * Display one of the files in a package. |
@@ -1269,22 +1319,25 @@ discard block |
||
| 1269 | 1319 | require_once($sourcedir . '/Subs-Package.php'); |
| 1270 | 1320 | |
| 1271 | 1321 | // No package? Show him or her the door. |
| 1272 | - if (!isset($_REQUEST['package']) || $_REQUEST['package'] == '') |
|
| 1273 | - redirectexit('action=admin;area=packages'); |
|
| 1322 | + if (!isset($_REQUEST['package']) || $_REQUEST['package'] == '') { |
|
| 1323 | + redirectexit('action=admin;area=packages'); |
|
| 1324 | + } |
|
| 1274 | 1325 | |
| 1275 | 1326 | // No file? Show him or her the door. |
| 1276 | - if (!isset($_REQUEST['file']) || $_REQUEST['file'] == '') |
|
| 1277 | - redirectexit('action=admin;area=packages'); |
|
| 1327 | + if (!isset($_REQUEST['file']) || $_REQUEST['file'] == '') { |
|
| 1328 | + redirectexit('action=admin;area=packages'); |
|
| 1329 | + } |
|
| 1278 | 1330 | |
| 1279 | 1331 | $_REQUEST['package'] = preg_replace('~[\.]+~', '.', strtr($_REQUEST['package'], array('/' => '_', '\\' => '_'))); |
| 1280 | 1332 | $_REQUEST['file'] = preg_replace('~[\.]+~', '.', $_REQUEST['file']); |
| 1281 | 1333 | |
| 1282 | 1334 | if (isset($_REQUEST['raw'])) |
| 1283 | 1335 | { |
| 1284 | - if (is_file($packagesdir . '/' . $_REQUEST['package'])) |
|
| 1285 | - echo read_tgz_file($packagesdir . '/' . $_REQUEST['package'], $_REQUEST['file'], true); |
|
| 1286 | - elseif (is_dir($packagesdir . '/' . $_REQUEST['package'])) |
|
| 1287 | - echo file_get_contents($packagesdir . '/' . $_REQUEST['package'] . '/' . $_REQUEST['file']); |
|
| 1336 | + if (is_file($packagesdir . '/' . $_REQUEST['package'])) { |
|
| 1337 | + echo read_tgz_file($packagesdir . '/' . $_REQUEST['package'], $_REQUEST['file'], true); |
|
| 1338 | + } elseif (is_dir($packagesdir . '/' . $_REQUEST['package'])) { |
|
| 1339 | + echo file_get_contents($packagesdir . '/' . $_REQUEST['package'] . '/' . $_REQUEST['file']); |
|
| 1340 | + } |
|
| 1288 | 1341 | |
| 1289 | 1342 | obExit(false); |
| 1290 | 1343 | } |
@@ -1301,17 +1354,19 @@ discard block |
||
| 1301 | 1354 | $context['filename'] = $_REQUEST['file']; |
| 1302 | 1355 | |
| 1303 | 1356 | // Let the unpacker do the work.... but make sure we handle images properly. |
| 1304 | - if (in_array(strtolower(strrchr($_REQUEST['file'], '.')), array('.bmp', '.gif', '.jpeg', '.jpg', '.png'))) |
|
| 1305 | - $context['filedata'] = '<img src="' . $scripturl . '?action=admin;area=packages;sa=examine;package=' . $_REQUEST['package'] . ';file=' . $_REQUEST['file'] . ';raw" alt="' . $_REQUEST['file'] . '">'; |
|
| 1306 | - else |
|
| 1357 | + if (in_array(strtolower(strrchr($_REQUEST['file'], '.')), array('.bmp', '.gif', '.jpeg', '.jpg', '.png'))) { |
|
| 1358 | + $context['filedata'] = '<img src="' . $scripturl . '?action=admin;area=packages;sa=examine;package=' . $_REQUEST['package'] . ';file=' . $_REQUEST['file'] . ';raw" alt="' . $_REQUEST['file'] . '">'; |
|
| 1359 | + } else |
|
| 1307 | 1360 | { |
| 1308 | - if (is_file($packagesdir . '/' . $_REQUEST['package'])) |
|
| 1309 | - $context['filedata'] = $smcFunc['htmlspecialchars'](read_tgz_file($packagesdir . '/' . $_REQUEST['package'], $_REQUEST['file'], true)); |
|
| 1310 | - elseif (is_dir($packagesdir . '/' . $_REQUEST['package'])) |
|
| 1311 | - $context['filedata'] = $smcFunc['htmlspecialchars'](file_get_contents($packagesdir . '/' . $_REQUEST['package'] . '/' . $_REQUEST['file'])); |
|
| 1361 | + if (is_file($packagesdir . '/' . $_REQUEST['package'])) { |
|
| 1362 | + $context['filedata'] = $smcFunc['htmlspecialchars'](read_tgz_file($packagesdir . '/' . $_REQUEST['package'], $_REQUEST['file'], true)); |
|
| 1363 | + } elseif (is_dir($packagesdir . '/' . $_REQUEST['package'])) { |
|
| 1364 | + $context['filedata'] = $smcFunc['htmlspecialchars'](file_get_contents($packagesdir . '/' . $_REQUEST['package'] . '/' . $_REQUEST['file'])); |
|
| 1365 | + } |
|
| 1312 | 1366 | |
| 1313 | - if (strtolower(strrchr($_REQUEST['file'], '.')) == '.php') |
|
| 1314 | - $context['filedata'] = highlight_php_code($context['filedata']); |
|
| 1367 | + if (strtolower(strrchr($_REQUEST['file'], '.')) == '.php') { |
|
| 1368 | + $context['filedata'] = highlight_php_code($context['filedata']); |
|
| 1369 | + } |
|
| 1315 | 1370 | } |
| 1316 | 1371 | } |
| 1317 | 1372 | |
@@ -1326,8 +1381,9 @@ discard block |
||
| 1326 | 1381 | checkSession('get'); |
| 1327 | 1382 | |
| 1328 | 1383 | // Ack, don't allow deletion of arbitrary files here, could become a security hole somehow! |
| 1329 | - if (!isset($_GET['package']) || $_GET['package'] == 'index.php' || $_GET['package'] == 'backups') |
|
| 1330 | - redirectexit('action=admin;area=packages;sa=browse'); |
|
| 1384 | + if (!isset($_GET['package']) || $_GET['package'] == 'index.php' || $_GET['package'] == 'backups') { |
|
| 1385 | + redirectexit('action=admin;area=packages;sa=browse'); |
|
| 1386 | + } |
|
| 1331 | 1387 | $_GET['package'] = preg_replace('~[\.]+~', '.', strtr($_GET['package'], array('/' => '_', '\\' => '_'))); |
| 1332 | 1388 | |
| 1333 | 1389 | // Can't delete what's not there. |
@@ -1335,9 +1391,9 @@ discard block |
||
| 1335 | 1391 | { |
| 1336 | 1392 | create_chmod_control(array($packagesdir . '/' . $_GET['package']), array('destination_url' => $scripturl . '?action=admin;area=packages;sa=remove;package=' . $_GET['package'], 'crash_on_error' => true)); |
| 1337 | 1393 | |
| 1338 | - if (is_dir($packagesdir . '/' . $_GET['package'])) |
|
| 1339 | - deltree($packagesdir . '/' . $_GET['package']); |
|
| 1340 | - else |
|
| 1394 | + if (is_dir($packagesdir . '/' . $_GET['package'])) { |
|
| 1395 | + deltree($packagesdir . '/' . $_GET['package']); |
|
| 1396 | + } else |
|
| 1341 | 1397 | { |
| 1342 | 1398 | smf_chmod($packagesdir . '/' . $_GET['package'], 0777); |
| 1343 | 1399 | unlink($packagesdir . '/' . $_GET['package']); |
@@ -1385,8 +1441,9 @@ discard block |
||
| 1385 | 1441 | 'data' => array( |
| 1386 | 1442 | 'function' => function ($package_md5) use ($type, &$context) |
| 1387 | 1443 | { |
| 1388 | - if (isset($context['available_' . $type . ''][$package_md5])) |
|
| 1389 | - return $context['available_' . $type . ''][$package_md5]['sort_id']; |
|
| 1444 | + if (isset($context['available_' . $type . ''][$package_md5])) { |
|
| 1445 | + return $context['available_' . $type . ''][$package_md5]['sort_id']; |
|
| 1446 | + } |
|
| 1390 | 1447 | }, |
| 1391 | 1448 | ), |
| 1392 | 1449 | 'sort' => array( |
@@ -1402,8 +1459,9 @@ discard block |
||
| 1402 | 1459 | 'data' => array( |
| 1403 | 1460 | 'function' => function ($package_md5) use ($type, &$context) |
| 1404 | 1461 | { |
| 1405 | - if (isset($context['available_' . $type . ''][$package_md5])) |
|
| 1406 | - return $context['available_' . $type . ''][$package_md5]['name']; |
|
| 1462 | + if (isset($context['available_' . $type . ''][$package_md5])) { |
|
| 1463 | + return $context['available_' . $type . ''][$package_md5]['name']; |
|
| 1464 | + } |
|
| 1407 | 1465 | }, |
| 1408 | 1466 | ), |
| 1409 | 1467 | 'sort' => array( |
@@ -1418,8 +1476,9 @@ discard block |
||
| 1418 | 1476 | 'data' => array( |
| 1419 | 1477 | 'function' => function ($package_md5) use ($type, &$context) |
| 1420 | 1478 | { |
| 1421 | - if (isset($context['available_' . $type . ''][$package_md5])) |
|
| 1422 | - return $context['available_' . $type . ''][$package_md5]['version']; |
|
| 1479 | + if (isset($context['available_' . $type . ''][$package_md5])) { |
|
| 1480 | + return $context['available_' . $type . ''][$package_md5]['version']; |
|
| 1481 | + } |
|
| 1423 | 1482 | }, |
| 1424 | 1483 | ), |
| 1425 | 1484 | 'sort' => array( |
@@ -1434,8 +1493,9 @@ discard block |
||
| 1434 | 1493 | 'data' => array( |
| 1435 | 1494 | 'function' => function ($package_md5) use ($type, $txt, &$context) |
| 1436 | 1495 | { |
| 1437 | - if (isset($context['available_' . $type . ''][$package_md5])) |
|
| 1438 | - return !empty($context['available_' . $type . ''][$package_md5]['time_installed']) ? timeformat($context['available_' . $type . ''][$package_md5]['time_installed']) : $txt['not_applicable']; |
|
| 1496 | + if (isset($context['available_' . $type . ''][$package_md5])) { |
|
| 1497 | + return !empty($context['available_' . $type . ''][$package_md5]['time_installed']) ? timeformat($context['available_' . $type . ''][$package_md5]['time_installed']) : $txt['not_applicable']; |
|
| 1498 | + } |
|
| 1439 | 1499 | }, |
| 1440 | 1500 | 'class' => 'smalltext', |
| 1441 | 1501 | ), |
@@ -1451,28 +1511,30 @@ discard block |
||
| 1451 | 1511 | 'data' => array( |
| 1452 | 1512 | 'function' => function ($package_md5) use ($type, &$context, $scripturl, $txt) |
| 1453 | 1513 | { |
| 1454 | - if (!isset($context['available_' . $type . ''][$package_md5])) |
|
| 1455 | - return ''; |
|
| 1514 | + if (!isset($context['available_' . $type . ''][$package_md5])) { |
|
| 1515 | + return ''; |
|
| 1516 | + } |
|
| 1456 | 1517 | |
| 1457 | 1518 | // Rewrite shortcut |
| 1458 | 1519 | $package = $context['available_' . $type . ''][$package_md5]; |
| 1459 | 1520 | $return = ''; |
| 1460 | 1521 | |
| 1461 | - if ($package['can_uninstall']) |
|
| 1462 | - $return = ' |
|
| 1522 | + if ($package['can_uninstall']) { |
|
| 1523 | + $return = ' |
|
| 1463 | 1524 | <a href="' . $scripturl . '?action=admin;area=packages;sa=uninstall;package=' . $package['filename'] . ';pid=' . $package['installed_id'] . '" class="button">' . $txt['uninstall'] . '</a>'; |
| 1464 | - elseif ($package['can_emulate_uninstall']) |
|
| 1465 | - $return = ' |
|
| 1525 | + } elseif ($package['can_emulate_uninstall']) { |
|
| 1526 | + $return = ' |
|
| 1466 | 1527 | <a href="' . $scripturl . '?action=admin;area=packages;sa=uninstall;ve=' . $package['can_emulate_uninstall'] . ';package=' . $package['filename'] . ';pid=' . $package['installed_id'] . '" class="button">' . $txt['package_emulate_uninstall'] . ' ' . $package['can_emulate_uninstall'] . '</a>'; |
| 1467 | - elseif ($package['can_upgrade']) |
|
| 1468 | - $return = ' |
|
| 1528 | + } elseif ($package['can_upgrade']) { |
|
| 1529 | + $return = ' |
|
| 1469 | 1530 | <a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $package['filename'] . '" class="button">' . $txt['package_upgrade'] . '</a>'; |
| 1470 | - elseif ($package['can_install']) |
|
| 1471 | - $return = ' |
|
| 1531 | + } elseif ($package['can_install']) { |
|
| 1532 | + $return = ' |
|
| 1472 | 1533 | <a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $package['filename'] . '" class="button">' . $txt['install_mod'] . '</a>'; |
| 1473 | - elseif ($package['can_emulate_install']) |
|
| 1474 | - $return = ' |
|
| 1534 | + } elseif ($package['can_emulate_install']) { |
|
| 1535 | + $return = ' |
|
| 1475 | 1536 | <a href="' . $scripturl . '?action=admin;area=packages;sa=install;ve=' . $package['can_emulate_install'] . ';package=' . $package['filename'] . '" class="button">' . $txt['package_emulate_install'] . ' ' . $package['can_emulate_install'] . '</a>'; |
| 1537 | + } |
|
| 1476 | 1538 | |
| 1477 | 1539 | return $return . ' |
| 1478 | 1540 | <a href="' . $scripturl . '?action=admin;area=packages;sa=list;package=' . $package['filename'] . '" class="button">' . $txt['list_files'] . '</a> |
@@ -1537,12 +1599,14 @@ discard block |
||
| 1537 | 1599 | static $packages, $installed_mods; |
| 1538 | 1600 | |
| 1539 | 1601 | // Start things up |
| 1540 | - if (!isset($packages[$params])) |
|
| 1541 | - $packages[$params] = array(); |
|
| 1602 | + if (!isset($packages[$params])) { |
|
| 1603 | + $packages[$params] = array(); |
|
| 1604 | + } |
|
| 1542 | 1605 | |
| 1543 | 1606 | // We need the packages directory to be writable for this. |
| 1544 | - if (!@is_writable($packagesdir)) |
|
| 1545 | - create_chmod_control(array($packagesdir), array('destination_url' => $scripturl . '?action=admin;area=packages', 'crash_on_error' => true)); |
|
| 1607 | + if (!@is_writable($packagesdir)) { |
|
| 1608 | + create_chmod_control(array($packagesdir), array('destination_url' => $scripturl . '?action=admin;area=packages', 'crash_on_error' => true)); |
|
| 1609 | + } |
|
| 1546 | 1610 | |
| 1547 | 1611 | $the_version = strtr($forum_version, array('SMF ' => '')); |
| 1548 | 1612 | |
@@ -1550,41 +1614,44 @@ discard block |
||
| 1550 | 1614 | if (isset($_GET['version_emulate']) && strtr($_GET['version_emulate'], array('SMF ' => '')) == $the_version) |
| 1551 | 1615 | { |
| 1552 | 1616 | unset($_SESSION['version_emulate']); |
| 1553 | - } |
|
| 1554 | - elseif (isset($_GET['version_emulate'])) |
|
| 1617 | + } elseif (isset($_GET['version_emulate'])) |
|
| 1555 | 1618 | { |
| 1556 | - if (($_GET['version_emulate'] === 0 || $_GET['version_emulate'] === $forum_version) && isset($_SESSION['version_emulate'])) |
|
| 1557 | - unset($_SESSION['version_emulate']); |
|
| 1558 | - elseif ($_GET['version_emulate'] !== 0) |
|
| 1559 | - $_SESSION['version_emulate'] = strtr($_GET['version_emulate'], array('-' => ' ', '+' => ' ', 'SMF ' => '')); |
|
| 1619 | + if (($_GET['version_emulate'] === 0 || $_GET['version_emulate'] === $forum_version) && isset($_SESSION['version_emulate'])) { |
|
| 1620 | + unset($_SESSION['version_emulate']); |
|
| 1621 | + } elseif ($_GET['version_emulate'] !== 0) { |
|
| 1622 | + $_SESSION['version_emulate'] = strtr($_GET['version_emulate'], array('-' => ' ', '+' => ' ', 'SMF ' => '')); |
|
| 1623 | + } |
|
| 1560 | 1624 | } |
| 1561 | 1625 | if (!empty($_SESSION['version_emulate'])) |
| 1562 | 1626 | { |
| 1563 | 1627 | $context['forum_version'] = 'SMF ' . $_SESSION['version_emulate']; |
| 1564 | 1628 | $the_version = $_SESSION['version_emulate']; |
| 1565 | 1629 | } |
| 1566 | - if (isset($_SESSION['single_version_emulate'])) |
|
| 1567 | - unset($_SESSION['single_version_emulate']); |
|
| 1630 | + if (isset($_SESSION['single_version_emulate'])) { |
|
| 1631 | + unset($_SESSION['single_version_emulate']); |
|
| 1632 | + } |
|
| 1568 | 1633 | |
| 1569 | 1634 | if (empty($installed_mods)) |
| 1570 | 1635 | { |
| 1571 | 1636 | $instmods = loadInstalledPackages(); |
| 1572 | 1637 | $installed_mods = array(); |
| 1573 | 1638 | // Look through the list of installed mods... |
| 1574 | - foreach ($instmods as $installed_mod) |
|
| 1575 | - $installed_mods[$installed_mod['package_id']] = array( |
|
| 1639 | + foreach ($instmods as $installed_mod) { |
|
| 1640 | + $installed_mods[$installed_mod['package_id']] = array( |
|
| 1576 | 1641 | 'id' => $installed_mod['id'], |
| 1577 | 1642 | 'version' => $installed_mod['version'], |
| 1578 | 1643 | 'time_installed' => $installed_mod['time_installed'], |
| 1579 | 1644 | ); |
| 1645 | + } |
|
| 1580 | 1646 | |
| 1581 | 1647 | // Get a list of all the ids installed, so the latest packages won't include already installed ones. |
| 1582 | 1648 | $context['installed_mods'] = array_keys($installed_mods); |
| 1583 | 1649 | } |
| 1584 | 1650 | |
| 1585 | - if (empty($packages)) |
|
| 1586 | - foreach ($context['modification_types'] as $type) |
|
| 1651 | + if (empty($packages)) { |
|
| 1652 | + foreach ($context['modification_types'] as $type) |
|
| 1587 | 1653 | $packages[$type] = array(); |
| 1654 | + } |
|
| 1588 | 1655 | |
| 1589 | 1656 | if ($dir = @opendir($packagesdir)) |
| 1590 | 1657 | { |
@@ -1600,50 +1667,56 @@ discard block |
||
| 1600 | 1667 | |
| 1601 | 1668 | while ($package = readdir($dir)) |
| 1602 | 1669 | { |
| 1603 | - if ($package == '.' || $package == '..' || $package == 'temp' || (!(is_dir($packagesdir . '/' . $package) && file_exists($packagesdir . '/' . $package . '/package-info.xml')) && substr(strtolower($package), -7) != '.tar.gz' && substr(strtolower($package), -4) != '.tgz' && substr(strtolower($package), -4) != '.zip')) |
|
| 1604 | - continue; |
|
| 1670 | + if ($package == '.' || $package == '..' || $package == 'temp' || (!(is_dir($packagesdir . '/' . $package) && file_exists($packagesdir . '/' . $package . '/package-info.xml')) && substr(strtolower($package), -7) != '.tar.gz' && substr(strtolower($package), -4) != '.tgz' && substr(strtolower($package), -4) != '.zip')) { |
|
| 1671 | + continue; |
|
| 1672 | + } |
|
| 1605 | 1673 | |
| 1606 | 1674 | $skip = false; |
| 1607 | - foreach ($context['modification_types'] as $type) |
|
| 1608 | - if (isset($context['available_' . $type][md5($package)])) |
|
| 1675 | + foreach ($context['modification_types'] as $type) { |
|
| 1676 | + if (isset($context['available_' . $type][md5($package)])) |
|
| 1609 | 1677 | $skip = true; |
| 1678 | + } |
|
| 1610 | 1679 | |
| 1611 | - if ($skip) |
|
| 1612 | - continue; |
|
| 1680 | + if ($skip) { |
|
| 1681 | + continue; |
|
| 1682 | + } |
|
| 1613 | 1683 | |
| 1614 | 1684 | // Skip directories or files that are named the same. |
| 1615 | 1685 | if (is_dir($packagesdir . '/' . $package)) |
| 1616 | 1686 | { |
| 1617 | - if (in_array($package, $dirs)) |
|
| 1618 | - continue; |
|
| 1687 | + if (in_array($package, $dirs)) { |
|
| 1688 | + continue; |
|
| 1689 | + } |
|
| 1619 | 1690 | $dirs[] = $package; |
| 1620 | - } |
|
| 1621 | - elseif (substr(strtolower($package), -7) == '.tar.gz') |
|
| 1691 | + } elseif (substr(strtolower($package), -7) == '.tar.gz') |
|
| 1622 | 1692 | { |
| 1623 | - if (in_array(substr($package, 0, -7), $dirs)) |
|
| 1624 | - continue; |
|
| 1693 | + if (in_array(substr($package, 0, -7), $dirs)) { |
|
| 1694 | + continue; |
|
| 1695 | + } |
|
| 1625 | 1696 | $dirs[] = substr($package, 0, -7); |
| 1626 | - } |
|
| 1627 | - elseif (substr(strtolower($package), -4) == '.zip' || substr(strtolower($package), -4) == '.tgz') |
|
| 1697 | + } elseif (substr(strtolower($package), -4) == '.zip' || substr(strtolower($package), -4) == '.tgz') |
|
| 1628 | 1698 | { |
| 1629 | - if (in_array(substr($package, 0, -4), $dirs)) |
|
| 1630 | - continue; |
|
| 1699 | + if (in_array(substr($package, 0, -4), $dirs)) { |
|
| 1700 | + continue; |
|
| 1701 | + } |
|
| 1631 | 1702 | $dirs[] = substr($package, 0, -4); |
| 1632 | 1703 | } |
| 1633 | 1704 | |
| 1634 | 1705 | $packageInfo = getPackageInfo($package); |
| 1635 | - if (!is_array($packageInfo)) |
|
| 1636 | - continue; |
|
| 1706 | + if (!is_array($packageInfo)) { |
|
| 1707 | + continue; |
|
| 1708 | + } |
|
| 1637 | 1709 | |
| 1638 | 1710 | if (!empty($packageInfo)) |
| 1639 | 1711 | { |
| 1640 | 1712 | $packageInfo['installed_id'] = isset($installed_mods[$packageInfo['id']]) ? $installed_mods[$packageInfo['id']]['id'] : 0; |
| 1641 | 1713 | $packageInfo['time_installed'] = isset($installed_mods[$packageInfo['id']]) ? $installed_mods[$packageInfo['id']]['time_installed'] : 0; |
| 1642 | 1714 | |
| 1643 | - if (!isset($sort_id[$packageInfo['type']])) |
|
| 1644 | - $packageInfo['sort_id'] = $sort_id['unknown']; |
|
| 1645 | - else |
|
| 1646 | - $packageInfo['sort_id'] = $sort_id[$packageInfo['type']]; |
|
| 1715 | + if (!isset($sort_id[$packageInfo['type']])) { |
|
| 1716 | + $packageInfo['sort_id'] = $sort_id['unknown']; |
|
| 1717 | + } else { |
|
| 1718 | + $packageInfo['sort_id'] = $sort_id[$packageInfo['type']]; |
|
| 1719 | + } |
|
| 1647 | 1720 | |
| 1648 | 1721 | $packageInfo['is_installed'] = isset($installed_mods[$packageInfo['id']]); |
| 1649 | 1722 | $packageInfo['is_current'] = $packageInfo['is_installed'] && ($installed_mods[$packageInfo['id']]['version'] == $packageInfo['version']); |
@@ -1692,10 +1765,11 @@ discard block |
||
| 1692 | 1765 | foreach ($upgrades as $upgrade) |
| 1693 | 1766 | { |
| 1694 | 1767 | // Even if it is for this SMF, is it for the installed version of the mod? |
| 1695 | - if (!$upgrade->exists('@for') || matchPackageVersion($the_version, $upgrade->fetch('@for'))) |
|
| 1696 | - if (!$upgrade->exists('@from') || matchPackageVersion($installed_mods[$packageInfo['id']]['version'], $upgrade->fetch('@from'))) |
|
| 1768 | + if (!$upgrade->exists('@for') || matchPackageVersion($the_version, $upgrade->fetch('@for'))) { |
|
| 1769 | + if (!$upgrade->exists('@from') || matchPackageVersion($installed_mods[$packageInfo['id']]['version'], $upgrade->fetch('@from'))) |
|
| 1697 | 1770 | { |
| 1698 | 1771 | $packageInfo['can_upgrade'] = true; |
| 1772 | + } |
|
| 1699 | 1773 | break; |
| 1700 | 1774 | } |
| 1701 | 1775 | } |
@@ -1772,10 +1846,11 @@ discard block |
||
| 1772 | 1846 | |
| 1773 | 1847 | if (isset($_GET['type']) && $_GET['type'] == $params) |
| 1774 | 1848 | { |
| 1775 | - if (isset($_GET['desc'])) |
|
| 1776 | - krsort($packages[$params]); |
|
| 1777 | - else |
|
| 1778 | - ksort($packages[$params]); |
|
| 1849 | + if (isset($_GET['desc'])) { |
|
| 1850 | + krsort($packages[$params]); |
|
| 1851 | + } else { |
|
| 1852 | + ksort($packages[$params]); |
|
| 1853 | + } |
|
| 1779 | 1854 | } |
| 1780 | 1855 | |
| 1781 | 1856 | return $packages[$params]; |
@@ -1804,10 +1879,11 @@ discard block |
||
| 1804 | 1879 | redirectexit('action=admin;area=packages;sa=options'); |
| 1805 | 1880 | } |
| 1806 | 1881 | |
| 1807 | - if (preg_match('~^/home\d*/([^/]+?)/public_html~', $_SERVER['DOCUMENT_ROOT'], $match)) |
|
| 1808 | - $default_username = $match[1]; |
|
| 1809 | - else |
|
| 1810 | - $default_username = ''; |
|
| 1882 | + if (preg_match('~^/home\d*/([^/]+?)/public_html~', $_SERVER['DOCUMENT_ROOT'], $match)) { |
|
| 1883 | + $default_username = $match[1]; |
|
| 1884 | + } else { |
|
| 1885 | + $default_username = ''; |
|
| 1886 | + } |
|
| 1811 | 1887 | |
| 1812 | 1888 | $context['page_title'] = $txt['package_settings']; |
| 1813 | 1889 | $context['sub_template'] = 'install_options'; |
@@ -1836,8 +1912,9 @@ discard block |
||
| 1836 | 1912 | isAllowedTo('admin_forum'); |
| 1837 | 1913 | |
| 1838 | 1914 | // We need to know the operation key for the search and replace, mod file looking at, is it a board mod? |
| 1839 | - if (!isset($_REQUEST['operation_key'], $_REQUEST['filename']) && !is_numeric($_REQUEST['operation_key'])) |
|
| 1840 | - fatal_lang_error('operation_invalid', 'general'); |
|
| 1915 | + if (!isset($_REQUEST['operation_key'], $_REQUEST['filename']) && !is_numeric($_REQUEST['operation_key'])) { |
|
| 1916 | + fatal_lang_error('operation_invalid', 'general'); |
|
| 1917 | + } |
|
| 1841 | 1918 | |
| 1842 | 1919 | // Load the required file. |
| 1843 | 1920 | require_once($sourcedir . '/Subs-Package.php'); |
@@ -1853,18 +1930,19 @@ discard block |
||
| 1853 | 1930 | { |
| 1854 | 1931 | $context['extracted_files'] = read_tgz_file($packagesdir . '/' . $context['filename'], $packagesdir . '/temp'); |
| 1855 | 1932 | |
| 1856 | - if ($context['extracted_files'] && !file_exists($packagesdir . '/temp/package-info.xml')) |
|
| 1857 | - foreach ($context['extracted_files'] as $file) |
|
| 1933 | + if ($context['extracted_files'] && !file_exists($packagesdir . '/temp/package-info.xml')) { |
|
| 1934 | + foreach ($context['extracted_files'] as $file) |
|
| 1858 | 1935 | if (basename($file['filename']) == 'package-info.xml') |
| 1859 | 1936 | { |
| 1860 | 1937 | $context['base_path'] = dirname($file['filename']) . '/'; |
| 1938 | + } |
|
| 1861 | 1939 | break; |
| 1862 | 1940 | } |
| 1863 | 1941 | |
| 1864 | - if (!isset($context['base_path'])) |
|
| 1865 | - $context['base_path'] = ''; |
|
| 1866 | - } |
|
| 1867 | - elseif (is_dir($packagesdir . '/' . $context['filename'])) |
|
| 1942 | + if (!isset($context['base_path'])) { |
|
| 1943 | + $context['base_path'] = ''; |
|
| 1944 | + } |
|
| 1945 | + } elseif (is_dir($packagesdir . '/' . $context['filename'])) |
|
| 1868 | 1946 | { |
| 1869 | 1947 | copytree($packagesdir . '/' . $context['filename'], $packagesdir . '/temp'); |
| 1870 | 1948 | $context['extracted_files'] = listtree($packagesdir . '/temp'); |
@@ -1885,8 +1963,9 @@ discard block |
||
| 1885 | 1963 | ) |
| 1886 | 1964 | ); |
| 1887 | 1965 | $theme_paths = array(); |
| 1888 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
| 1889 | - $theme_paths[$row['id_theme']][$row['variable']] = $row['value']; |
|
| 1966 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
| 1967 | + $theme_paths[$row['id_theme']][$row['variable']] = $row['value']; |
|
| 1968 | + } |
|
| 1890 | 1969 | $smcFunc['db_free_result']($request); |
| 1891 | 1970 | |
| 1892 | 1971 | // If we're viewing uninstall operations, only consider themes that |
@@ -1911,19 +1990,21 @@ discard block |
||
| 1911 | 1990 | list ($old_themes) = $smcFunc['db_fetch_row']($request); |
| 1912 | 1991 | $old_themes = explode(',', $old_themes); |
| 1913 | 1992 | |
| 1914 | - foreach ($theme_paths as $id => $data) |
|
| 1915 | - if ($id != 1 && !in_array($id, $old_themes)) |
|
| 1993 | + foreach ($theme_paths as $id => $data) { |
|
| 1994 | + if ($id != 1 && !in_array($id, $old_themes)) |
|
| 1916 | 1995 | unset($theme_paths[$id]); |
| 1996 | + } |
|
| 1917 | 1997 | } |
| 1918 | 1998 | $smcFunc['db_free_result']($request); |
| 1919 | 1999 | } |
| 1920 | 2000 | } |
| 1921 | 2001 | |
| 1922 | 2002 | // Boardmod? |
| 1923 | - if (isset($_REQUEST['boardmod'])) |
|
| 1924 | - $mod_actions = parseBoardMod(@file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $_REQUEST['filename']), true, $reverse, $theme_paths); |
|
| 1925 | - else |
|
| 1926 | - $mod_actions = parseModification(@file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $_REQUEST['filename']), true, $reverse, $theme_paths); |
|
| 2003 | + if (isset($_REQUEST['boardmod'])) { |
|
| 2004 | + $mod_actions = parseBoardMod(@file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $_REQUEST['filename']), true, $reverse, $theme_paths); |
|
| 2005 | + } else { |
|
| 2006 | + $mod_actions = parseModification(@file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $_REQUEST['filename']), true, $reverse, $theme_paths); |
|
| 2007 | + } |
|
| 1927 | 2008 | |
| 1928 | 2009 | // Ok lets get the content of the file. |
| 1929 | 2010 | $context['operations'] = array( |
@@ -1979,9 +2060,9 @@ discard block |
||
| 1979 | 2060 | 'path' => $detect_path, |
| 1980 | 2061 | 'form_elements_only' => true, |
| 1981 | 2062 | ); |
| 2063 | + } else { |
|
| 2064 | + $context['ftp_connected'] = true; |
|
| 1982 | 2065 | } |
| 1983 | - else |
|
| 1984 | - $context['ftp_connected'] = true; |
|
| 1985 | 2066 | |
| 1986 | 2067 | // Define the template. |
| 1987 | 2068 | $context['page_title'] = $txt['package_file_perms']; |
@@ -2094,18 +2175,19 @@ discard block |
||
| 2094 | 2175 | { |
| 2095 | 2176 | unset($context['file_tree'][strtr($boarddir, array('\\' => '/'))]['contents']['attachments']); |
| 2096 | 2177 | |
| 2097 | - if (!is_array($modSettings['attachmentUploadDir'])) |
|
| 2098 | - $modSettings['attachmentUploadDir'] = smf_json_decode($modSettings['attachmentUploadDir'], true); |
|
| 2178 | + if (!is_array($modSettings['attachmentUploadDir'])) { |
|
| 2179 | + $modSettings['attachmentUploadDir'] = smf_json_decode($modSettings['attachmentUploadDir'], true); |
|
| 2180 | + } |
|
| 2099 | 2181 | |
| 2100 | 2182 | // @todo Should we suggest non-current directories be read only? |
| 2101 | - foreach ($modSettings['attachmentUploadDir'] as $dir) |
|
| 2102 | - $context['file_tree'][strtr($dir, array('\\' => '/'))] = array( |
|
| 2183 | + foreach ($modSettings['attachmentUploadDir'] as $dir) { |
|
| 2184 | + $context['file_tree'][strtr($dir, array('\\' => '/'))] = array( |
|
| 2103 | 2185 | 'type' => 'dir', |
| 2104 | 2186 | 'writable_on' => 'restrictive', |
| 2105 | 2187 | ); |
| 2188 | + } |
|
| 2106 | 2189 | |
| 2107 | - } |
|
| 2108 | - elseif (substr($modSettings['attachmentUploadDir'], 0, strlen($boarddir)) != $boarddir) |
|
| 2190 | + } elseif (substr($modSettings['attachmentUploadDir'], 0, strlen($boarddir)) != $boarddir) |
|
| 2109 | 2191 | { |
| 2110 | 2192 | unset($context['file_tree'][strtr($boarddir, array('\\' => '/'))]['contents']['attachments']); |
| 2111 | 2193 | $context['file_tree'][strtr($modSettings['attachmentUploadDir'], array('\\' => '/'))] = array( |
@@ -2155,8 +2237,8 @@ discard block |
||
| 2155 | 2237 | ); |
| 2156 | 2238 | while ($row = $smcFunc['db_fetch_assoc']($request)) |
| 2157 | 2239 | { |
| 2158 | - if (substr(strtolower(strtr($row['value'], array('\\' => '/'))), 0, strlen($boarddir) + 7) == strtolower(strtr($boarddir, array('\\' => '/')) . '/Themes')) |
|
| 2159 | - $context['file_tree'][strtr($boarddir, array('\\' => '/'))]['contents']['Themes']['contents'][substr($row['value'], strlen($boarddir) + 8)] = array( |
|
| 2240 | + if (substr(strtolower(strtr($row['value'], array('\\' => '/'))), 0, strlen($boarddir) + 7) == strtolower(strtr($boarddir, array('\\' => '/')) . '/Themes')) { |
|
| 2241 | + $context['file_tree'][strtr($boarddir, array('\\' => '/'))]['contents']['Themes']['contents'][substr($row['value'], strlen($boarddir) + 8)] = array( |
|
| 2160 | 2242 | 'type' => 'dir_recursive', |
| 2161 | 2243 | 'list_contents' => true, |
| 2162 | 2244 | 'contents' => array( |
@@ -2166,7 +2248,7 @@ discard block |
||
| 2166 | 2248 | ), |
| 2167 | 2249 | ), |
| 2168 | 2250 | ); |
| 2169 | - else |
|
| 2251 | + } else |
|
| 2170 | 2252 | { |
| 2171 | 2253 | $context['file_tree'][strtr($row['value'], array('\\' => '/'))] = array( |
| 2172 | 2254 | 'type' => 'dir_recursive', |
@@ -2183,28 +2265,33 @@ discard block |
||
| 2183 | 2265 | $smcFunc['db_free_result']($request); |
| 2184 | 2266 | |
| 2185 | 2267 | // If we're submitting then let's move on to another function to keep things cleaner.. |
| 2186 | - if (isset($_POST['action_changes'])) |
|
| 2187 | - return PackagePermissionsAction(); |
|
| 2268 | + if (isset($_POST['action_changes'])) { |
|
| 2269 | + return PackagePermissionsAction(); |
|
| 2270 | + } |
|
| 2188 | 2271 | |
| 2189 | 2272 | $context['look_for'] = array(); |
| 2190 | 2273 | // Are we looking for a particular tree - normally an expansion? |
| 2191 | - if (!empty($_REQUEST['find'])) |
|
| 2192 | - $context['look_for'][] = base64_decode($_REQUEST['find']); |
|
| 2274 | + if (!empty($_REQUEST['find'])) { |
|
| 2275 | + $context['look_for'][] = base64_decode($_REQUEST['find']); |
|
| 2276 | + } |
|
| 2193 | 2277 | // Only that tree? |
| 2194 | 2278 | $context['only_find'] = isset($_GET['xml']) && !empty($_REQUEST['onlyfind']) ? $_REQUEST['onlyfind'] : ''; |
| 2195 | - if ($context['only_find']) |
|
| 2196 | - $context['look_for'][] = $context['only_find']; |
|
| 2279 | + if ($context['only_find']) { |
|
| 2280 | + $context['look_for'][] = $context['only_find']; |
|
| 2281 | + } |
|
| 2197 | 2282 | |
| 2198 | 2283 | // Have we got a load of back-catalogue trees to expand from a submit etc? |
| 2199 | 2284 | if (!empty($_GET['back_look'])) |
| 2200 | 2285 | { |
| 2201 | 2286 | $potententialTrees = smf_json_decode(base64_decode($_GET['back_look']), true); |
| 2202 | - foreach ($potententialTrees as $tree) |
|
| 2203 | - $context['look_for'][] = $tree; |
|
| 2287 | + foreach ($potententialTrees as $tree) { |
|
| 2288 | + $context['look_for'][] = $tree; |
|
| 2289 | + } |
|
| 2204 | 2290 | } |
| 2205 | 2291 | // ... maybe posted? |
| 2206 | - if (!empty($_POST['back_look'])) |
|
| 2207 | - $context['only_find'] = array_merge($context['only_find'], $_POST['back_look']); |
|
| 2292 | + if (!empty($_POST['back_look'])) { |
|
| 2293 | + $context['only_find'] = array_merge($context['only_find'], $_POST['back_look']); |
|
| 2294 | + } |
|
| 2208 | 2295 | |
| 2209 | 2296 | $context['back_look_data'] = base64_encode(json_encode(array_slice($context['look_for'], 0, 15))); |
| 2210 | 2297 | |
@@ -2243,9 +2330,9 @@ discard block |
||
| 2243 | 2330 | 'chmod' => @is_writable($path), |
| 2244 | 2331 | 'perms' => @fileperms($path), |
| 2245 | 2332 | ); |
| 2333 | + } else { |
|
| 2334 | + unset($context['file_tree'][$path]); |
|
| 2246 | 2335 | } |
| 2247 | - else |
|
| 2248 | - unset($context['file_tree'][$path]); |
|
| 2249 | 2336 | } |
| 2250 | 2337 | |
| 2251 | 2338 | // Is this actually xml? |
@@ -2269,22 +2356,25 @@ discard block |
||
| 2269 | 2356 | global $context; |
| 2270 | 2357 | |
| 2271 | 2358 | $isLikelyPath = false; |
| 2272 | - foreach ($context['look_for'] as $possiblePath) |
|
| 2273 | - if (substr($possiblePath, 0, strlen($path)) == $path) |
|
| 2359 | + foreach ($context['look_for'] as $possiblePath) { |
|
| 2360 | + if (substr($possiblePath, 0, strlen($path)) == $path) |
|
| 2274 | 2361 | $isLikelyPath = true; |
| 2362 | + } |
|
| 2275 | 2363 | |
| 2276 | 2364 | // Is this where we stop? |
| 2277 | - if (isset($_GET['xml']) && !empty($context['look_for']) && !$isLikelyPath) |
|
| 2278 | - return; |
|
| 2279 | - elseif ($level > $context['default_level'] && !$isLikelyPath) |
|
| 2280 | - return; |
|
| 2365 | + if (isset($_GET['xml']) && !empty($context['look_for']) && !$isLikelyPath) { |
|
| 2366 | + return; |
|
| 2367 | + } elseif ($level > $context['default_level'] && !$isLikelyPath) { |
|
| 2368 | + return; |
|
| 2369 | + } |
|
| 2281 | 2370 | |
| 2282 | 2371 | // Are we actually interested in saving this data? |
| 2283 | 2372 | $save_data = empty($context['only_find']) || $context['only_find'] == $path; |
| 2284 | 2373 | |
| 2285 | 2374 | // @todo Shouldn't happen - but better error message? |
| 2286 | - if (!is_dir($path)) |
|
| 2287 | - fatal_lang_error('no_access', false); |
|
| 2375 | + if (!is_dir($path)) { |
|
| 2376 | + fatal_lang_error('no_access', false); |
|
| 2377 | + } |
|
| 2288 | 2378 | |
| 2289 | 2379 | // This is where we put stuff we've found for sorting. |
| 2290 | 2380 | $foundData = array( |
@@ -2299,11 +2389,13 @@ discard block |
||
| 2299 | 2389 | if (is_file($path . '/' . $entry)) |
| 2300 | 2390 | { |
| 2301 | 2391 | // Are we listing PHP files in this directory? |
| 2302 | - if ($save_data && !empty($data['list_contents']) && substr($entry, -4) == '.php') |
|
| 2303 | - $foundData['files'][$entry] = true; |
|
| 2392 | + if ($save_data && !empty($data['list_contents']) && substr($entry, -4) == '.php') { |
|
| 2393 | + $foundData['files'][$entry] = true; |
|
| 2394 | + } |
|
| 2304 | 2395 | // A file we were looking for. |
| 2305 | - elseif ($save_data && isset($data['contents'][$entry])) |
|
| 2306 | - $foundData['files'][$entry] = true; |
|
| 2396 | + elseif ($save_data && isset($data['contents'][$entry])) { |
|
| 2397 | + $foundData['files'][$entry] = true; |
|
| 2398 | + } |
|
| 2307 | 2399 | } |
| 2308 | 2400 | // It's a directory - we're interested one way or another, probably... |
| 2309 | 2401 | elseif ($entry != '.' && $entry != '..') |
@@ -2311,32 +2403,36 @@ discard block |
||
| 2311 | 2403 | // Going further? |
| 2312 | 2404 | if ((!empty($data['type']) && $data['type'] == 'dir_recursive') || (isset($data['contents'][$entry]) && (!empty($data['contents'][$entry]['list_contents']) || (!empty($data['contents'][$entry]['type']) && $data['contents'][$entry]['type'] == 'dir_recursive')))) |
| 2313 | 2405 | { |
| 2314 | - if (!isset($data['contents'][$entry])) |
|
| 2315 | - $foundData['folders'][$entry] = 'dir_recursive'; |
|
| 2316 | - else |
|
| 2317 | - $foundData['folders'][$entry] = true; |
|
| 2406 | + if (!isset($data['contents'][$entry])) { |
|
| 2407 | + $foundData['folders'][$entry] = 'dir_recursive'; |
|
| 2408 | + } else { |
|
| 2409 | + $foundData['folders'][$entry] = true; |
|
| 2410 | + } |
|
| 2318 | 2411 | |
| 2319 | 2412 | // If this wasn't expected inherit the recusiveness... |
| 2320 | - if (!isset($data['contents'][$entry])) |
|
| 2321 | - // We need to do this as we will be going all recursive. |
|
| 2413 | + if (!isset($data['contents'][$entry])) { |
|
| 2414 | + // We need to do this as we will be going all recursive. |
|
| 2322 | 2415 | $data['contents'][$entry] = array( |
| 2323 | 2416 | 'type' => 'dir_recursive', |
| 2324 | 2417 | ); |
| 2418 | + } |
|
| 2325 | 2419 | |
| 2326 | 2420 | // Actually do the recursive stuff... |
| 2327 | 2421 | fetchPerms__recursive($path . '/' . $entry, $data['contents'][$entry], $level + 1); |
| 2328 | 2422 | } |
| 2329 | 2423 | // Maybe it is a folder we are not descending into. |
| 2330 | - elseif (isset($data['contents'][$entry])) |
|
| 2331 | - $foundData['folders'][$entry] = true; |
|
| 2424 | + elseif (isset($data['contents'][$entry])) { |
|
| 2425 | + $foundData['folders'][$entry] = true; |
|
| 2426 | + } |
|
| 2332 | 2427 | // Otherwise we stop here. |
| 2333 | 2428 | } |
| 2334 | 2429 | } |
| 2335 | 2430 | closedir($dh); |
| 2336 | 2431 | |
| 2337 | 2432 | // Nothing to see here? |
| 2338 | - if (!$save_data) |
|
| 2339 | - return; |
|
| 2433 | + if (!$save_data) { |
|
| 2434 | + return; |
|
| 2435 | + } |
|
| 2340 | 2436 | |
| 2341 | 2437 | // Now actually add the data, starting with the folders. |
| 2342 | 2438 | ksort($foundData['folders']); |
@@ -2348,8 +2444,9 @@ discard block |
||
| 2348 | 2444 | 'perms' => @fileperms($path . '/' . $folder), |
| 2349 | 2445 | ), |
| 2350 | 2446 | ); |
| 2351 | - if ($type !== true) |
|
| 2352 | - $additional_data['type'] = $type; |
|
| 2447 | + if ($type !== true) { |
|
| 2448 | + $additional_data['type'] = $type; |
|
| 2449 | + } |
|
| 2353 | 2450 | |
| 2354 | 2451 | // If there's an offset ignore any folders in XML mode. |
| 2355 | 2452 | if (isset($_GET['xml']) && $context['file_offset'] == 0) |
@@ -2368,13 +2465,13 @@ discard block |
||
| 2368 | 2465 | ), |
| 2369 | 2466 | 'value' => $folder, |
| 2370 | 2467 | ); |
| 2371 | - } |
|
| 2372 | - elseif (!isset($_GET['xml'])) |
|
| 2468 | + } elseif (!isset($_GET['xml'])) |
|
| 2373 | 2469 | { |
| 2374 | - if (isset($data['contents'][$folder])) |
|
| 2375 | - $data['contents'][$folder] = array_merge($data['contents'][$folder], $additional_data); |
|
| 2376 | - else |
|
| 2377 | - $data['contents'][$folder] = $additional_data; |
|
| 2470 | + if (isset($data['contents'][$folder])) { |
|
| 2471 | + $data['contents'][$folder] = array_merge($data['contents'][$folder], $additional_data); |
|
| 2472 | + } else { |
|
| 2473 | + $data['contents'][$folder] = $additional_data; |
|
| 2474 | + } |
|
| 2378 | 2475 | } |
| 2379 | 2476 | } |
| 2380 | 2477 | |
@@ -2386,11 +2483,13 @@ discard block |
||
| 2386 | 2483 | $counter++; |
| 2387 | 2484 | |
| 2388 | 2485 | // Have we reached our offset? |
| 2389 | - if ($context['file_offset'] > $counter) |
|
| 2390 | - continue; |
|
| 2486 | + if ($context['file_offset'] > $counter) { |
|
| 2487 | + continue; |
|
| 2488 | + } |
|
| 2391 | 2489 | // Gone too far? |
| 2392 | - if ($counter > ($context['file_offset'] + $context['file_limit'])) |
|
| 2393 | - continue; |
|
| 2490 | + if ($counter > ($context['file_offset'] + $context['file_limit'])) { |
|
| 2491 | + continue; |
|
| 2492 | + } |
|
| 2394 | 2493 | |
| 2395 | 2494 | $additional_data = array( |
| 2396 | 2495 | 'perms' => array( |
@@ -2416,13 +2515,13 @@ discard block |
||
| 2416 | 2515 | ), |
| 2417 | 2516 | 'value' => $file, |
| 2418 | 2517 | ); |
| 2419 | - } |
|
| 2420 | - elseif ($counter != ($context['file_offset'] + $context['file_limit'])) |
|
| 2518 | + } elseif ($counter != ($context['file_offset'] + $context['file_limit'])) |
|
| 2421 | 2519 | { |
| 2422 | - if (isset($data['contents'][$file])) |
|
| 2423 | - $data['contents'][$file] = array_merge($data['contents'][$file], $additional_data); |
|
| 2424 | - else |
|
| 2425 | - $data['contents'][$file] = $additional_data; |
|
| 2520 | + if (isset($data['contents'][$file])) { |
|
| 2521 | + $data['contents'][$file] = array_merge($data['contents'][$file], $additional_data); |
|
| 2522 | + } else { |
|
| 2523 | + $data['contents'][$file] = $additional_data; |
|
| 2524 | + } |
|
| 2426 | 2525 | } |
| 2427 | 2526 | } |
| 2428 | 2527 | } |
@@ -2444,8 +2543,9 @@ discard block |
||
| 2444 | 2543 | $context['back_look_data'] = isset($_POST['back_look']) ? $_POST['back_look'] : array(); |
| 2445 | 2544 | |
| 2446 | 2545 | // Skipping use of FTP? |
| 2447 | - if (empty($package_ftp)) |
|
| 2448 | - $context['skip_ftp'] = true; |
|
| 2546 | + if (empty($package_ftp)) { |
|
| 2547 | + $context['skip_ftp'] = true; |
|
| 2548 | + } |
|
| 2449 | 2549 | |
| 2450 | 2550 | // We'll start off in a good place, security. Make sure that if we're dealing with individual files that they seem in the right place. |
| 2451 | 2551 | if ($context['method'] == 'individual') |
@@ -2455,8 +2555,9 @@ discard block |
||
| 2455 | 2555 | $context['custom_value'] = (int) $_POST['custom_value']; |
| 2456 | 2556 | |
| 2457 | 2557 | // Continuing? |
| 2458 | - if (isset($_POST['toProcess'])) |
|
| 2459 | - $_POST['permStatus'] = smf_json_decode(base64_decode($_POST['toProcess']), true); |
|
| 2558 | + if (isset($_POST['toProcess'])) { |
|
| 2559 | + $_POST['permStatus'] = smf_json_decode(base64_decode($_POST['toProcess']), true); |
|
| 2560 | + } |
|
| 2460 | 2561 | |
| 2461 | 2562 | if (isset($_POST['permStatus'])) |
| 2462 | 2563 | { |
@@ -2465,22 +2566,27 @@ discard block |
||
| 2465 | 2566 | foreach ($_POST['permStatus'] as $path => $status) |
| 2466 | 2567 | { |
| 2467 | 2568 | // Nothing to see here? |
| 2468 | - if ($status == 'no_change') |
|
| 2469 | - continue; |
|
| 2569 | + if ($status == 'no_change') { |
|
| 2570 | + continue; |
|
| 2571 | + } |
|
| 2470 | 2572 | $legal = false; |
| 2471 | - foreach ($legal_roots as $root) |
|
| 2472 | - if (substr($path, 0, strlen($root)) == $root) |
|
| 2573 | + foreach ($legal_roots as $root) { |
|
| 2574 | + if (substr($path, 0, strlen($root)) == $root) |
|
| 2473 | 2575 | $legal = true; |
| 2576 | + } |
|
| 2474 | 2577 | |
| 2475 | - if (!$legal) |
|
| 2476 | - continue; |
|
| 2578 | + if (!$legal) { |
|
| 2579 | + continue; |
|
| 2580 | + } |
|
| 2477 | 2581 | |
| 2478 | 2582 | // Check it exists. |
| 2479 | - if (!file_exists($path)) |
|
| 2480 | - continue; |
|
| 2583 | + if (!file_exists($path)) { |
|
| 2584 | + continue; |
|
| 2585 | + } |
|
| 2481 | 2586 | |
| 2482 | - if ($status == 'custom') |
|
| 2483 | - $validate_custom = true; |
|
| 2587 | + if ($status == 'custom') { |
|
| 2588 | + $validate_custom = true; |
|
| 2589 | + } |
|
| 2484 | 2590 | |
| 2485 | 2591 | // Now add it. |
| 2486 | 2592 | $context['to_process'][$path] = $status; |
@@ -2490,17 +2596,20 @@ discard block |
||
| 2490 | 2596 | // Make sure the chmod status is valid? |
| 2491 | 2597 | if ($validate_custom) |
| 2492 | 2598 | { |
| 2493 | - if (preg_match('~^[4567][4567][4567]$~', $context['custom_value']) == false) |
|
| 2494 | - fatal_error($txt['chmod_value_invalid']); |
|
| 2599 | + if (preg_match('~^[4567][4567][4567]$~', $context['custom_value']) == false) { |
|
| 2600 | + fatal_error($txt['chmod_value_invalid']); |
|
| 2601 | + } |
|
| 2495 | 2602 | } |
| 2496 | 2603 | |
| 2497 | 2604 | // Nothing to do? |
| 2498 | - if (empty($context['to_process'])) |
|
| 2499 | - redirectexit('action=admin;area=packages;sa=perms' . (!empty($context['back_look_data']) ? ';back_look=' . base64_encode(json_encode($context['back_look_data'])) : '') . ';' . $context['session_var'] . '=' . $context['session_id']); |
|
| 2605 | + if (empty($context['to_process'])) { |
|
| 2606 | + redirectexit('action=admin;area=packages;sa=perms' . (!empty($context['back_look_data']) ? ';back_look=' . base64_encode(json_encode($context['back_look_data'])) : '') . ';' . $context['session_var'] . '=' . $context['session_id']); |
|
| 2607 | + } |
|
| 2500 | 2608 | } |
| 2501 | 2609 | // Should never get here, |
| 2502 | - else |
|
| 2503 | - fatal_lang_error('no_access', false); |
|
| 2610 | + else { |
|
| 2611 | + fatal_lang_error('no_access', false); |
|
| 2612 | + } |
|
| 2504 | 2613 | |
| 2505 | 2614 | // Setup the custom value. |
| 2506 | 2615 | $custom_value = octdec('0' . $context['custom_value']); |
@@ -2508,26 +2617,27 @@ discard block |
||
| 2508 | 2617 | // Start processing items. |
| 2509 | 2618 | foreach ($context['to_process'] as $path => $status) |
| 2510 | 2619 | { |
| 2511 | - if (in_array($status, array('execute', 'writable', 'read'))) |
|
| 2512 | - package_chmod($path, $status); |
|
| 2513 | - elseif ($status == 'custom' && !empty($custom_value)) |
|
| 2620 | + if (in_array($status, array('execute', 'writable', 'read'))) { |
|
| 2621 | + package_chmod($path, $status); |
|
| 2622 | + } elseif ($status == 'custom' && !empty($custom_value)) |
|
| 2514 | 2623 | { |
| 2515 | 2624 | // Use FTP if we have it. |
| 2516 | 2625 | if (!empty($package_ftp) && !empty($_SESSION['pack_ftp'])) |
| 2517 | 2626 | { |
| 2518 | 2627 | $ftp_file = strtr($path, array($_SESSION['pack_ftp']['root'] => '')); |
| 2519 | 2628 | $package_ftp->chmod($ftp_file, $custom_value); |
| 2629 | + } else { |
|
| 2630 | + smf_chmod($path, $custom_value); |
|
| 2520 | 2631 | } |
| 2521 | - else |
|
| 2522 | - smf_chmod($path, $custom_value); |
|
| 2523 | 2632 | } |
| 2524 | 2633 | |
| 2525 | 2634 | // This fish is fried... |
| 2526 | 2635 | unset($context['to_process'][$path]); |
| 2527 | 2636 | |
| 2528 | 2637 | // See if we're out of time? |
| 2529 | - if (time() - array_sum(explode(' ', $time_start)) > $timeout_limit) |
|
| 2530 | - return false; |
|
| 2638 | + if (time() - array_sum(explode(' ', $time_start)) > $timeout_limit) { |
|
| 2639 | + return false; |
|
| 2640 | + } |
|
| 2531 | 2641 | } |
| 2532 | 2642 | } |
| 2533 | 2643 | // If predefined this is a little different. |
@@ -2595,23 +2705,27 @@ discard block |
||
| 2595 | 2705 | { |
| 2596 | 2706 | global $context; |
| 2597 | 2707 | |
| 2598 | - if (!empty($data['writable_on'])) |
|
| 2599 | - if ($context['predefined_type'] == 'standard' || $data['writable_on'] == 'restrictive') |
|
| 2708 | + if (!empty($data['writable_on'])) { |
|
| 2709 | + if ($context['predefined_type'] == 'standard' || $data['writable_on'] == 'restrictive') |
|
| 2600 | 2710 | $context['special_files'][$path] = 1; |
| 2711 | + } |
|
| 2601 | 2712 | |
| 2602 | - if (!empty($data['contents'])) |
|
| 2603 | - foreach ($data['contents'] as $name => $contents) |
|
| 2713 | + if (!empty($data['contents'])) { |
|
| 2714 | + foreach ($data['contents'] as $name => $contents) |
|
| 2604 | 2715 | build_special_files__recursive($path . '/' . $name, $contents); |
| 2716 | + } |
|
| 2605 | 2717 | } |
| 2606 | 2718 | |
| 2607 | - foreach ($context['file_tree'] as $path => $data) |
|
| 2608 | - build_special_files__recursive($path, $data); |
|
| 2719 | + foreach ($context['file_tree'] as $path => $data) { |
|
| 2720 | + build_special_files__recursive($path, $data); |
|
| 2721 | + } |
|
| 2609 | 2722 | } |
| 2610 | 2723 | // Free doesn't need special files. |
| 2611 | - elseif ($context['predefined_type'] == 'free') |
|
| 2612 | - $context['special_files'] = array(); |
|
| 2613 | - else |
|
| 2614 | - $context['special_files'] = smf_json_decode(base64_decode($_POST['specialFiles']), true); |
|
| 2724 | + elseif ($context['predefined_type'] == 'free') { |
|
| 2725 | + $context['special_files'] = array(); |
|
| 2726 | + } else { |
|
| 2727 | + $context['special_files'] = smf_json_decode(base64_decode($_POST['specialFiles']), true); |
|
| 2728 | + } |
|
| 2615 | 2729 | |
| 2616 | 2730 | // Now we definitely know where we are, we need to go through again doing the chmod! |
| 2617 | 2731 | foreach ($context['directory_list'] as $path => $dummy) |
@@ -2656,8 +2770,9 @@ discard block |
||
| 2656 | 2770 | unset($context['directory_list'][$path]); |
| 2657 | 2771 | |
| 2658 | 2772 | // See if we're out of time? |
| 2659 | - if (time() - array_sum(explode(' ', $time_start)) > $timeout_limit) |
|
| 2660 | - return false; |
|
| 2773 | + if (time() - array_sum(explode(' ', $time_start)) > $timeout_limit) { |
|
| 2774 | + return false; |
|
| 2775 | + } |
|
| 2661 | 2776 | } |
| 2662 | 2777 | } |
| 2663 | 2778 | |
