SimpleMachines /
SMF2.1
@@ -419,8 +419,8 @@ discard block |
||
| 419 | 419 | <div class="bar"></div> |
| 420 | 420 | </div> |
| 421 | 421 | <div class="attach-ui"> |
| 422 | - <a data-dz-remove class="button cancel">', $txt['modify_cancel'] ,'</a> |
|
| 423 | - <a class="button upload">', $txt['upload'] ,'</a> |
|
| 422 | + <a data-dz-remove class="button cancel">', $txt['modify_cancel'], '</a> |
|
| 423 | + <a class="button upload">', $txt['upload'], '</a> |
|
| 424 | 424 | </div> |
| 425 | 425 | </div><!-- .attach-info --> |
| 426 | 426 | </div><!-- #au-template --> |
@@ -437,10 +437,10 @@ discard block |
||
| 437 | 437 | </dt> |
| 438 | 438 | <dd class="smalltext fallback"> |
| 439 | 439 | <div id="attachUpload" class="descbox"> |
| 440 | - <h5>', $txt['attach_drop_zone'] ,'</h5> |
|
| 441 | - <a class="button" id="attach-cancelAll">', $txt['attached_cancelAll'] ,'</a> |
|
| 442 | - <a class="button" id="attach-uploadAll">', $txt['attached_uploadAll'] ,'</a> |
|
| 443 | - <a class="button fileinput-button">', $txt['attach_add'] ,'</a> |
|
| 440 | + <h5>', $txt['attach_drop_zone'], '</h5> |
|
| 441 | + <a class="button" id="attach-cancelAll">', $txt['attached_cancelAll'], '</a> |
|
| 442 | + <a class="button" id="attach-uploadAll">', $txt['attached_uploadAll'], '</a> |
|
| 443 | + <a class="button fileinput-button">', $txt['attach_add'], '</a> |
|
| 444 | 444 | <div id="total-progress" class="progress_bar" role="progressBar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0"> |
| 445 | 445 | <div class="bar"></div> |
| 446 | 446 | </div> |
@@ -550,7 +550,7 @@ discard block |
||
| 550 | 550 | // Option to delete an event if user is editing one. |
| 551 | 551 | if ($context['make_event'] && !$context['event']['new']) |
| 552 | 552 | echo ' |
| 553 | - <input type="submit" name="deleteevent" value="', $txt['event_delete'], '" data-confirm="', $txt['event_delete_confirm'] ,'" class="button you_sure">'; |
|
| 553 | + <input type="submit" name="deleteevent" value="', $txt['event_delete'], '" data-confirm="', $txt['event_delete_confirm'], '" class="button you_sure">'; |
|
| 554 | 554 | |
| 555 | 555 | echo ' |
| 556 | 556 | </span> |
@@ -804,7 +804,7 @@ discard block |
||
| 804 | 804 | });'; |
| 805 | 805 | |
| 806 | 806 | echo ' |
| 807 | - var oEditorID = "', $context['post_box_name'] ,'"; |
|
| 807 | + var oEditorID = "', $context['post_box_name'], '"; |
|
| 808 | 808 | var oEditorObject = oEditorHandle_', $context['post_box_name'], '; |
| 809 | 809 | </script>'; |
| 810 | 810 | |
@@ -836,7 +836,7 @@ discard block |
||
| 836 | 836 | if ($context['can_quote']) |
| 837 | 837 | echo ' |
| 838 | 838 | <ul class="quickbuttons" id="msg_', $post['id'], '_quote"> |
| 839 | - <li style="display:none;" id="quoteSelected_', $post['id'], '" data-msgid="', $post['id'], '"><a href="javascript:void(0)"><span class="generic_icons quote_selected"></span>', $txt['quote_selected_action'] ,'</a></li> |
|
| 839 | + <li style="display:none;" id="quoteSelected_', $post['id'], '" data-msgid="', $post['id'], '"><a href="javascript:void(0)"><span class="generic_icons quote_selected"></span>', $txt['quote_selected_action'], '</a></li> |
|
| 840 | 840 | <li id="post_modify"><a href="#postmodify" onclick="return insertQuoteFast(', $post['id'], ');"><span class="generic_icons quote"></span>', $txt['quote'], '</a></li> |
| 841 | 841 | </ul>'; |
| 842 | 842 | |
@@ -920,7 +920,7 @@ discard block |
||
| 920 | 920 | <head> |
| 921 | 921 | <meta charset="', $context['character_set'], '"> |
| 922 | 922 | <title>', $txt['spell_check'], '</title> |
| 923 | - <link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'] ,'"> |
|
| 923 | + <link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'], '"> |
|
| 924 | 924 | <style> |
| 925 | 925 | body, td { |
| 926 | 926 | font-size: small; |
@@ -950,8 +950,8 @@ discard block |
||
| 950 | 950 | var spell_formname = window.opener.spell_formname; |
| 951 | 951 | var spell_fieldname = window.opener.spell_fieldname; |
| 952 | 952 | </script> |
| 953 | - <script src="', $settings['default_theme_url'], '/scripts/spellcheck.js', $modSettings['browser_cache'] ,'"></script> |
|
| 954 | - <script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'] ,'"></script> |
|
| 953 | + <script src="', $settings['default_theme_url'], '/scripts/spellcheck.js', $modSettings['browser_cache'], '"></script> |
|
| 954 | + <script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'], '"></script> |
|
| 955 | 955 | <script> |
| 956 | 956 | ', $context['spell_js'], ' |
| 957 | 957 | </script> |
@@ -995,7 +995,7 @@ discard block |
||
| 995 | 995 | <head> |
| 996 | 996 | <meta charset="', $context['character_set'], '"> |
| 997 | 997 | <title>', $txt['retrieving_quote'], '</title> |
| 998 | - <script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'] ,'"></script> |
|
| 998 | + <script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'], '"></script> |
|
| 999 | 999 | </head> |
| 1000 | 1000 | <body> |
| 1001 | 1001 | ', $txt['retrieving_quote'], ' |
@@ -22,24 +22,26 @@ discard block |
||
| 22 | 22 | <script>'; |
| 23 | 23 | |
| 24 | 24 | // When using Go Back due to fatal_error, allow the form to be re-submitted with changes. |
| 25 | - if (isBrowser('is_firefox')) |
|
| 26 | - echo ' |
|
| 25 | + if (isBrowser('is_firefox')) { |
|
| 26 | + echo ' |
|
| 27 | 27 | window.addEventListener("pageshow", reActivate, false);'; |
| 28 | + } |
|
| 28 | 29 | |
| 29 | 30 | // Start with message icons - and any missing from this theme. |
| 30 | 31 | echo ' |
| 31 | 32 | var icon_urls = {'; |
| 32 | 33 | |
| 33 | - foreach ($context['icons'] as $icon) |
|
| 34 | - echo ' |
|
| 34 | + foreach ($context['icons'] as $icon) { |
|
| 35 | + echo ' |
|
| 35 | 36 | \'', $icon['value'], '\': \'', $icon['url'], '\'', $icon['is_last'] ? '' : ','; |
| 37 | + } |
|
| 36 | 38 | |
| 37 | 39 | echo ' |
| 38 | 40 | };'; |
| 39 | 41 | |
| 40 | 42 | // If this is a poll - use some javascript to ensure the user doesn't create a poll with illegal option combinations. |
| 41 | - if ($context['make_poll']) |
|
| 42 | - echo ' |
|
| 43 | + if ($context['make_poll']) { |
|
| 44 | + echo ' |
|
| 43 | 45 | var pollOptionNum = 0, pollTabIndex; |
| 44 | 46 | var pollOptionId = ', $context['last_choice_id'], '; |
| 45 | 47 | function addPollOption() |
@@ -58,11 +60,13 @@ discard block |
||
| 58 | 60 | |
| 59 | 61 | setOuterHTML(document.getElementById(\'pollMoreOptions\'), ', JavaScriptEscape('<dt><label for="options-'), ' + pollOptionId + ', JavaScriptEscape('">' . $txt['option'] . ' '), ' + pollOptionNum + ', JavaScriptEscape('</label>:</dt><dd><input type="text" name="options['), ' + pollOptionId + ', JavaScriptEscape(']" id="options-'), ' + pollOptionId + ', JavaScriptEscape('" value="" size="80" maxlength="255" tabindex="'), ' + pollTabIndex + ', JavaScriptEscape('"></dd><p id="pollMoreOptions"></p>'), '); |
| 60 | 62 | }'; |
| 63 | + } |
|
| 61 | 64 | |
| 62 | 65 | // If we are making a calendar event we want to ensure we show the current days in a month etc... this is done here. |
| 63 | - if ($context['make_event']) |
|
| 64 | - echo ' |
|
| 66 | + if ($context['make_event']) { |
|
| 67 | + echo ' |
|
| 65 | 68 | var monthLength = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];'; |
| 69 | + } |
|
| 66 | 70 | |
| 67 | 71 | // End of the javascript, start the form and display the link tree. |
| 68 | 72 | echo ' |
@@ -83,9 +87,10 @@ discard block |
||
| 83 | 87 | </div> |
| 84 | 88 | <br>'; |
| 85 | 89 | |
| 86 | - if ($context['make_event'] && (!$context['event']['new'] || !empty($context['current_board']))) |
|
| 87 | - echo ' |
|
| 90 | + if ($context['make_event'] && (!$context['event']['new'] || !empty($context['current_board']))) { |
|
| 91 | + echo ' |
|
| 88 | 92 | <input type="hidden" name="eventid" value="', $context['event']['id'], '">'; |
| 93 | + } |
|
| 89 | 94 | |
| 90 | 95 | // Start the main table. |
| 91 | 96 | echo ' |
@@ -110,26 +115,29 @@ discard block |
||
| 110 | 115 | </div>'; |
| 111 | 116 | |
| 112 | 117 | // If this won't be approved let them know! |
| 113 | - if (!$context['becomes_approved']) |
|
| 114 | - echo ' |
|
| 118 | + if (!$context['becomes_approved']) { |
|
| 119 | + echo ' |
|
| 115 | 120 | <div class="noticebox"> |
| 116 | 121 | <em>', $txt['wait_for_approval'], '</em> |
| 117 | 122 | <input type="hidden" name="not_approved" value="1"> |
| 118 | 123 | </div>'; |
| 124 | + } |
|
| 119 | 125 | |
| 120 | 126 | // If it's locked, show a message to warn the replier. |
| 121 | - if (!empty($context['locked'])) |
|
| 122 | - echo ' |
|
| 127 | + if (!empty($context['locked'])) { |
|
| 128 | + echo ' |
|
| 123 | 129 | <div class="errorbox"> |
| 124 | 130 | ', $txt['topic_locked_no_reply'], ' |
| 125 | 131 | </div>'; |
| 132 | + } |
|
| 126 | 133 | |
| 127 | - if (!empty($modSettings['drafts_post_enabled'])) |
|
| 128 | - echo ' |
|
| 134 | + if (!empty($modSettings['drafts_post_enabled'])) { |
|
| 135 | + echo ' |
|
| 129 | 136 | <div id="draft_section" class="infobox"', isset($context['draft_saved']) ? '' : ' style="display: none;"', '>', |
| 130 | 137 | sprintf($txt['draft_saved'], $scripturl . '?action=profile;u=' . $context['user']['id'] . ';area=showdrafts'), ' |
| 131 | 138 | ', (!empty($modSettings['drafts_keep_days']) ? ' <strong>' . sprintf($txt['draft_save_warning'], $modSettings['drafts_keep_days']) . '</strong>' : ''), ' |
| 132 | 139 | </div>'; |
| 140 | + } |
|
| 133 | 141 | |
| 134 | 142 | // The post header... important stuff |
| 135 | 143 | echo ' |
@@ -139,14 +147,15 @@ discard block |
||
| 139 | 147 | // Mod & theme authors can use the 'integrate_post_end' hook to modify or add to these (see Post.php) |
| 140 | 148 | if (!empty($context['posting_fields']) && is_array($context['posting_fields'])) |
| 141 | 149 | { |
| 142 | - foreach ($context['posting_fields'] as $pfid => $pf) |
|
| 143 | - echo ' |
|
| 150 | + foreach ($context['posting_fields'] as $pfid => $pf) { |
|
| 151 | + echo ' |
|
| 144 | 152 | <dt class="clear', !is_numeric($pfid) ? ' pf_' . $pfid : '', '"> |
| 145 | 153 | ', $pf['dt'], ' |
| 146 | 154 | </dt> |
| 147 | 155 | <dd', !is_numeric($pfid) ? ' class="pf_' . $pfid . '"' : '', '> |
| 148 | 156 | ', preg_replace('~<(input|select|textarea|button|area|a|object)\b~', '<$1 tabindex="' . $context['tabindex']++ . '"', $pf['dd']), ' |
| 149 | 157 | </dd>'; |
| 158 | + } |
|
| 150 | 159 | } |
| 151 | 160 | |
| 152 | 161 | echo ' |
@@ -180,9 +189,10 @@ discard block |
||
| 180 | 189 | echo ' |
| 181 | 190 | <optgroup label="', $category['name'], '">'; |
| 182 | 191 | |
| 183 | - foreach ($category['boards'] as $board) |
|
| 184 | - echo ' |
|
| 192 | + foreach ($category['boards'] as $board) { |
|
| 193 | + echo ' |
|
| 185 | 194 | <option value="', $board['id'], '"', $board['selected'] ? ' selected' : '', '>', $board['child_level'] > 0 ? str_repeat('==', $board['child_level'] - 1) . '=>' : '', ' ', $board['name'], '</option>'; |
| 195 | + } |
|
| 186 | 196 | echo ' |
| 187 | 197 | </optgroup>'; |
| 188 | 198 | } |
@@ -218,9 +228,10 @@ discard block |
||
| 218 | 228 | <span class="label">', $txt['calendar_timezone'], '</span> |
| 219 | 229 | <select name="tz" id="tz"', !empty($context['event']['allday']) ? ' disabled' : '', '>'; |
| 220 | 230 | |
| 221 | - foreach ($context['all_timezones'] as $tz => $tzname) |
|
| 222 | - echo ' |
|
| 231 | + foreach ($context['all_timezones'] as $tz => $tzname) { |
|
| 232 | + echo ' |
|
| 223 | 233 | <option', is_numeric($tz) ? ' value="" disabled' : ' value="' . $tz . '"', $tz === $context['event']['tz'] ? ' selected' : '', '>', $tzname, '</option>'; |
| 234 | + } |
|
| 224 | 235 | |
| 225 | 236 | echo ' |
| 226 | 237 | </select> |
@@ -249,14 +260,15 @@ discard block |
||
| 249 | 260 | </dd>'; |
| 250 | 261 | |
| 251 | 262 | // Loop through all the choices and print them out. |
| 252 | - foreach ($context['choices'] as $choice) |
|
| 253 | - echo ' |
|
| 263 | + foreach ($context['choices'] as $choice) { |
|
| 264 | + echo ' |
|
| 254 | 265 | <dt> |
| 255 | 266 | <label for="options-', $choice['id'], '">', $txt['option'], ' ', $choice['number'], '</label>: |
| 256 | 267 | </dt> |
| 257 | 268 | <dd> |
| 258 | 269 | <input type="text" name="options[', $choice['id'], ']" id="options-', $choice['id'], '" value="', $choice['label'], '" tabindex="', $context['tabindex']++, '" size="80" maxlength="255"> |
| 259 | 270 | </dd>'; |
| 271 | + } |
|
| 260 | 272 | |
| 261 | 273 | echo ' |
| 262 | 274 | <p id="pollMoreOptions"></p> |
@@ -286,14 +298,15 @@ discard block |
||
| 286 | 298 | <input type="checkbox" id="poll_change_vote" name="poll_change_vote"', !empty($context['poll']['change_vote']) ? ' checked' : '', '> |
| 287 | 299 | </dd>'; |
| 288 | 300 | |
| 289 | - if ($context['poll_options']['guest_vote_enabled']) |
|
| 290 | - echo ' |
|
| 301 | + if ($context['poll_options']['guest_vote_enabled']) { |
|
| 302 | + echo ' |
|
| 291 | 303 | <dt> |
| 292 | 304 | <label for="poll_guest_vote">', $txt['poll_guest_vote'], ':</label> |
| 293 | 305 | </dt> |
| 294 | 306 | <dd> |
| 295 | 307 | <input type="checkbox" id="poll_guest_vote" name="poll_guest_vote"', !empty($context['poll_options']['guest_vote']) ? ' checked' : '', '> |
| 296 | 308 | </dd>'; |
| 309 | + } |
|
| 297 | 310 | |
| 298 | 311 | echo ' |
| 299 | 312 | <dt> |
@@ -314,8 +327,8 @@ discard block |
||
| 314 | 327 | ', template_control_richedit($context['post_box_name'], 'smileyBox_message', 'bbcBox_message'); |
| 315 | 328 | |
| 316 | 329 | // If we're editing and displaying edit details, show a box where they can say why |
| 317 | - if (isset($context['editing']) && $modSettings['show_modify']) |
|
| 318 | - echo ' |
|
| 330 | + if (isset($context['editing']) && $modSettings['show_modify']) { |
|
| 331 | + echo ' |
|
| 319 | 332 | <dl> |
| 320 | 333 | <dt class="clear"> |
| 321 | 334 | <span id="caption_edit_reason">', $txt['reason_for_edit'], ':</span> |
@@ -324,20 +337,23 @@ discard block |
||
| 324 | 337 | <input type="text" name="modify_reason"', isset($context['last_modified_reason']) ? ' value="' . $context['last_modified_reason'] . '"' : '', ' tabindex="', $context['tabindex']++, '" size="80" maxlength="80"> |
| 325 | 338 | </dd> |
| 326 | 339 | </dl>'; |
| 340 | + } |
|
| 327 | 341 | |
| 328 | 342 | // If this message has been edited in the past - display when it was. |
| 329 | - if (isset($context['last_modified'])) |
|
| 330 | - echo ' |
|
| 343 | + if (isset($context['last_modified'])) { |
|
| 344 | + echo ' |
|
| 331 | 345 | <div class="padding smalltext"> |
| 332 | 346 | ', $context['last_modified_text'], ' |
| 333 | 347 | </div>'; |
| 348 | + } |
|
| 334 | 349 | |
| 335 | 350 | // If the admin has enabled the hiding of the additional options - show a link and image for it. |
| 336 | - if (!empty($modSettings['additional_options_collapsable'])) |
|
| 337 | - echo ' |
|
| 351 | + if (!empty($modSettings['additional_options_collapsable'])) { |
|
| 352 | + echo ' |
|
| 338 | 353 | <div id="postAdditionalOptionsHeader"> |
| 339 | 354 | <strong><a href="#" id="postMoreExpandLink"> ', $context['can_post_attachment'] ? $txt['post_additionalopt_attach'] : $txt['post_additionalopt'], '</a></strong> |
| 340 | 355 | </div>'; |
| 356 | + } |
|
| 341 | 357 | |
| 342 | 358 | echo ' |
| 343 | 359 | <div id="postAdditionalOptions">'; |
@@ -370,19 +386,21 @@ discard block |
||
| 370 | 386 | ', $txt['uncheck_unwatchd_attach'], ': |
| 371 | 387 | </dd>'; |
| 372 | 388 | |
| 373 | - foreach ($context['current_attachments'] as $attachment) |
|
| 374 | - echo ' |
|
| 389 | + foreach ($context['current_attachments'] as $attachment) { |
|
| 390 | + echo ' |
|
| 375 | 391 | <dd class="smalltext"> |
| 376 | 392 | <label for="attachment_', $attachment['attachID'], '"><input type="checkbox" id="attachment_', $attachment['attachID'], '" name="attach_del[]" value="', $attachment['attachID'], '"', empty($attachment['unchecked']) ? ' checked' : '', '> ', $attachment['name'], (empty($attachment['approved']) ? ' (' . $txt['awaiting_approval'] . ')' : ''), |
| 377 | 393 | !empty($modSettings['attachmentPostLimit']) || !empty($modSettings['attachmentSizeLimit']) ? sprintf($txt['attach_kb'], comma_format(round(max($attachment['size'], 1024) / 1024), 0)) : '', '</label> |
| 378 | 394 | </dd>'; |
| 395 | + } |
|
| 379 | 396 | |
| 380 | 397 | echo ' |
| 381 | 398 | </dl>'; |
| 382 | 399 | |
| 383 | - if (!empty($context['files_in_session_warning'])) |
|
| 384 | - echo ' |
|
| 400 | + if (!empty($context['files_in_session_warning'])) { |
|
| 401 | + echo ' |
|
| 385 | 402 | <div class="smalltext">', $context['files_in_session_warning'], '</div>'; |
| 403 | + } |
|
| 386 | 404 | } |
| 387 | 405 | |
| 388 | 406 | // Is the user allowed to post any additional ones? If so give them the boxes to do it! |
@@ -447,13 +465,14 @@ discard block |
||
| 447 | 465 | <div class="fallback"> |
| 448 | 466 | <input type="file" multiple="multiple" name="attachment[]" id="attachment1" class="fallback"> (<a href="javascript:void(0);" onclick="cleanFileInput(\'attachment1\');">', $txt['clean_attach'], '</a>)'; |
| 449 | 467 | |
| 450 | - if (!empty($modSettings['attachmentSizeLimit'])) |
|
| 451 | - echo ' |
|
| 468 | + if (!empty($modSettings['attachmentSizeLimit'])) { |
|
| 469 | + echo ' |
|
| 452 | 470 | <input type="hidden" name="MAX_FILE_SIZE" value="' . $modSettings['attachmentSizeLimit'] * 1024 . '">'; |
| 471 | + } |
|
| 453 | 472 | |
| 454 | 473 | // Show more boxes if they aren't approaching that limit. |
| 455 | - if ($context['num_allowed_attachments'] > 1) |
|
| 456 | - echo ' |
|
| 474 | + if ($context['num_allowed_attachments'] > 1) { |
|
| 475 | + echo ' |
|
| 457 | 476 | <script> |
| 458 | 477 | var allowed_attachments = ', $context['num_allowed_attachments'], '; |
| 459 | 478 | var current_attachment = 1; |
@@ -473,6 +492,7 @@ discard block |
||
| 473 | 492 | <a href="#" onclick="addAttachment(); return false;">(', $txt['more_attachments'], ')</a> |
| 474 | 493 | </div><!-- .fallback --> |
| 475 | 494 | </div><!-- #attachUpload -->'; |
| 495 | + } |
|
| 476 | 496 | |
| 477 | 497 | echo ' |
| 478 | 498 | </dd>'; |
@@ -484,21 +504,25 @@ discard block |
||
| 484 | 504 | <dd class="smalltext">'; |
| 485 | 505 | |
| 486 | 506 | // Show some useful information such as allowed extensions, maximum size and amount of attachments allowed. |
| 487 | - if (!empty($modSettings['attachmentCheckExtensions'])) |
|
| 488 | - echo ' |
|
| 507 | + if (!empty($modSettings['attachmentCheckExtensions'])) { |
|
| 508 | + echo ' |
|
| 489 | 509 | ', $txt['allowed_types'], ': ', $context['allowed_extensions'], '<br>'; |
| 510 | + } |
|
| 490 | 511 | |
| 491 | - if (!empty($context['attachment_restrictions'])) |
|
| 492 | - echo ' |
|
| 512 | + if (!empty($context['attachment_restrictions'])) { |
|
| 513 | + echo ' |
|
| 493 | 514 | ', $txt['attach_restrictions'], ' ', implode(', ', $context['attachment_restrictions']), '<br>'; |
| 515 | + } |
|
| 494 | 516 | |
| 495 | - if ($context['num_allowed_attachments'] == 0) |
|
| 496 | - echo ' |
|
| 517 | + if ($context['num_allowed_attachments'] == 0) { |
|
| 518 | + echo ' |
|
| 497 | 519 | ', $txt['attach_limit_nag'], '<br>'; |
| 520 | + } |
|
| 498 | 521 | |
| 499 | - if (!$context['can_post_attachment_unapproved']) |
|
| 500 | - echo ' |
|
| 522 | + if (!$context['can_post_attachment_unapproved']) { |
|
| 523 | + echo ' |
|
| 501 | 524 | <span class="alert">', $txt['attachment_requires_approval'], '</span>', '<br>'; |
| 525 | + } |
|
| 502 | 526 | |
| 503 | 527 | echo ' |
| 504 | 528 | </dd> |
@@ -522,24 +546,26 @@ discard block |
||
| 522 | 546 | <dt><strong>', $txt['subject'], '</strong></dt> |
| 523 | 547 | <dd><strong>', $txt['draft_saved_on'], '</strong></dd>'; |
| 524 | 548 | |
| 525 | - foreach ($context['drafts'] as $draft) |
|
| 526 | - echo ' |
|
| 549 | + foreach ($context['drafts'] as $draft) { |
|
| 550 | + echo ' |
|
| 527 | 551 | <dt>', $draft['link'], '</dt> |
| 528 | 552 | <dd>', $draft['poster_time'], '</dd>'; |
| 553 | + } |
|
| 529 | 554 | echo ' |
| 530 | 555 | </dl> |
| 531 | 556 | </div>'; |
| 532 | 557 | } |
| 533 | 558 | |
| 534 | 559 | // Is visual verification enabled? |
| 535 | - if ($context['require_verification']) |
|
| 536 | - echo ' |
|
| 560 | + if ($context['require_verification']) { |
|
| 561 | + echo ' |
|
| 537 | 562 | <div class="post_verification"> |
| 538 | 563 | <span', !empty($context['post_error']['need_qr_verification']) ? ' class="error"' : '', '> |
| 539 | 564 | <strong>', $txt['verification'], ':</strong> |
| 540 | 565 | </span> |
| 541 | 566 | ', template_control_verification($context['visual_verification_id'], 'all'), ' |
| 542 | 567 | </div>'; |
| 568 | + } |
|
| 543 | 569 | |
| 544 | 570 | // Finally, the submit buttons. |
| 545 | 571 | echo ' |
@@ -548,9 +574,10 @@ discard block |
||
| 548 | 574 | ', template_control_richedit_buttons($context['post_box_name']); |
| 549 | 575 | |
| 550 | 576 | // Option to delete an event if user is editing one. |
| 551 | - if ($context['make_event'] && !$context['event']['new']) |
|
| 552 | - echo ' |
|
| 577 | + if ($context['make_event'] && !$context['event']['new']) { |
|
| 578 | + echo ' |
|
| 553 | 579 | <input type="submit" name="deleteevent" value="', $txt['event_delete'], '" data-confirm="', $txt['event_delete_confirm'] ,'" class="button you_sure">'; |
| 580 | + } |
|
| 554 | 581 | |
| 555 | 582 | echo ' |
| 556 | 583 | </span> |
@@ -559,9 +586,10 @@ discard block |
||
| 559 | 586 | <br class="clear">'; |
| 560 | 587 | |
| 561 | 588 | // Assuming this isn't a new topic pass across the last message id. |
| 562 | - if (isset($context['topic_last_message'])) |
|
| 563 | - echo ' |
|
| 589 | + if (isset($context['topic_last_message'])) { |
|
| 590 | + echo ' |
|
| 564 | 591 | <input type="hidden" name="last_msg" value="', $context['topic_last_message'], '">'; |
| 592 | + } |
|
| 565 | 593 | |
| 566 | 594 | echo ' |
| 567 | 595 | <input type="hidden" name="additional_options" id="additional_options" value="', $context['show_additional_options'] ? '1' : '0', '"> |
@@ -704,9 +732,10 @@ discard block |
||
| 704 | 732 | |
| 705 | 733 | newPostsHTML += \'<div class="windowbg\' + (++reply_counter % 2 == 0 ? \'2\' : \'\') + \'"><div id="msg\' + newPosts[i].getAttribute("id") + \'"><div class="floatleft"><h5>', $txt['posted_by'], ': \' + newPosts[i].getElementsByTagName("poster")[0].firstChild.nodeValue + \'</h5><span class="smalltext">« <strong>', $txt['on'], ':</strong> \' + newPosts[i].getElementsByTagName("time")[0].firstChild.nodeValue + \' »</span> <span class="new_posts" id="image_new_\' + newPosts[i].getAttribute("id") + \'">', $txt['new'], '</span></div>\';'; |
| 706 | 734 | |
| 707 | - if ($context['can_quote']) |
|
| 708 | - echo ' |
|
| 735 | + if ($context['can_quote']) { |
|
| 736 | + echo ' |
|
| 709 | 737 | newPostsHTML += \'<ul class="quickbuttons" id="msg_\' + newPosts[i].getAttribute("id") + \'_quote"><li><a href="#postmodify" onclick="return insertQuoteFast(\\\'\' + newPosts[i].getAttribute("id") + \'\\\');" class="quote_button"><span>', $txt['quote'], '</span><\' + \'/a></li></ul>\';'; |
| 738 | + } |
|
| 710 | 739 | |
| 711 | 740 | echo ' |
| 712 | 741 | newPostsHTML += \'<br class="clear">\'; |
@@ -749,8 +778,8 @@ discard block |
||
| 749 | 778 | }'; |
| 750 | 779 | |
| 751 | 780 | // Code for showing and hiding additional options. |
| 752 | - if (!empty($modSettings['additional_options_collapsable'])) |
|
| 753 | - echo ' |
|
| 781 | + if (!empty($modSettings['additional_options_collapsable'])) { |
|
| 782 | + echo ' |
|
| 754 | 783 | var oSwapAdditionalOptions = new smc_Toggle({ |
| 755 | 784 | bToggleEnabled: true, |
| 756 | 785 | bCurrentlyCollapsed: ', $context['show_additional_options'] ? 'false' : 'true', ', |
@@ -778,10 +807,11 @@ discard block |
||
| 778 | 807 | } |
| 779 | 808 | ] |
| 780 | 809 | });'; |
| 810 | + } |
|
| 781 | 811 | |
| 782 | 812 | // Code for showing and hiding drafts |
| 783 | - if (!empty($context['drafts'])) |
|
| 784 | - echo ' |
|
| 813 | + if (!empty($context['drafts'])) { |
|
| 814 | + echo ' |
|
| 785 | 815 | var oSwapDraftOptions = new smc_Toggle({ |
| 786 | 816 | bToggleEnabled: true, |
| 787 | 817 | bCurrentlyCollapsed: true, |
@@ -803,6 +833,7 @@ discard block |
||
| 803 | 833 | } |
| 804 | 834 | ] |
| 805 | 835 | });'; |
| 836 | + } |
|
| 806 | 837 | |
| 807 | 838 | echo ' |
| 808 | 839 | var oEditorID = "', $context['post_box_name'] ,'"; |
@@ -823,8 +854,9 @@ discard block |
||
| 823 | 854 | foreach ($context['previous_posts'] as $post) |
| 824 | 855 | { |
| 825 | 856 | $ignoring = false; |
| 826 | - if (!empty($post['is_ignored'])) |
|
| 827 | - $ignored_posts[] = $ignoring = $post['id']; |
|
| 857 | + if (!empty($post['is_ignored'])) { |
|
| 858 | + $ignored_posts[] = $ignoring = $post['id']; |
|
| 859 | + } |
|
| 828 | 860 | |
| 829 | 861 | echo ' |
| 830 | 862 | <div class="windowbg"> |
@@ -834,22 +866,24 @@ discard block |
||
| 834 | 866 | </h5> |
| 835 | 867 | - ', $post['time']; |
| 836 | 868 | |
| 837 | - if ($context['can_quote']) |
|
| 838 | - echo ' |
|
| 869 | + if ($context['can_quote']) { |
|
| 870 | + echo ' |
|
| 839 | 871 | <ul class="quickbuttons" id="msg_', $post['id'], '_quote"> |
| 840 | 872 | <li style="display:none;" id="quoteSelected_', $post['id'], '" data-msgid="', $post['id'], '"><a href="javascript:void(0)"><span class="generic_icons quote_selected"></span>', $txt['quote_selected_action'] ,'</a></li> |
| 841 | 873 | <li id="post_modify"><a href="#postmodify" onclick="return insertQuoteFast(', $post['id'], ');"><span class="generic_icons quote"></span>', $txt['quote'], '</a></li> |
| 842 | 874 | </ul>'; |
| 875 | + } |
|
| 843 | 876 | |
| 844 | 877 | echo ' |
| 845 | 878 | <br class="clear">'; |
| 846 | 879 | |
| 847 | - if ($ignoring) |
|
| 848 | - echo ' |
|
| 880 | + if ($ignoring) { |
|
| 881 | + echo ' |
|
| 849 | 882 | <div id="msg_', $post['id'], '_ignored_prompt" class="smalltext"> |
| 850 | 883 | ', $txt['ignoring_user'], ' |
| 851 | 884 | <a href="#" id="msg_', $post['id'], '_ignored_link" style="display: none;">', $txt['show_ignore_user_post'], '</a> |
| 852 | 885 | </div>'; |
| 886 | + } |
|
| 853 | 887 | |
| 854 | 888 | echo ' |
| 855 | 889 | <div class="list_posts smalltext" id="msg_', $post['id'], '_body" data-msgid="', $post['id'], '">', $post['message'], '</div> |
@@ -1004,10 +1038,10 @@ discard block |
||
| 1004 | 1038 | <div id="temporary_posting_area" style="display: none;"></div> |
| 1005 | 1039 | <script>'; |
| 1006 | 1040 | |
| 1007 | - if ($context['close_window']) |
|
| 1008 | - echo ' |
|
| 1041 | + if ($context['close_window']) { |
|
| 1042 | + echo ' |
|
| 1009 | 1043 | window.close();'; |
| 1010 | - else |
|
| 1044 | + } else |
|
| 1011 | 1045 | { |
| 1012 | 1046 | // Lucky for us, Internet Explorer has an "innerText" feature which basically converts entities <--> text. Use it if possible ;) |
| 1013 | 1047 | echo ' |
@@ -1061,11 +1095,12 @@ discard block |
||
| 1061 | 1095 | </p> |
| 1062 | 1096 | <ul>'; |
| 1063 | 1097 | |
| 1064 | - foreach ($context['groups'] as $group) |
|
| 1065 | - echo ' |
|
| 1098 | + foreach ($context['groups'] as $group) { |
|
| 1099 | + echo ' |
|
| 1066 | 1100 | <li> |
| 1067 | 1101 | <label for="who_', $group['id'], '"><input type="checkbox" name="who[', $group['id'], ']" id="who_', $group['id'], '" value="', $group['id'], '" checked> ', $group['name'], '</label> <em>(', $group['member_count'], ')</em> |
| 1068 | 1102 | </li>'; |
| 1103 | + } |
|
| 1069 | 1104 | |
| 1070 | 1105 | echo ' |
| 1071 | 1106 | <li> |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | |
| 71 | 71 | echo ' |
| 72 | 72 | <div class="main_container"> |
| 73 | - <div class="cat_bar ', $category['is_collapsed'] ? 'collapsed' : '','" id="category_', $category['id'], '"> |
|
| 73 | + <div class="cat_bar ', $category['is_collapsed'] ? 'collapsed' : '', '" id="category_', $category['id'], '"> |
|
| 74 | 74 | <h3 class="catbg">'; |
| 75 | 75 | |
| 76 | 76 | // If this category even can collapse, show a link to collapse it. |
@@ -249,7 +249,7 @@ discard block |
||
| 249 | 249 | foreach ($board['children'] as $child) |
| 250 | 250 | { |
| 251 | 251 | if (!$child['is_redirect']) |
| 252 | - $child['link'] = ''. ($child['new'] ? '<a href="' . $scripturl . '?action=unread;board=' . $child['id'] . '" title="' . $txt['new_posts'] . ' (' . $txt['board_topics'] . ': ' . comma_format($child['topics']) . ', ' . $txt['posts'] . ': ' . comma_format($child['posts']) . ')" class="new_posts">' . $txt['new'] . '</a>' : '') . '<a href="' . $child['href'] . '" ' . ($child['new'] ? 'class="board_new_posts" ' : '') . 'title="' . ($child['new'] ? $txt['new_posts'] : $txt['old_posts']) . ' (' . $txt['board_topics'] . ': ' . comma_format($child['topics']) . ', ' . $txt['posts'] . ': ' . comma_format($child['posts']) . ')">' . $child['name'] . '</a>'; |
|
| 252 | + $child['link'] = '' . ($child['new'] ? '<a href="' . $scripturl . '?action=unread;board=' . $child['id'] . '" title="' . $txt['new_posts'] . ' (' . $txt['board_topics'] . ': ' . comma_format($child['topics']) . ', ' . $txt['posts'] . ': ' . comma_format($child['posts']) . ')" class="new_posts">' . $txt['new'] . '</a>' : '') . '<a href="' . $child['href'] . '" ' . ($child['new'] ? 'class="board_new_posts" ' : '') . 'title="' . ($child['new'] ? $txt['new_posts'] : $txt['old_posts']) . ' (' . $txt['board_topics'] . ': ' . comma_format($child['topics']) . ', ' . $txt['posts'] . ': ' . comma_format($child['posts']) . ')">' . $child['name'] . '</a>'; |
|
| 253 | 253 | else |
| 254 | 254 | $child['link'] = '<a href="' . $child['href'] . '" title="' . comma_format($child['posts']) . ' ' . $txt['redirects'] . ' - ' . $child['short_description'] . '">' . $child['name'] . '</a>'; |
| 255 | 255 | |
@@ -31,9 +31,10 @@ discard block |
||
| 31 | 31 | echo ' |
| 32 | 32 | <ul id="smf_slider" class="roundframe">'; |
| 33 | 33 | |
| 34 | - foreach ($context['news_lines'] as $news) |
|
| 35 | - echo ' |
|
| 34 | + foreach ($context['news_lines'] as $news) { |
|
| 35 | + echo ' |
|
| 36 | 36 | <li>', $news, '</li>'; |
| 37 | + } |
|
| 37 | 38 | |
| 38 | 39 | echo ' |
| 39 | 40 | </ul> |
@@ -65,8 +66,9 @@ discard block |
||
| 65 | 66 | foreach ($context['categories'] as $category) |
| 66 | 67 | { |
| 67 | 68 | // If theres no parent boards we can see, avoid showing an empty category (unless its collapsed) |
| 68 | - if (empty($category['boards']) && !$category['is_collapsed']) |
|
| 69 | - continue; |
|
| 69 | + if (empty($category['boards']) && !$category['is_collapsed']) { |
|
| 70 | + continue; |
|
| 71 | + } |
|
| 70 | 72 | |
| 71 | 73 | echo ' |
| 72 | 74 | <div class="main_container"> |
@@ -74,9 +76,10 @@ discard block |
||
| 74 | 76 | <h3 class="catbg">'; |
| 75 | 77 | |
| 76 | 78 | // If this category even can collapse, show a link to collapse it. |
| 77 | - if ($category['can_collapse']) |
|
| 78 | - echo ' |
|
| 79 | + if ($category['can_collapse']) { |
|
| 80 | + echo ' |
|
| 79 | 81 | <span id="category_', $category['id'], '_upshrink" class="', $category['is_collapsed'] ? 'toggle_down' : 'toggle_up', ' floatright" data-collapsed="', (int) $category['is_collapsed'], '" title="', !$category['is_collapsed'] ? $txt['hide_category'] : $txt['show_category'], '" style="display: none;"></span>'; |
| 82 | + } |
|
| 80 | 83 | |
| 81 | 84 | echo ' |
| 82 | 85 | ', $category['link'], ' |
@@ -106,10 +109,11 @@ discard block |
||
| 106 | 109 | </div>'; |
| 107 | 110 | |
| 108 | 111 | // Won't somebody think of the children! |
| 109 | - if (function_exists('template_bi_' . $board['type'] . '_children')) |
|
| 110 | - call_user_func('template_bi_' . $board['type'] . '_children', $board); |
|
| 111 | - else |
|
| 112 | - template_bi_board_children($board); |
|
| 112 | + if (function_exists('template_bi_' . $board['type'] . '_children')) { |
|
| 113 | + call_user_func('template_bi_' . $board['type'] . '_children', $board); |
|
| 114 | + } else { |
|
| 115 | + template_bi_board_children($board); |
|
| 116 | + } |
|
| 113 | 117 | |
| 114 | 118 | echo ' |
| 115 | 119 | </div><!-- #board_[id] -->'; |
@@ -124,12 +128,13 @@ discard block |
||
| 124 | 128 | </div><!-- #boardindex_table -->'; |
| 125 | 129 | |
| 126 | 130 | // Show the mark all as read button? |
| 127 | - if ($context['user']['is_logged'] && !empty($context['categories'])) |
|
| 128 | - echo ' |
|
| 131 | + if ($context['user']['is_logged'] && !empty($context['categories'])) { |
|
| 132 | + echo ' |
|
| 129 | 133 | <div class="mark_read"> |
| 130 | 134 | ', template_button_strip($context['mark_read_button'], 'right'), ' |
| 131 | 135 | </div>'; |
| 132 | -} |
|
| 136 | + } |
|
| 137 | + } |
|
| 133 | 138 | |
| 134 | 139 | /** |
| 135 | 140 | * Outputs the board icon for a standard board. |
@@ -173,18 +178,20 @@ discard block |
||
| 173 | 178 | </a>'; |
| 174 | 179 | |
| 175 | 180 | // Has it outstanding posts for approval? |
| 176 | - if ($board['can_approve_posts'] && ($board['unapproved_posts'] || $board['unapproved_topics'])) |
|
| 177 | - echo ' |
|
| 181 | + if ($board['can_approve_posts'] && ($board['unapproved_posts'] || $board['unapproved_topics'])) { |
|
| 182 | + echo ' |
|
| 178 | 183 | <a href="', $scripturl, '?action=moderate;area=postmod;sa=', ($board['unapproved_topics'] > 0 ? 'topics' : 'posts'), ';brd=', $board['id'], ';', $context['session_var'], '=', $context['session_id'], '" title="', sprintf($txt['unapproved_posts'], $board['unapproved_topics'], $board['unapproved_posts']), '" class="moderation_link">(!)</a>'; |
| 184 | + } |
|
| 179 | 185 | |
| 180 | 186 | echo ' |
| 181 | 187 | <p class="board_description">', $board['description'], '</p>'; |
| 182 | 188 | |
| 183 | 189 | // Show the "Moderators: ". Each has name, href, link, and id. (but we're gonna use link_moderators.) |
| 184 | - if (!empty($board['link_moderators'])) |
|
| 185 | - echo ' |
|
| 190 | + if (!empty($board['link_moderators'])) { |
|
| 191 | + echo ' |
|
| 186 | 192 | <p class="moderators">', count($board['link_moderators']) == 1 ? $txt['moderator'] : $txt['moderators'], ': ', implode(', ', $board['link_moderators']), '</p>'; |
| 187 | -} |
|
| 193 | + } |
|
| 194 | + } |
|
| 188 | 195 | |
| 189 | 196 | /** |
| 190 | 197 | * Outputs the board stats for a standard board. |
@@ -225,10 +232,11 @@ discard block |
||
| 225 | 232 | */ |
| 226 | 233 | function template_bi_board_lastpost($board) |
| 227 | 234 | { |
| 228 | - if (!empty($board['last_post']['id'])) |
|
| 229 | - echo ' |
|
| 235 | + if (!empty($board['last_post']['id'])) { |
|
| 236 | + echo ' |
|
| 230 | 237 | <p>', $board['last_post']['last_post_message'], '</p>'; |
| 231 | -} |
|
| 238 | + } |
|
| 239 | + } |
|
| 232 | 240 | |
| 233 | 241 | /** |
| 234 | 242 | * Outputs the board children for a standard board. |
@@ -248,14 +256,16 @@ discard block |
||
| 248 | 256 | id, name, description, new (is it new?), topics (#), posts (#), href, link, and last_post. */ |
| 249 | 257 | foreach ($board['children'] as $child) |
| 250 | 258 | { |
| 251 | - if (!$child['is_redirect']) |
|
| 252 | - $child['link'] = ''. ($child['new'] ? '<a href="' . $scripturl . '?action=unread;board=' . $child['id'] . '" title="' . $txt['new_posts'] . ' (' . $txt['board_topics'] . ': ' . comma_format($child['topics']) . ', ' . $txt['posts'] . ': ' . comma_format($child['posts']) . ')" class="new_posts">' . $txt['new'] . '</a>' : '') . '<a href="' . $child['href'] . '" ' . ($child['new'] ? 'class="board_new_posts" ' : '') . 'title="' . ($child['new'] ? $txt['new_posts'] : $txt['old_posts']) . ' (' . $txt['board_topics'] . ': ' . comma_format($child['topics']) . ', ' . $txt['posts'] . ': ' . comma_format($child['posts']) . ')">' . $child['name'] . '</a>'; |
|
| 253 | - else |
|
| 254 | - $child['link'] = '<a href="' . $child['href'] . '" title="' . comma_format($child['posts']) . ' ' . $txt['redirects'] . ' - ' . $child['short_description'] . '">' . $child['name'] . '</a>'; |
|
| 259 | + if (!$child['is_redirect']) { |
|
| 260 | + $child['link'] = ''. ($child['new'] ? '<a href="' . $scripturl . '?action=unread;board=' . $child['id'] . '" title="' . $txt['new_posts'] . ' (' . $txt['board_topics'] . ': ' . comma_format($child['topics']) . ', ' . $txt['posts'] . ': ' . comma_format($child['posts']) . ')" class="new_posts">' . $txt['new'] . '</a>' : '') . '<a href="' . $child['href'] . '" ' . ($child['new'] ? 'class="board_new_posts" ' : '') . 'title="' . ($child['new'] ? $txt['new_posts'] : $txt['old_posts']) . ' (' . $txt['board_topics'] . ': ' . comma_format($child['topics']) . ', ' . $txt['posts'] . ': ' . comma_format($child['posts']) . ')">' . $child['name'] . '</a>'; |
|
| 261 | + } else { |
|
| 262 | + $child['link'] = '<a href="' . $child['href'] . '" title="' . comma_format($child['posts']) . ' ' . $txt['redirects'] . ' - ' . $child['short_description'] . '">' . $child['name'] . '</a>'; |
|
| 263 | + } |
|
| 255 | 264 | |
| 256 | 265 | // Has it posts awaiting approval? |
| 257 | - if ($child['can_approve_posts'] && ($child['unapproved_posts'] || $child['unapproved_topics'])) |
|
| 258 | - $child['link'] .= ' <a href="' . $scripturl . '?action=moderate;area=postmod;sa=' . ($child['unapproved_topics'] > 0 ? 'topics' : 'posts') . ';brd=' . $child['id'] . ';' . $context['session_var'] . '=' . $context['session_id'] . '" title="' . sprintf($txt['unapproved_posts'], $child['unapproved_topics'], $child['unapproved_posts']) . '" class="moderation_link">(!)</a>'; |
|
| 266 | + if ($child['can_approve_posts'] && ($child['unapproved_posts'] || $child['unapproved_topics'])) { |
|
| 267 | + $child['link'] .= ' <a href="' . $scripturl . '?action=moderate;area=postmod;sa=' . ($child['unapproved_topics'] > 0 ? 'topics' : 'posts') . ';brd=' . $child['id'] . ';' . $context['session_var'] . '=' . $context['session_id'] . '" title="' . sprintf($txt['unapproved_posts'], $child['unapproved_topics'], $child['unapproved_posts']) . '" class="moderation_link">(!)</a>'; |
|
| 268 | + } |
|
| 259 | 269 | |
| 260 | 270 | $children[] = $child['new'] ? '<span class="strong">' . $child['link'] . '</span>' : '<span>' . $child['link'] . '</span>'; |
| 261 | 271 | } |
@@ -282,8 +292,9 @@ discard block |
||
| 282 | 292 | { |
| 283 | 293 | global $context, $options, $txt; |
| 284 | 294 | |
| 285 | - if (empty($context['info_center'])) |
|
| 286 | - return; |
|
| 295 | + if (empty($context['info_center'])) { |
|
| 296 | + return; |
|
| 297 | + } |
|
| 287 | 298 | |
| 288 | 299 | // Here's where the "Info Center" starts... |
| 289 | 300 | echo ' |
@@ -383,14 +394,15 @@ discard block |
||
| 383 | 394 | /* Each post in latest_posts has: |
| 384 | 395 | board (with an id, name, and link.), topic (the topic's id.), poster (with id, name, and link.), |
| 385 | 396 | subject, short_subject (shortened with...), time, link, and href. */ |
| 386 | - foreach ($context['latest_posts'] as $post) |
|
| 387 | - echo ' |
|
| 397 | + foreach ($context['latest_posts'] as $post) { |
|
| 398 | + echo ' |
|
| 388 | 399 | <tr class="windowbg"> |
| 389 | 400 | <td class="recentpost"><strong>', $post['link'], '</strong></td> |
| 390 | 401 | <td class="recentposter">', $post['poster']['link'], '</td> |
| 391 | 402 | <td class="recentboard">', $post['board']['link'], '</td> |
| 392 | 403 | <td class="recenttime">', $post['time'], '</td> |
| 393 | 404 | </tr>'; |
| 405 | + } |
|
| 394 | 406 | echo ' |
| 395 | 407 | </table>'; |
| 396 | 408 | } |
@@ -414,11 +426,12 @@ discard block |
||
| 414 | 426 | </div>'; |
| 415 | 427 | |
| 416 | 428 | // Holidays like "Christmas", "Chanukah", and "We Love [Unknown] Day" :P |
| 417 | - if (!empty($context['calendar_holidays'])) |
|
| 418 | - echo ' |
|
| 429 | + if (!empty($context['calendar_holidays'])) { |
|
| 430 | + echo ' |
|
| 419 | 431 | <p class="inline holiday"> |
| 420 | 432 | <span>', $txt['calendar_prompt'], '</span> ', implode(', ', $context['calendar_holidays']), ' |
| 421 | 433 | </p>'; |
| 434 | + } |
|
| 422 | 435 | |
| 423 | 436 | // People's birthdays. Like mine. And yours, I guess. Kidding. |
| 424 | 437 | if (!empty($context['calendar_birthdays'])) |
@@ -428,9 +441,10 @@ discard block |
||
| 428 | 441 | <span class="birthday">', $context['calendar_only_today'] ? $txt['birthdays'] : $txt['birthdays_upcoming'], '</span>'; |
| 429 | 442 | |
| 430 | 443 | // Each member in calendar_birthdays has: id, name (person), age (if they have one set?), is_last. (last in list?), and is_today (birthday is today?) |
| 431 | - foreach ($context['calendar_birthdays'] as $member) |
|
| 432 | - echo ' |
|
| 444 | + foreach ($context['calendar_birthdays'] as $member) { |
|
| 445 | + echo ' |
|
| 433 | 446 | <a href="', $scripturl, '?action=profile;u=', $member['id'], '">', $member['is_today'] ? '<strong class="fix_rtl_names">' : '', $member['name'], $member['is_today'] ? '</strong>' : '', isset($member['age']) ? ' (' . $member['age'] . ')' : '', '</a>', $member['is_last'] ? '' : ', '; |
| 447 | + } |
|
| 434 | 448 | |
| 435 | 449 | echo ' |
| 436 | 450 | </p>'; |
@@ -445,9 +459,10 @@ discard block |
||
| 445 | 459 | |
| 446 | 460 | // Each event in calendar_events should have: |
| 447 | 461 | // title, href, is_last, can_edit (are they allowed?), modify_href, and is_today. |
| 448 | - foreach ($context['calendar_events'] as $event) |
|
| 449 | - echo ' |
|
| 462 | + foreach ($context['calendar_events'] as $event) { |
|
| 463 | + echo ' |
|
| 450 | 464 | ', $event['can_edit'] ? '<a href="' . $event['modify_href'] . '" title="' . $txt['calendar_edit'] . '"><span class="generic_icons calendar_modify"></span></a> ' : '', $event['href'] == '' ? '' : '<a href="' . $event['href'] . '">', $event['is_today'] ? '<strong>' . $event['title'] . '</strong>' : $event['title'], $event['href'] == '' ? '' : '</a>', $event['is_last'] ? '<br>' : ', '; |
| 465 | + } |
|
| 451 | 466 | echo ' |
| 452 | 467 | </p>'; |
| 453 | 468 | } |
@@ -493,17 +508,21 @@ discard block |
||
| 493 | 508 | // Handle hidden users and buddies. |
| 494 | 509 | $bracketList = array(); |
| 495 | 510 | |
| 496 | - if ($context['show_buddies']) |
|
| 497 | - $bracketList[] = comma_format($context['num_buddies']) . ' ' . ($context['num_buddies'] == 1 ? $txt['buddy'] : $txt['buddies']); |
|
| 511 | + if ($context['show_buddies']) { |
|
| 512 | + $bracketList[] = comma_format($context['num_buddies']) . ' ' . ($context['num_buddies'] == 1 ? $txt['buddy'] : $txt['buddies']); |
|
| 513 | + } |
|
| 498 | 514 | |
| 499 | - if (!empty($context['num_spiders'])) |
|
| 500 | - $bracketList[] = comma_format($context['num_spiders']) . ' ' . ($context['num_spiders'] == 1 ? $txt['spider'] : $txt['spiders']); |
|
| 515 | + if (!empty($context['num_spiders'])) { |
|
| 516 | + $bracketList[] = comma_format($context['num_spiders']) . ' ' . ($context['num_spiders'] == 1 ? $txt['spider'] : $txt['spiders']); |
|
| 517 | + } |
|
| 501 | 518 | |
| 502 | - if (!empty($context['num_users_hidden'])) |
|
| 503 | - $bracketList[] = comma_format($context['num_users_hidden']) . ' ' . ($context['num_spiders'] == 1 ? $txt['hidden'] : $txt['hidden_s']); |
|
| 519 | + if (!empty($context['num_users_hidden'])) { |
|
| 520 | + $bracketList[] = comma_format($context['num_users_hidden']) . ' ' . ($context['num_spiders'] == 1 ? $txt['hidden'] : $txt['hidden_s']); |
|
| 521 | + } |
|
| 504 | 522 | |
| 505 | - if (!empty($bracketList)) |
|
| 506 | - echo ' (' . implode(', ', $bracketList) . ')'; |
|
| 523 | + if (!empty($bracketList)) { |
|
| 524 | + echo ' (' . implode(', ', $bracketList) . ')'; |
|
| 525 | + } |
|
| 507 | 526 | |
| 508 | 527 | echo $context['show_who'] ? '</a>' : '', ' |
| 509 | 528 | |
@@ -517,9 +536,10 @@ discard block |
||
| 517 | 536 | ', sprintf($txt['users_active'], $modSettings['lastActive']), ': ', implode(', ', $context['list_users_online']); |
| 518 | 537 | |
| 519 | 538 | // Showing membergroups? |
| 520 | - if (!empty($settings['show_group_key']) && !empty($context['membergroups'])) |
|
| 521 | - echo ' |
|
| 539 | + if (!empty($settings['show_group_key']) && !empty($context['membergroups'])) { |
|
| 540 | + echo ' |
|
| 522 | 541 | <span class="membergroups">' . implode(', ', $context['membergroups']) . '</span>'; |
| 542 | + } |
|
| 523 | 543 | } |
| 524 | 544 | |
| 525 | 545 | echo ' |
@@ -13,8 +13,9 @@ discard block |
||
| 13 | 13 | * @version 2.1 Beta 4 |
| 14 | 14 | */ |
| 15 | 15 | |
| 16 | -if (!defined('SMF')) |
|
| 16 | +if (!defined('SMF')) { |
|
| 17 | 17 | die('No direct access...'); |
| 18 | +} |
|
| 18 | 19 | |
| 19 | 20 | /** |
| 20 | 21 | * Entry point function, permission checks, admin bars, etc. |
@@ -99,27 +100,27 @@ discard block |
||
| 99 | 100 | 'function' => function($rowData) use ($scripturl) |
| 100 | 101 | { |
| 101 | 102 | // Since the moderator group has no explicit members, no link is needed. |
| 102 | - if ($rowData['id_group'] == 3) |
|
| 103 | - $group_name = $rowData['group_name']; |
|
| 104 | - else |
|
| 103 | + if ($rowData['id_group'] == 3) { |
|
| 104 | + $group_name = $rowData['group_name']; |
|
| 105 | + } else |
|
| 105 | 106 | { |
| 106 | 107 | $color_style = empty($rowData['online_color']) ? '' : sprintf(' style="color: %1$s;"', $rowData['online_color']); |
| 107 | 108 | |
| 108 | 109 | if (allowedTo('manage_membergroups')) |
| 109 | 110 | { |
| 110 | 111 | $group_name = sprintf('<a href="%1$s?action=admin;area=membergroups;sa=members;group=%2$d"%3$s>%4$s</a>', $scripturl, $rowData['id_group'], $color_style, $rowData['group_name']); |
| 111 | - } |
|
| 112 | - else |
|
| 112 | + } else |
|
| 113 | 113 | { |
| 114 | 114 | $group_name = sprintf('<a href="%1$s?action=groups;sa=members;group=%2$d"%3$s>%4$s</a>', $scripturl, $rowData['id_group'], $color_style, $rowData['group_name']); |
| 115 | 115 | } |
| 116 | 116 | } |
| 117 | 117 | |
| 118 | 118 | // Add a help option for moderator and administrator. |
| 119 | - if ($rowData['id_group'] == 1) |
|
| 120 | - $group_name .= sprintf(' (<a href="%1$s?action=helpadmin;help=membergroup_administrator" onclick="return reqOverlayDiv(this.href);">?</a>)', $scripturl); |
|
| 121 | - elseif ($rowData['id_group'] == 3) |
|
| 122 | - $group_name .= sprintf(' (<a href="%1$s?action=helpadmin;help=membergroup_moderator" onclick="return reqOverlayDiv(this.href);">?</a>)', $scripturl); |
|
| 119 | + if ($rowData['id_group'] == 1) { |
|
| 120 | + $group_name .= sprintf(' (<a href="%1$s?action=helpadmin;help=membergroup_administrator" onclick="return reqOverlayDiv(this.href);">?</a>)', $scripturl); |
|
| 121 | + } elseif ($rowData['id_group'] == 3) { |
|
| 122 | + $group_name .= sprintf(' (<a href="%1$s?action=helpadmin;help=membergroup_moderator" onclick="return reqOverlayDiv(this.href);">?</a>)', $scripturl); |
|
| 123 | + } |
|
| 123 | 124 | |
| 124 | 125 | return $group_name; |
| 125 | 126 | }, |
@@ -198,8 +199,9 @@ discard block |
||
| 198 | 199 | $_REQUEST['group'] = isset($_REQUEST['group']) ? (int) $_REQUEST['group'] : 0; |
| 199 | 200 | |
| 200 | 201 | // No browsing of guests, membergroup 0 or moderators. |
| 201 | - if (in_array($_REQUEST['group'], array(-1, 0, 3))) |
|
| 202 | - fatal_lang_error('membergroup_does_not_exist', false); |
|
| 202 | + if (in_array($_REQUEST['group'], array(-1, 0, 3))) { |
|
| 203 | + fatal_lang_error('membergroup_does_not_exist', false); |
|
| 204 | + } |
|
| 203 | 205 | |
| 204 | 206 | // Load up the group details. |
| 205 | 207 | $request = $smcFunc['db_query']('', ' |
@@ -214,8 +216,9 @@ discard block |
||
| 214 | 216 | ) |
| 215 | 217 | ); |
| 216 | 218 | // Doesn't exist? |
| 217 | - if ($smcFunc['db_num_rows']($request) == 0) |
|
| 218 | - fatal_lang_error('membergroup_does_not_exist', false); |
|
| 219 | + if ($smcFunc['db_num_rows']($request) == 0) { |
|
| 220 | + fatal_lang_error('membergroup_does_not_exist', false); |
|
| 221 | + } |
|
| 219 | 222 | $context['group'] = $smcFunc['db_fetch_assoc']($request); |
| 220 | 223 | $smcFunc['db_free_result']($request); |
| 221 | 224 | |
@@ -248,21 +251,25 @@ discard block |
||
| 248 | 251 | 'name' => $row['real_name'] |
| 249 | 252 | ); |
| 250 | 253 | |
| 251 | - if ($user_info['id'] == $row['id_member'] && $context['group']['group_type'] != 1) |
|
| 252 | - $context['group']['can_moderate'] = true; |
|
| 254 | + if ($user_info['id'] == $row['id_member'] && $context['group']['group_type'] != 1) { |
|
| 255 | + $context['group']['can_moderate'] = true; |
|
| 256 | + } |
|
| 253 | 257 | } |
| 254 | 258 | $smcFunc['db_free_result']($request); |
| 255 | 259 | |
| 256 | 260 | // If this group is hidden then it can only "exists" if the user can moderate it! |
| 257 | - if ($context['group']['hidden'] && !$context['group']['can_moderate']) |
|
| 258 | - fatal_lang_error('membergroup_does_not_exist', false); |
|
| 261 | + if ($context['group']['hidden'] && !$context['group']['can_moderate']) { |
|
| 262 | + fatal_lang_error('membergroup_does_not_exist', false); |
|
| 263 | + } |
|
| 259 | 264 | |
| 260 | 265 | // You can only assign membership if you are the moderator and/or can manage groups! |
| 261 | - if (!$context['group']['can_moderate']) |
|
| 262 | - $context['group']['assignable'] = 0; |
|
| 266 | + if (!$context['group']['can_moderate']) { |
|
| 267 | + $context['group']['assignable'] = 0; |
|
| 268 | + } |
|
| 263 | 269 | // Non-admins cannot assign admins. |
| 264 | - elseif ($context['group']['id'] == 1 && !allowedTo('admin_forum')) |
|
| 265 | - $context['group']['assignable'] = 0; |
|
| 270 | + elseif ($context['group']['id'] == 1 && !allowedTo('admin_forum')) { |
|
| 271 | + $context['group']['assignable'] = 0; |
|
| 272 | + } |
|
| 266 | 273 | |
| 267 | 274 | // Removing member from group? |
| 268 | 275 | if (isset($_POST['remove']) && !empty($_REQUEST['rem']) && is_array($_REQUEST['rem']) && $context['group']['assignable']) |
@@ -271,8 +278,9 @@ discard block |
||
| 271 | 278 | validateToken('mod-mgm'); |
| 272 | 279 | |
| 273 | 280 | // Make sure we're dealing with integers only. |
| 274 | - foreach ($_REQUEST['rem'] as $key => $group) |
|
| 275 | - $_REQUEST['rem'][$key] = (int) $group; |
|
| 281 | + foreach ($_REQUEST['rem'] as $key => $group) { |
|
| 282 | + $_REQUEST['rem'][$key] = (int) $group; |
|
| 283 | + } |
|
| 276 | 284 | |
| 277 | 285 | require_once($sourcedir . '/Subs-Membergroups.php'); |
| 278 | 286 | removeMembersFromGroups($_REQUEST['rem'], $_REQUEST['group'], true); |
@@ -295,16 +303,18 @@ discard block |
||
| 295 | 303 | { |
| 296 | 304 | $member_names[$index] = trim($smcFunc['strtolower']($member_names[$index])); |
| 297 | 305 | |
| 298 | - if (strlen($member_names[$index]) == 0) |
|
| 299 | - unset($member_names[$index]); |
|
| 306 | + if (strlen($member_names[$index]) == 0) { |
|
| 307 | + unset($member_names[$index]); |
|
| 308 | + } |
|
| 300 | 309 | } |
| 301 | 310 | |
| 302 | 311 | // Any passed by ID? |
| 303 | 312 | $member_ids = array(); |
| 304 | - if (!empty($_REQUEST['member_add'])) |
|
| 305 | - foreach ($_REQUEST['member_add'] as $id) |
|
| 313 | + if (!empty($_REQUEST['member_add'])) { |
|
| 314 | + foreach ($_REQUEST['member_add'] as $id) |
|
| 306 | 315 | if ($id > 0) |
| 307 | 316 | $member_ids[] = (int) $id; |
| 317 | + } |
|
| 308 | 318 | |
| 309 | 319 | // Construct the query pelements. |
| 310 | 320 | if (!empty($member_ids)) |
@@ -332,8 +342,9 @@ discard block |
||
| 332 | 342 | 'id_group' => $_REQUEST['group'], |
| 333 | 343 | )) |
| 334 | 344 | ); |
| 335 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
| 336 | - $members[] = $row['id_member']; |
|
| 345 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
| 346 | + $members[] = $row['id_member']; |
|
| 347 | + } |
|
| 337 | 348 | $smcFunc['db_free_result']($request); |
| 338 | 349 | } |
| 339 | 350 | |
@@ -372,10 +383,11 @@ discard block |
||
| 372 | 383 | $context['sort_direction'] = isset($_REQUEST['desc']) ? 'down' : 'up'; |
| 373 | 384 | |
| 374 | 385 | // The where on the query is interesting. Non-moderators should only see people who are in this group as primary. |
| 375 | - if ($context['group']['can_moderate']) |
|
| 376 | - $where = $context['group']['is_post_group'] ? 'id_post_group = {int:group}' : 'id_group = {int:group} OR FIND_IN_SET({int:group}, additional_groups) != 0'; |
|
| 377 | - else |
|
| 378 | - $where = $context['group']['is_post_group'] ? 'id_post_group = {int:group}' : 'id_group = {int:group}'; |
|
| 386 | + if ($context['group']['can_moderate']) { |
|
| 387 | + $where = $context['group']['is_post_group'] ? 'id_post_group = {int:group}' : 'id_group = {int:group} OR FIND_IN_SET({int:group}, additional_groups) != 0'; |
|
| 388 | + } else { |
|
| 389 | + $where = $context['group']['is_post_group'] ? 'id_post_group = {int:group}' : 'id_group = {int:group}'; |
|
| 390 | + } |
|
| 379 | 391 | |
| 380 | 392 | // Count members of the group. |
| 381 | 393 | $request = $smcFunc['db_query']('', ' |
@@ -416,8 +428,9 @@ discard block |
||
| 416 | 428 | $last_online = empty($row['last_login']) ? $txt['never'] : timeformat($row['last_login']); |
| 417 | 429 | |
| 418 | 430 | // Italicize the online note if they aren't activated. |
| 419 | - if ($row['is_activated'] % 10 != 1) |
|
| 420 | - $last_online = '<em title="' . $txt['not_activated'] . '">' . $last_online . '</em>'; |
|
| 431 | + if ($row['is_activated'] % 10 != 1) { |
|
| 432 | + $last_online = '<em title="' . $txt['not_activated'] . '">' . $last_online . '</em>'; |
|
| 433 | + } |
|
| 421 | 434 | |
| 422 | 435 | $context['members'][] = array( |
| 423 | 436 | 'id' => $row['id_member'], |
@@ -437,9 +450,10 @@ discard block |
||
| 437 | 450 | $context['page_title'] = $txt['membergroups_members_title'] . ': ' . $context['group']['name']; |
| 438 | 451 | createToken('mod-mgm'); |
| 439 | 452 | |
| 440 | - if ($context['group']['assignable']) |
|
| 441 | - loadJavaScriptFile('suggest.js', array('defer' => false, 'minimize' => true), 'smf_suggest'); |
|
| 442 | -} |
|
| 453 | + if ($context['group']['assignable']) { |
|
| 454 | + loadJavaScriptFile('suggest.js', array('defer' => false, 'minimize' => true), 'smf_suggest'); |
|
| 455 | + } |
|
| 456 | + } |
|
| 443 | 457 | |
| 444 | 458 | /** |
| 445 | 459 | * Show and manage all group requests. |
@@ -453,16 +467,18 @@ discard block |
||
| 453 | 467 | $context['sub_template'] = 'show_list'; |
| 454 | 468 | |
| 455 | 469 | // Verify we can be here. |
| 456 | - if ($user_info['mod_cache']['gq'] == '0=1') |
|
| 457 | - isAllowedTo('manage_membergroups'); |
|
| 470 | + if ($user_info['mod_cache']['gq'] == '0=1') { |
|
| 471 | + isAllowedTo('manage_membergroups'); |
|
| 472 | + } |
|
| 458 | 473 | |
| 459 | 474 | // Normally, we act normally... |
| 460 | 475 | $where = ($user_info['mod_cache']['gq'] == '1=1' || $user_info['mod_cache']['gq'] == '0=1' ? $user_info['mod_cache']['gq'] : 'lgr.' . $user_info['mod_cache']['gq']); |
| 461 | 476 | |
| 462 | - if (isset($_GET['closed'])) |
|
| 463 | - $where .= ' AND lgr.status != {int:status_open}'; |
|
| 464 | - else |
|
| 465 | - $where .= ' AND lgr.status = {int:status_open}'; |
|
| 477 | + if (isset($_GET['closed'])) { |
|
| 478 | + $where .= ' AND lgr.status != {int:status_open}'; |
|
| 479 | + } else { |
|
| 480 | + $where .= ' AND lgr.status = {int:status_open}'; |
|
| 481 | + } |
|
| 466 | 482 | |
| 467 | 483 | $where_parameters = array( |
| 468 | 484 | 'status_open' => 0, |
@@ -475,8 +491,9 @@ discard block |
||
| 475 | 491 | validateToken('mod-gr'); |
| 476 | 492 | |
| 477 | 493 | // Clean the values. |
| 478 | - foreach ($_POST['groupr'] as $k => $request) |
|
| 479 | - $_POST['groupr'][$k] = (int) $request; |
|
| 494 | + foreach ($_POST['groupr'] as $k => $request) { |
|
| 495 | + $_POST['groupr'][$k] = (int) $request; |
|
| 496 | + } |
|
| 480 | 497 | |
| 481 | 498 | $log_changes = array(); |
| 482 | 499 | |
@@ -513,8 +530,8 @@ discard block |
||
| 513 | 530 | $request_list = array(); |
| 514 | 531 | while ($row = $smcFunc['db_fetch_assoc']($request)) |
| 515 | 532 | { |
| 516 | - if (!isset($log_changes[$row['id_request']])) |
|
| 517 | - $log_changes[$row['id_request']] = array( |
|
| 533 | + if (!isset($log_changes[$row['id_request']])) { |
|
| 534 | + $log_changes[$row['id_request']] = array( |
|
| 518 | 535 | 'id_request' => $row['id_request'], |
| 519 | 536 | 'status' => $_POST['req_action'] == 'approve' ? 1 : 2, // 1 = approved, 2 = rejected |
| 520 | 537 | 'id_member_acted' => $user_info['id'], |
@@ -522,6 +539,7 @@ discard block |
||
| 522 | 539 | 'time_acted' => time(), |
| 523 | 540 | 'act_reason' => $_POST['req_action'] != 'approve' && !empty($_POST['groupreason']) && !empty($_POST['groupreason'][$row['id_request']]) ? $smcFunc['htmlspecialchars']($_POST['groupreason'][$row['id_request']], ENT_QUOTES) : '', |
| 524 | 541 | ); |
| 542 | + } |
|
| 525 | 543 | $request_list[] = $row['id_request']; |
| 526 | 544 | } |
| 527 | 545 | $smcFunc['db_free_result']($request); |
@@ -744,21 +762,24 @@ discard block |
||
| 744 | 762 | $group_requests = array(); |
| 745 | 763 | while ($row = $smcFunc['db_fetch_assoc']($request)) |
| 746 | 764 | { |
| 747 | - if (empty($row['reason'])) |
|
| 748 | - $reason = '<em>(' . $txt['mc_groupr_no_reason'] . ')</em>'; |
|
| 749 | - else |
|
| 750 | - $reason = censorText($row['reason']); |
|
| 765 | + if (empty($row['reason'])) { |
|
| 766 | + $reason = '<em>(' . $txt['mc_groupr_no_reason'] . ')</em>'; |
|
| 767 | + } else { |
|
| 768 | + $reason = censorText($row['reason']); |
|
| 769 | + } |
|
| 751 | 770 | |
| 752 | 771 | if (isset($_GET['closed'])) |
| 753 | 772 | { |
| 754 | - if ($row['status'] == 1) |
|
| 755 | - $reason .= '<br><br><strong>' . $txt['mc_groupr_approved'] . '</strong>'; |
|
| 756 | - elseif ($row['status'] == 2) |
|
| 757 | - $reason .= '<br><br><strong>' . $txt['mc_groupr_rejected'] . '</strong>'; |
|
| 773 | + if ($row['status'] == 1) { |
|
| 774 | + $reason .= '<br><br><strong>' . $txt['mc_groupr_approved'] . '</strong>'; |
|
| 775 | + } elseif ($row['status'] == 2) { |
|
| 776 | + $reason .= '<br><br><strong>' . $txt['mc_groupr_rejected'] . '</strong>'; |
|
| 777 | + } |
|
| 758 | 778 | |
| 759 | 779 | $reason .= ' (' . timeformat($row['time_acted']) . ')'; |
| 760 | - if (!empty($row['act_reason'])) |
|
| 761 | - $reason .= '<br><br>' . censorText($row['act_reason']); |
|
| 780 | + if (!empty($row['act_reason'])) { |
|
| 781 | + $reason .= '<br><br>' . censorText($row['act_reason']); |
|
| 782 | + } |
|
| 762 | 783 | } |
| 763 | 784 | |
| 764 | 785 | $group_requests[] = array( |
@@ -13,8 +13,9 @@ discard block |
||
| 13 | 13 | * @version 2.1 Beta 4 |
| 14 | 14 | */ |
| 15 | 15 | |
| 16 | -if (!defined('SMF')) |
|
| 16 | +if (!defined('SMF')) { |
|
| 17 | 17 | die('No direct access...'); |
| 18 | +} |
|
| 18 | 19 | |
| 19 | 20 | /** |
| 20 | 21 | * The main admin handling function.<br> |
@@ -444,8 +445,9 @@ discard block |
||
| 444 | 445 | foreach ($admin_includes as $include) |
| 445 | 446 | { |
| 446 | 447 | $include = strtr(trim($include), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir, '$themedir' => $settings['theme_dir'])); |
| 447 | - if (file_exists($include)) |
|
| 448 | - require_once($include); |
|
| 448 | + if (file_exists($include)) { |
|
| 449 | + require_once($include); |
|
| 450 | + } |
|
| 449 | 451 | } |
| 450 | 452 | } |
| 451 | 453 | |
@@ -457,24 +459,27 @@ discard block |
||
| 457 | 459 | unset($admin_areas); |
| 458 | 460 | |
| 459 | 461 | // Nothing valid? |
| 460 | - if ($admin_include_data == false) |
|
| 461 | - fatal_lang_error('no_access', false); |
|
| 462 | + if ($admin_include_data == false) { |
|
| 463 | + fatal_lang_error('no_access', false); |
|
| 464 | + } |
|
| 462 | 465 | |
| 463 | 466 | // Build the link tree. |
| 464 | 467 | $context['linktree'][] = array( |
| 465 | 468 | 'url' => $scripturl . '?action=admin', |
| 466 | 469 | 'name' => $txt['admin_center'], |
| 467 | 470 | ); |
| 468 | - if (isset($admin_include_data['current_area']) && $admin_include_data['current_area'] != 'index') |
|
| 469 | - $context['linktree'][] = array( |
|
| 471 | + if (isset($admin_include_data['current_area']) && $admin_include_data['current_area'] != 'index') { |
|
| 472 | + $context['linktree'][] = array( |
|
| 470 | 473 | 'url' => $scripturl . '?action=admin;area=' . $admin_include_data['current_area'] . ';' . $context['session_var'] . '=' . $context['session_id'], |
| 471 | 474 | 'name' => $admin_include_data['label'], |
| 472 | 475 | ); |
| 473 | - if (!empty($admin_include_data['current_subsection']) && $admin_include_data['subsections'][$admin_include_data['current_subsection']][0] != $admin_include_data['label']) |
|
| 474 | - $context['linktree'][] = array( |
|
| 476 | + } |
|
| 477 | + if (!empty($admin_include_data['current_subsection']) && $admin_include_data['subsections'][$admin_include_data['current_subsection']][0] != $admin_include_data['label']) { |
|
| 478 | + $context['linktree'][] = array( |
|
| 475 | 479 | 'url' => $scripturl . '?action=admin;area=' . $admin_include_data['current_area'] . ';sa=' . $admin_include_data['current_subsection'] . ';' . $context['session_var'] . '=' . $context['session_id'], |
| 476 | 480 | 'name' => $admin_include_data['subsections'][$admin_include_data['current_subsection']][0], |
| 477 | 481 | ); |
| 482 | + } |
|
| 478 | 483 | |
| 479 | 484 | // Make a note of the Unique ID for this menu. |
| 480 | 485 | $context['admin_menu_id'] = $context['max_menu_id']; |
@@ -484,16 +489,18 @@ discard block |
||
| 484 | 489 | $context['admin_area'] = $admin_include_data['current_area']; |
| 485 | 490 | |
| 486 | 491 | // Now - finally - call the right place! |
| 487 | - if (isset($admin_include_data['file'])) |
|
| 488 | - require_once($sourcedir . '/' . $admin_include_data['file']); |
|
| 492 | + if (isset($admin_include_data['file'])) { |
|
| 493 | + require_once($sourcedir . '/' . $admin_include_data['file']); |
|
| 494 | + } |
|
| 489 | 495 | |
| 490 | 496 | // Get the right callable. |
| 491 | 497 | $call = call_helper($admin_include_data['function'], true); |
| 492 | 498 | |
| 493 | 499 | // Is it valid? |
| 494 | - if (!empty($call)) |
|
| 495 | - call_user_func($call); |
|
| 496 | -} |
|
| 500 | + if (!empty($call)) { |
|
| 501 | + call_user_func($call); |
|
| 502 | + } |
|
| 503 | + } |
|
| 497 | 504 | |
| 498 | 505 | /** |
| 499 | 506 | * The main administration section. |
@@ -547,13 +554,14 @@ discard block |
||
| 547 | 554 | |
| 548 | 555 | $context['sub_template'] = $context['admin_area'] == 'credits' ? 'credits' : 'admin'; |
| 549 | 556 | $context['page_title'] = $context['admin_area'] == 'credits' ? $txt['support_credits_title'] : $txt['admin_center']; |
| 550 | - if ($context['admin_area'] != 'credits') |
|
| 551 | - $context[$context['admin_menu_name']]['tab_data'] = array( |
|
| 557 | + if ($context['admin_area'] != 'credits') { |
|
| 558 | + $context[$context['admin_menu_name']]['tab_data'] = array( |
|
| 552 | 559 | 'title' => $txt['admin_center'], |
| 553 | 560 | 'help' => '', |
| 554 | 561 | 'description' => '<strong>' . $txt['hello_guest'] . ' ' . $context['user']['name'] . '!</strong> |
| 555 | 562 | ' . sprintf($txt['admin_main_welcome'], $txt['admin_center'], $txt['help'], $txt['help']), |
| 556 | 563 | ); |
| 564 | + } |
|
| 557 | 565 | |
| 558 | 566 | // Lastly, fill in the blanks in the support resources paragraphs. |
| 559 | 567 | $txt['support_resources_p1'] = sprintf($txt['support_resources_p1'], |
@@ -571,9 +579,10 @@ discard block |
||
| 571 | 579 | 'https://www.simplemachines.org/redirect/customize_support' |
| 572 | 580 | ); |
| 573 | 581 | |
| 574 | - if ($context['admin_area'] == 'admin') |
|
| 575 | - loadJavaScriptFile('admin.js', array('defer' => false, 'minimize' => true), 'smf_admin'); |
|
| 576 | -} |
|
| 582 | + if ($context['admin_area'] == 'admin') { |
|
| 583 | + loadJavaScriptFile('admin.js', array('defer' => false, 'minimize' => true), 'smf_admin'); |
|
| 584 | + } |
|
| 585 | + } |
|
| 577 | 586 | |
| 578 | 587 | /** |
| 579 | 588 | * Get one of the admin information files from Simple Machines. |
@@ -584,8 +593,9 @@ discard block |
||
| 584 | 593 | |
| 585 | 594 | setMemoryLimit('32M'); |
| 586 | 595 | |
| 587 | - if (empty($_REQUEST['filename']) || !is_string($_REQUEST['filename'])) |
|
| 588 | - fatal_lang_error('no_access', false); |
|
| 596 | + if (empty($_REQUEST['filename']) || !is_string($_REQUEST['filename'])) { |
|
| 597 | + fatal_lang_error('no_access', false); |
|
| 598 | + } |
|
| 589 | 599 | |
| 590 | 600 | // Strip off the forum cache part or we won't find it... |
| 591 | 601 | $_REQUEST['filename'] = str_replace($modSettings['browser_cache'], '', $_REQUEST['filename']); |
@@ -600,27 +610,30 @@ discard block |
||
| 600 | 610 | ) |
| 601 | 611 | ); |
| 602 | 612 | |
| 603 | - if ($smcFunc['db_num_rows']($request) == 0) |
|
| 604 | - fatal_lang_error('admin_file_not_found', true, array($_REQUEST['filename']), 404); |
|
| 613 | + if ($smcFunc['db_num_rows']($request) == 0) { |
|
| 614 | + fatal_lang_error('admin_file_not_found', true, array($_REQUEST['filename']), 404); |
|
| 615 | + } |
|
| 605 | 616 | |
| 606 | 617 | list ($file_data, $filetype) = $smcFunc['db_fetch_row']($request); |
| 607 | 618 | $smcFunc['db_free_result']($request); |
| 608 | 619 | |
| 609 | 620 | // @todo Temp |
| 610 | 621 | // Figure out if sesc is still being used. |
| 611 | - if (strpos($file_data, ';sesc=') !== false && $filetype == 'text/javascript') |
|
| 612 | - $file_data = ' |
|
| 622 | + if (strpos($file_data, ';sesc=') !== false && $filetype == 'text/javascript') { |
|
| 623 | + $file_data = ' |
|
| 613 | 624 | if (!(\'smfForum_sessionvar\' in window)) |
| 614 | 625 | window.smfForum_sessionvar = \'sesc\'; |
| 615 | 626 | ' . strtr($file_data, array(';sesc=' => ';\' + window.smfForum_sessionvar + \'=')); |
| 627 | + } |
|
| 616 | 628 | |
| 617 | 629 | $context['template_layers'] = array(); |
| 618 | 630 | // Lets make sure we aren't going to output anything nasty. |
| 619 | 631 | @ob_end_clean(); |
| 620 | - if (!empty($modSettings['enableCompressedOutput'])) |
|
| 621 | - @ob_start('ob_gzhandler'); |
|
| 622 | - else |
|
| 623 | - @ob_start(); |
|
| 632 | + if (!empty($modSettings['enableCompressedOutput'])) { |
|
| 633 | + @ob_start('ob_gzhandler'); |
|
| 634 | + } else { |
|
| 635 | + @ob_start(); |
|
| 636 | + } |
|
| 624 | 637 | |
| 625 | 638 | // Make sure they know what type of file we are. |
| 626 | 639 | header('content-type: ' . $filetype); |
@@ -660,11 +673,12 @@ discard block |
||
| 660 | 673 | updateAdminPreferences(); |
| 661 | 674 | } |
| 662 | 675 | |
| 663 | - if (trim($context['search_term']) == '') |
|
| 664 | - $context['search_results'] = array(); |
|
| 665 | - else |
|
| 666 | - call_helper($subActions[$context['search_type']]); |
|
| 667 | -} |
|
| 676 | + if (trim($context['search_term']) == '') { |
|
| 677 | + $context['search_results'] = array(); |
|
| 678 | + } else { |
|
| 679 | + call_helper($subActions[$context['search_type']]); |
|
| 680 | + } |
|
| 681 | + } |
|
| 668 | 682 | |
| 669 | 683 | /** |
| 670 | 684 | * A complicated but relatively quick internal search. |
@@ -728,8 +742,9 @@ discard block |
||
| 728 | 742 | |
| 729 | 743 | loadLanguage(implode('+', $language_files)); |
| 730 | 744 | |
| 731 | - foreach ($include_files as $file) |
|
| 732 | - require_once($sourcedir . '/' . $file . '.php'); |
|
| 745 | + foreach ($include_files as $file) { |
|
| 746 | + require_once($sourcedir . '/' . $file . '.php'); |
|
| 747 | + } |
|
| 733 | 748 | |
| 734 | 749 | /* This is the huge array that defines everything... it's a huge array of items formatted as follows: |
| 735 | 750 | 0 = Language index (Can be array of indexes) to search through for this setting. |
@@ -753,11 +768,12 @@ discard block |
||
| 753 | 768 | foreach ($section['areas'] as $menu_key => $menu_item) |
| 754 | 769 | { |
| 755 | 770 | $search_data['sections'][] = array($menu_item['label'], 'area=' . $menu_key); |
| 756 | - if (!empty($menu_item['subsections'])) |
|
| 757 | - foreach ($menu_item['subsections'] as $key => $sublabel) |
|
| 771 | + if (!empty($menu_item['subsections'])) { |
|
| 772 | + foreach ($menu_item['subsections'] as $key => $sublabel) |
|
| 758 | 773 | { |
| 759 | 774 | if (isset($sublabel['label'])) |
| 760 | 775 | $search_data['sections'][] = array($sublabel['label'], 'area=' . $menu_key . ';sa=' . $key); |
| 776 | + } |
|
| 761 | 777 | } |
| 762 | 778 | } |
| 763 | 779 | } |
@@ -767,9 +783,10 @@ discard block |
||
| 767 | 783 | // Get a list of their variables. |
| 768 | 784 | $config_vars = $setting_area[0](true); |
| 769 | 785 | |
| 770 | - foreach ($config_vars as $var) |
|
| 771 | - if (!empty($var[1]) && !in_array($var[0], array('permissions', 'switch', 'desc'))) |
|
| 786 | + foreach ($config_vars as $var) { |
|
| 787 | + if (!empty($var[1]) && !in_array($var[0], array('permissions', 'switch', 'desc'))) |
|
| 772 | 788 | $search_data['settings'][] = array($var[(isset($var[2]) && in_array($var[2], array('file', 'db'))) ? 0 : 1], $setting_area[1], 'alttxt' => (isset($var[2]) && in_array($var[2], array('file', 'db'))) || isset($var[3]) ? (in_array($var[2], array('file', 'db')) ? $var[1] : $var[3]) : ''); |
| 789 | + } |
|
| 773 | 790 | } |
| 774 | 791 | |
| 775 | 792 | $context['page_title'] = $txt['admin_search_results']; |
@@ -782,8 +799,9 @@ discard block |
||
| 782 | 799 | foreach ($data as $item) |
| 783 | 800 | { |
| 784 | 801 | $found = false; |
| 785 | - if (!is_array($item[0])) |
|
| 786 | - $item[0] = array($item[0]); |
|
| 802 | + if (!is_array($item[0])) { |
|
| 803 | + $item[0] = array($item[0]); |
|
| 804 | + } |
|
| 787 | 805 | foreach ($item[0] as $term) |
| 788 | 806 | { |
| 789 | 807 | if (stripos($term, $search_term) !== false || (isset($txt[$term]) && stripos($txt[$term], $search_term) !== false) || (isset($txt['setting_' . $term]) && stripos($txt['setting_' . $term], $search_term) !== false)) |
@@ -841,8 +859,9 @@ discard block |
||
| 841 | 859 | $postVars = explode(' ', $context['search_term']); |
| 842 | 860 | |
| 843 | 861 | // Encode the search data. |
| 844 | - foreach ($postVars as $k => $v) |
|
| 845 | - $postVars[$k] = urlencode($v); |
|
| 862 | + foreach ($postVars as $k => $v) { |
|
| 863 | + $postVars[$k] = urlencode($v); |
|
| 864 | + } |
|
| 846 | 865 | |
| 847 | 866 | // This is what we will send. |
| 848 | 867 | $postVars = implode('+', $postVars); |
@@ -853,8 +872,9 @@ discard block |
||
| 853 | 872 | $search_results = fetch_web_data($context['doc_apiurl'] . '?action=query&list=search&srprop=timestamp|snippet&format=xml&srwhat=text&srsearch=' . $postVars); |
| 854 | 873 | |
| 855 | 874 | // If we didn't get any xml back we are in trouble - perhaps the doc site is overloaded? |
| 856 | - if (!$search_results || preg_match('~<' . '\?xml\sversion="\d+\.\d+"\?' . '>\s*(<api>.+?</api>)~is', $search_results, $matches) != true) |
|
| 857 | - fatal_lang_error('cannot_connect_doc_site'); |
|
| 875 | + if (!$search_results || preg_match('~<' . '\?xml\sversion="\d+\.\d+"\?' . '>\s*(<api>.+?</api>)~is', $search_results, $matches) != true) { |
|
| 876 | + fatal_lang_error('cannot_connect_doc_site'); |
|
| 877 | + } |
|
| 858 | 878 | |
| 859 | 879 | $search_results = $matches[1]; |
| 860 | 880 | |
@@ -866,8 +886,9 @@ discard block |
||
| 866 | 886 | $results = new xmlArray($search_results, false); |
| 867 | 887 | |
| 868 | 888 | // Move through the api layer. |
| 869 | - if (!$results->exists('api')) |
|
| 870 | - fatal_lang_error('cannot_connect_doc_site'); |
|
| 889 | + if (!$results->exists('api')) { |
|
| 890 | + fatal_lang_error('cannot_connect_doc_site'); |
|
| 891 | + } |
|
| 871 | 892 | |
| 872 | 893 | // Are there actually some results? |
| 873 | 894 | if ($results->exists('api/query/search/p')) |
@@ -903,8 +924,9 @@ discard block |
||
| 903 | 924 | ); |
| 904 | 925 | |
| 905 | 926 | // If it's not got a sa set it must have come here for first time, pretend error log should be reversed. |
| 906 | - if (!isset($_REQUEST['sa'])) |
|
| 907 | - $_REQUEST['desc'] = true; |
|
| 927 | + if (!isset($_REQUEST['sa'])) { |
|
| 928 | + $_REQUEST['desc'] = true; |
|
| 929 | + } |
|
| 908 | 930 | |
| 909 | 931 | // Setup some tab stuff. |
| 910 | 932 | $context[$context['admin_menu_name']]['tab_data'] = array( |
@@ -954,9 +976,10 @@ discard block |
||
| 954 | 976 | unset($_SESSION['admin_time']); |
| 955 | 977 | |
| 956 | 978 | // Clean any admin tokens as well. |
| 957 | - foreach ($_SESSION['token'] as $key => $token) |
|
| 958 | - if (strpos($key, '-admin') !== false) |
|
| 979 | + foreach ($_SESSION['token'] as $key => $token) { |
|
| 980 | + if (strpos($key, '-admin') !== false) |
|
| 959 | 981 | unset($_SESSION['token'][$key]); |
| 982 | + } |
|
| 960 | 983 | |
| 961 | 984 | redirectexit(); |
| 962 | 985 | } |
@@ -15,8 +15,9 @@ discard block |
||
| 15 | 15 | * @version 2.1 Beta 4 |
| 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 | * The main designating function for modifying profiles. Loads up info, determins what to do, etc. |
@@ -29,18 +30,21 @@ discard block |
||
| 29 | 30 | global $modSettings, $memberContext, $profile_vars, $post_errors, $smcFunc; |
| 30 | 31 | |
| 31 | 32 | // Don't reload this as we may have processed error strings. |
| 32 | - if (empty($post_errors)) |
|
| 33 | - loadLanguage('Profile+Drafts'); |
|
| 33 | + if (empty($post_errors)) { |
|
| 34 | + loadLanguage('Profile+Drafts'); |
|
| 35 | + } |
|
| 34 | 36 | loadTemplate('Profile'); |
| 35 | 37 | |
| 36 | 38 | require_once($sourcedir . '/Subs-Menu.php'); |
| 37 | 39 | |
| 38 | 40 | // Did we get the user by name... |
| 39 | - if (isset($_REQUEST['user'])) |
|
| 40 | - $memberResult = loadMemberData($_REQUEST['user'], true, 'profile'); |
|
| 41 | + if (isset($_REQUEST['user'])) { |
|
| 42 | + $memberResult = loadMemberData($_REQUEST['user'], true, 'profile'); |
|
| 43 | + } |
|
| 41 | 44 | // ... or by id_member? |
| 42 | - elseif (!empty($_REQUEST['u'])) |
|
| 43 | - $memberResult = loadMemberData((int) $_REQUEST['u'], false, 'profile'); |
|
| 45 | + elseif (!empty($_REQUEST['u'])) { |
|
| 46 | + $memberResult = loadMemberData((int) $_REQUEST['u'], false, 'profile'); |
|
| 47 | + } |
|
| 44 | 48 | // If it was just ?action=profile, edit your own profile, but only if you're not a guest. |
| 45 | 49 | else |
| 46 | 50 | { |
@@ -50,8 +54,9 @@ discard block |
||
| 50 | 54 | } |
| 51 | 55 | |
| 52 | 56 | // Check if loadMemberData() has returned a valid result. |
| 53 | - if (!$memberResult) |
|
| 54 | - fatal_lang_error('not_a_user', false, 404); |
|
| 57 | + if (!$memberResult) { |
|
| 58 | + fatal_lang_error('not_a_user', false, 404); |
|
| 59 | + } |
|
| 55 | 60 | |
| 56 | 61 | // If all went well, we have a valid member ID! |
| 57 | 62 | list ($memID) = $memberResult; |
@@ -67,8 +72,9 @@ discard block |
||
| 67 | 72 | |
| 68 | 73 | // Group management isn't actually a permission. But we need it to be for this, so we need a phantom permission. |
| 69 | 74 | // And we care about what the current user can do, not what the user whose profile it is. |
| 70 | - if ($user_info['mod_cache']['gq'] != '0=1') |
|
| 71 | - $user_info['permissions'][] = 'approve_group_requests'; |
|
| 75 | + if ($user_info['mod_cache']['gq'] != '0=1') { |
|
| 76 | + $user_info['permissions'][] = 'approve_group_requests'; |
|
| 77 | + } |
|
| 72 | 78 | |
| 73 | 79 | // If paid subscriptions are enabled, make sure we actually have at least one subscription available... |
| 74 | 80 | $context['subs_available'] = false; |
@@ -436,21 +442,25 @@ discard block |
||
| 436 | 442 | foreach ($section['areas'] as $area_id => $area) |
| 437 | 443 | { |
| 438 | 444 | // If it said no permissions that meant it wasn't valid! |
| 439 | - if (empty($area['permission'][$context['user']['is_owner'] ? 'own' : 'any'])) |
|
| 440 | - $profile_areas[$section_id]['areas'][$area_id]['enabled'] = false; |
|
| 445 | + if (empty($area['permission'][$context['user']['is_owner'] ? 'own' : 'any'])) { |
|
| 446 | + $profile_areas[$section_id]['areas'][$area_id]['enabled'] = false; |
|
| 447 | + } |
|
| 441 | 448 | // Otherwise pick the right set. |
| 442 | - else |
|
| 443 | - $profile_areas[$section_id]['areas'][$area_id]['permission'] = $area['permission'][$context['user']['is_owner'] ? 'own' : 'any']; |
|
| 449 | + else { |
|
| 450 | + $profile_areas[$section_id]['areas'][$area_id]['permission'] = $area['permission'][$context['user']['is_owner'] ? 'own' : 'any']; |
|
| 451 | + } |
|
| 444 | 452 | |
| 445 | 453 | // Password required in most cases |
| 446 | - if (!empty($area['password'])) |
|
| 447 | - $context['password_areas'][] = $area_id; |
|
| 454 | + if (!empty($area['password'])) { |
|
| 455 | + $context['password_areas'][] = $area_id; |
|
| 456 | + } |
|
| 448 | 457 | } |
| 449 | 458 | } |
| 450 | 459 | |
| 451 | 460 | // Is there an updated message to show? |
| 452 | - if (isset($_GET['updated'])) |
|
| 453 | - $context['profile_updated'] = $txt['profile_updated_own']; |
|
| 461 | + if (isset($_GET['updated'])) { |
|
| 462 | + $context['profile_updated'] = $txt['profile_updated_own']; |
|
| 463 | + } |
|
| 454 | 464 | |
| 455 | 465 | // Set a few options for the menu. |
| 456 | 466 | $menuOptions = array( |
@@ -465,8 +475,9 @@ discard block |
||
| 465 | 475 | $profile_include_data = createMenu($profile_areas, $menuOptions); |
| 466 | 476 | |
| 467 | 477 | // No menu means no access. |
| 468 | - if (!$profile_include_data && (!$user_info['is_guest'] || validateSession())) |
|
| 469 | - fatal_lang_error('no_access', false); |
|
| 478 | + if (!$profile_include_data && (!$user_info['is_guest'] || validateSession())) { |
|
| 479 | + fatal_lang_error('no_access', false); |
|
| 480 | + } |
|
| 470 | 481 | |
| 471 | 482 | // Make a note of the Unique ID for this menu. |
| 472 | 483 | $context['profile_menu_id'] = $context['max_menu_id']; |
@@ -492,8 +503,9 @@ discard block |
||
| 492 | 503 | if ($current_area == $area_id) |
| 493 | 504 | { |
| 494 | 505 | // This can't happen - but is a security check. |
| 495 | - if ((isset($section['enabled']) && $section['enabled'] == false) || (isset($area['enabled']) && $area['enabled'] == false)) |
|
| 496 | - fatal_lang_error('no_access', false); |
|
| 506 | + if ((isset($section['enabled']) && $section['enabled'] == false) || (isset($area['enabled']) && $area['enabled'] == false)) { |
|
| 507 | + fatal_lang_error('no_access', false); |
|
| 508 | + } |
|
| 497 | 509 | |
| 498 | 510 | // Are we saving data in a valid area? |
| 499 | 511 | if (isset($area['sc']) && (isset($_REQUEST['save']) || $context['do_preview'])) |
@@ -512,12 +524,14 @@ discard block |
||
| 512 | 524 | } |
| 513 | 525 | |
| 514 | 526 | // Does this require session validating? |
| 515 | - if (!empty($area['validate']) || (isset($_REQUEST['save']) && !$context['user']['is_owner'])) |
|
| 516 | - $security_checks['validate'] = true; |
|
| 527 | + if (!empty($area['validate']) || (isset($_REQUEST['save']) && !$context['user']['is_owner'])) { |
|
| 528 | + $security_checks['validate'] = true; |
|
| 529 | + } |
|
| 517 | 530 | |
| 518 | 531 | // Permissions for good measure. |
| 519 | - if (!empty($profile_include_data['permission'])) |
|
| 520 | - $security_checks['permission'] = $profile_include_data['permission']; |
|
| 532 | + if (!empty($profile_include_data['permission'])) { |
|
| 533 | + $security_checks['permission'] = $profile_include_data['permission']; |
|
| 534 | + } |
|
| 521 | 535 | |
| 522 | 536 | // Either way got something. |
| 523 | 537 | $found_area = true; |
@@ -526,21 +540,26 @@ discard block |
||
| 526 | 540 | } |
| 527 | 541 | |
| 528 | 542 | // Oh dear, some serious security lapse is going on here... we'll put a stop to that! |
| 529 | - if (!$found_area) |
|
| 530 | - fatal_lang_error('no_access', false); |
|
| 543 | + if (!$found_area) { |
|
| 544 | + fatal_lang_error('no_access', false); |
|
| 545 | + } |
|
| 531 | 546 | |
| 532 | 547 | // Release this now. |
| 533 | 548 | unset($profile_areas); |
| 534 | 549 | |
| 535 | 550 | // Now the context is setup have we got any security checks to carry out additional to that above? |
| 536 | - if (isset($security_checks['session'])) |
|
| 537 | - checkSession($security_checks['session']); |
|
| 538 | - if (isset($security_checks['validate'])) |
|
| 539 | - validateSession(); |
|
| 540 | - if (isset($security_checks['validateToken'])) |
|
| 541 | - validateToken($token_name, $token_type); |
|
| 542 | - if (isset($security_checks['permission'])) |
|
| 543 | - isAllowedTo($security_checks['permission']); |
|
| 551 | + if (isset($security_checks['session'])) { |
|
| 552 | + checkSession($security_checks['session']); |
|
| 553 | + } |
|
| 554 | + if (isset($security_checks['validate'])) { |
|
| 555 | + validateSession(); |
|
| 556 | + } |
|
| 557 | + if (isset($security_checks['validateToken'])) { |
|
| 558 | + validateToken($token_name, $token_type); |
|
| 559 | + } |
|
| 560 | + if (isset($security_checks['permission'])) { |
|
| 561 | + isAllowedTo($security_checks['permission']); |
|
| 562 | + } |
|
| 544 | 563 | |
| 545 | 564 | // Create a token if needed. |
| 546 | 565 | if (isset($security_checks['needsToken']) || isset($security_checks['validateToken'])) |
@@ -550,8 +569,9 @@ discard block |
||
| 550 | 569 | } |
| 551 | 570 | |
| 552 | 571 | // File to include? |
| 553 | - if (isset($profile_include_data['file'])) |
|
| 554 | - require_once($sourcedir . '/' . $profile_include_data['file']); |
|
| 572 | + if (isset($profile_include_data['file'])) { |
|
| 573 | + require_once($sourcedir . '/' . $profile_include_data['file']); |
|
| 574 | + } |
|
| 555 | 575 | |
| 556 | 576 | // Build the link tree. |
| 557 | 577 | $context['linktree'][] = array( |
@@ -559,17 +579,19 @@ discard block |
||
| 559 | 579 | 'name' => sprintf($txt['profile_of_username'], $context['member']['name']), |
| 560 | 580 | ); |
| 561 | 581 | |
| 562 | - if (!empty($profile_include_data['label'])) |
|
| 563 | - $context['linktree'][] = array( |
|
| 582 | + if (!empty($profile_include_data['label'])) { |
|
| 583 | + $context['linktree'][] = array( |
|
| 564 | 584 | 'url' => $scripturl . '?action=profile' . ($memID != $user_info['id'] ? ';u=' . $memID : '') . ';area=' . $profile_include_data['current_area'], |
| 565 | 585 | 'name' => $profile_include_data['label'], |
| 566 | 586 | ); |
| 587 | + } |
|
| 567 | 588 | |
| 568 | - if (!empty($profile_include_data['current_subsection']) && $profile_include_data['subsections'][$profile_include_data['current_subsection']][0] != $profile_include_data['label']) |
|
| 569 | - $context['linktree'][] = array( |
|
| 589 | + if (!empty($profile_include_data['current_subsection']) && $profile_include_data['subsections'][$profile_include_data['current_subsection']][0] != $profile_include_data['label']) { |
|
| 590 | + $context['linktree'][] = array( |
|
| 570 | 591 | 'url' => $scripturl . '?action=profile' . ($memID != $user_info['id'] ? ';u=' . $memID : '') . ';area=' . $profile_include_data['current_area'] . ';sa=' . $profile_include_data['current_subsection'], |
| 571 | 592 | 'name' => $profile_include_data['subsections'][$profile_include_data['current_subsection']][0], |
| 572 | 593 | ); |
| 594 | + } |
|
| 573 | 595 | |
| 574 | 596 | // Set the template for this area and add the profile layer. |
| 575 | 597 | $context['sub_template'] = $profile_include_data['function']; |
@@ -595,12 +617,14 @@ discard block |
||
| 595 | 617 | if ($check_password) |
| 596 | 618 | { |
| 597 | 619 | // Check to ensure we're forcing SSL for authentication |
| 598 | - if (!empty($modSettings['force_ssl']) && empty($maintenance) && !httpsOn()) |
|
| 599 | - fatal_lang_error('login_ssl_required'); |
|
| 620 | + if (!empty($modSettings['force_ssl']) && empty($maintenance) && !httpsOn()) { |
|
| 621 | + fatal_lang_error('login_ssl_required'); |
|
| 622 | + } |
|
| 600 | 623 | |
| 601 | 624 | // You didn't even enter a password! |
| 602 | - if (trim($_POST['oldpasswrd']) == '') |
|
| 603 | - $post_errors[] = 'no_password'; |
|
| 625 | + if (trim($_POST['oldpasswrd']) == '') { |
|
| 626 | + $post_errors[] = 'no_password'; |
|
| 627 | + } |
|
| 604 | 628 | |
| 605 | 629 | // Since the password got modified due to all the $_POST cleaning, lets undo it so we can get the correct password |
| 606 | 630 | $_POST['oldpasswrd'] = un_htmlspecialchars($_POST['oldpasswrd']); |
@@ -609,42 +633,43 @@ discard block |
||
| 609 | 633 | $good_password = in_array(true, call_integration_hook('integrate_verify_password', array($cur_profile['member_name'], $_POST['oldpasswrd'], false)), true); |
| 610 | 634 | |
| 611 | 635 | // Bad password!!! |
| 612 | - if (!$good_password && !hash_verify_password($user_profile[$memID]['member_name'], un_htmlspecialchars(stripslashes($_POST['oldpasswrd'])), $user_info['passwd'])) |
|
| 613 | - $post_errors[] = 'bad_password'; |
|
| 636 | + if (!$good_password && !hash_verify_password($user_profile[$memID]['member_name'], un_htmlspecialchars(stripslashes($_POST['oldpasswrd'])), $user_info['passwd'])) { |
|
| 637 | + $post_errors[] = 'bad_password'; |
|
| 638 | + } |
|
| 614 | 639 | |
| 615 | 640 | // Warn other elements not to jump the gun and do custom changes! |
| 616 | - if (in_array('bad_password', $post_errors)) |
|
| 617 | - $context['password_auth_failed'] = true; |
|
| 641 | + if (in_array('bad_password', $post_errors)) { |
|
| 642 | + $context['password_auth_failed'] = true; |
|
| 643 | + } |
|
| 618 | 644 | } |
| 619 | 645 | |
| 620 | 646 | // Change the IP address in the database. |
| 621 | - if ($context['user']['is_owner']) |
|
| 622 | - $profile_vars['member_ip'] = $user_info['ip']; |
|
| 647 | + if ($context['user']['is_owner']) { |
|
| 648 | + $profile_vars['member_ip'] = $user_info['ip']; |
|
| 649 | + } |
|
| 623 | 650 | |
| 624 | 651 | // Now call the sub-action function... |
| 625 | 652 | if ($current_area == 'activateaccount') |
| 626 | 653 | { |
| 627 | - if (empty($post_errors)) |
|
| 628 | - activateAccount($memID); |
|
| 629 | - } |
|
| 630 | - elseif ($current_area == 'deleteaccount') |
|
| 654 | + if (empty($post_errors)) { |
|
| 655 | + activateAccount($memID); |
|
| 656 | + } |
|
| 657 | + } elseif ($current_area == 'deleteaccount') |
|
| 631 | 658 | { |
| 632 | 659 | if (empty($post_errors)) |
| 633 | 660 | { |
| 634 | 661 | deleteAccount2($memID); |
| 635 | 662 | redirectexit(); |
| 636 | 663 | } |
| 637 | - } |
|
| 638 | - elseif ($current_area == 'groupmembership' && empty($post_errors)) |
|
| 664 | + } elseif ($current_area == 'groupmembership' && empty($post_errors)) |
|
| 639 | 665 | { |
| 640 | 666 | $msg = groupMembership2($profile_vars, $post_errors, $memID); |
| 641 | 667 | |
| 642 | 668 | // Whatever we've done, we have nothing else to do here... |
| 643 | 669 | redirectexit('action=profile' . ($context['user']['is_owner'] ? '' : ';u=' . $memID) . ';area=groupmembership' . (!empty($msg) ? ';msg=' . $msg : '')); |
| 644 | - } |
|
| 645 | - elseif (in_array($current_area, array('account', 'forumprofile', 'theme'))) |
|
| 646 | - saveProfileFields(); |
|
| 647 | - else |
|
| 670 | + } elseif (in_array($current_area, array('account', 'forumprofile', 'theme'))) { |
|
| 671 | + saveProfileFields(); |
|
| 672 | + } else |
|
| 648 | 673 | { |
| 649 | 674 | $force_redirect = true; |
| 650 | 675 | // Ensure we include this. |
@@ -660,34 +685,36 @@ discard block |
||
| 660 | 685 | // Load the language file so we can give a nice explanation of the errors. |
| 661 | 686 | loadLanguage('Errors'); |
| 662 | 687 | $context['post_errors'] = $post_errors; |
| 663 | - } |
|
| 664 | - elseif (!empty($profile_vars)) |
|
| 688 | + } elseif (!empty($profile_vars)) |
|
| 665 | 689 | { |
| 666 | 690 | // If we've changed the password, notify any integration that may be listening in. |
| 667 | - if (isset($profile_vars['passwd'])) |
|
| 668 | - call_integration_hook('integrate_reset_pass', array($cur_profile['member_name'], $cur_profile['member_name'], $_POST['passwrd2'])); |
|
| 691 | + if (isset($profile_vars['passwd'])) { |
|
| 692 | + call_integration_hook('integrate_reset_pass', array($cur_profile['member_name'], $cur_profile['member_name'], $_POST['passwrd2'])); |
|
| 693 | + } |
|
| 669 | 694 | |
| 670 | 695 | updateMemberData($memID, $profile_vars); |
| 671 | 696 | |
| 672 | 697 | // What if this is the newest member? |
| 673 | - if ($modSettings['latestMember'] == $memID) |
|
| 674 | - updateStats('member'); |
|
| 675 | - elseif (isset($profile_vars['real_name'])) |
|
| 676 | - updateSettings(array('memberlist_updated' => time())); |
|
| 698 | + if ($modSettings['latestMember'] == $memID) { |
|
| 699 | + updateStats('member'); |
|
| 700 | + } elseif (isset($profile_vars['real_name'])) { |
|
| 701 | + updateSettings(array('memberlist_updated' => time())); |
|
| 702 | + } |
|
| 677 | 703 | |
| 678 | 704 | // If the member changed his/her birthdate, update calendar statistics. |
| 679 | - if (isset($profile_vars['birthdate']) || isset($profile_vars['real_name'])) |
|
| 680 | - updateSettings(array( |
|
| 705 | + if (isset($profile_vars['birthdate']) || isset($profile_vars['real_name'])) { |
|
| 706 | + updateSettings(array( |
|
| 681 | 707 | 'calendar_updated' => time(), |
| 682 | 708 | )); |
| 709 | + } |
|
| 683 | 710 | |
| 684 | 711 | // Anything worth logging? |
| 685 | 712 | if (!empty($context['log_changes']) && !empty($modSettings['modlog_enabled'])) |
| 686 | 713 | { |
| 687 | 714 | $log_changes = array(); |
| 688 | 715 | require_once($sourcedir . '/Logging.php'); |
| 689 | - foreach ($context['log_changes'] as $k => $v) |
|
| 690 | - $log_changes[] = array( |
|
| 716 | + foreach ($context['log_changes'] as $k => $v) { |
|
| 717 | + $log_changes[] = array( |
|
| 691 | 718 | 'action' => $k, |
| 692 | 719 | 'log_type' => 'user', |
| 693 | 720 | 'extra' => array_merge($v, array( |
@@ -695,14 +722,16 @@ discard block |
||
| 695 | 722 | 'member_affected' => $memID, |
| 696 | 723 | )), |
| 697 | 724 | ); |
| 725 | + } |
|
| 698 | 726 | |
| 699 | 727 | logActions($log_changes); |
| 700 | 728 | } |
| 701 | 729 | |
| 702 | 730 | // Have we got any post save functions to execute? |
| 703 | - if (!empty($context['profile_execute_on_save'])) |
|
| 704 | - foreach ($context['profile_execute_on_save'] as $saveFunc) |
|
| 731 | + if (!empty($context['profile_execute_on_save'])) { |
|
| 732 | + foreach ($context['profile_execute_on_save'] as $saveFunc) |
|
| 705 | 733 | $saveFunc(); |
| 734 | + } |
|
| 706 | 735 | |
| 707 | 736 | // Let them know it worked! |
| 708 | 737 | $context['profile_updated'] = $context['user']['is_owner'] ? $txt['profile_updated_own'] : sprintf($txt['profile_updated_else'], $cur_profile['member_name']); |
@@ -716,27 +745,31 @@ discard block |
||
| 716 | 745 | if (!empty($post_errors)) |
| 717 | 746 | { |
| 718 | 747 | // Set all the errors so the template knows what went wrong. |
| 719 | - foreach ($post_errors as $error_type) |
|
| 720 | - $context['modify_error'][$error_type] = true; |
|
| 748 | + foreach ($post_errors as $error_type) { |
|
| 749 | + $context['modify_error'][$error_type] = true; |
|
| 750 | + } |
|
| 721 | 751 | } |
| 722 | 752 | // If it's you then we should redirect upon save. |
| 723 | - elseif (!empty($profile_vars) && $context['user']['is_owner'] && !$context['do_preview']) |
|
| 724 | - redirectexit('action=profile;area=' . $current_area . (!empty($current_sa) ? ';sa=' . $current_sa : '') . ';updated'); |
|
| 725 | - elseif (!empty($force_redirect)) |
|
| 726 | - redirectexit('action=profile' . ($context['user']['is_owner'] ? '' : ';u=' . $memID) . ';area=' . $current_area); |
|
| 753 | + elseif (!empty($profile_vars) && $context['user']['is_owner'] && !$context['do_preview']) { |
|
| 754 | + redirectexit('action=profile;area=' . $current_area . (!empty($current_sa) ? ';sa=' . $current_sa : '') . ';updated'); |
|
| 755 | + } elseif (!empty($force_redirect)) { |
|
| 756 | + redirectexit('action=profile' . ($context['user']['is_owner'] ? '' : ';u=' . $memID) . ';area=' . $current_area); |
|
| 757 | + } |
|
| 727 | 758 | |
| 728 | 759 | |
| 729 | 760 | // Get the right callable. |
| 730 | 761 | $call = call_helper($profile_include_data['function'], true); |
| 731 | 762 | |
| 732 | 763 | // Is it valid? |
| 733 | - if (!empty($call)) |
|
| 734 | - call_user_func($call, $memID); |
|
| 764 | + if (!empty($call)) { |
|
| 765 | + call_user_func($call, $memID); |
|
| 766 | + } |
|
| 735 | 767 | |
| 736 | 768 | // Set the page title if it's not already set... |
| 737 | - if (!isset($context['page_title'])) |
|
| 738 | - $context['page_title'] = $txt['profile'] . (isset($txt[$current_area]) ? ' - ' . $txt[$current_area] : ''); |
|
| 739 | -} |
|
| 769 | + if (!isset($context['page_title'])) { |
|
| 770 | + $context['page_title'] = $txt['profile'] . (isset($txt[$current_area]) ? ' - ' . $txt[$current_area] : ''); |
|
| 771 | + } |
|
| 772 | + } |
|
| 740 | 773 | |
| 741 | 774 | /** |
| 742 | 775 | * Set up the requirements for the profile popup - the area that is shown as the popup menu for the current user. |
@@ -859,16 +892,18 @@ discard block |
||
| 859 | 892 | if (!allowedTo('admin_forum') && $area != 'register') |
| 860 | 893 | { |
| 861 | 894 | // If it's the owner they can see two types of private fields, regardless. |
| 862 | - if ($memID == $user_info['id']) |
|
| 863 | - $where .= $area == 'summary' ? ' AND private < 3' : ' AND (private = 0 OR private = 2)'; |
|
| 864 | - else |
|
| 865 | - $where .= $area == 'summary' ? ' AND private < 2' : ' AND private = 0'; |
|
| 895 | + if ($memID == $user_info['id']) { |
|
| 896 | + $where .= $area == 'summary' ? ' AND private < 3' : ' AND (private = 0 OR private = 2)'; |
|
| 897 | + } else { |
|
| 898 | + $where .= $area == 'summary' ? ' AND private < 2' : ' AND private = 0'; |
|
| 899 | + } |
|
| 866 | 900 | } |
| 867 | 901 | |
| 868 | - if ($area == 'register') |
|
| 869 | - $where .= ' AND show_reg != 0'; |
|
| 870 | - elseif ($area != 'summary') |
|
| 871 | - $where .= ' AND show_profile = {string:area}'; |
|
| 902 | + if ($area == 'register') { |
|
| 903 | + $where .= ' AND show_reg != 0'; |
|
| 904 | + } elseif ($area != 'summary') { |
|
| 905 | + $where .= ' AND show_profile = {string:area}'; |
|
| 906 | + } |
|
| 872 | 907 | |
| 873 | 908 | // Load all the relevant fields - and data. |
| 874 | 909 | $request = $smcFunc['db_query']('', ' |
@@ -893,8 +928,9 @@ discard block |
||
| 893 | 928 | $fieldOptions = explode(',', $row['field_options']); |
| 894 | 929 | foreach ($fieldOptions as $k => $v) |
| 895 | 930 | { |
| 896 | - if (empty($currentKey)) |
|
| 897 | - $currentKey = $v === $value ? $k : 0; |
|
| 931 | + if (empty($currentKey)) { |
|
| 932 | + $currentKey = $v === $value ? $k : 0; |
|
| 933 | + } |
|
| 898 | 934 | } |
| 899 | 935 | } |
| 900 | 936 | |
@@ -906,13 +942,15 @@ discard block |
||
| 906 | 942 | if (isset($_POST['customfield']) && isset($_POST['customfield'][$row['col_name']])) |
| 907 | 943 | { |
| 908 | 944 | $value = $smcFunc['htmlspecialchars']($_POST['customfield'][$row['col_name']]); |
| 909 | - if (in_array($row['field_type'], array('select', 'radio'))) |
|
| 910 | - $value = ($options = explode(',', $row['field_options'])) && isset($options[$value]) ? $options[$value] : ''; |
|
| 945 | + if (in_array($row['field_type'], array('select', 'radio'))) { |
|
| 946 | + $value = ($options = explode(',', $row['field_options'])) && isset($options[$value]) ? $options[$value] : ''; |
|
| 947 | + } |
|
| 911 | 948 | } |
| 912 | 949 | |
| 913 | 950 | // Don't show the "disabled" option for the "gender" field if we are on the "summary" area. |
| 914 | - if ($area == 'summary' && $row['col_name'] == 'cust_gender' && $value == 'None') |
|
| 915 | - continue; |
|
| 951 | + if ($area == 'summary' && $row['col_name'] == 'cust_gender' && $value == 'None') { |
|
| 952 | + continue; |
|
| 953 | + } |
|
| 916 | 954 | |
| 917 | 955 | // HTML for the input form. |
| 918 | 956 | $output_html = $value; |
@@ -921,8 +959,7 @@ discard block |
||
| 921 | 959 | $true = (!$exists && $row['default_value']) || $value; |
| 922 | 960 | $input_html = '<input type="checkbox" name="customfield[' . $row['col_name'] . ']" id="customfield[' . $row['col_name'] . ']"' . ($true ? ' checked' : '') . '>'; |
| 923 | 961 | $output_html = $true ? $txt['yes'] : $txt['no']; |
| 924 | - } |
|
| 925 | - elseif ($row['field_type'] == 'select') |
|
| 962 | + } elseif ($row['field_type'] == 'select') |
|
| 926 | 963 | { |
| 927 | 964 | $input_html = '<select name="customfield[' . $row['col_name'] . ']" id="customfield[' . $row['col_name'] . ']"><option value="-1"></option>'; |
| 928 | 965 | $options = explode(',', $row['field_options']); |
@@ -930,13 +967,13 @@ discard block |
||
| 930 | 967 | { |
| 931 | 968 | $true = (!$exists && $row['default_value'] == $v) || $value == $v; |
| 932 | 969 | $input_html .= '<option value="' . $k . '"' . ($true ? ' selected' : '') . '>' . $v . '</option>'; |
| 933 | - if ($true) |
|
| 934 | - $output_html = $v; |
|
| 970 | + if ($true) { |
|
| 971 | + $output_html = $v; |
|
| 972 | + } |
|
| 935 | 973 | } |
| 936 | 974 | |
| 937 | 975 | $input_html .= '</select>'; |
| 938 | - } |
|
| 939 | - elseif ($row['field_type'] == 'radio') |
|
| 976 | + } elseif ($row['field_type'] == 'radio') |
|
| 940 | 977 | { |
| 941 | 978 | $input_html = '<fieldset>'; |
| 942 | 979 | $options = explode(',', $row['field_options']); |
@@ -944,37 +981,38 @@ discard block |
||
| 944 | 981 | { |
| 945 | 982 | $true = (!$exists && $row['default_value'] == $v) || $value == $v; |
| 946 | 983 | $input_html .= '<label for="customfield_' . $row['col_name'] . '_' . $k . '"><input type="radio" name="customfield[' . $row['col_name'] . ']" id="customfield_' . $row['col_name'] . '_' . $k . '" value="' . $k . '"' . ($true ? ' checked' : '') . '>' . $v . '</label><br>'; |
| 947 | - if ($true) |
|
| 948 | - $output_html = $v; |
|
| 984 | + if ($true) { |
|
| 985 | + $output_html = $v; |
|
| 986 | + } |
|
| 949 | 987 | } |
| 950 | 988 | $input_html .= '</fieldset>'; |
| 951 | - } |
|
| 952 | - elseif ($row['field_type'] == 'text') |
|
| 989 | + } elseif ($row['field_type'] == 'text') |
|
| 953 | 990 | { |
| 954 | 991 | $input_html = '<input type="text" name="customfield[' . $row['col_name'] . ']" id="customfield[' . $row['col_name'] . ']"' . ($row['field_length'] != 0 ? ' maxlength="' . $row['field_length'] . '"' : '') . ' size="' . ($row['field_length'] == 0 || $row['field_length'] >= 50 ? 50 : ($row['field_length'] > 30 ? 30 : ($row['field_length'] > 10 ? 20 : 10))) . '" value="' . un_htmlspecialchars($value) . '"' . ($row['show_reg'] == 2 ? ' required' : '') . '>'; |
| 955 | - } |
|
| 956 | - else |
|
| 992 | + } else |
|
| 957 | 993 | { |
| 958 | 994 | @list ($rows, $cols) = @explode(',', $row['default_value']); |
| 959 | 995 | $input_html = '<textarea name="customfield[' . $row['col_name'] . ']" id="customfield[' . $row['col_name'] . ']"' . (!empty($rows) ? ' rows="' . $rows . '"' : '') . (!empty($cols) ? ' cols="' . $cols . '"' : '') . ($row['show_reg'] == 2 ? ' required' : '') . '>' . un_htmlspecialchars($value) . '</textarea>'; |
| 960 | 996 | } |
| 961 | 997 | |
| 962 | 998 | // Parse BBCode |
| 963 | - if ($row['bbc']) |
|
| 964 | - $output_html = parse_bbc($output_html); |
|
| 965 | - elseif ($row['field_type'] == 'textarea') |
|
| 966 | - // Allow for newlines at least |
|
| 999 | + if ($row['bbc']) { |
|
| 1000 | + $output_html = parse_bbc($output_html); |
|
| 1001 | + } elseif ($row['field_type'] == 'textarea') { |
|
| 1002 | + // Allow for newlines at least |
|
| 967 | 1003 | $output_html = strtr($output_html, array("\n" => '<br>')); |
| 1004 | + } |
|
| 968 | 1005 | |
| 969 | 1006 | // Enclosing the user input within some other text? |
| 970 | - if (!empty($row['enclose']) && !empty($output_html)) |
|
| 971 | - $output_html = strtr($row['enclose'], array( |
|
| 1007 | + if (!empty($row['enclose']) && !empty($output_html)) { |
|
| 1008 | + $output_html = strtr($row['enclose'], array( |
|
| 972 | 1009 | '{SCRIPTURL}' => $scripturl, |
| 973 | 1010 | '{IMAGES_URL}' => $settings['images_url'], |
| 974 | 1011 | '{DEFAULT_IMAGES_URL}' => $settings['default_images_url'], |
| 975 | 1012 | '{INPUT}' => un_htmlspecialchars($output_html), |
| 976 | 1013 | '{KEY}' => $currentKey |
| 977 | 1014 | )); |
| 1015 | + } |
|
| 978 | 1016 | |
| 979 | 1017 | $context['custom_fields'][] = array( |
| 980 | 1018 | 'name' => $row['field_name'], |
@@ -136,7 +136,7 @@ discard block |
||
| 136 | 136 | } |
| 137 | 137 | if ($c === $n) { |
| 138 | 138 | $q = $delta; |
| 139 | - for ($k = static::BASE;; $k += static::BASE) { |
|
| 139 | + for ($k = static::BASE; ; $k += static::BASE) { |
|
| 140 | 140 | $t = $this->calculateThreshold($k, $bias); |
| 141 | 141 | if ($q < $t) { |
| 142 | 142 | break; |
@@ -224,7 +224,7 @@ discard block |
||
| 224 | 224 | $oldi = $i; |
| 225 | 225 | $w = 1; |
| 226 | 226 | |
| 227 | - for ($k = static::BASE;; $k += static::BASE) { |
|
| 227 | + for ($k = static::BASE; ; $k += static::BASE) { |
|
| 228 | 228 | $digit = static::$decodeTable[$input[$pos++]]; |
| 229 | 229 | $i = $i + ($digit * $w); |
| 230 | 230 | $t = $this->calculateThreshold($k, $bias); |
@@ -18,8 +18,9 @@ |
||
| 18 | 18 | * @version 2.1 Beta 4 |
| 19 | 19 | */ |
| 20 | 20 | |
| 21 | -if (!defined('SMF')) |
|
| 21 | +if (!defined('SMF')) { |
|
| 22 | 22 | die('No direct access...'); |
| 23 | +} |
|
| 23 | 24 | |
| 24 | 25 | /** |
| 25 | 26 | * Punycode implementation as described in RFC 3492 |
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | */ |
| 20 | 20 | |
| 21 | 21 | if (!defined('SMF')) |
| 22 | - die('No direct access...'); |
|
| 22 | + die('No direct access...'); |
|
| 23 | 23 | |
| 24 | 24 | /** |
| 25 | 25 | * Punycode implementation as described in RFC 3492 |
@@ -28,332 +28,332 @@ discard block |
||
| 28 | 28 | */ |
| 29 | 29 | class Punycode |
| 30 | 30 | { |
| 31 | - /** |
|
| 32 | - * Bootstring parameter values |
|
| 33 | - * |
|
| 34 | - */ |
|
| 35 | - const BASE = 36; |
|
| 36 | - const TMIN = 1; |
|
| 37 | - const TMAX = 26; |
|
| 38 | - const SKEW = 38; |
|
| 39 | - const DAMP = 700; |
|
| 40 | - const INITIAL_BIAS = 72; |
|
| 41 | - const INITIAL_N = 128; |
|
| 42 | - const PREFIX = 'xn--'; |
|
| 43 | - const DELIMITER = '-'; |
|
| 44 | - |
|
| 45 | - /** |
|
| 46 | - * Encode table |
|
| 47 | - * |
|
| 48 | - * @param array |
|
| 49 | - */ |
|
| 50 | - protected static $encodeTable = array( |
|
| 51 | - 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', |
|
| 52 | - 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', |
|
| 53 | - 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', |
|
| 54 | - ); |
|
| 55 | - |
|
| 56 | - /** |
|
| 57 | - * Decode table |
|
| 58 | - * |
|
| 59 | - * @param array |
|
| 60 | - */ |
|
| 61 | - protected static $decodeTable = array( |
|
| 62 | - 'a' => 0, 'b' => 1, 'c' => 2, 'd' => 3, 'e' => 4, 'f' => 5, |
|
| 63 | - 'g' => 6, 'h' => 7, 'i' => 8, 'j' => 9, 'k' => 10, 'l' => 11, |
|
| 64 | - 'm' => 12, 'n' => 13, 'o' => 14, 'p' => 15, 'q' => 16, 'r' => 17, |
|
| 65 | - 's' => 18, 't' => 19, 'u' => 20, 'v' => 21, 'w' => 22, 'x' => 23, |
|
| 66 | - 'y' => 24, 'z' => 25, '0' => 26, '1' => 27, '2' => 28, '3' => 29, |
|
| 67 | - '4' => 30, '5' => 31, '6' => 32, '7' => 33, '8' => 34, '9' => 35 |
|
| 68 | - ); |
|
| 69 | - |
|
| 70 | - /** |
|
| 71 | - * Character encoding |
|
| 72 | - * |
|
| 73 | - * @param string |
|
| 74 | - */ |
|
| 75 | - protected $encoding; |
|
| 76 | - |
|
| 77 | - /** |
|
| 78 | - * Constructor |
|
| 79 | - * |
|
| 80 | - * @param string $encoding Character encoding |
|
| 81 | - */ |
|
| 82 | - public function __construct($encoding = 'UTF-8') |
|
| 83 | - { |
|
| 84 | - $this->encoding = $encoding; |
|
| 85 | - } |
|
| 86 | - |
|
| 87 | - /** |
|
| 88 | - * Encode a domain to its Punycode version |
|
| 89 | - * |
|
| 90 | - * @param string $input Domain name in Unicode to be encoded |
|
| 91 | - * @return string Punycode representation in ASCII |
|
| 92 | - */ |
|
| 93 | - public function encode($input) |
|
| 94 | - { |
|
| 95 | - $input = mb_strtolower($input, $this->encoding); |
|
| 96 | - $parts = explode('.', $input); |
|
| 97 | - foreach ($parts as &$part) { |
|
| 98 | - $part = $this->encodePart($part); |
|
| 99 | - } |
|
| 100 | - $output = implode('.', $parts); |
|
| 101 | - $length = strlen($output); |
|
| 102 | - |
|
| 103 | - return $output; |
|
| 104 | - } |
|
| 105 | - |
|
| 106 | - /** |
|
| 107 | - * Encode a part of a domain name, such as tld, to its Punycode version |
|
| 108 | - * |
|
| 109 | - * @param string $input Part of a domain name |
|
| 110 | - * @return string Punycode representation of a domain part |
|
| 111 | - */ |
|
| 112 | - protected function encodePart($input) |
|
| 113 | - { |
|
| 114 | - $codePoints = $this->listCodePoints($input); |
|
| 115 | - |
|
| 116 | - $n = static::INITIAL_N; |
|
| 117 | - $bias = static::INITIAL_BIAS; |
|
| 118 | - $delta = 0; |
|
| 119 | - $h = $b = count($codePoints['basic']); |
|
| 120 | - |
|
| 121 | - $output = ''; |
|
| 122 | - foreach ($codePoints['basic'] as $code) { |
|
| 123 | - $output .= $this->codePointToChar($code); |
|
| 124 | - } |
|
| 125 | - if ($input === $output) { |
|
| 126 | - return $output; |
|
| 127 | - } |
|
| 128 | - if ($b > 0) { |
|
| 129 | - $output .= static::DELIMITER; |
|
| 130 | - } |
|
| 131 | - |
|
| 132 | - $codePoints['nonBasic'] = array_unique($codePoints['nonBasic']); |
|
| 133 | - sort($codePoints['nonBasic']); |
|
| 134 | - |
|
| 135 | - $i = 0; |
|
| 136 | - $length = mb_strlen($input, $this->encoding); |
|
| 137 | - while ($h < $length) { |
|
| 138 | - $m = $codePoints['nonBasic'][$i++]; |
|
| 139 | - $delta = $delta + ($m - $n) * ($h + 1); |
|
| 140 | - $n = $m; |
|
| 141 | - |
|
| 142 | - foreach ($codePoints['all'] as $c) { |
|
| 143 | - if ($c < $n || $c < static::INITIAL_N) { |
|
| 144 | - $delta++; |
|
| 145 | - } |
|
| 146 | - if ($c === $n) { |
|
| 147 | - $q = $delta; |
|
| 148 | - for ($k = static::BASE;; $k += static::BASE) { |
|
| 149 | - $t = $this->calculateThreshold($k, $bias); |
|
| 150 | - if ($q < $t) { |
|
| 151 | - break; |
|
| 152 | - } |
|
| 153 | - |
|
| 154 | - $code = $t + (($q - $t) % (static::BASE - $t)); |
|
| 155 | - $output .= static::$encodeTable[$code]; |
|
| 156 | - |
|
| 157 | - $q = ($q - $t) / (static::BASE - $t); |
|
| 158 | - } |
|
| 159 | - |
|
| 160 | - $output .= static::$encodeTable[$q]; |
|
| 161 | - $bias = $this->adapt($delta, $h + 1, ($h === $b)); |
|
| 162 | - $delta = 0; |
|
| 163 | - $h++; |
|
| 164 | - } |
|
| 165 | - } |
|
| 166 | - |
|
| 167 | - $delta++; |
|
| 168 | - $n++; |
|
| 169 | - } |
|
| 170 | - $out = static::PREFIX . $output; |
|
| 171 | - |
|
| 172 | - return $out; |
|
| 173 | - } |
|
| 174 | - |
|
| 175 | - /** |
|
| 176 | - * Decode a Punycode domain name to its Unicode counterpart |
|
| 177 | - * |
|
| 178 | - * @param string $input Domain name in Punycode |
|
| 179 | - * @return string Unicode domain name |
|
| 180 | - */ |
|
| 181 | - public function decode($input) |
|
| 182 | - { |
|
| 183 | - $input = strtolower($input); |
|
| 184 | - $parts = explode('.', $input); |
|
| 185 | - foreach ($parts as &$part) { |
|
| 186 | - if (strpos($part, static::PREFIX) !== 0) { |
|
| 187 | - continue; |
|
| 188 | - } |
|
| 189 | - |
|
| 190 | - $part = substr($part, strlen(static::PREFIX)); |
|
| 191 | - $part = $this->decodePart($part); |
|
| 192 | - } |
|
| 193 | - $output = implode('.', $parts); |
|
| 194 | - |
|
| 195 | - return $output; |
|
| 196 | - } |
|
| 197 | - |
|
| 198 | - /** |
|
| 199 | - * Decode a part of domain name, such as tld |
|
| 200 | - * |
|
| 201 | - * @param string $input Part of a domain name |
|
| 202 | - * @return string Unicode domain part |
|
| 203 | - */ |
|
| 204 | - protected function decodePart($input) |
|
| 205 | - { |
|
| 206 | - $n = static::INITIAL_N; |
|
| 207 | - $i = 0; |
|
| 208 | - $bias = static::INITIAL_BIAS; |
|
| 209 | - $output = ''; |
|
| 210 | - |
|
| 211 | - $pos = strrpos($input, static::DELIMITER); |
|
| 212 | - if ($pos !== false) { |
|
| 213 | - $output = substr($input, 0, $pos++); |
|
| 214 | - } else { |
|
| 215 | - $pos = 0; |
|
| 216 | - } |
|
| 217 | - |
|
| 218 | - $outputLength = strlen($output); |
|
| 219 | - $inputLength = strlen($input); |
|
| 220 | - while ($pos < $inputLength) { |
|
| 221 | - $oldi = $i; |
|
| 222 | - $w = 1; |
|
| 223 | - |
|
| 224 | - for ($k = static::BASE;; $k += static::BASE) { |
|
| 225 | - $digit = static::$decodeTable[$input[$pos++]]; |
|
| 226 | - $i = $i + ($digit * $w); |
|
| 227 | - $t = $this->calculateThreshold($k, $bias); |
|
| 228 | - |
|
| 229 | - if ($digit < $t) { |
|
| 230 | - break; |
|
| 231 | - } |
|
| 232 | - |
|
| 233 | - $w = $w * (static::BASE - $t); |
|
| 234 | - } |
|
| 235 | - |
|
| 236 | - $bias = $this->adapt($i - $oldi, ++$outputLength, ($oldi === 0)); |
|
| 237 | - $n = $n + (int) ($i / $outputLength); |
|
| 238 | - $i = $i % ($outputLength); |
|
| 239 | - $output = mb_substr($output, 0, $i, $this->encoding) . $this->codePointToChar($n) . mb_substr($output, $i, $outputLength - 1, $this->encoding); |
|
| 240 | - |
|
| 241 | - $i++; |
|
| 242 | - } |
|
| 243 | - |
|
| 244 | - return $output; |
|
| 245 | - } |
|
| 246 | - |
|
| 247 | - /** |
|
| 248 | - * Calculate the bias threshold to fall between TMIN and TMAX |
|
| 249 | - * |
|
| 250 | - * @param integer $k |
|
| 251 | - * @param integer $bias |
|
| 252 | - * @return integer |
|
| 253 | - */ |
|
| 254 | - protected function calculateThreshold($k, $bias) |
|
| 255 | - { |
|
| 256 | - if ($k <= $bias + static::TMIN) { |
|
| 257 | - return static::TMIN; |
|
| 258 | - } elseif ($k >= $bias + static::TMAX) { |
|
| 259 | - return static::TMAX; |
|
| 260 | - } |
|
| 261 | - return $k - $bias; |
|
| 262 | - } |
|
| 263 | - |
|
| 264 | - /** |
|
| 265 | - * Bias adaptation |
|
| 266 | - * |
|
| 267 | - * @param integer $delta |
|
| 268 | - * @param integer $numPoints |
|
| 269 | - * @param boolean $firstTime |
|
| 270 | - * @return integer |
|
| 271 | - */ |
|
| 272 | - protected function adapt($delta, $numPoints, $firstTime) |
|
| 273 | - { |
|
| 274 | - $delta = (int) ( |
|
| 275 | - ($firstTime) |
|
| 276 | - ? $delta / static::DAMP |
|
| 277 | - : $delta / 2 |
|
| 278 | - ); |
|
| 279 | - $delta += (int) ($delta / $numPoints); |
|
| 280 | - |
|
| 281 | - $k = 0; |
|
| 282 | - while ($delta > ((static::BASE - static::TMIN) * static::TMAX) / 2) { |
|
| 283 | - $delta = (int) ($delta / (static::BASE - static::TMIN)); |
|
| 284 | - $k = $k + static::BASE; |
|
| 285 | - } |
|
| 286 | - $k = $k + (int) (((static::BASE - static::TMIN + 1) * $delta) / ($delta + static::SKEW)); |
|
| 287 | - |
|
| 288 | - return $k; |
|
| 289 | - } |
|
| 290 | - |
|
| 291 | - /** |
|
| 292 | - * List code points for a given input |
|
| 293 | - * |
|
| 294 | - * @param string $input |
|
| 295 | - * @return array Multi-dimension array with basic, non-basic and aggregated code points |
|
| 296 | - */ |
|
| 297 | - protected function listCodePoints($input) |
|
| 298 | - { |
|
| 299 | - $codePoints = array( |
|
| 300 | - 'all' => array(), |
|
| 301 | - 'basic' => array(), |
|
| 302 | - 'nonBasic' => array(), |
|
| 303 | - ); |
|
| 304 | - |
|
| 305 | - $length = mb_strlen($input, $this->encoding); |
|
| 306 | - for ($i = 0; $i < $length; $i++) { |
|
| 307 | - $char = mb_substr($input, $i, 1, $this->encoding); |
|
| 308 | - $code = $this->charToCodePoint($char); |
|
| 309 | - if ($code < 128) { |
|
| 310 | - $codePoints['all'][] = $codePoints['basic'][] = $code; |
|
| 311 | - } else { |
|
| 312 | - $codePoints['all'][] = $codePoints['nonBasic'][] = $code; |
|
| 313 | - } |
|
| 314 | - } |
|
| 315 | - |
|
| 316 | - return $codePoints; |
|
| 317 | - } |
|
| 318 | - |
|
| 319 | - /** |
|
| 320 | - * Convert a single or multi-byte character to its code point |
|
| 321 | - * |
|
| 322 | - * @param string $char |
|
| 323 | - * @return integer |
|
| 324 | - */ |
|
| 325 | - protected function charToCodePoint($char) |
|
| 326 | - { |
|
| 327 | - $code = ord($char[0]); |
|
| 328 | - if ($code < 128) { |
|
| 329 | - return $code; |
|
| 330 | - } elseif ($code < 224) { |
|
| 331 | - return (($code - 192) * 64) + (ord($char[1]) - 128); |
|
| 332 | - } elseif ($code < 240) { |
|
| 333 | - return (($code - 224) * 4096) + ((ord($char[1]) - 128) * 64) + (ord($char[2]) - 128); |
|
| 334 | - } else { |
|
| 335 | - return (($code - 240) * 262144) + ((ord($char[1]) - 128) * 4096) + ((ord($char[2]) - 128) * 64) + (ord($char[3]) - 128); |
|
| 336 | - } |
|
| 337 | - } |
|
| 338 | - |
|
| 339 | - /** |
|
| 340 | - * Convert a code point to its single or multi-byte character |
|
| 341 | - * |
|
| 342 | - * @param integer $code |
|
| 343 | - * @return string |
|
| 344 | - */ |
|
| 345 | - protected function codePointToChar($code) |
|
| 346 | - { |
|
| 347 | - if ($code <= 0x7F) { |
|
| 348 | - return chr($code); |
|
| 349 | - } elseif ($code <= 0x7FF) { |
|
| 350 | - return chr(($code >> 6) + 192) . chr(($code & 63) + 128); |
|
| 351 | - } elseif ($code <= 0xFFFF) { |
|
| 352 | - return chr(($code >> 12) + 224) . chr((($code >> 6) & 63) + 128) . chr(($code & 63) + 128); |
|
| 353 | - } else { |
|
| 354 | - return chr(($code >> 18) + 240) . chr((($code >> 12) & 63) + 128) . chr((($code >> 6) & 63) + 128) . chr(($code & 63) + 128); |
|
| 355 | - } |
|
| 356 | - } |
|
| 31 | + /** |
|
| 32 | + * Bootstring parameter values |
|
| 33 | + * |
|
| 34 | + */ |
|
| 35 | + const BASE = 36; |
|
| 36 | + const TMIN = 1; |
|
| 37 | + const TMAX = 26; |
|
| 38 | + const SKEW = 38; |
|
| 39 | + const DAMP = 700; |
|
| 40 | + const INITIAL_BIAS = 72; |
|
| 41 | + const INITIAL_N = 128; |
|
| 42 | + const PREFIX = 'xn--'; |
|
| 43 | + const DELIMITER = '-'; |
|
| 44 | + |
|
| 45 | + /** |
|
| 46 | + * Encode table |
|
| 47 | + * |
|
| 48 | + * @param array |
|
| 49 | + */ |
|
| 50 | + protected static $encodeTable = array( |
|
| 51 | + 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', |
|
| 52 | + 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', |
|
| 53 | + 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', |
|
| 54 | + ); |
|
| 55 | + |
|
| 56 | + /** |
|
| 57 | + * Decode table |
|
| 58 | + * |
|
| 59 | + * @param array |
|
| 60 | + */ |
|
| 61 | + protected static $decodeTable = array( |
|
| 62 | + 'a' => 0, 'b' => 1, 'c' => 2, 'd' => 3, 'e' => 4, 'f' => 5, |
|
| 63 | + 'g' => 6, 'h' => 7, 'i' => 8, 'j' => 9, 'k' => 10, 'l' => 11, |
|
| 64 | + 'm' => 12, 'n' => 13, 'o' => 14, 'p' => 15, 'q' => 16, 'r' => 17, |
|
| 65 | + 's' => 18, 't' => 19, 'u' => 20, 'v' => 21, 'w' => 22, 'x' => 23, |
|
| 66 | + 'y' => 24, 'z' => 25, '0' => 26, '1' => 27, '2' => 28, '3' => 29, |
|
| 67 | + '4' => 30, '5' => 31, '6' => 32, '7' => 33, '8' => 34, '9' => 35 |
|
| 68 | + ); |
|
| 69 | + |
|
| 70 | + /** |
|
| 71 | + * Character encoding |
|
| 72 | + * |
|
| 73 | + * @param string |
|
| 74 | + */ |
|
| 75 | + protected $encoding; |
|
| 76 | + |
|
| 77 | + /** |
|
| 78 | + * Constructor |
|
| 79 | + * |
|
| 80 | + * @param string $encoding Character encoding |
|
| 81 | + */ |
|
| 82 | + public function __construct($encoding = 'UTF-8') |
|
| 83 | + { |
|
| 84 | + $this->encoding = $encoding; |
|
| 85 | + } |
|
| 86 | + |
|
| 87 | + /** |
|
| 88 | + * Encode a domain to its Punycode version |
|
| 89 | + * |
|
| 90 | + * @param string $input Domain name in Unicode to be encoded |
|
| 91 | + * @return string Punycode representation in ASCII |
|
| 92 | + */ |
|
| 93 | + public function encode($input) |
|
| 94 | + { |
|
| 95 | + $input = mb_strtolower($input, $this->encoding); |
|
| 96 | + $parts = explode('.', $input); |
|
| 97 | + foreach ($parts as &$part) { |
|
| 98 | + $part = $this->encodePart($part); |
|
| 99 | + } |
|
| 100 | + $output = implode('.', $parts); |
|
| 101 | + $length = strlen($output); |
|
| 102 | + |
|
| 103 | + return $output; |
|
| 104 | + } |
|
| 105 | + |
|
| 106 | + /** |
|
| 107 | + * Encode a part of a domain name, such as tld, to its Punycode version |
|
| 108 | + * |
|
| 109 | + * @param string $input Part of a domain name |
|
| 110 | + * @return string Punycode representation of a domain part |
|
| 111 | + */ |
|
| 112 | + protected function encodePart($input) |
|
| 113 | + { |
|
| 114 | + $codePoints = $this->listCodePoints($input); |
|
| 115 | + |
|
| 116 | + $n = static::INITIAL_N; |
|
| 117 | + $bias = static::INITIAL_BIAS; |
|
| 118 | + $delta = 0; |
|
| 119 | + $h = $b = count($codePoints['basic']); |
|
| 120 | + |
|
| 121 | + $output = ''; |
|
| 122 | + foreach ($codePoints['basic'] as $code) { |
|
| 123 | + $output .= $this->codePointToChar($code); |
|
| 124 | + } |
|
| 125 | + if ($input === $output) { |
|
| 126 | + return $output; |
|
| 127 | + } |
|
| 128 | + if ($b > 0) { |
|
| 129 | + $output .= static::DELIMITER; |
|
| 130 | + } |
|
| 131 | + |
|
| 132 | + $codePoints['nonBasic'] = array_unique($codePoints['nonBasic']); |
|
| 133 | + sort($codePoints['nonBasic']); |
|
| 134 | + |
|
| 135 | + $i = 0; |
|
| 136 | + $length = mb_strlen($input, $this->encoding); |
|
| 137 | + while ($h < $length) { |
|
| 138 | + $m = $codePoints['nonBasic'][$i++]; |
|
| 139 | + $delta = $delta + ($m - $n) * ($h + 1); |
|
| 140 | + $n = $m; |
|
| 141 | + |
|
| 142 | + foreach ($codePoints['all'] as $c) { |
|
| 143 | + if ($c < $n || $c < static::INITIAL_N) { |
|
| 144 | + $delta++; |
|
| 145 | + } |
|
| 146 | + if ($c === $n) { |
|
| 147 | + $q = $delta; |
|
| 148 | + for ($k = static::BASE;; $k += static::BASE) { |
|
| 149 | + $t = $this->calculateThreshold($k, $bias); |
|
| 150 | + if ($q < $t) { |
|
| 151 | + break; |
|
| 152 | + } |
|
| 153 | + |
|
| 154 | + $code = $t + (($q - $t) % (static::BASE - $t)); |
|
| 155 | + $output .= static::$encodeTable[$code]; |
|
| 156 | + |
|
| 157 | + $q = ($q - $t) / (static::BASE - $t); |
|
| 158 | + } |
|
| 159 | + |
|
| 160 | + $output .= static::$encodeTable[$q]; |
|
| 161 | + $bias = $this->adapt($delta, $h + 1, ($h === $b)); |
|
| 162 | + $delta = 0; |
|
| 163 | + $h++; |
|
| 164 | + } |
|
| 165 | + } |
|
| 166 | + |
|
| 167 | + $delta++; |
|
| 168 | + $n++; |
|
| 169 | + } |
|
| 170 | + $out = static::PREFIX . $output; |
|
| 171 | + |
|
| 172 | + return $out; |
|
| 173 | + } |
|
| 174 | + |
|
| 175 | + /** |
|
| 176 | + * Decode a Punycode domain name to its Unicode counterpart |
|
| 177 | + * |
|
| 178 | + * @param string $input Domain name in Punycode |
|
| 179 | + * @return string Unicode domain name |
|
| 180 | + */ |
|
| 181 | + public function decode($input) |
|
| 182 | + { |
|
| 183 | + $input = strtolower($input); |
|
| 184 | + $parts = explode('.', $input); |
|
| 185 | + foreach ($parts as &$part) { |
|
| 186 | + if (strpos($part, static::PREFIX) !== 0) { |
|
| 187 | + continue; |
|
| 188 | + } |
|
| 189 | + |
|
| 190 | + $part = substr($part, strlen(static::PREFIX)); |
|
| 191 | + $part = $this->decodePart($part); |
|
| 192 | + } |
|
| 193 | + $output = implode('.', $parts); |
|
| 194 | + |
|
| 195 | + return $output; |
|
| 196 | + } |
|
| 197 | + |
|
| 198 | + /** |
|
| 199 | + * Decode a part of domain name, such as tld |
|
| 200 | + * |
|
| 201 | + * @param string $input Part of a domain name |
|
| 202 | + * @return string Unicode domain part |
|
| 203 | + */ |
|
| 204 | + protected function decodePart($input) |
|
| 205 | + { |
|
| 206 | + $n = static::INITIAL_N; |
|
| 207 | + $i = 0; |
|
| 208 | + $bias = static::INITIAL_BIAS; |
|
| 209 | + $output = ''; |
|
| 210 | + |
|
| 211 | + $pos = strrpos($input, static::DELIMITER); |
|
| 212 | + if ($pos !== false) { |
|
| 213 | + $output = substr($input, 0, $pos++); |
|
| 214 | + } else { |
|
| 215 | + $pos = 0; |
|
| 216 | + } |
|
| 217 | + |
|
| 218 | + $outputLength = strlen($output); |
|
| 219 | + $inputLength = strlen($input); |
|
| 220 | + while ($pos < $inputLength) { |
|
| 221 | + $oldi = $i; |
|
| 222 | + $w = 1; |
|
| 223 | + |
|
| 224 | + for ($k = static::BASE;; $k += static::BASE) { |
|
| 225 | + $digit = static::$decodeTable[$input[$pos++]]; |
|
| 226 | + $i = $i + ($digit * $w); |
|
| 227 | + $t = $this->calculateThreshold($k, $bias); |
|
| 228 | + |
|
| 229 | + if ($digit < $t) { |
|
| 230 | + break; |
|
| 231 | + } |
|
| 232 | + |
|
| 233 | + $w = $w * (static::BASE - $t); |
|
| 234 | + } |
|
| 235 | + |
|
| 236 | + $bias = $this->adapt($i - $oldi, ++$outputLength, ($oldi === 0)); |
|
| 237 | + $n = $n + (int) ($i / $outputLength); |
|
| 238 | + $i = $i % ($outputLength); |
|
| 239 | + $output = mb_substr($output, 0, $i, $this->encoding) . $this->codePointToChar($n) . mb_substr($output, $i, $outputLength - 1, $this->encoding); |
|
| 240 | + |
|
| 241 | + $i++; |
|
| 242 | + } |
|
| 243 | + |
|
| 244 | + return $output; |
|
| 245 | + } |
|
| 246 | + |
|
| 247 | + /** |
|
| 248 | + * Calculate the bias threshold to fall between TMIN and TMAX |
|
| 249 | + * |
|
| 250 | + * @param integer $k |
|
| 251 | + * @param integer $bias |
|
| 252 | + * @return integer |
|
| 253 | + */ |
|
| 254 | + protected function calculateThreshold($k, $bias) |
|
| 255 | + { |
|
| 256 | + if ($k <= $bias + static::TMIN) { |
|
| 257 | + return static::TMIN; |
|
| 258 | + } elseif ($k >= $bias + static::TMAX) { |
|
| 259 | + return static::TMAX; |
|
| 260 | + } |
|
| 261 | + return $k - $bias; |
|
| 262 | + } |
|
| 263 | + |
|
| 264 | + /** |
|
| 265 | + * Bias adaptation |
|
| 266 | + * |
|
| 267 | + * @param integer $delta |
|
| 268 | + * @param integer $numPoints |
|
| 269 | + * @param boolean $firstTime |
|
| 270 | + * @return integer |
|
| 271 | + */ |
|
| 272 | + protected function adapt($delta, $numPoints, $firstTime) |
|
| 273 | + { |
|
| 274 | + $delta = (int) ( |
|
| 275 | + ($firstTime) |
|
| 276 | + ? $delta / static::DAMP |
|
| 277 | + : $delta / 2 |
|
| 278 | + ); |
|
| 279 | + $delta += (int) ($delta / $numPoints); |
|
| 280 | + |
|
| 281 | + $k = 0; |
|
| 282 | + while ($delta > ((static::BASE - static::TMIN) * static::TMAX) / 2) { |
|
| 283 | + $delta = (int) ($delta / (static::BASE - static::TMIN)); |
|
| 284 | + $k = $k + static::BASE; |
|
| 285 | + } |
|
| 286 | + $k = $k + (int) (((static::BASE - static::TMIN + 1) * $delta) / ($delta + static::SKEW)); |
|
| 287 | + |
|
| 288 | + return $k; |
|
| 289 | + } |
|
| 290 | + |
|
| 291 | + /** |
|
| 292 | + * List code points for a given input |
|
| 293 | + * |
|
| 294 | + * @param string $input |
|
| 295 | + * @return array Multi-dimension array with basic, non-basic and aggregated code points |
|
| 296 | + */ |
|
| 297 | + protected function listCodePoints($input) |
|
| 298 | + { |
|
| 299 | + $codePoints = array( |
|
| 300 | + 'all' => array(), |
|
| 301 | + 'basic' => array(), |
|
| 302 | + 'nonBasic' => array(), |
|
| 303 | + ); |
|
| 304 | + |
|
| 305 | + $length = mb_strlen($input, $this->encoding); |
|
| 306 | + for ($i = 0; $i < $length; $i++) { |
|
| 307 | + $char = mb_substr($input, $i, 1, $this->encoding); |
|
| 308 | + $code = $this->charToCodePoint($char); |
|
| 309 | + if ($code < 128) { |
|
| 310 | + $codePoints['all'][] = $codePoints['basic'][] = $code; |
|
| 311 | + } else { |
|
| 312 | + $codePoints['all'][] = $codePoints['nonBasic'][] = $code; |
|
| 313 | + } |
|
| 314 | + } |
|
| 315 | + |
|
| 316 | + return $codePoints; |
|
| 317 | + } |
|
| 318 | + |
|
| 319 | + /** |
|
| 320 | + * Convert a single or multi-byte character to its code point |
|
| 321 | + * |
|
| 322 | + * @param string $char |
|
| 323 | + * @return integer |
|
| 324 | + */ |
|
| 325 | + protected function charToCodePoint($char) |
|
| 326 | + { |
|
| 327 | + $code = ord($char[0]); |
|
| 328 | + if ($code < 128) { |
|
| 329 | + return $code; |
|
| 330 | + } elseif ($code < 224) { |
|
| 331 | + return (($code - 192) * 64) + (ord($char[1]) - 128); |
|
| 332 | + } elseif ($code < 240) { |
|
| 333 | + return (($code - 224) * 4096) + ((ord($char[1]) - 128) * 64) + (ord($char[2]) - 128); |
|
| 334 | + } else { |
|
| 335 | + return (($code - 240) * 262144) + ((ord($char[1]) - 128) * 4096) + ((ord($char[2]) - 128) * 64) + (ord($char[3]) - 128); |
|
| 336 | + } |
|
| 337 | + } |
|
| 338 | + |
|
| 339 | + /** |
|
| 340 | + * Convert a code point to its single or multi-byte character |
|
| 341 | + * |
|
| 342 | + * @param integer $code |
|
| 343 | + * @return string |
|
| 344 | + */ |
|
| 345 | + protected function codePointToChar($code) |
|
| 346 | + { |
|
| 347 | + if ($code <= 0x7F) { |
|
| 348 | + return chr($code); |
|
| 349 | + } elseif ($code <= 0x7FF) { |
|
| 350 | + return chr(($code >> 6) + 192) . chr(($code & 63) + 128); |
|
| 351 | + } elseif ($code <= 0xFFFF) { |
|
| 352 | + return chr(($code >> 12) + 224) . chr((($code >> 6) & 63) + 128) . chr(($code & 63) + 128); |
|
| 353 | + } else { |
|
| 354 | + return chr(($code >> 18) + 240) . chr((($code >> 12) & 63) + 128) . chr((($code >> 6) & 63) + 128) . chr(($code & 63) + 128); |
|
| 355 | + } |
|
| 356 | + } |
|
| 357 | 357 | } |
| 358 | 358 | |
| 359 | 359 | ?> |
| 360 | 360 | \ No newline at end of file |
@@ -13,8 +13,9 @@ discard block |
||
| 13 | 13 | * @version 2.1 Beta 4 |
| 14 | 14 | */ |
| 15 | 15 | |
| 16 | -if (!defined('SMF')) |
|
| 16 | +if (!defined('SMF')) { |
|
| 17 | 17 | die('No direct access...'); |
| 18 | +} |
|
| 18 | 19 | |
| 19 | 20 | /** |
| 20 | 21 | * 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, 'minimize' => true), 'smf_suggest'); |
|
| 87 | + if ($context['sub_action'] == 'browse') { |
|
| 88 | + loadJavaScriptFile('suggest.js', array('defer' => false, 'minimize' => true), '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,51 +374,53 @@ discard block |
||
| 361 | 374 | 'description' => $txt['package_action_missing'], |
| 362 | 375 | 'failed' => true, |
| 363 | 376 | ); |
| 364 | - } |
|
| 365 | - else |
|
| 377 | + } else |
|
| 366 | 378 | { |
| 367 | - if ($action['boardmod']) |
|
| 368 | - $mod_actions = parseBoardMod(@file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $action['filename']), true, $action['reverse'], $theme_paths); |
|
| 369 | - else |
|
| 370 | - $mod_actions = parseModification(@file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $action['filename']), true, $action['reverse'], $theme_paths); |
|
| 379 | + if ($action['boardmod']) { |
|
| 380 | + $mod_actions = parseBoardMod(@file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $action['filename']), true, $action['reverse'], $theme_paths); |
|
| 381 | + } else { |
|
| 382 | + $mod_actions = parseModification(@file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $action['filename']), true, $action['reverse'], $theme_paths); |
|
| 383 | + } |
|
| 371 | 384 | |
| 372 | - if (count($mod_actions) == 1 && isset($mod_actions[0]) && $mod_actions[0]['type'] == 'error' && $mod_actions[0]['filename'] == '-') |
|
| 373 | - $mod_actions[0]['filename'] = $action['filename']; |
|
| 385 | + if (count($mod_actions) == 1 && isset($mod_actions[0]) && $mod_actions[0]['type'] == 'error' && $mod_actions[0]['filename'] == '-') { |
|
| 386 | + $mod_actions[0]['filename'] = $action['filename']; |
|
| 387 | + } |
|
| 374 | 388 | |
| 375 | 389 | foreach ($mod_actions as $key => $mod_action) |
| 376 | 390 | { |
| 377 | 391 | // Lets get the last section of the file name. |
| 378 | - if (isset($mod_action['filename']) && substr($mod_action['filename'], -13) != '.template.php') |
|
| 379 | - $actual_filename = strtolower(substr(strrchr($mod_action['filename'], '/'), 1) . '||' . $action['filename']); |
|
| 380 | - elseif (isset($mod_action['filename']) && preg_match('~([\w]*)/([\w]*)\.template\.php$~', $mod_action['filename'], $matches)) |
|
| 381 | - $actual_filename = strtolower($matches[1] . '/' . $matches[2] . '.template.php' . '||' . $action['filename']); |
|
| 382 | - else |
|
| 383 | - $actual_filename = $key; |
|
| 384 | - |
|
| 385 | - if ($mod_action['type'] == 'opened') |
|
| 386 | - $failed = false; |
|
| 387 | - elseif ($mod_action['type'] == 'failure') |
|
| 392 | + if (isset($mod_action['filename']) && substr($mod_action['filename'], -13) != '.template.php') { |
|
| 393 | + $actual_filename = strtolower(substr(strrchr($mod_action['filename'], '/'), 1) . '||' . $action['filename']); |
|
| 394 | + } elseif (isset($mod_action['filename']) && preg_match('~([\w]*)/([\w]*)\.template\.php$~', $mod_action['filename'], $matches)) { |
|
| 395 | + $actual_filename = strtolower($matches[1] . '/' . $matches[2] . '.template.php' . '||' . $action['filename']); |
|
| 396 | + } else { |
|
| 397 | + $actual_filename = $key; |
|
| 398 | + } |
|
| 399 | + |
|
| 400 | + if ($mod_action['type'] == 'opened') { |
|
| 401 | + $failed = false; |
|
| 402 | + } elseif ($mod_action['type'] == 'failure') |
|
| 388 | 403 | { |
| 389 | - if (empty($mod_action['is_custom'])) |
|
| 390 | - $context['has_failure'] = true; |
|
| 404 | + if (empty($mod_action['is_custom'])) { |
|
| 405 | + $context['has_failure'] = true; |
|
| 406 | + } |
|
| 391 | 407 | $failed = true; |
| 392 | - } |
|
| 393 | - elseif ($mod_action['type'] == 'chmod') |
|
| 408 | + } elseif ($mod_action['type'] == 'chmod') |
|
| 394 | 409 | { |
| 395 | 410 | $chmod_files[] = $mod_action['filename']; |
| 396 | - } |
|
| 397 | - elseif ($mod_action['type'] == 'saved') |
|
| 411 | + } elseif ($mod_action['type'] == 'saved') |
|
| 398 | 412 | { |
| 399 | 413 | if (!empty($mod_action['is_custom'])) |
| 400 | 414 | { |
| 401 | - if (!isset($context['theme_actions'][$mod_action['is_custom']])) |
|
| 402 | - $context['theme_actions'][$mod_action['is_custom']] = array( |
|
| 415 | + if (!isset($context['theme_actions'][$mod_action['is_custom']])) { |
|
| 416 | + $context['theme_actions'][$mod_action['is_custom']] = array( |
|
| 403 | 417 | 'name' => $theme_paths[$mod_action['is_custom']]['name'], |
| 404 | 418 | 'actions' => array(), |
| 405 | 419 | 'has_failure' => $failed, |
| 406 | 420 | ); |
| 407 | - else |
|
| 408 | - $context['theme_actions'][$mod_action['is_custom']]['has_failure'] |= $failed; |
|
| 421 | + } else { |
|
| 422 | + $context['theme_actions'][$mod_action['is_custom']]['has_failure'] |= $failed; |
|
| 423 | + } |
|
| 409 | 424 | |
| 410 | 425 | $context['theme_actions'][$mod_action['is_custom']]['actions'][$actual_filename] = array( |
| 411 | 426 | 'type' => $txt['execute_modification'], |
@@ -413,8 +428,7 @@ discard block |
||
| 413 | 428 | 'description' => $failed ? $txt['package_action_failure'] : $txt['package_action_success'], |
| 414 | 429 | 'failed' => $failed, |
| 415 | 430 | ); |
| 416 | - } |
|
| 417 | - elseif (!isset($context['actions'][$actual_filename])) |
|
| 431 | + } elseif (!isset($context['actions'][$actual_filename])) |
|
| 418 | 432 | { |
| 419 | 433 | $context['actions'][$actual_filename] = array( |
| 420 | 434 | 'type' => $txt['execute_modification'], |
@@ -422,22 +436,19 @@ discard block |
||
| 422 | 436 | 'description' => $failed ? $txt['package_action_failure'] : $txt['package_action_success'], |
| 423 | 437 | 'failed' => $failed, |
| 424 | 438 | ); |
| 425 | - } |
|
| 426 | - else |
|
| 439 | + } else |
|
| 427 | 440 | { |
| 428 | 441 | $context['actions'][$actual_filename]['failed'] |= $failed; |
| 429 | 442 | $context['actions'][$actual_filename]['description'] = $context['actions'][$actual_filename]['failed'] ? $txt['package_action_failure'] : $txt['package_action_success']; |
| 430 | 443 | } |
| 431 | - } |
|
| 432 | - elseif ($mod_action['type'] == 'skipping') |
|
| 444 | + } elseif ($mod_action['type'] == 'skipping') |
|
| 433 | 445 | { |
| 434 | 446 | $context['actions'][$actual_filename] = array( |
| 435 | 447 | 'type' => $txt['execute_modification'], |
| 436 | 448 | 'action' => $smcFunc['htmlspecialchars'](strtr($mod_action['filename'], array($boarddir => '.'))), |
| 437 | 449 | 'description' => $txt['package_action_skipping'] |
| 438 | 450 | ); |
| 439 | - } |
|
| 440 | - elseif ($mod_action['type'] == 'missing' && empty($mod_action['is_custom'])) |
|
| 451 | + } elseif ($mod_action['type'] == 'missing' && empty($mod_action['is_custom'])) |
|
| 441 | 452 | { |
| 442 | 453 | $context['has_failure'] = true; |
| 443 | 454 | $context['actions'][$actual_filename] = array( |
@@ -446,32 +457,33 @@ discard block |
||
| 446 | 457 | 'description' => $txt['package_action_missing'], |
| 447 | 458 | 'failed' => true, |
| 448 | 459 | ); |
| 449 | - } |
|
| 450 | - elseif ($mod_action['type'] == 'error') |
|
| 451 | - $context['actions'][$actual_filename] = array( |
|
| 460 | + } elseif ($mod_action['type'] == 'error') { |
|
| 461 | + $context['actions'][$actual_filename] = array( |
|
| 452 | 462 | 'type' => $txt['execute_modification'], |
| 453 | 463 | 'action' => $smcFunc['htmlspecialchars'](strtr($mod_action['filename'], array($boarddir => '.'))), |
| 454 | 464 | 'description' => $txt['package_action_error'], |
| 455 | 465 | 'failed' => true, |
| 456 | 466 | ); |
| 467 | + } |
|
| 457 | 468 | } |
| 458 | 469 | |
| 459 | 470 | // We need to loop again just to get the operations down correctly. |
| 460 | 471 | foreach ($mod_actions as $operation_key => $mod_action) |
| 461 | 472 | { |
| 462 | 473 | // Lets get the last section of the file name. |
| 463 | - if (isset($mod_action['filename']) && substr($mod_action['filename'], -13) != '.template.php') |
|
| 464 | - $actual_filename = strtolower(substr(strrchr($mod_action['filename'], '/'), 1) . '||' . $action['filename']); |
|
| 465 | - elseif (isset($mod_action['filename']) && preg_match('~([\w]*)/([\w]*)\.template\.php$~', $mod_action['filename'], $matches)) |
|
| 466 | - $actual_filename = strtolower($matches[1] . '/' . $matches[2] . '.template.php' . '||' . $action['filename']); |
|
| 467 | - else |
|
| 468 | - $actual_filename = $key; |
|
| 474 | + if (isset($mod_action['filename']) && substr($mod_action['filename'], -13) != '.template.php') { |
|
| 475 | + $actual_filename = strtolower(substr(strrchr($mod_action['filename'], '/'), 1) . '||' . $action['filename']); |
|
| 476 | + } elseif (isset($mod_action['filename']) && preg_match('~([\w]*)/([\w]*)\.template\.php$~', $mod_action['filename'], $matches)) { |
|
| 477 | + $actual_filename = strtolower($matches[1] . '/' . $matches[2] . '.template.php' . '||' . $action['filename']); |
|
| 478 | + } else { |
|
| 479 | + $actual_filename = $key; |
|
| 480 | + } |
|
| 469 | 481 | |
| 470 | 482 | // We just need it for actual parse changes. |
| 471 | 483 | if (!in_array($mod_action['type'], array('error', 'result', 'opened', 'saved', 'end', 'missing', 'skipping', 'chmod'))) |
| 472 | 484 | { |
| 473 | - if (empty($mod_action['is_custom'])) |
|
| 474 | - $context['actions'][$actual_filename]['operations'][] = array( |
|
| 485 | + if (empty($mod_action['is_custom'])) { |
|
| 486 | + $context['actions'][$actual_filename]['operations'][] = array( |
|
| 475 | 487 | 'type' => $txt['execute_modification'], |
| 476 | 488 | 'action' => $smcFunc['htmlspecialchars'](strtr($mod_action['filename'], array($boarddir => '.'))), |
| 477 | 489 | 'description' => $mod_action['failed'] ? $txt['package_action_failure'] : $txt['package_action_success'], |
@@ -482,10 +494,11 @@ discard block |
||
| 482 | 494 | 'failed' => $mod_action['failed'], |
| 483 | 495 | 'ignore_failure' => !empty($mod_action['ignore_failure']), |
| 484 | 496 | ); |
| 497 | + } |
|
| 485 | 498 | |
| 486 | 499 | // Themes are under the saved type. |
| 487 | - if (isset($mod_action['is_custom']) && isset($context['theme_actions'][$mod_action['is_custom']])) |
|
| 488 | - $context['theme_actions'][$mod_action['is_custom']]['actions'][$actual_filename]['operations'][] = array( |
|
| 500 | + if (isset($mod_action['is_custom']) && isset($context['theme_actions'][$mod_action['is_custom']])) { |
|
| 501 | + $context['theme_actions'][$mod_action['is_custom']]['actions'][$actual_filename]['operations'][] = array( |
|
| 489 | 502 | 'type' => $txt['execute_modification'], |
| 490 | 503 | 'action' => $smcFunc['htmlspecialchars'](strtr($mod_action['filename'], array($boarddir => '.'))), |
| 491 | 504 | 'description' => $mod_action['failed'] ? $txt['package_action_failure'] : $txt['package_action_success'], |
@@ -496,59 +509,55 @@ discard block |
||
| 496 | 509 | 'failed' => $mod_action['failed'], |
| 497 | 510 | 'ignore_failure' => !empty($mod_action['ignore_failure']), |
| 498 | 511 | ); |
| 512 | + } |
|
| 499 | 513 | } |
| 500 | 514 | } |
| 501 | 515 | } |
| 502 | - } |
|
| 503 | - elseif ($action['type'] == 'code') |
|
| 516 | + } elseif ($action['type'] == 'code') |
|
| 504 | 517 | { |
| 505 | 518 | $thisAction = array( |
| 506 | 519 | 'type' => $txt['execute_code'], |
| 507 | 520 | 'action' => $smcFunc['htmlspecialchars']($action['filename']), |
| 508 | 521 | ); |
| 509 | - } |
|
| 510 | - elseif ($action['type'] == 'database') |
|
| 522 | + } elseif ($action['type'] == 'database') |
|
| 511 | 523 | { |
| 512 | 524 | $thisAction = array( |
| 513 | 525 | 'type' => $txt['execute_database_changes'], |
| 514 | 526 | 'action' => $smcFunc['htmlspecialchars']($action['filename']), |
| 515 | 527 | ); |
| 516 | - } |
|
| 517 | - elseif (in_array($action['type'], array('create-dir', 'create-file'))) |
|
| 528 | + } elseif (in_array($action['type'], array('create-dir', 'create-file'))) |
|
| 518 | 529 | { |
| 519 | 530 | $thisAction = array( |
| 520 | 531 | 'type' => $txt['package_create'] . ' ' . ($action['type'] == 'create-dir' ? $txt['package_tree'] : $txt['package_file']), |
| 521 | 532 | 'action' => $smcFunc['htmlspecialchars'](strtr($action['destination'], array($boarddir => '.'))) |
| 522 | 533 | ); |
| 523 | - } |
|
| 524 | - elseif ($action['type'] == 'hook') |
|
| 534 | + } elseif ($action['type'] == 'hook') |
|
| 525 | 535 | { |
| 526 | 536 | $action['description'] = !isset($action['hook'], $action['function']) ? $txt['package_action_failure'] : $txt['package_action_success']; |
| 527 | 537 | |
| 528 | - if (!isset($action['hook'], $action['function'])) |
|
| 529 | - $context['has_failure'] = true; |
|
| 538 | + if (!isset($action['hook'], $action['function'])) { |
|
| 539 | + $context['has_failure'] = true; |
|
| 540 | + } |
|
| 530 | 541 | |
| 531 | 542 | $thisAction = array( |
| 532 | 543 | 'type' => $action['reverse'] ? $txt['execute_hook_remove'] : $txt['execute_hook_add'], |
| 533 | 544 | 'action' => sprintf($txt['execute_hook_action' . ($action['reverse'] ? '_inverse' : '')], $smcFunc['htmlspecialchars']($action['hook'])), |
| 534 | 545 | ); |
| 535 | - } |
|
| 536 | - elseif ($action['type'] == 'credits') |
|
| 546 | + } elseif ($action['type'] == 'credits') |
|
| 537 | 547 | { |
| 538 | 548 | $thisAction = array( |
| 539 | 549 | 'type' => $txt['execute_credits_add'], |
| 540 | 550 | 'action' => sprintf($txt['execute_credits_action'], $smcFunc['htmlspecialchars']($action['title'])), |
| 541 | 551 | ); |
| 542 | - } |
|
| 543 | - elseif ($action['type'] == 'requires') |
|
| 552 | + } elseif ($action['type'] == 'requires') |
|
| 544 | 553 | { |
| 545 | 554 | $installed = false; |
| 546 | 555 | $version = true; |
| 547 | 556 | |
| 548 | 557 | // package missing required values? |
| 549 | - if (!isset($action['id'])) |
|
| 550 | - $context['has_failure'] = true; |
|
| 551 | - else |
|
| 558 | + if (!isset($action['id'])) { |
|
| 559 | + $context['has_failure'] = true; |
|
| 560 | + } else |
|
| 552 | 561 | { |
| 553 | 562 | // See if this dependancy is installed |
| 554 | 563 | $request = $smcFunc['db_query']('', ' |
@@ -564,8 +573,9 @@ discard block |
||
| 564 | 573 | ) |
| 565 | 574 | ); |
| 566 | 575 | $installed = ($smcFunc['db_num_rows']($request) !== 0); |
| 567 | - if ($installed) |
|
| 568 | - list ($version) = $smcFunc['db_fetch_row']($request); |
|
| 576 | + if ($installed) { |
|
| 577 | + list ($version) = $smcFunc['db_fetch_row']($request); |
|
| 578 | + } |
|
| 569 | 579 | $smcFunc['db_free_result']($request); |
| 570 | 580 | |
| 571 | 581 | // do a version level check (if requested) in the most basic way |
@@ -580,8 +590,7 @@ discard block |
||
| 580 | 590 | 'type' => $txt['package_requires'], |
| 581 | 591 | 'action' => $txt['package_check_for'] . ' ' . $action['id'] . (isset($action['version']) ? (' / ' . ($version ? $action['version'] : '<span class="error">' . $action['version'] . '</span>')) : ''), |
| 582 | 592 | ); |
| 583 | - } |
|
| 584 | - elseif (in_array($action['type'], array('require-dir', 'require-file'))) |
|
| 593 | + } elseif (in_array($action['type'], array('require-dir', 'require-file'))) |
|
| 585 | 594 | { |
| 586 | 595 | // Do this one... |
| 587 | 596 | $thisAction = array( |
@@ -595,26 +604,29 @@ discard block |
||
| 595 | 604 | // Is the action already stated? |
| 596 | 605 | $theme_action = !empty($action['theme_action']) && in_array($action['theme_action'], array('no', 'yes', 'auto')) ? $action['theme_action'] : 'auto'; |
| 597 | 606 | // If it's not auto do we think we have something we can act upon? |
| 598 | - if ($theme_action != 'auto' && !in_array($matches[1], array('languagedir', 'languages_dir', 'imagesdir', 'themedir'))) |
|
| 599 | - $theme_action = ''; |
|
| 607 | + if ($theme_action != 'auto' && !in_array($matches[1], array('languagedir', 'languages_dir', 'imagesdir', 'themedir'))) { |
|
| 608 | + $theme_action = ''; |
|
| 609 | + } |
|
| 600 | 610 | // ... or if it's auto do we even want to do anything? |
| 601 | - elseif ($theme_action == 'auto' && $matches[1] != 'imagesdir') |
|
| 602 | - $theme_action = ''; |
|
| 611 | + elseif ($theme_action == 'auto' && $matches[1] != 'imagesdir') { |
|
| 612 | + $theme_action = ''; |
|
| 613 | + } |
|
| 603 | 614 | |
| 604 | 615 | // So, we still want to do something? |
| 605 | - if ($theme_action != '') |
|
| 606 | - $themeFinds['candidates'][] = $action; |
|
| 616 | + if ($theme_action != '') { |
|
| 617 | + $themeFinds['candidates'][] = $action; |
|
| 618 | + } |
|
| 607 | 619 | // Otherwise is this is going into another theme record it. |
| 608 | - elseif ($matches[1] == 'themes_dir') |
|
| 609 | - $themeFinds['other_themes'][] = strtolower(strtr(parse_path($action['unparsed_destination']), array('\\' => '/')) . '/' . basename($action['filename'])); |
|
| 620 | + elseif ($matches[1] == 'themes_dir') { |
|
| 621 | + $themeFinds['other_themes'][] = strtolower(strtr(parse_path($action['unparsed_destination']), array('\\' => '/')) . '/' . basename($action['filename'])); |
|
| 622 | + } |
|
| 610 | 623 | } |
| 611 | - } |
|
| 612 | - elseif (in_array($action['type'], array('move-dir', 'move-file'))) |
|
| 613 | - $thisAction = array( |
|
| 624 | + } elseif (in_array($action['type'], array('move-dir', 'move-file'))) { |
|
| 625 | + $thisAction = array( |
|
| 614 | 626 | 'type' => $txt['package_move'] . ' ' . ($action['type'] == 'move-dir' ? $txt['package_tree'] : $txt['package_file']), |
| 615 | 627 | 'action' => $smcFunc['htmlspecialchars'](strtr($action['source'], array($boarddir => '.'))) . ' => ' . $smcFunc['htmlspecialchars'](strtr($action['destination'], array($boarddir => '.'))) |
| 616 | 628 | ); |
| 617 | - elseif (in_array($action['type'], array('remove-dir', 'remove-file'))) |
|
| 629 | + } elseif (in_array($action['type'], array('remove-dir', 'remove-file'))) |
|
| 618 | 630 | { |
| 619 | 631 | $thisAction = array( |
| 620 | 632 | 'type' => $txt['package_delete'] . ' ' . ($action['type'] == 'remove-dir' ? $txt['package_tree'] : $txt['package_file']), |
@@ -629,30 +641,36 @@ discard block |
||
| 629 | 641 | $action['unparsed_destination'] = $action['unparsed_filename']; |
| 630 | 642 | |
| 631 | 643 | // If it's not auto do we think we have something we can act upon? |
| 632 | - if ($theme_action != 'auto' && !in_array($matches[1], array('languagedir', 'languages_dir', 'imagesdir', 'themedir'))) |
|
| 633 | - $theme_action = ''; |
|
| 644 | + if ($theme_action != 'auto' && !in_array($matches[1], array('languagedir', 'languages_dir', 'imagesdir', 'themedir'))) { |
|
| 645 | + $theme_action = ''; |
|
| 646 | + } |
|
| 634 | 647 | // ... or if it's auto do we even want to do anything? |
| 635 | - elseif ($theme_action == 'auto' && $matches[1] != 'imagesdir') |
|
| 636 | - $theme_action = ''; |
|
| 648 | + elseif ($theme_action == 'auto' && $matches[1] != 'imagesdir') { |
|
| 649 | + $theme_action = ''; |
|
| 650 | + } |
|
| 637 | 651 | |
| 638 | 652 | // So, we still want to do something? |
| 639 | - if ($theme_action != '') |
|
| 640 | - $themeFinds['candidates'][] = $action; |
|
| 653 | + if ($theme_action != '') { |
|
| 654 | + $themeFinds['candidates'][] = $action; |
|
| 655 | + } |
|
| 641 | 656 | // Otherwise is this is going into another theme record it. |
| 642 | - elseif ($matches[1] == 'themes_dir') |
|
| 643 | - $themeFinds['other_themes'][] = strtolower(strtr(parse_path($action['unparsed_filename']), array('\\' => '/')) . '/' . basename($action['filename'])); |
|
| 657 | + elseif ($matches[1] == 'themes_dir') { |
|
| 658 | + $themeFinds['other_themes'][] = strtolower(strtr(parse_path($action['unparsed_filename']), array('\\' => '/')) . '/' . basename($action['filename'])); |
|
| 659 | + } |
|
| 644 | 660 | } |
| 645 | 661 | } |
| 646 | 662 | |
| 647 | - if (empty($thisAction)) |
|
| 648 | - continue; |
|
| 663 | + if (empty($thisAction)) { |
|
| 664 | + continue; |
|
| 665 | + } |
|
| 649 | 666 | |
| 650 | 667 | if (!in_array($action['type'], array('hook', 'credits'))) |
| 651 | 668 | { |
| 652 | - if ($context['uninstalling']) |
|
| 653 | - $file = in_array($action['type'], array('remove-dir', 'remove-file')) ? $action['filename'] : $packagesdir . '/temp/' . $context['base_path'] . $action['filename']; |
|
| 654 | - else |
|
| 655 | - $file = $packagesdir . '/temp/' . $context['base_path'] . $action['filename']; |
|
| 669 | + if ($context['uninstalling']) { |
|
| 670 | + $file = in_array($action['type'], array('remove-dir', 'remove-file')) ? $action['filename'] : $packagesdir . '/temp/' . $context['base_path'] . $action['filename']; |
|
| 671 | + } else { |
|
| 672 | + $file = $packagesdir . '/temp/' . $context['base_path'] . $action['filename']; |
|
| 673 | + } |
|
| 656 | 674 | } |
| 657 | 675 | |
| 658 | 676 | // Don't fail if a file/directory we're trying to create doesn't exist... |
@@ -667,8 +685,9 @@ discard block |
||
| 667 | 685 | } |
| 668 | 686 | |
| 669 | 687 | // @todo None given? |
| 670 | - if (empty($thisAction['description'])) |
|
| 671 | - $thisAction['description'] = isset($action['description']) ? $action['description'] : ''; |
|
| 688 | + if (empty($thisAction['description'])) { |
|
| 689 | + $thisAction['description'] = isset($action['description']) ? $action['description'] : ''; |
|
| 690 | + } |
|
| 672 | 691 | |
| 673 | 692 | $context['actions'][] = $thisAction; |
| 674 | 693 | } |
@@ -681,18 +700,21 @@ discard block |
||
| 681 | 700 | // Get the part of the file we'll be dealing with. |
| 682 | 701 | preg_match('~^\$(languagedir|languages_dir|imagesdir|themedir)(\\|/)*(.+)*~i', $action_data['unparsed_destination'], $matches); |
| 683 | 702 | |
| 684 | - if ($matches[1] == 'imagesdir') |
|
| 685 | - $path = '/' . basename($settings['default_images_url']); |
|
| 686 | - elseif ($matches[1] == 'languagedir' || $matches[1] == 'languages_dir') |
|
| 687 | - $path = '/languages'; |
|
| 688 | - else |
|
| 689 | - $path = ''; |
|
| 703 | + if ($matches[1] == 'imagesdir') { |
|
| 704 | + $path = '/' . basename($settings['default_images_url']); |
|
| 705 | + } elseif ($matches[1] == 'languagedir' || $matches[1] == 'languages_dir') { |
|
| 706 | + $path = '/languages'; |
|
| 707 | + } else { |
|
| 708 | + $path = ''; |
|
| 709 | + } |
|
| 690 | 710 | |
| 691 | - if (!empty($matches[3])) |
|
| 692 | - $path .= $matches[3]; |
|
| 711 | + if (!empty($matches[3])) { |
|
| 712 | + $path .= $matches[3]; |
|
| 713 | + } |
|
| 693 | 714 | |
| 694 | - if (!$context['uninstalling']) |
|
| 695 | - $path .= '/' . basename($action_data['filename']); |
|
| 715 | + if (!$context['uninstalling']) { |
|
| 716 | + $path .= '/' . basename($action_data['filename']); |
|
| 717 | + } |
|
| 696 | 718 | |
| 697 | 719 | // Loop through each custom theme to note it's candidacy! |
| 698 | 720 | foreach ($theme_paths as $id => $theme_data) |
@@ -708,36 +730,40 @@ discard block |
||
| 708 | 730 | if (!mktree(dirname($real_path), false)) |
| 709 | 731 | { |
| 710 | 732 | $temp = dirname($real_path); |
| 711 | - while (!file_exists($temp) && strlen($temp) > 1) |
|
| 712 | - $temp = dirname($temp); |
|
| 733 | + while (!file_exists($temp) && strlen($temp) > 1) { |
|
| 734 | + $temp = dirname($temp); |
|
| 735 | + } |
|
| 713 | 736 | $chmod_files[] = $temp; |
| 714 | 737 | } |
| 715 | 738 | |
| 716 | - if ($action_data['type'] == 'require-dir' && !is_writable($real_path) && (file_exists($real_path) || !is_writable(dirname($real_path)))) |
|
| 717 | - $chmod_files[] = $real_path; |
|
| 739 | + if ($action_data['type'] == 'require-dir' && !is_writable($real_path) && (file_exists($real_path) || !is_writable(dirname($real_path)))) { |
|
| 740 | + $chmod_files[] = $real_path; |
|
| 741 | + } |
|
| 718 | 742 | |
| 719 | - if (!isset($context['theme_actions'][$id])) |
|
| 720 | - $context['theme_actions'][$id] = array( |
|
| 743 | + if (!isset($context['theme_actions'][$id])) { |
|
| 744 | + $context['theme_actions'][$id] = array( |
|
| 721 | 745 | 'name' => $theme_data['name'], |
| 722 | 746 | 'actions' => array(), |
| 723 | 747 | ); |
| 748 | + } |
|
| 724 | 749 | |
| 725 | - if ($context['uninstalling']) |
|
| 726 | - $context['theme_actions'][$id]['actions'][] = array( |
|
| 750 | + if ($context['uninstalling']) { |
|
| 751 | + $context['theme_actions'][$id]['actions'][] = array( |
|
| 727 | 752 | 'type' => $txt['package_delete'] . ' ' . ($action_data['type'] == 'require-dir' ? $txt['package_tree'] : $txt['package_file']), |
| 728 | 753 | 'action' => strtr($real_path, array('\\' => '/', $boarddir => '.')), |
| 729 | 754 | 'description' => '', |
| 730 | 755 | 'value' => base64_encode($smcFunc['json_encode'](array('type' => $action_data['type'], 'orig' => $action_data['filename'], 'future' => $real_path, 'id' => $id))), |
| 731 | 756 | 'not_mod' => true, |
| 732 | 757 | ); |
| 733 | - else |
|
| 734 | - $context['theme_actions'][$id]['actions'][] = array( |
|
| 758 | + } else { |
|
| 759 | + $context['theme_actions'][$id]['actions'][] = array( |
|
| 735 | 760 | 'type' => $txt['package_extract'] . ' ' . ($action_data['type'] == 'require-dir' ? $txt['package_tree'] : $txt['package_file']), |
| 736 | 761 | 'action' => strtr($real_path, array('\\' => '/', $boarddir => '.')), |
| 737 | 762 | 'description' => '', |
| 738 | 763 | 'value' => base64_encode($smcFunc['json_encode'](array('type' => $action_data['type'], 'orig' => $action_data['destination'], 'future' => $real_path, 'id' => $id))), |
| 739 | 764 | 'not_mod' => true, |
| 740 | 765 | ); |
| 766 | + } |
|
| 741 | 767 | } |
| 742 | 768 | } |
| 743 | 769 | } |
@@ -747,8 +773,9 @@ discard block |
||
| 747 | 773 | // Trash the cache... which will also check permissions for us! |
| 748 | 774 | package_flush_cache(true); |
| 749 | 775 | |
| 750 | - if (file_exists($packagesdir . '/temp')) |
|
| 751 | - deltree($packagesdir . '/temp'); |
|
| 776 | + if (file_exists($packagesdir . '/temp')) { |
|
| 777 | + deltree($packagesdir . '/temp'); |
|
| 778 | + } |
|
| 752 | 779 | |
| 753 | 780 | if (!empty($chmod_files)) |
| 754 | 781 | { |
@@ -773,8 +800,9 @@ discard block |
||
| 773 | 800 | checkSession(); |
| 774 | 801 | |
| 775 | 802 | // If there's no file, what are we installing? |
| 776 | - if (!isset($_REQUEST['package']) || $_REQUEST['package'] == '') |
|
| 777 | - redirectexit('action=admin;area=packages'); |
|
| 803 | + if (!isset($_REQUEST['package']) || $_REQUEST['package'] == '') { |
|
| 804 | + redirectexit('action=admin;area=packages'); |
|
| 805 | + } |
|
| 778 | 806 | $context['filename'] = $_REQUEST['package']; |
| 779 | 807 | |
| 780 | 808 | // If this is an uninstall, we'll have an id. |
@@ -795,51 +823,55 @@ discard block |
||
| 795 | 823 | |
| 796 | 824 | $context['sub_template'] = 'extract_package'; |
| 797 | 825 | |
| 798 | - if (!file_exists($packagesdir . '/' . $context['filename'])) |
|
| 799 | - fatal_lang_error('package_no_file', false); |
|
| 826 | + if (!file_exists($packagesdir . '/' . $context['filename'])) { |
|
| 827 | + fatal_lang_error('package_no_file', false); |
|
| 828 | + } |
|
| 800 | 829 | |
| 801 | 830 | // Load up the package FTP information? |
| 802 | 831 | create_chmod_control(array(), array('destination_url' => $scripturl . '?action=admin;area=packages;sa=' . $_REQUEST['sa'] . ';package=' . $_REQUEST['package'])); |
| 803 | 832 | |
| 804 | 833 | // Make sure temp directory exists and is empty! |
| 805 | - if (file_exists($packagesdir . '/temp')) |
|
| 806 | - deltree($packagesdir . '/temp', false); |
|
| 807 | - else |
|
| 808 | - mktree($packagesdir . '/temp', 0777); |
|
| 834 | + if (file_exists($packagesdir . '/temp')) { |
|
| 835 | + deltree($packagesdir . '/temp', false); |
|
| 836 | + } else { |
|
| 837 | + mktree($packagesdir . '/temp', 0777); |
|
| 838 | + } |
|
| 809 | 839 | |
| 810 | 840 | // Let the unpacker do the work. |
| 811 | 841 | if (is_file($packagesdir . '/' . $context['filename'])) |
| 812 | 842 | { |
| 813 | 843 | $context['extracted_files'] = read_tgz_file($packagesdir . '/' . $context['filename'], $packagesdir . '/temp'); |
| 814 | 844 | |
| 815 | - if (!file_exists($packagesdir . '/temp/package-info.xml')) |
|
| 816 | - foreach ($context['extracted_files'] as $file) |
|
| 845 | + if (!file_exists($packagesdir . '/temp/package-info.xml')) { |
|
| 846 | + foreach ($context['extracted_files'] as $file) |
|
| 817 | 847 | if (basename($file['filename']) == 'package-info.xml') |
| 818 | 848 | { |
| 819 | 849 | $context['base_path'] = dirname($file['filename']) . '/'; |
| 850 | + } |
|
| 820 | 851 | break; |
| 821 | 852 | } |
| 822 | 853 | |
| 823 | - if (!isset($context['base_path'])) |
|
| 824 | - $context['base_path'] = ''; |
|
| 825 | - } |
|
| 826 | - elseif (is_dir($packagesdir . '/' . $context['filename'])) |
|
| 854 | + if (!isset($context['base_path'])) { |
|
| 855 | + $context['base_path'] = ''; |
|
| 856 | + } |
|
| 857 | + } elseif (is_dir($packagesdir . '/' . $context['filename'])) |
|
| 827 | 858 | { |
| 828 | 859 | copytree($packagesdir . '/' . $context['filename'], $packagesdir . '/temp'); |
| 829 | 860 | $context['extracted_files'] = listtree($packagesdir . '/temp'); |
| 830 | 861 | $context['base_path'] = ''; |
| 862 | + } else { |
|
| 863 | + fatal_lang_error('no_access', false); |
|
| 831 | 864 | } |
| 832 | - else |
|
| 833 | - fatal_lang_error('no_access', false); |
|
| 834 | 865 | |
| 835 | 866 | // Are we installing this into any custom themes? |
| 836 | 867 | $custom_themes = array(1); |
| 837 | 868 | $known_themes = explode(',', $modSettings['knownThemes']); |
| 838 | 869 | if (!empty($_POST['custom_theme'])) |
| 839 | 870 | { |
| 840 | - foreach ($_POST['custom_theme'] as $tid) |
|
| 841 | - if (in_array($tid, $known_themes)) |
|
| 871 | + foreach ($_POST['custom_theme'] as $tid) { |
|
| 872 | + if (in_array($tid, $known_themes)) |
|
| 842 | 873 | $custom_themes[] = (int) $tid; |
| 874 | + } |
|
| 843 | 875 | } |
| 844 | 876 | |
| 845 | 877 | // Now load up the paths of the themes that we need to know about. |
@@ -856,8 +888,9 @@ discard block |
||
| 856 | 888 | ); |
| 857 | 889 | $theme_paths = array(); |
| 858 | 890 | $themes_installed = array(1); |
| 859 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
| 860 | - $theme_paths[$row['id_theme']][$row['variable']] = $row['value']; |
|
| 891 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
| 892 | + $theme_paths[$row['id_theme']][$row['variable']] = $row['value']; |
|
| 893 | + } |
|
| 861 | 894 | $smcFunc['db_free_result']($request); |
| 862 | 895 | |
| 863 | 896 | // Are there any theme copying that we want to take place? |
@@ -869,11 +902,13 @@ discard block |
||
| 869 | 902 | { |
| 870 | 903 | foreach ($_POST['theme_changes'] as $change) |
| 871 | 904 | { |
| 872 | - if (empty($change)) |
|
| 873 | - continue; |
|
| 905 | + if (empty($change)) { |
|
| 906 | + continue; |
|
| 907 | + } |
|
| 874 | 908 | $theme_data = $smcFunc['json_decode'](base64_decode($change), true); |
| 875 | - if (empty($theme_data['type'])) |
|
| 876 | - continue; |
|
| 909 | + if (empty($theme_data['type'])) { |
|
| 910 | + continue; |
|
| 911 | + } |
|
| 877 | 912 | |
| 878 | 913 | $themes_installed[] = $theme_data['id']; |
| 879 | 914 | $context['theme_copies'][$theme_data['type']][$theme_data['orig']][] = $theme_data['future']; |
@@ -882,8 +917,9 @@ discard block |
||
| 882 | 917 | |
| 883 | 918 | // Get the package info... |
| 884 | 919 | $packageInfo = getPackageInfo($context['filename']); |
| 885 | - if (!is_array($packageInfo)) |
|
| 886 | - fatal_lang_error($packageInfo); |
|
| 920 | + if (!is_array($packageInfo)) { |
|
| 921 | + fatal_lang_error($packageInfo); |
|
| 922 | + } |
|
| 887 | 923 | |
| 888 | 924 | $packageInfo['filename'] = $context['filename']; |
| 889 | 925 | |
@@ -895,8 +931,9 @@ discard block |
||
| 895 | 931 | { |
| 896 | 932 | $_SESSION['last_backup_for'] = $context['filename'] . ($context['uninstalling'] ? '$$' : '$'); |
| 897 | 933 | $result = package_create_backup(($context['uninstalling'] ? 'backup_' : 'before_') . strtok($context['filename'], '.')); |
| 898 | - if (!$result) |
|
| 899 | - fatal_lang_error('could_not_package_backup', false); |
|
| 934 | + if (!$result) { |
|
| 935 | + fatal_lang_error('could_not_package_backup', false); |
|
| 936 | + } |
|
| 900 | 937 | } |
| 901 | 938 | |
| 902 | 939 | // The mod isn't installed.... unless proven otherwise. |
@@ -936,35 +973,38 @@ discard block |
||
| 936 | 973 | $install_log = parsePackageInfo($packageInfo['xml'], false, 'uninstall'); |
| 937 | 974 | |
| 938 | 975 | // Gadzooks! There's no uninstaller at all!? |
| 939 | - if (empty($install_log)) |
|
| 940 | - fatal_lang_error('package_uninstall_cannot', false); |
|
| 976 | + if (empty($install_log)) { |
|
| 977 | + fatal_lang_error('package_uninstall_cannot', false); |
|
| 978 | + } |
|
| 941 | 979 | |
| 942 | 980 | // They can only uninstall from what it was originally installed into. |
| 943 | - foreach ($theme_paths as $id => $data) |
|
| 944 | - if ($id != 1 && !in_array($id, $old_themes)) |
|
| 981 | + foreach ($theme_paths as $id => $data) { |
|
| 982 | + if ($id != 1 && !in_array($id, $old_themes)) |
|
| 945 | 983 | unset($theme_paths[$id]); |
| 946 | - } |
|
| 947 | - elseif (isset($old_version) && $old_version != $packageInfo['version']) |
|
| 984 | + } |
|
| 985 | + } elseif (isset($old_version) && $old_version != $packageInfo['version']) |
|
| 948 | 986 | { |
| 949 | 987 | // Look for an upgrade... |
| 950 | 988 | $install_log = parsePackageInfo($packageInfo['xml'], false, 'upgrade', $old_version); |
| 951 | 989 | |
| 952 | 990 | // There was no upgrade.... |
| 953 | - if (empty($install_log)) |
|
| 954 | - $context['is_installed'] = true; |
|
| 955 | - else |
|
| 991 | + if (empty($install_log)) { |
|
| 992 | + $context['is_installed'] = true; |
|
| 993 | + } else |
|
| 956 | 994 | { |
| 957 | 995 | // Upgrade previous themes only! |
| 958 | - foreach ($theme_paths as $id => $data) |
|
| 959 | - if ($id != 1 && !in_array($id, $old_themes)) |
|
| 996 | + foreach ($theme_paths as $id => $data) { |
|
| 997 | + if ($id != 1 && !in_array($id, $old_themes)) |
|
| 960 | 998 | unset($theme_paths[$id]); |
| 999 | + } |
|
| 961 | 1000 | } |
| 1001 | + } elseif (isset($old_version) && $old_version == $packageInfo['version']) { |
|
| 1002 | + $context['is_installed'] = true; |
|
| 962 | 1003 | } |
| 963 | - elseif (isset($old_version) && $old_version == $packageInfo['version']) |
|
| 964 | - $context['is_installed'] = true; |
|
| 965 | 1004 | |
| 966 | - if (!isset($old_version) || $context['is_installed']) |
|
| 967 | - $install_log = parsePackageInfo($packageInfo['xml'], false, 'install'); |
|
| 1005 | + if (!isset($old_version) || $context['is_installed']) { |
|
| 1006 | + $install_log = parsePackageInfo($packageInfo['xml'], false, 'install'); |
|
| 1007 | + } |
|
| 968 | 1008 | |
| 969 | 1009 | $context['install_finished'] = false; |
| 970 | 1010 | |
@@ -981,37 +1021,39 @@ discard block |
||
| 981 | 1021 | |
| 982 | 1022 | if ($action['type'] == 'modification' && !empty($action['filename'])) |
| 983 | 1023 | { |
| 984 | - if ($action['boardmod']) |
|
| 985 | - $mod_actions = parseBoardMod(file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $action['filename']), false, $action['reverse'], $theme_paths); |
|
| 986 | - else |
|
| 987 | - $mod_actions = parseModification(file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $action['filename']), false, $action['reverse'], $theme_paths); |
|
| 1024 | + if ($action['boardmod']) { |
|
| 1025 | + $mod_actions = parseBoardMod(file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $action['filename']), false, $action['reverse'], $theme_paths); |
|
| 1026 | + } else { |
|
| 1027 | + $mod_actions = parseModification(file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $action['filename']), false, $action['reverse'], $theme_paths); |
|
| 1028 | + } |
|
| 988 | 1029 | |
| 989 | 1030 | // Any errors worth noting? |
| 990 | 1031 | foreach ($mod_actions as $key => $modAction) |
| 991 | 1032 | { |
| 992 | - if ($modAction['type'] == 'failure') |
|
| 993 | - $failed_steps[] = array( |
|
| 1033 | + if ($modAction['type'] == 'failure') { |
|
| 1034 | + $failed_steps[] = array( |
|
| 994 | 1035 | 'file' => $modAction['filename'], |
| 995 | 1036 | 'large_step' => $failed_count, |
| 996 | 1037 | 'sub_step' => $key, |
| 997 | 1038 | 'theme' => 1, |
| 998 | 1039 | ); |
| 1040 | + } |
|
| 999 | 1041 | |
| 1000 | 1042 | // Gather the themes we installed into. |
| 1001 | - if (!empty($modAction['is_custom'])) |
|
| 1002 | - $themes_installed[] = $modAction['is_custom']; |
|
| 1043 | + if (!empty($modAction['is_custom'])) { |
|
| 1044 | + $themes_installed[] = $modAction['is_custom']; |
|
| 1045 | + } |
|
| 1003 | 1046 | } |
| 1004 | - } |
|
| 1005 | - elseif ($action['type'] == 'code' && !empty($action['filename'])) |
|
| 1047 | + } elseif ($action['type'] == 'code' && !empty($action['filename'])) |
|
| 1006 | 1048 | { |
| 1007 | 1049 | // This is just here as reference for what is available. |
| 1008 | 1050 | global $txt, $boarddir, $sourcedir, $modSettings, $context, $settings, $forum_version, $smcFunc; |
| 1009 | 1051 | |
| 1010 | 1052 | // Now include the file and be done with it ;). |
| 1011 | - if (file_exists($packagesdir . '/temp/' . $context['base_path'] . $action['filename'])) |
|
| 1012 | - require($packagesdir . '/temp/' . $context['base_path'] . $action['filename']); |
|
| 1013 | - } |
|
| 1014 | - elseif ($action['type'] == 'credits') |
|
| 1053 | + if (file_exists($packagesdir . '/temp/' . $context['base_path'] . $action['filename'])) { |
|
| 1054 | + require($packagesdir . '/temp/' . $context['base_path'] . $action['filename']); |
|
| 1055 | + } |
|
| 1056 | + } elseif ($action['type'] == 'credits') |
|
| 1015 | 1057 | { |
| 1016 | 1058 | // Time to build the billboard |
| 1017 | 1059 | $credits_tag = array( |
@@ -1021,13 +1063,13 @@ discard block |
||
| 1021 | 1063 | 'copyright' => $action['copyright'], |
| 1022 | 1064 | 'title' => $action['title'], |
| 1023 | 1065 | ); |
| 1024 | - } |
|
| 1025 | - elseif ($action['type'] == 'hook' && isset($action['hook'], $action['function'])) |
|
| 1066 | + } elseif ($action['type'] == 'hook' && isset($action['hook'], $action['function'])) |
|
| 1026 | 1067 | { |
| 1027 | - if ($action['reverse']) |
|
| 1028 | - remove_integration_function($action['hook'], $action['function'], true, $action['include_file'], $action['object']); |
|
| 1029 | - else |
|
| 1030 | - add_integration_function($action['hook'], $action['function'], true, $action['include_file'], $action['object']); |
|
| 1068 | + if ($action['reverse']) { |
|
| 1069 | + remove_integration_function($action['hook'], $action['function'], true, $action['include_file'], $action['object']); |
|
| 1070 | + } else { |
|
| 1071 | + add_integration_function($action['hook'], $action['function'], true, $action['include_file'], $action['object']); |
|
| 1072 | + } |
|
| 1031 | 1073 | } |
| 1032 | 1074 | // Only do the database changes on uninstall if requested. |
| 1033 | 1075 | elseif ($action['type'] == 'database' && !empty($action['filename']) && (!$context['uninstalling'] || !empty($_POST['do_db_changes']))) |
@@ -1040,8 +1082,9 @@ discard block |
||
| 1040 | 1082 | db_extend('packages'); |
| 1041 | 1083 | |
| 1042 | 1084 | // Let the file work its magic ;) |
| 1043 | - if (file_exists($packagesdir . '/temp/' . $context['base_path'] . $action['filename'])) |
|
| 1044 | - require($packagesdir . '/temp/' . $context['base_path'] . $action['filename']); |
|
| 1085 | + if (file_exists($packagesdir . '/temp/' . $context['base_path'] . $action['filename'])) { |
|
| 1086 | + require($packagesdir . '/temp/' . $context['base_path'] . $action['filename']); |
|
| 1087 | + } |
|
| 1045 | 1088 | } |
| 1046 | 1089 | // Handle a redirect... |
| 1047 | 1090 | elseif ($action['type'] == 'redirect' && !empty($action['redirect_url'])) |
@@ -1123,8 +1166,9 @@ discard block |
||
| 1123 | 1166 | reloadSettings(); |
| 1124 | 1167 | |
| 1125 | 1168 | // Any db changes from older version? |
| 1126 | - if (!empty($old_db_changes)) |
|
| 1127 | - $db_package_log = empty($db_package_log) ? $old_db_changes : array_merge($old_db_changes, $db_package_log); |
|
| 1169 | + if (!empty($old_db_changes)) { |
|
| 1170 | + $db_package_log = empty($db_package_log) ? $old_db_changes : array_merge($old_db_changes, $db_package_log); |
|
| 1171 | + } |
|
| 1128 | 1172 | |
| 1129 | 1173 | // If there are some database changes we might want to remove then filter them out. |
| 1130 | 1174 | if (!empty($db_package_log)) |
@@ -1140,22 +1184,24 @@ discard block |
||
| 1140 | 1184 | */ |
| 1141 | 1185 | function sort_table_first($a, $b) |
| 1142 | 1186 | { |
| 1143 | - if ($a[0] == $b[0]) |
|
| 1144 | - return 0; |
|
| 1187 | + if ($a[0] == $b[0]) { |
|
| 1188 | + return 0; |
|
| 1189 | + } |
|
| 1145 | 1190 | return $a[0] == 'remove_table' ? -1 : 1; |
| 1146 | 1191 | } |
| 1147 | 1192 | usort($db_package_log, 'sort_table_first'); |
| 1148 | 1193 | foreach ($db_package_log as $k => $log) |
| 1149 | 1194 | { |
| 1150 | - if ($log[0] == 'remove_table') |
|
| 1151 | - $tables[] = $log[1]; |
|
| 1152 | - elseif (in_array($log[1], $tables)) |
|
| 1153 | - unset($db_package_log[$k]); |
|
| 1195 | + if ($log[0] == 'remove_table') { |
|
| 1196 | + $tables[] = $log[1]; |
|
| 1197 | + } elseif (in_array($log[1], $tables)) { |
|
| 1198 | + unset($db_package_log[$k]); |
|
| 1199 | + } |
|
| 1154 | 1200 | } |
| 1155 | 1201 | $db_changes = $smcFunc['json_encode']($db_package_log); |
| 1202 | + } else { |
|
| 1203 | + $db_changes = ''; |
|
| 1156 | 1204 | } |
| 1157 | - else |
|
| 1158 | - $db_changes = ''; |
|
| 1159 | 1205 | |
| 1160 | 1206 | // What themes did we actually install? |
| 1161 | 1207 | $themes_installed = array_unique($themes_installed); |
@@ -1204,18 +1250,20 @@ discard block |
||
| 1204 | 1250 | |
| 1205 | 1251 | foreach ($db_changes as $change) |
| 1206 | 1252 | { |
| 1207 | - if ($change[0] == 'remove_table' && isset($change[1])) |
|
| 1208 | - $smcFunc['db_drop_table']($change[1]); |
|
| 1209 | - elseif ($change[0] == 'remove_column' && isset($change[2])) |
|
| 1210 | - $smcFunc['db_remove_column']($change[1], $change[2]); |
|
| 1211 | - elseif ($change[0] == 'remove_index' && isset($change[2])) |
|
| 1212 | - $smcFunc['db_remove_index']($change[1], $change[2]); |
|
| 1253 | + if ($change[0] == 'remove_table' && isset($change[1])) { |
|
| 1254 | + $smcFunc['db_drop_table']($change[1]); |
|
| 1255 | + } elseif ($change[0] == 'remove_column' && isset($change[2])) { |
|
| 1256 | + $smcFunc['db_remove_column']($change[1], $change[2]); |
|
| 1257 | + } elseif ($change[0] == 'remove_index' && isset($change[2])) { |
|
| 1258 | + $smcFunc['db_remove_index']($change[1], $change[2]); |
|
| 1259 | + } |
|
| 1213 | 1260 | } |
| 1214 | 1261 | } |
| 1215 | 1262 | |
| 1216 | 1263 | // Clean house... get rid of the evidence ;). |
| 1217 | - if (file_exists($packagesdir . '/temp')) |
|
| 1218 | - deltree($packagesdir . '/temp'); |
|
| 1264 | + if (file_exists($packagesdir . '/temp')) { |
|
| 1265 | + deltree($packagesdir . '/temp'); |
|
| 1266 | + } |
|
| 1219 | 1267 | |
| 1220 | 1268 | // Log what we just did. |
| 1221 | 1269 | logAction($context['uninstalling'] ? 'uninstall_package' : (!empty($is_upgrade) ? 'upgrade_package' : 'install_package'), array('package' => $smcFunc['htmlspecialchars']($packageInfo['name']), 'version' => $smcFunc['htmlspecialchars']($packageInfo['version'])), 'admin'); |
@@ -1238,8 +1286,9 @@ discard block |
||
| 1238 | 1286 | require_once($sourcedir . '/Subs-Package.php'); |
| 1239 | 1287 | |
| 1240 | 1288 | // No package? Show him or her the door. |
| 1241 | - if (!isset($_REQUEST['package']) || $_REQUEST['package'] == '') |
|
| 1242 | - redirectexit('action=admin;area=packages'); |
|
| 1289 | + if (!isset($_REQUEST['package']) || $_REQUEST['package'] == '') { |
|
| 1290 | + redirectexit('action=admin;area=packages'); |
|
| 1291 | + } |
|
| 1243 | 1292 | |
| 1244 | 1293 | $context['linktree'][] = array( |
| 1245 | 1294 | 'url' => $scripturl . '?action=admin;area=packages;sa=list;package=' . $_REQUEST['package'], |
@@ -1252,11 +1301,12 @@ discard block |
||
| 1252 | 1301 | $context['filename'] = $_REQUEST['package']; |
| 1253 | 1302 | |
| 1254 | 1303 | // Let the unpacker do the work. |
| 1255 | - if (is_file($packagesdir . '/' . $context['filename'])) |
|
| 1256 | - $context['files'] = read_tgz_file($packagesdir . '/' . $context['filename'], null); |
|
| 1257 | - elseif (is_dir($packagesdir . '/' . $context['filename'])) |
|
| 1258 | - $context['files'] = listtree($packagesdir . '/' . $context['filename']); |
|
| 1259 | -} |
|
| 1304 | + if (is_file($packagesdir . '/' . $context['filename'])) { |
|
| 1305 | + $context['files'] = read_tgz_file($packagesdir . '/' . $context['filename'], null); |
|
| 1306 | + } elseif (is_dir($packagesdir . '/' . $context['filename'])) { |
|
| 1307 | + $context['files'] = listtree($packagesdir . '/' . $context['filename']); |
|
| 1308 | + } |
|
| 1309 | + } |
|
| 1260 | 1310 | |
| 1261 | 1311 | /** |
| 1262 | 1312 | * Display one of the files in a package. |
@@ -1268,22 +1318,25 @@ discard block |
||
| 1268 | 1318 | require_once($sourcedir . '/Subs-Package.php'); |
| 1269 | 1319 | |
| 1270 | 1320 | // No package? Show him or her the door. |
| 1271 | - if (!isset($_REQUEST['package']) || $_REQUEST['package'] == '') |
|
| 1272 | - redirectexit('action=admin;area=packages'); |
|
| 1321 | + if (!isset($_REQUEST['package']) || $_REQUEST['package'] == '') { |
|
| 1322 | + redirectexit('action=admin;area=packages'); |
|
| 1323 | + } |
|
| 1273 | 1324 | |
| 1274 | 1325 | // No file? Show him or her the door. |
| 1275 | - if (!isset($_REQUEST['file']) || $_REQUEST['file'] == '') |
|
| 1276 | - redirectexit('action=admin;area=packages'); |
|
| 1326 | + if (!isset($_REQUEST['file']) || $_REQUEST['file'] == '') { |
|
| 1327 | + redirectexit('action=admin;area=packages'); |
|
| 1328 | + } |
|
| 1277 | 1329 | |
| 1278 | 1330 | $_REQUEST['package'] = preg_replace('~[\.]+~', '.', strtr($_REQUEST['package'], array('/' => '_', '\\' => '_'))); |
| 1279 | 1331 | $_REQUEST['file'] = preg_replace('~[\.]+~', '.', $_REQUEST['file']); |
| 1280 | 1332 | |
| 1281 | 1333 | if (isset($_REQUEST['raw'])) |
| 1282 | 1334 | { |
| 1283 | - if (is_file($packagesdir . '/' . $_REQUEST['package'])) |
|
| 1284 | - echo read_tgz_file($packagesdir . '/' . $_REQUEST['package'], $_REQUEST['file'], true); |
|
| 1285 | - elseif (is_dir($packagesdir . '/' . $_REQUEST['package'])) |
|
| 1286 | - echo file_get_contents($packagesdir . '/' . $_REQUEST['package'] . '/' . $_REQUEST['file']); |
|
| 1335 | + if (is_file($packagesdir . '/' . $_REQUEST['package'])) { |
|
| 1336 | + echo read_tgz_file($packagesdir . '/' . $_REQUEST['package'], $_REQUEST['file'], true); |
|
| 1337 | + } elseif (is_dir($packagesdir . '/' . $_REQUEST['package'])) { |
|
| 1338 | + echo file_get_contents($packagesdir . '/' . $_REQUEST['package'] . '/' . $_REQUEST['file']); |
|
| 1339 | + } |
|
| 1287 | 1340 | |
| 1288 | 1341 | obExit(false); |
| 1289 | 1342 | } |
@@ -1300,17 +1353,19 @@ discard block |
||
| 1300 | 1353 | $context['filename'] = $_REQUEST['file']; |
| 1301 | 1354 | |
| 1302 | 1355 | // Let the unpacker do the work.... but make sure we handle images properly. |
| 1303 | - if (in_array(strtolower(strrchr($_REQUEST['file'], '.')), array('.bmp', '.gif', '.jpeg', '.jpg', '.png'))) |
|
| 1304 | - $context['filedata'] = '<img src="' . $scripturl . '?action=admin;area=packages;sa=examine;package=' . $_REQUEST['package'] . ';file=' . $_REQUEST['file'] . ';raw" alt="' . $_REQUEST['file'] . '">'; |
|
| 1305 | - else |
|
| 1356 | + if (in_array(strtolower(strrchr($_REQUEST['file'], '.')), array('.bmp', '.gif', '.jpeg', '.jpg', '.png'))) { |
|
| 1357 | + $context['filedata'] = '<img src="' . $scripturl . '?action=admin;area=packages;sa=examine;package=' . $_REQUEST['package'] . ';file=' . $_REQUEST['file'] . ';raw" alt="' . $_REQUEST['file'] . '">'; |
|
| 1358 | + } else |
|
| 1306 | 1359 | { |
| 1307 | - if (is_file($packagesdir . '/' . $_REQUEST['package'])) |
|
| 1308 | - $context['filedata'] = $smcFunc['htmlspecialchars'](read_tgz_file($packagesdir . '/' . $_REQUEST['package'], $_REQUEST['file'], true)); |
|
| 1309 | - elseif (is_dir($packagesdir . '/' . $_REQUEST['package'])) |
|
| 1310 | - $context['filedata'] = $smcFunc['htmlspecialchars'](file_get_contents($packagesdir . '/' . $_REQUEST['package'] . '/' . $_REQUEST['file'])); |
|
| 1360 | + if (is_file($packagesdir . '/' . $_REQUEST['package'])) { |
|
| 1361 | + $context['filedata'] = $smcFunc['htmlspecialchars'](read_tgz_file($packagesdir . '/' . $_REQUEST['package'], $_REQUEST['file'], true)); |
|
| 1362 | + } elseif (is_dir($packagesdir . '/' . $_REQUEST['package'])) { |
|
| 1363 | + $context['filedata'] = $smcFunc['htmlspecialchars'](file_get_contents($packagesdir . '/' . $_REQUEST['package'] . '/' . $_REQUEST['file'])); |
|
| 1364 | + } |
|
| 1311 | 1365 | |
| 1312 | - if (strtolower(strrchr($_REQUEST['file'], '.')) == '.php') |
|
| 1313 | - $context['filedata'] = highlight_php_code($context['filedata']); |
|
| 1366 | + if (strtolower(strrchr($_REQUEST['file'], '.')) == '.php') { |
|
| 1367 | + $context['filedata'] = highlight_php_code($context['filedata']); |
|
| 1368 | + } |
|
| 1314 | 1369 | } |
| 1315 | 1370 | } |
| 1316 | 1371 | |
@@ -1325,8 +1380,9 @@ discard block |
||
| 1325 | 1380 | checkSession('get'); |
| 1326 | 1381 | |
| 1327 | 1382 | // Ack, don't allow deletion of arbitrary files here, could become a security hole somehow! |
| 1328 | - if (!isset($_GET['package']) || $_GET['package'] == 'index.php' || $_GET['package'] == 'backups') |
|
| 1329 | - redirectexit('action=admin;area=packages;sa=browse'); |
|
| 1383 | + if (!isset($_GET['package']) || $_GET['package'] == 'index.php' || $_GET['package'] == 'backups') { |
|
| 1384 | + redirectexit('action=admin;area=packages;sa=browse'); |
|
| 1385 | + } |
|
| 1330 | 1386 | $_GET['package'] = preg_replace('~[\.]+~', '.', strtr($_GET['package'], array('/' => '_', '\\' => '_'))); |
| 1331 | 1387 | |
| 1332 | 1388 | // Can't delete what's not there. |
@@ -1334,9 +1390,9 @@ discard block |
||
| 1334 | 1390 | { |
| 1335 | 1391 | create_chmod_control(array($packagesdir . '/' . $_GET['package']), array('destination_url' => $scripturl . '?action=admin;area=packages;sa=remove;package=' . $_GET['package'], 'crash_on_error' => true)); |
| 1336 | 1392 | |
| 1337 | - if (is_dir($packagesdir . '/' . $_GET['package'])) |
|
| 1338 | - deltree($packagesdir . '/' . $_GET['package']); |
|
| 1339 | - else |
|
| 1393 | + if (is_dir($packagesdir . '/' . $_GET['package'])) { |
|
| 1394 | + deltree($packagesdir . '/' . $_GET['package']); |
|
| 1395 | + } else |
|
| 1340 | 1396 | { |
| 1341 | 1397 | smf_chmod($packagesdir . '/' . $_GET['package'], 0777); |
| 1342 | 1398 | unlink($packagesdir . '/' . $_GET['package']); |
@@ -1384,8 +1440,9 @@ discard block |
||
| 1384 | 1440 | 'data' => array( |
| 1385 | 1441 | 'function' => function($package_md5) use ($type, &$context) |
| 1386 | 1442 | { |
| 1387 | - if (isset($context['available_' . $type . ''][$package_md5])) |
|
| 1388 | - return $context['available_' . $type . ''][$package_md5]['sort_id']; |
|
| 1443 | + if (isset($context['available_' . $type . ''][$package_md5])) { |
|
| 1444 | + return $context['available_' . $type . ''][$package_md5]['sort_id']; |
|
| 1445 | + } |
|
| 1389 | 1446 | }, |
| 1390 | 1447 | ), |
| 1391 | 1448 | 'sort' => array( |
@@ -1401,8 +1458,9 @@ discard block |
||
| 1401 | 1458 | 'data' => array( |
| 1402 | 1459 | 'function' => function($package_md5) use ($type, &$context) |
| 1403 | 1460 | { |
| 1404 | - if (isset($context['available_' . $type . ''][$package_md5])) |
|
| 1405 | - return $context['available_' . $type . ''][$package_md5]['name']; |
|
| 1461 | + if (isset($context['available_' . $type . ''][$package_md5])) { |
|
| 1462 | + return $context['available_' . $type . ''][$package_md5]['name']; |
|
| 1463 | + } |
|
| 1406 | 1464 | }, |
| 1407 | 1465 | ), |
| 1408 | 1466 | 'sort' => array( |
@@ -1417,8 +1475,9 @@ discard block |
||
| 1417 | 1475 | 'data' => array( |
| 1418 | 1476 | 'function' => function($package_md5) use ($type, &$context) |
| 1419 | 1477 | { |
| 1420 | - if (isset($context['available_' . $type . ''][$package_md5])) |
|
| 1421 | - return $context['available_' . $type . ''][$package_md5]['version']; |
|
| 1478 | + if (isset($context['available_' . $type . ''][$package_md5])) { |
|
| 1479 | + return $context['available_' . $type . ''][$package_md5]['version']; |
|
| 1480 | + } |
|
| 1422 | 1481 | }, |
| 1423 | 1482 | ), |
| 1424 | 1483 | 'sort' => array( |
@@ -1433,8 +1492,9 @@ discard block |
||
| 1433 | 1492 | 'data' => array( |
| 1434 | 1493 | 'function' => function($package_md5) use ($type, $txt, &$context) |
| 1435 | 1494 | { |
| 1436 | - if (isset($context['available_' . $type . ''][$package_md5])) |
|
| 1437 | - return !empty($context['available_' . $type . ''][$package_md5]['time_installed']) ? timeformat($context['available_' . $type . ''][$package_md5]['time_installed']) : $txt['not_applicable']; |
|
| 1495 | + if (isset($context['available_' . $type . ''][$package_md5])) { |
|
| 1496 | + return !empty($context['available_' . $type . ''][$package_md5]['time_installed']) ? timeformat($context['available_' . $type . ''][$package_md5]['time_installed']) : $txt['not_applicable']; |
|
| 1497 | + } |
|
| 1438 | 1498 | }, |
| 1439 | 1499 | 'class' => 'smalltext', |
| 1440 | 1500 | ), |
@@ -1450,28 +1510,30 @@ discard block |
||
| 1450 | 1510 | 'data' => array( |
| 1451 | 1511 | 'function' => function($package_md5) use ($type, &$context, $scripturl, $txt) |
| 1452 | 1512 | { |
| 1453 | - if (!isset($context['available_' . $type . ''][$package_md5])) |
|
| 1454 | - return ''; |
|
| 1513 | + if (!isset($context['available_' . $type . ''][$package_md5])) { |
|
| 1514 | + return ''; |
|
| 1515 | + } |
|
| 1455 | 1516 | |
| 1456 | 1517 | // Rewrite shortcut |
| 1457 | 1518 | $package = $context['available_' . $type . ''][$package_md5]; |
| 1458 | 1519 | $return = ''; |
| 1459 | 1520 | |
| 1460 | - if ($package['can_uninstall']) |
|
| 1461 | - $return = ' |
|
| 1521 | + if ($package['can_uninstall']) { |
|
| 1522 | + $return = ' |
|
| 1462 | 1523 | <a href="' . $scripturl . '?action=admin;area=packages;sa=uninstall;package=' . $package['filename'] . ';pid=' . $package['installed_id'] . '" class="button">' . $txt['uninstall'] . '</a>'; |
| 1463 | - elseif ($package['can_emulate_uninstall']) |
|
| 1464 | - $return = ' |
|
| 1524 | + } elseif ($package['can_emulate_uninstall']) { |
|
| 1525 | + $return = ' |
|
| 1465 | 1526 | <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>'; |
| 1466 | - elseif ($package['can_upgrade']) |
|
| 1467 | - $return = ' |
|
| 1527 | + } elseif ($package['can_upgrade']) { |
|
| 1528 | + $return = ' |
|
| 1468 | 1529 | <a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $package['filename'] . '" class="button">' . $txt['package_upgrade'] . '</a>'; |
| 1469 | - elseif ($package['can_install']) |
|
| 1470 | - $return = ' |
|
| 1530 | + } elseif ($package['can_install']) { |
|
| 1531 | + $return = ' |
|
| 1471 | 1532 | <a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $package['filename'] . '" class="button">' . $txt['install_mod'] . '</a>'; |
| 1472 | - elseif ($package['can_emulate_install']) |
|
| 1473 | - $return = ' |
|
| 1533 | + } elseif ($package['can_emulate_install']) { |
|
| 1534 | + $return = ' |
|
| 1474 | 1535 | <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>'; |
| 1536 | + } |
|
| 1475 | 1537 | |
| 1476 | 1538 | return $return . ' |
| 1477 | 1539 | <a href="' . $scripturl . '?action=admin;area=packages;sa=list;package=' . $package['filename'] . '" class="button">' . $txt['list_files'] . '</a> |
@@ -1536,12 +1598,14 @@ discard block |
||
| 1536 | 1598 | static $packages, $installed_mods; |
| 1537 | 1599 | |
| 1538 | 1600 | // Start things up |
| 1539 | - if (!isset($packages[$params])) |
|
| 1540 | - $packages[$params] = array(); |
|
| 1601 | + if (!isset($packages[$params])) { |
|
| 1602 | + $packages[$params] = array(); |
|
| 1603 | + } |
|
| 1541 | 1604 | |
| 1542 | 1605 | // We need the packages directory to be writable for this. |
| 1543 | - if (!@is_writable($packagesdir)) |
|
| 1544 | - create_chmod_control(array($packagesdir), array('destination_url' => $scripturl . '?action=admin;area=packages', 'crash_on_error' => true)); |
|
| 1606 | + if (!@is_writable($packagesdir)) { |
|
| 1607 | + create_chmod_control(array($packagesdir), array('destination_url' => $scripturl . '?action=admin;area=packages', 'crash_on_error' => true)); |
|
| 1608 | + } |
|
| 1545 | 1609 | |
| 1546 | 1610 | $the_version = strtr($forum_version, array('SMF ' => '')); |
| 1547 | 1611 | |
@@ -1549,41 +1613,44 @@ discard block |
||
| 1549 | 1613 | if (isset($_GET['version_emulate']) && strtr($_GET['version_emulate'], array('SMF ' => '')) == $the_version) |
| 1550 | 1614 | { |
| 1551 | 1615 | unset($_SESSION['version_emulate']); |
| 1552 | - } |
|
| 1553 | - elseif (isset($_GET['version_emulate'])) |
|
| 1616 | + } elseif (isset($_GET['version_emulate'])) |
|
| 1554 | 1617 | { |
| 1555 | - if (($_GET['version_emulate'] === 0 || $_GET['version_emulate'] === $forum_version) && isset($_SESSION['version_emulate'])) |
|
| 1556 | - unset($_SESSION['version_emulate']); |
|
| 1557 | - elseif ($_GET['version_emulate'] !== 0) |
|
| 1558 | - $_SESSION['version_emulate'] = strtr($_GET['version_emulate'], array('-' => ' ', '+' => ' ', 'SMF ' => '')); |
|
| 1618 | + if (($_GET['version_emulate'] === 0 || $_GET['version_emulate'] === $forum_version) && isset($_SESSION['version_emulate'])) { |
|
| 1619 | + unset($_SESSION['version_emulate']); |
|
| 1620 | + } elseif ($_GET['version_emulate'] !== 0) { |
|
| 1621 | + $_SESSION['version_emulate'] = strtr($_GET['version_emulate'], array('-' => ' ', '+' => ' ', 'SMF ' => '')); |
|
| 1622 | + } |
|
| 1559 | 1623 | } |
| 1560 | 1624 | if (!empty($_SESSION['version_emulate'])) |
| 1561 | 1625 | { |
| 1562 | 1626 | $context['forum_version'] = 'SMF ' . $_SESSION['version_emulate']; |
| 1563 | 1627 | $the_version = $_SESSION['version_emulate']; |
| 1564 | 1628 | } |
| 1565 | - if (isset($_SESSION['single_version_emulate'])) |
|
| 1566 | - unset($_SESSION['single_version_emulate']); |
|
| 1629 | + if (isset($_SESSION['single_version_emulate'])) { |
|
| 1630 | + unset($_SESSION['single_version_emulate']); |
|
| 1631 | + } |
|
| 1567 | 1632 | |
| 1568 | 1633 | if (empty($installed_mods)) |
| 1569 | 1634 | { |
| 1570 | 1635 | $instmods = loadInstalledPackages(); |
| 1571 | 1636 | $installed_mods = array(); |
| 1572 | 1637 | // Look through the list of installed mods... |
| 1573 | - foreach ($instmods as $installed_mod) |
|
| 1574 | - $installed_mods[$installed_mod['package_id']] = array( |
|
| 1638 | + foreach ($instmods as $installed_mod) { |
|
| 1639 | + $installed_mods[$installed_mod['package_id']] = array( |
|
| 1575 | 1640 | 'id' => $installed_mod['id'], |
| 1576 | 1641 | 'version' => $installed_mod['version'], |
| 1577 | 1642 | 'time_installed' => $installed_mod['time_installed'], |
| 1578 | 1643 | ); |
| 1644 | + } |
|
| 1579 | 1645 | |
| 1580 | 1646 | // Get a list of all the ids installed, so the latest packages won't include already installed ones. |
| 1581 | 1647 | $context['installed_mods'] = array_keys($installed_mods); |
| 1582 | 1648 | } |
| 1583 | 1649 | |
| 1584 | - if (empty($packages)) |
|
| 1585 | - foreach ($context['modification_types'] as $type) |
|
| 1650 | + if (empty($packages)) { |
|
| 1651 | + foreach ($context['modification_types'] as $type) |
|
| 1586 | 1652 | $packages[$type] = array(); |
| 1653 | + } |
|
| 1587 | 1654 | |
| 1588 | 1655 | if ($dir = @opendir($packagesdir)) |
| 1589 | 1656 | { |
@@ -1599,50 +1666,56 @@ discard block |
||
| 1599 | 1666 | |
| 1600 | 1667 | while ($package = readdir($dir)) |
| 1601 | 1668 | { |
| 1602 | - 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')) |
|
| 1603 | - continue; |
|
| 1669 | + 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')) { |
|
| 1670 | + continue; |
|
| 1671 | + } |
|
| 1604 | 1672 | |
| 1605 | 1673 | $skip = false; |
| 1606 | - foreach ($context['modification_types'] as $type) |
|
| 1607 | - if (isset($context['available_' . $type][md5($package)])) |
|
| 1674 | + foreach ($context['modification_types'] as $type) { |
|
| 1675 | + if (isset($context['available_' . $type][md5($package)])) |
|
| 1608 | 1676 | $skip = true; |
| 1677 | + } |
|
| 1609 | 1678 | |
| 1610 | - if ($skip) |
|
| 1611 | - continue; |
|
| 1679 | + if ($skip) { |
|
| 1680 | + continue; |
|
| 1681 | + } |
|
| 1612 | 1682 | |
| 1613 | 1683 | // Skip directories or files that are named the same. |
| 1614 | 1684 | if (is_dir($packagesdir . '/' . $package)) |
| 1615 | 1685 | { |
| 1616 | - if (in_array($package, $dirs)) |
|
| 1617 | - continue; |
|
| 1686 | + if (in_array($package, $dirs)) { |
|
| 1687 | + continue; |
|
| 1688 | + } |
|
| 1618 | 1689 | $dirs[] = $package; |
| 1619 | - } |
|
| 1620 | - elseif (substr(strtolower($package), -7) == '.tar.gz') |
|
| 1690 | + } elseif (substr(strtolower($package), -7) == '.tar.gz') |
|
| 1621 | 1691 | { |
| 1622 | - if (in_array(substr($package, 0, -7), $dirs)) |
|
| 1623 | - continue; |
|
| 1692 | + if (in_array(substr($package, 0, -7), $dirs)) { |
|
| 1693 | + continue; |
|
| 1694 | + } |
|
| 1624 | 1695 | $dirs[] = substr($package, 0, -7); |
| 1625 | - } |
|
| 1626 | - elseif (substr(strtolower($package), -4) == '.zip' || substr(strtolower($package), -4) == '.tgz') |
|
| 1696 | + } elseif (substr(strtolower($package), -4) == '.zip' || substr(strtolower($package), -4) == '.tgz') |
|
| 1627 | 1697 | { |
| 1628 | - if (in_array(substr($package, 0, -4), $dirs)) |
|
| 1629 | - continue; |
|
| 1698 | + if (in_array(substr($package, 0, -4), $dirs)) { |
|
| 1699 | + continue; |
|
| 1700 | + } |
|
| 1630 | 1701 | $dirs[] = substr($package, 0, -4); |
| 1631 | 1702 | } |
| 1632 | 1703 | |
| 1633 | 1704 | $packageInfo = getPackageInfo($package); |
| 1634 | - if (!is_array($packageInfo)) |
|
| 1635 | - continue; |
|
| 1705 | + if (!is_array($packageInfo)) { |
|
| 1706 | + continue; |
|
| 1707 | + } |
|
| 1636 | 1708 | |
| 1637 | 1709 | if (!empty($packageInfo)) |
| 1638 | 1710 | { |
| 1639 | 1711 | $packageInfo['installed_id'] = isset($installed_mods[$packageInfo['id']]) ? $installed_mods[$packageInfo['id']]['id'] : 0; |
| 1640 | 1712 | $packageInfo['time_installed'] = isset($installed_mods[$packageInfo['id']]) ? $installed_mods[$packageInfo['id']]['time_installed'] : 0; |
| 1641 | 1713 | |
| 1642 | - if (!isset($sort_id[$packageInfo['type']])) |
|
| 1643 | - $packageInfo['sort_id'] = $sort_id['unknown']; |
|
| 1644 | - else |
|
| 1645 | - $packageInfo['sort_id'] = $sort_id[$packageInfo['type']]; |
|
| 1714 | + if (!isset($sort_id[$packageInfo['type']])) { |
|
| 1715 | + $packageInfo['sort_id'] = $sort_id['unknown']; |
|
| 1716 | + } else { |
|
| 1717 | + $packageInfo['sort_id'] = $sort_id[$packageInfo['type']]; |
|
| 1718 | + } |
|
| 1646 | 1719 | |
| 1647 | 1720 | $packageInfo['is_installed'] = isset($installed_mods[$packageInfo['id']]); |
| 1648 | 1721 | $packageInfo['is_current'] = $packageInfo['is_installed'] && ($installed_mods[$packageInfo['id']]['version'] == $packageInfo['version']); |
@@ -1691,10 +1764,11 @@ discard block |
||
| 1691 | 1764 | foreach ($upgrades as $upgrade) |
| 1692 | 1765 | { |
| 1693 | 1766 | // Even if it is for this SMF, is it for the installed version of the mod? |
| 1694 | - if (!$upgrade->exists('@for') || matchPackageVersion($the_version, $upgrade->fetch('@for'))) |
|
| 1695 | - if (!$upgrade->exists('@from') || matchPackageVersion($installed_mods[$packageInfo['id']]['version'], $upgrade->fetch('@from'))) |
|
| 1767 | + if (!$upgrade->exists('@for') || matchPackageVersion($the_version, $upgrade->fetch('@for'))) { |
|
| 1768 | + if (!$upgrade->exists('@from') || matchPackageVersion($installed_mods[$packageInfo['id']]['version'], $upgrade->fetch('@from'))) |
|
| 1696 | 1769 | { |
| 1697 | 1770 | $packageInfo['can_upgrade'] = true; |
| 1771 | + } |
|
| 1698 | 1772 | break; |
| 1699 | 1773 | } |
| 1700 | 1774 | } |
@@ -1771,10 +1845,11 @@ discard block |
||
| 1771 | 1845 | |
| 1772 | 1846 | if (isset($_GET['type']) && $_GET['type'] == $params) |
| 1773 | 1847 | { |
| 1774 | - if (isset($_GET['desc'])) |
|
| 1775 | - krsort($packages[$params]); |
|
| 1776 | - else |
|
| 1777 | - ksort($packages[$params]); |
|
| 1848 | + if (isset($_GET['desc'])) { |
|
| 1849 | + krsort($packages[$params]); |
|
| 1850 | + } else { |
|
| 1851 | + ksort($packages[$params]); |
|
| 1852 | + } |
|
| 1778 | 1853 | } |
| 1779 | 1854 | |
| 1780 | 1855 | return $packages[$params]; |
@@ -1803,10 +1878,11 @@ discard block |
||
| 1803 | 1878 | redirectexit('action=admin;area=packages;sa=options'); |
| 1804 | 1879 | } |
| 1805 | 1880 | |
| 1806 | - if (preg_match('~^/home\d*/([^/]+?)/public_html~', $_SERVER['DOCUMENT_ROOT'], $match)) |
|
| 1807 | - $default_username = $match[1]; |
|
| 1808 | - else |
|
| 1809 | - $default_username = ''; |
|
| 1881 | + if (preg_match('~^/home\d*/([^/]+?)/public_html~', $_SERVER['DOCUMENT_ROOT'], $match)) { |
|
| 1882 | + $default_username = $match[1]; |
|
| 1883 | + } else { |
|
| 1884 | + $default_username = ''; |
|
| 1885 | + } |
|
| 1810 | 1886 | |
| 1811 | 1887 | $context['page_title'] = $txt['package_settings']; |
| 1812 | 1888 | $context['sub_template'] = 'install_options'; |
@@ -1835,8 +1911,9 @@ discard block |
||
| 1835 | 1911 | isAllowedTo('admin_forum'); |
| 1836 | 1912 | |
| 1837 | 1913 | // We need to know the operation key for the search and replace, mod file looking at, is it a board mod? |
| 1838 | - if (!isset($_REQUEST['operation_key'], $_REQUEST['filename']) && !is_numeric($_REQUEST['operation_key'])) |
|
| 1839 | - fatal_lang_error('operation_invalid', 'general'); |
|
| 1914 | + if (!isset($_REQUEST['operation_key'], $_REQUEST['filename']) && !is_numeric($_REQUEST['operation_key'])) { |
|
| 1915 | + fatal_lang_error('operation_invalid', 'general'); |
|
| 1916 | + } |
|
| 1840 | 1917 | |
| 1841 | 1918 | // Load the required file. |
| 1842 | 1919 | require_once($sourcedir . '/Subs-Package.php'); |
@@ -1852,18 +1929,19 @@ discard block |
||
| 1852 | 1929 | { |
| 1853 | 1930 | $context['extracted_files'] = read_tgz_file($packagesdir . '/' . $context['filename'], $packagesdir . '/temp'); |
| 1854 | 1931 | |
| 1855 | - if ($context['extracted_files'] && !file_exists($packagesdir . '/temp/package-info.xml')) |
|
| 1856 | - foreach ($context['extracted_files'] as $file) |
|
| 1932 | + if ($context['extracted_files'] && !file_exists($packagesdir . '/temp/package-info.xml')) { |
|
| 1933 | + foreach ($context['extracted_files'] as $file) |
|
| 1857 | 1934 | if (basename($file['filename']) == 'package-info.xml') |
| 1858 | 1935 | { |
| 1859 | 1936 | $context['base_path'] = dirname($file['filename']) . '/'; |
| 1937 | + } |
|
| 1860 | 1938 | break; |
| 1861 | 1939 | } |
| 1862 | 1940 | |
| 1863 | - if (!isset($context['base_path'])) |
|
| 1864 | - $context['base_path'] = ''; |
|
| 1865 | - } |
|
| 1866 | - elseif (is_dir($packagesdir . '/' . $context['filename'])) |
|
| 1941 | + if (!isset($context['base_path'])) { |
|
| 1942 | + $context['base_path'] = ''; |
|
| 1943 | + } |
|
| 1944 | + } elseif (is_dir($packagesdir . '/' . $context['filename'])) |
|
| 1867 | 1945 | { |
| 1868 | 1946 | copytree($packagesdir . '/' . $context['filename'], $packagesdir . '/temp'); |
| 1869 | 1947 | $context['extracted_files'] = listtree($packagesdir . '/temp'); |
@@ -1884,8 +1962,9 @@ discard block |
||
| 1884 | 1962 | ) |
| 1885 | 1963 | ); |
| 1886 | 1964 | $theme_paths = array(); |
| 1887 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
| 1888 | - $theme_paths[$row['id_theme']][$row['variable']] = $row['value']; |
|
| 1965 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
| 1966 | + $theme_paths[$row['id_theme']][$row['variable']] = $row['value']; |
|
| 1967 | + } |
|
| 1889 | 1968 | $smcFunc['db_free_result']($request); |
| 1890 | 1969 | |
| 1891 | 1970 | // If we're viewing uninstall operations, only consider themes that |
@@ -1910,19 +1989,21 @@ discard block |
||
| 1910 | 1989 | list ($old_themes) = $smcFunc['db_fetch_row']($request); |
| 1911 | 1990 | $old_themes = explode(',', $old_themes); |
| 1912 | 1991 | |
| 1913 | - foreach ($theme_paths as $id => $data) |
|
| 1914 | - if ($id != 1 && !in_array($id, $old_themes)) |
|
| 1992 | + foreach ($theme_paths as $id => $data) { |
|
| 1993 | + if ($id != 1 && !in_array($id, $old_themes)) |
|
| 1915 | 1994 | unset($theme_paths[$id]); |
| 1995 | + } |
|
| 1916 | 1996 | } |
| 1917 | 1997 | $smcFunc['db_free_result']($request); |
| 1918 | 1998 | } |
| 1919 | 1999 | } |
| 1920 | 2000 | |
| 1921 | 2001 | // Boardmod? |
| 1922 | - if (isset($_REQUEST['boardmod'])) |
|
| 1923 | - $mod_actions = parseBoardMod(@file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $_REQUEST['filename']), true, $reverse, $theme_paths); |
|
| 1924 | - else |
|
| 1925 | - $mod_actions = parseModification(@file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $_REQUEST['filename']), true, $reverse, $theme_paths); |
|
| 2002 | + if (isset($_REQUEST['boardmod'])) { |
|
| 2003 | + $mod_actions = parseBoardMod(@file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $_REQUEST['filename']), true, $reverse, $theme_paths); |
|
| 2004 | + } else { |
|
| 2005 | + $mod_actions = parseModification(@file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $_REQUEST['filename']), true, $reverse, $theme_paths); |
|
| 2006 | + } |
|
| 1926 | 2007 | |
| 1927 | 2008 | // Ok lets get the content of the file. |
| 1928 | 2009 | $context['operations'] = array( |
@@ -1978,9 +2059,9 @@ discard block |
||
| 1978 | 2059 | 'path' => $detect_path, |
| 1979 | 2060 | 'form_elements_only' => true, |
| 1980 | 2061 | ); |
| 2062 | + } else { |
|
| 2063 | + $context['ftp_connected'] = true; |
|
| 1981 | 2064 | } |
| 1982 | - else |
|
| 1983 | - $context['ftp_connected'] = true; |
|
| 1984 | 2065 | |
| 1985 | 2066 | // Define the template. |
| 1986 | 2067 | $context['page_title'] = $txt['package_file_perms']; |
@@ -2093,17 +2174,18 @@ discard block |
||
| 2093 | 2174 | { |
| 2094 | 2175 | unset($context['file_tree'][strtr($boarddir, array('\\' => '/'))]['contents']['attachments']); |
| 2095 | 2176 | |
| 2096 | - if (!is_array($modSettings['attachmentUploadDir'])) |
|
| 2097 | - $modSettings['attachmentUploadDir'] = $smcFunc['json_decode']($modSettings['attachmentUploadDir'], true); |
|
| 2177 | + if (!is_array($modSettings['attachmentUploadDir'])) { |
|
| 2178 | + $modSettings['attachmentUploadDir'] = $smcFunc['json_decode']($modSettings['attachmentUploadDir'], true); |
|
| 2179 | + } |
|
| 2098 | 2180 | |
| 2099 | 2181 | // @todo Should we suggest non-current directories be read only? |
| 2100 | - foreach ($modSettings['attachmentUploadDir'] as $dir) |
|
| 2101 | - $context['file_tree'][strtr($dir, array('\\' => '/'))] = array( |
|
| 2182 | + foreach ($modSettings['attachmentUploadDir'] as $dir) { |
|
| 2183 | + $context['file_tree'][strtr($dir, array('\\' => '/'))] = array( |
|
| 2102 | 2184 | 'type' => 'dir', |
| 2103 | 2185 | 'writable_on' => 'restrictive', |
| 2104 | 2186 | ); |
| 2105 | - } |
|
| 2106 | - elseif (substr($modSettings['attachmentUploadDir'], 0, strlen($boarddir)) != $boarddir) |
|
| 2187 | + } |
|
| 2188 | + } elseif (substr($modSettings['attachmentUploadDir'], 0, strlen($boarddir)) != $boarddir) |
|
| 2107 | 2189 | { |
| 2108 | 2190 | unset($context['file_tree'][strtr($boarddir, array('\\' => '/'))]['contents']['attachments']); |
| 2109 | 2191 | $context['file_tree'][strtr($modSettings['attachmentUploadDir'], array('\\' => '/'))] = array( |
@@ -2153,8 +2235,8 @@ discard block |
||
| 2153 | 2235 | ); |
| 2154 | 2236 | while ($row = $smcFunc['db_fetch_assoc']($request)) |
| 2155 | 2237 | { |
| 2156 | - if (substr(strtolower(strtr($row['value'], array('\\' => '/'))), 0, strlen($boarddir) + 7) == strtolower(strtr($boarddir, array('\\' => '/')) . '/Themes')) |
|
| 2157 | - $context['file_tree'][strtr($boarddir, array('\\' => '/'))]['contents']['Themes']['contents'][substr($row['value'], strlen($boarddir) + 8)] = array( |
|
| 2238 | + if (substr(strtolower(strtr($row['value'], array('\\' => '/'))), 0, strlen($boarddir) + 7) == strtolower(strtr($boarddir, array('\\' => '/')) . '/Themes')) { |
|
| 2239 | + $context['file_tree'][strtr($boarddir, array('\\' => '/'))]['contents']['Themes']['contents'][substr($row['value'], strlen($boarddir) + 8)] = array( |
|
| 2158 | 2240 | 'type' => 'dir_recursive', |
| 2159 | 2241 | 'list_contents' => true, |
| 2160 | 2242 | 'contents' => array( |
@@ -2164,7 +2246,7 @@ discard block |
||
| 2164 | 2246 | ), |
| 2165 | 2247 | ), |
| 2166 | 2248 | ); |
| 2167 | - else |
|
| 2249 | + } else |
|
| 2168 | 2250 | { |
| 2169 | 2251 | $context['file_tree'][strtr($row['value'], array('\\' => '/'))] = array( |
| 2170 | 2252 | 'type' => 'dir_recursive', |
@@ -2181,28 +2263,33 @@ discard block |
||
| 2181 | 2263 | $smcFunc['db_free_result']($request); |
| 2182 | 2264 | |
| 2183 | 2265 | // If we're submitting then let's move on to another function to keep things cleaner.. |
| 2184 | - if (isset($_POST['action_changes'])) |
|
| 2185 | - return PackagePermissionsAction(); |
|
| 2266 | + if (isset($_POST['action_changes'])) { |
|
| 2267 | + return PackagePermissionsAction(); |
|
| 2268 | + } |
|
| 2186 | 2269 | |
| 2187 | 2270 | $context['look_for'] = array(); |
| 2188 | 2271 | // Are we looking for a particular tree - normally an expansion? |
| 2189 | - if (!empty($_REQUEST['find'])) |
|
| 2190 | - $context['look_for'][] = base64_decode($_REQUEST['find']); |
|
| 2272 | + if (!empty($_REQUEST['find'])) { |
|
| 2273 | + $context['look_for'][] = base64_decode($_REQUEST['find']); |
|
| 2274 | + } |
|
| 2191 | 2275 | // Only that tree? |
| 2192 | 2276 | $context['only_find'] = isset($_GET['xml']) && !empty($_REQUEST['onlyfind']) ? $_REQUEST['onlyfind'] : ''; |
| 2193 | - if ($context['only_find']) |
|
| 2194 | - $context['look_for'][] = $context['only_find']; |
|
| 2277 | + if ($context['only_find']) { |
|
| 2278 | + $context['look_for'][] = $context['only_find']; |
|
| 2279 | + } |
|
| 2195 | 2280 | |
| 2196 | 2281 | // Have we got a load of back-catalogue trees to expand from a submit etc? |
| 2197 | 2282 | if (!empty($_GET['back_look'])) |
| 2198 | 2283 | { |
| 2199 | 2284 | $potententialTrees = $smcFunc['json_decode'](base64_decode($_GET['back_look']), true); |
| 2200 | - foreach ($potententialTrees as $tree) |
|
| 2201 | - $context['look_for'][] = $tree; |
|
| 2285 | + foreach ($potententialTrees as $tree) { |
|
| 2286 | + $context['look_for'][] = $tree; |
|
| 2287 | + } |
|
| 2202 | 2288 | } |
| 2203 | 2289 | // ... maybe posted? |
| 2204 | - if (!empty($_POST['back_look'])) |
|
| 2205 | - $context['only_find'] = array_merge($context['only_find'], $_POST['back_look']); |
|
| 2290 | + if (!empty($_POST['back_look'])) { |
|
| 2291 | + $context['only_find'] = array_merge($context['only_find'], $_POST['back_look']); |
|
| 2292 | + } |
|
| 2206 | 2293 | |
| 2207 | 2294 | $context['back_look_data'] = base64_encode($smcFunc['json_encode'](array_slice($context['look_for'], 0, 15))); |
| 2208 | 2295 | |
@@ -2241,9 +2328,9 @@ discard block |
||
| 2241 | 2328 | 'chmod' => @is_writable($path), |
| 2242 | 2329 | 'perms' => @fileperms($path), |
| 2243 | 2330 | ); |
| 2331 | + } else { |
|
| 2332 | + unset($context['file_tree'][$path]); |
|
| 2244 | 2333 | } |
| 2245 | - else |
|
| 2246 | - unset($context['file_tree'][$path]); |
|
| 2247 | 2334 | } |
| 2248 | 2335 | |
| 2249 | 2336 | // Is this actually xml? |
@@ -2267,22 +2354,25 @@ discard block |
||
| 2267 | 2354 | global $context; |
| 2268 | 2355 | |
| 2269 | 2356 | $isLikelyPath = false; |
| 2270 | - foreach ($context['look_for'] as $possiblePath) |
|
| 2271 | - if (substr($possiblePath, 0, strlen($path)) == $path) |
|
| 2357 | + foreach ($context['look_for'] as $possiblePath) { |
|
| 2358 | + if (substr($possiblePath, 0, strlen($path)) == $path) |
|
| 2272 | 2359 | $isLikelyPath = true; |
| 2360 | + } |
|
| 2273 | 2361 | |
| 2274 | 2362 | // Is this where we stop? |
| 2275 | - if (isset($_GET['xml']) && !empty($context['look_for']) && !$isLikelyPath) |
|
| 2276 | - return; |
|
| 2277 | - elseif ($level > $context['default_level'] && !$isLikelyPath) |
|
| 2278 | - return; |
|
| 2363 | + if (isset($_GET['xml']) && !empty($context['look_for']) && !$isLikelyPath) { |
|
| 2364 | + return; |
|
| 2365 | + } elseif ($level > $context['default_level'] && !$isLikelyPath) { |
|
| 2366 | + return; |
|
| 2367 | + } |
|
| 2279 | 2368 | |
| 2280 | 2369 | // Are we actually interested in saving this data? |
| 2281 | 2370 | $save_data = empty($context['only_find']) || $context['only_find'] == $path; |
| 2282 | 2371 | |
| 2283 | 2372 | // @todo Shouldn't happen - but better error message? |
| 2284 | - if (!is_dir($path)) |
|
| 2285 | - fatal_lang_error('no_access', false); |
|
| 2373 | + if (!is_dir($path)) { |
|
| 2374 | + fatal_lang_error('no_access', false); |
|
| 2375 | + } |
|
| 2286 | 2376 | |
| 2287 | 2377 | // This is where we put stuff we've found for sorting. |
| 2288 | 2378 | $foundData = array( |
@@ -2297,11 +2387,13 @@ discard block |
||
| 2297 | 2387 | if (is_file($path . '/' . $entry)) |
| 2298 | 2388 | { |
| 2299 | 2389 | // Are we listing PHP files in this directory? |
| 2300 | - if ($save_data && !empty($data['list_contents']) && substr($entry, -4) == '.php') |
|
| 2301 | - $foundData['files'][$entry] = true; |
|
| 2390 | + if ($save_data && !empty($data['list_contents']) && substr($entry, -4) == '.php') { |
|
| 2391 | + $foundData['files'][$entry] = true; |
|
| 2392 | + } |
|
| 2302 | 2393 | // A file we were looking for. |
| 2303 | - elseif ($save_data && isset($data['contents'][$entry])) |
|
| 2304 | - $foundData['files'][$entry] = true; |
|
| 2394 | + elseif ($save_data && isset($data['contents'][$entry])) { |
|
| 2395 | + $foundData['files'][$entry] = true; |
|
| 2396 | + } |
|
| 2305 | 2397 | } |
| 2306 | 2398 | // It's a directory - we're interested one way or another, probably... |
| 2307 | 2399 | elseif ($entry != '.' && $entry != '..') |
@@ -2309,32 +2401,36 @@ discard block |
||
| 2309 | 2401 | // Going further? |
| 2310 | 2402 | 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')))) |
| 2311 | 2403 | { |
| 2312 | - if (!isset($data['contents'][$entry])) |
|
| 2313 | - $foundData['folders'][$entry] = 'dir_recursive'; |
|
| 2314 | - else |
|
| 2315 | - $foundData['folders'][$entry] = true; |
|
| 2404 | + if (!isset($data['contents'][$entry])) { |
|
| 2405 | + $foundData['folders'][$entry] = 'dir_recursive'; |
|
| 2406 | + } else { |
|
| 2407 | + $foundData['folders'][$entry] = true; |
|
| 2408 | + } |
|
| 2316 | 2409 | |
| 2317 | 2410 | // If this wasn't expected inherit the recusiveness... |
| 2318 | - if (!isset($data['contents'][$entry])) |
|
| 2319 | - // We need to do this as we will be going all recursive. |
|
| 2411 | + if (!isset($data['contents'][$entry])) { |
|
| 2412 | + // We need to do this as we will be going all recursive. |
|
| 2320 | 2413 | $data['contents'][$entry] = array( |
| 2321 | 2414 | 'type' => 'dir_recursive', |
| 2322 | 2415 | ); |
| 2416 | + } |
|
| 2323 | 2417 | |
| 2324 | 2418 | // Actually do the recursive stuff... |
| 2325 | 2419 | fetchPerms__recursive($path . '/' . $entry, $data['contents'][$entry], $level + 1); |
| 2326 | 2420 | } |
| 2327 | 2421 | // Maybe it is a folder we are not descending into. |
| 2328 | - elseif (isset($data['contents'][$entry])) |
|
| 2329 | - $foundData['folders'][$entry] = true; |
|
| 2422 | + elseif (isset($data['contents'][$entry])) { |
|
| 2423 | + $foundData['folders'][$entry] = true; |
|
| 2424 | + } |
|
| 2330 | 2425 | // Otherwise we stop here. |
| 2331 | 2426 | } |
| 2332 | 2427 | } |
| 2333 | 2428 | closedir($dh); |
| 2334 | 2429 | |
| 2335 | 2430 | // Nothing to see here? |
| 2336 | - if (!$save_data) |
|
| 2337 | - return; |
|
| 2431 | + if (!$save_data) { |
|
| 2432 | + return; |
|
| 2433 | + } |
|
| 2338 | 2434 | |
| 2339 | 2435 | // Now actually add the data, starting with the folders. |
| 2340 | 2436 | ksort($foundData['folders']); |
@@ -2346,8 +2442,9 @@ discard block |
||
| 2346 | 2442 | 'perms' => @fileperms($path . '/' . $folder), |
| 2347 | 2443 | ), |
| 2348 | 2444 | ); |
| 2349 | - if ($type !== true) |
|
| 2350 | - $additional_data['type'] = $type; |
|
| 2445 | + if ($type !== true) { |
|
| 2446 | + $additional_data['type'] = $type; |
|
| 2447 | + } |
|
| 2351 | 2448 | |
| 2352 | 2449 | // If there's an offset ignore any folders in XML mode. |
| 2353 | 2450 | if (isset($_GET['xml']) && $context['file_offset'] == 0) |
@@ -2366,13 +2463,13 @@ discard block |
||
| 2366 | 2463 | ), |
| 2367 | 2464 | 'value' => $folder, |
| 2368 | 2465 | ); |
| 2369 | - } |
|
| 2370 | - elseif (!isset($_GET['xml'])) |
|
| 2466 | + } elseif (!isset($_GET['xml'])) |
|
| 2371 | 2467 | { |
| 2372 | - if (isset($data['contents'][$folder])) |
|
| 2373 | - $data['contents'][$folder] = array_merge($data['contents'][$folder], $additional_data); |
|
| 2374 | - else |
|
| 2375 | - $data['contents'][$folder] = $additional_data; |
|
| 2468 | + if (isset($data['contents'][$folder])) { |
|
| 2469 | + $data['contents'][$folder] = array_merge($data['contents'][$folder], $additional_data); |
|
| 2470 | + } else { |
|
| 2471 | + $data['contents'][$folder] = $additional_data; |
|
| 2472 | + } |
|
| 2376 | 2473 | } |
| 2377 | 2474 | } |
| 2378 | 2475 | |
@@ -2384,11 +2481,13 @@ discard block |
||
| 2384 | 2481 | $counter++; |
| 2385 | 2482 | |
| 2386 | 2483 | // Have we reached our offset? |
| 2387 | - if ($context['file_offset'] > $counter) |
|
| 2388 | - continue; |
|
| 2484 | + if ($context['file_offset'] > $counter) { |
|
| 2485 | + continue; |
|
| 2486 | + } |
|
| 2389 | 2487 | // Gone too far? |
| 2390 | - if ($counter > ($context['file_offset'] + $context['file_limit'])) |
|
| 2391 | - continue; |
|
| 2488 | + if ($counter > ($context['file_offset'] + $context['file_limit'])) { |
|
| 2489 | + continue; |
|
| 2490 | + } |
|
| 2392 | 2491 | |
| 2393 | 2492 | $additional_data = array( |
| 2394 | 2493 | 'perms' => array( |
@@ -2414,13 +2513,13 @@ discard block |
||
| 2414 | 2513 | ), |
| 2415 | 2514 | 'value' => $file, |
| 2416 | 2515 | ); |
| 2417 | - } |
|
| 2418 | - elseif ($counter != ($context['file_offset'] + $context['file_limit'])) |
|
| 2516 | + } elseif ($counter != ($context['file_offset'] + $context['file_limit'])) |
|
| 2419 | 2517 | { |
| 2420 | - if (isset($data['contents'][$file])) |
|
| 2421 | - $data['contents'][$file] = array_merge($data['contents'][$file], $additional_data); |
|
| 2422 | - else |
|
| 2423 | - $data['contents'][$file] = $additional_data; |
|
| 2518 | + if (isset($data['contents'][$file])) { |
|
| 2519 | + $data['contents'][$file] = array_merge($data['contents'][$file], $additional_data); |
|
| 2520 | + } else { |
|
| 2521 | + $data['contents'][$file] = $additional_data; |
|
| 2522 | + } |
|
| 2424 | 2523 | } |
| 2425 | 2524 | } |
| 2426 | 2525 | } |
@@ -2442,8 +2541,9 @@ discard block |
||
| 2442 | 2541 | $context['back_look_data'] = isset($_POST['back_look']) ? $_POST['back_look'] : array(); |
| 2443 | 2542 | |
| 2444 | 2543 | // Skipping use of FTP? |
| 2445 | - if (empty($package_ftp)) |
|
| 2446 | - $context['skip_ftp'] = true; |
|
| 2544 | + if (empty($package_ftp)) { |
|
| 2545 | + $context['skip_ftp'] = true; |
|
| 2546 | + } |
|
| 2447 | 2547 | |
| 2448 | 2548 | // 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. |
| 2449 | 2549 | if ($context['method'] == 'individual') |
@@ -2453,8 +2553,9 @@ discard block |
||
| 2453 | 2553 | $context['custom_value'] = (int) $_POST['custom_value']; |
| 2454 | 2554 | |
| 2455 | 2555 | // Continuing? |
| 2456 | - if (isset($_POST['toProcess'])) |
|
| 2457 | - $_POST['permStatus'] = $smcFunc['json_decode'](base64_decode($_POST['toProcess']), true); |
|
| 2556 | + if (isset($_POST['toProcess'])) { |
|
| 2557 | + $_POST['permStatus'] = $smcFunc['json_decode'](base64_decode($_POST['toProcess']), true); |
|
| 2558 | + } |
|
| 2458 | 2559 | |
| 2459 | 2560 | if (isset($_POST['permStatus'])) |
| 2460 | 2561 | { |
@@ -2463,22 +2564,27 @@ discard block |
||
| 2463 | 2564 | foreach ($_POST['permStatus'] as $path => $status) |
| 2464 | 2565 | { |
| 2465 | 2566 | // Nothing to see here? |
| 2466 | - if ($status == 'no_change') |
|
| 2467 | - continue; |
|
| 2567 | + if ($status == 'no_change') { |
|
| 2568 | + continue; |
|
| 2569 | + } |
|
| 2468 | 2570 | $legal = false; |
| 2469 | - foreach ($legal_roots as $root) |
|
| 2470 | - if (substr($path, 0, strlen($root)) == $root) |
|
| 2571 | + foreach ($legal_roots as $root) { |
|
| 2572 | + if (substr($path, 0, strlen($root)) == $root) |
|
| 2471 | 2573 | $legal = true; |
| 2574 | + } |
|
| 2472 | 2575 | |
| 2473 | - if (!$legal) |
|
| 2474 | - continue; |
|
| 2576 | + if (!$legal) { |
|
| 2577 | + continue; |
|
| 2578 | + } |
|
| 2475 | 2579 | |
| 2476 | 2580 | // Check it exists. |
| 2477 | - if (!file_exists($path)) |
|
| 2478 | - continue; |
|
| 2581 | + if (!file_exists($path)) { |
|
| 2582 | + continue; |
|
| 2583 | + } |
|
| 2479 | 2584 | |
| 2480 | - if ($status == 'custom') |
|
| 2481 | - $validate_custom = true; |
|
| 2585 | + if ($status == 'custom') { |
|
| 2586 | + $validate_custom = true; |
|
| 2587 | + } |
|
| 2482 | 2588 | |
| 2483 | 2589 | // Now add it. |
| 2484 | 2590 | $context['to_process'][$path] = $status; |
@@ -2488,17 +2594,20 @@ discard block |
||
| 2488 | 2594 | // Make sure the chmod status is valid? |
| 2489 | 2595 | if ($validate_custom) |
| 2490 | 2596 | { |
| 2491 | - if (preg_match('~^[4567][4567][4567]$~', $context['custom_value']) == false) |
|
| 2492 | - fatal_error($txt['chmod_value_invalid']); |
|
| 2597 | + if (preg_match('~^[4567][4567][4567]$~', $context['custom_value']) == false) { |
|
| 2598 | + fatal_error($txt['chmod_value_invalid']); |
|
| 2599 | + } |
|
| 2493 | 2600 | } |
| 2494 | 2601 | |
| 2495 | 2602 | // Nothing to do? |
| 2496 | - if (empty($context['to_process'])) |
|
| 2497 | - redirectexit('action=admin;area=packages;sa=perms' . (!empty($context['back_look_data']) ? ';back_look=' . base64_encode($smcFunc['json_encode']($context['back_look_data'])) : '') . ';' . $context['session_var'] . '=' . $context['session_id']); |
|
| 2603 | + if (empty($context['to_process'])) { |
|
| 2604 | + redirectexit('action=admin;area=packages;sa=perms' . (!empty($context['back_look_data']) ? ';back_look=' . base64_encode($smcFunc['json_encode']($context['back_look_data'])) : '') . ';' . $context['session_var'] . '=' . $context['session_id']); |
|
| 2605 | + } |
|
| 2498 | 2606 | } |
| 2499 | 2607 | // Should never get here, |
| 2500 | - else |
|
| 2501 | - fatal_lang_error('no_access', false); |
|
| 2608 | + else { |
|
| 2609 | + fatal_lang_error('no_access', false); |
|
| 2610 | + } |
|
| 2502 | 2611 | |
| 2503 | 2612 | // Setup the custom value. |
| 2504 | 2613 | $custom_value = octdec('0' . $context['custom_value']); |
@@ -2506,18 +2615,18 @@ discard block |
||
| 2506 | 2615 | // Start processing items. |
| 2507 | 2616 | foreach ($context['to_process'] as $path => $status) |
| 2508 | 2617 | { |
| 2509 | - if (in_array($status, array('execute', 'writable', 'read'))) |
|
| 2510 | - package_chmod($path, $status); |
|
| 2511 | - elseif ($status == 'custom' && !empty($custom_value)) |
|
| 2618 | + if (in_array($status, array('execute', 'writable', 'read'))) { |
|
| 2619 | + package_chmod($path, $status); |
|
| 2620 | + } elseif ($status == 'custom' && !empty($custom_value)) |
|
| 2512 | 2621 | { |
| 2513 | 2622 | // Use FTP if we have it. |
| 2514 | 2623 | if (!empty($package_ftp) && !empty($_SESSION['pack_ftp'])) |
| 2515 | 2624 | { |
| 2516 | 2625 | $ftp_file = strtr($path, array($_SESSION['pack_ftp']['root'] => '')); |
| 2517 | 2626 | $package_ftp->chmod($ftp_file, $custom_value); |
| 2627 | + } else { |
|
| 2628 | + smf_chmod($path, $custom_value); |
|
| 2518 | 2629 | } |
| 2519 | - else |
|
| 2520 | - smf_chmod($path, $custom_value); |
|
| 2521 | 2630 | } |
| 2522 | 2631 | |
| 2523 | 2632 | // This fish is fried... |
@@ -2601,23 +2710,27 @@ discard block |
||
| 2601 | 2710 | { |
| 2602 | 2711 | global $context; |
| 2603 | 2712 | |
| 2604 | - if (!empty($data['writable_on'])) |
|
| 2605 | - if ($context['predefined_type'] == 'standard' || $data['writable_on'] == 'restrictive') |
|
| 2713 | + if (!empty($data['writable_on'])) { |
|
| 2714 | + if ($context['predefined_type'] == 'standard' || $data['writable_on'] == 'restrictive') |
|
| 2606 | 2715 | $context['special_files'][$path] = 1; |
| 2716 | + } |
|
| 2607 | 2717 | |
| 2608 | - if (!empty($data['contents'])) |
|
| 2609 | - foreach ($data['contents'] as $name => $contents) |
|
| 2718 | + if (!empty($data['contents'])) { |
|
| 2719 | + foreach ($data['contents'] as $name => $contents) |
|
| 2610 | 2720 | build_special_files__recursive($path . '/' . $name, $contents); |
| 2721 | + } |
|
| 2611 | 2722 | } |
| 2612 | 2723 | |
| 2613 | - foreach ($context['file_tree'] as $path => $data) |
|
| 2614 | - build_special_files__recursive($path, $data); |
|
| 2724 | + foreach ($context['file_tree'] as $path => $data) { |
|
| 2725 | + build_special_files__recursive($path, $data); |
|
| 2726 | + } |
|
| 2615 | 2727 | } |
| 2616 | 2728 | // Free doesn't need special files. |
| 2617 | - elseif ($context['predefined_type'] == 'free') |
|
| 2618 | - $context['special_files'] = array(); |
|
| 2619 | - else |
|
| 2620 | - $context['special_files'] = $smcFunc['json_decode'](base64_decode($_POST['specialFiles']), true); |
|
| 2729 | + elseif ($context['predefined_type'] == 'free') { |
|
| 2730 | + $context['special_files'] = array(); |
|
| 2731 | + } else { |
|
| 2732 | + $context['special_files'] = $smcFunc['json_decode'](base64_decode($_POST['specialFiles']), true); |
|
| 2733 | + } |
|
| 2621 | 2734 | |
| 2622 | 2735 | // Now we definitely know where we are, we need to go through again doing the chmod! |
| 2623 | 2736 | foreach ($context['directory_list'] as $path => $dummy) |
@@ -13,8 +13,9 @@ discard block |
||
| 13 | 13 | * @version 2.1 Beta 4 |
| 14 | 14 | */ |
| 15 | 15 | |
| 16 | -if (!defined('SMF')) |
|
| 16 | +if (!defined('SMF')) { |
|
| 17 | 17 | die('No direct access...'); |
| 18 | +} |
|
| 18 | 19 | |
| 19 | 20 | /** |
| 20 | 21 | * Finds or repairs errors in the database to fix possible problems. |
@@ -50,8 +51,9 @@ discard block |
||
| 50 | 51 | ); |
| 51 | 52 | |
| 52 | 53 | // Start displaying errors without fixing them. |
| 53 | - if (isset($_GET['fixErrors'])) |
|
| 54 | - checkSession('get'); |
|
| 54 | + if (isset($_GET['fixErrors'])) { |
|
| 55 | + checkSession('get'); |
|
| 56 | + } |
|
| 55 | 57 | |
| 56 | 58 | // Will want this. |
| 57 | 59 | loadForumTests(); |
@@ -69,11 +71,11 @@ discard block |
||
| 69 | 71 | $_SESSION['repairboards_to_fix'] = $context['to_fix']; |
| 70 | 72 | $_SESSION['repairboards_to_fix2'] = null; |
| 71 | 73 | |
| 72 | - if (empty($context['repair_errors'])) |
|
| 73 | - $context['repair_errors'][] = '???'; |
|
| 74 | + if (empty($context['repair_errors'])) { |
|
| 75 | + $context['repair_errors'][] = '???'; |
|
| 76 | + } |
|
| 74 | 77 | } |
| 75 | - } |
|
| 76 | - else |
|
| 78 | + } else |
|
| 77 | 79 | { |
| 78 | 80 | $context['error_search'] = false; |
| 79 | 81 | $context['to_fix'] = isset($_SESSION['repairboards_to_fix']) ? $_SESSION['repairboards_to_fix'] : array(); |
@@ -120,16 +122,19 @@ discard block |
||
| 120 | 122 | |
| 121 | 123 | // More time, I need more time! |
| 122 | 124 | @set_time_limit(600); |
| 123 | - if (function_exists('apache_reset_timeout')) |
|
| 124 | - @apache_reset_timeout(); |
|
| 125 | + if (function_exists('apache_reset_timeout')) { |
|
| 126 | + @apache_reset_timeout(); |
|
| 127 | + } |
|
| 125 | 128 | |
| 126 | 129 | // Errr, wait. How much time has this taken already? |
| 127 | - if (!$force && (time() - $time_start) < 3) |
|
| 128 | - return; |
|
| 130 | + if (!$force && (time() - $time_start) < 3) { |
|
| 131 | + return; |
|
| 132 | + } |
|
| 129 | 133 | |
| 130 | 134 | // Restore the query cache if interested. |
| 131 | - if (!empty($db_temp_cache)) |
|
| 132 | - $db_cache = $db_temp_cache; |
|
| 135 | + if (!empty($db_temp_cache)) { |
|
| 136 | + $db_cache = $db_temp_cache; |
|
| 137 | + } |
|
| 133 | 138 | |
| 134 | 139 | $context['continue_get_data'] = '?action=admin;area=repairboards' . (isset($_GET['fixErrors']) ? ';fixErrors' : '') . ';step=' . $_GET['step'] . ';substep=' . $_GET['substep'] . ';' . $context['session_var'] . '=' . $context['session_id']; |
| 135 | 140 | $context['page_title'] = $txt['not_done_title']; |
@@ -138,10 +143,11 @@ discard block |
||
| 138 | 143 | $context['sub_template'] = 'not_done'; |
| 139 | 144 | |
| 140 | 145 | // Change these two if more steps are added! |
| 141 | - if (empty($max_substep)) |
|
| 142 | - $context['continue_percent'] = round(($_GET['step'] * 100) / $context['total_steps']); |
|
| 143 | - else |
|
| 144 | - $context['continue_percent'] = round((($_GET['step'] + ($_GET['substep'] / $max_substep)) * 100) / $context['total_steps']); |
|
| 146 | + if (empty($max_substep)) { |
|
| 147 | + $context['continue_percent'] = round(($_GET['step'] * 100) / $context['total_steps']); |
|
| 148 | + } else { |
|
| 149 | + $context['continue_percent'] = round((($_GET['step'] + ($_GET['substep'] / $max_substep)) * 100) / $context['total_steps']); |
|
| 150 | + } |
|
| 145 | 151 | |
| 146 | 152 | // Never more than 100%! |
| 147 | 153 | $context['continue_percent'] = min($context['continue_percent'], 100); |
@@ -609,8 +615,9 @@ discard block |
||
| 609 | 615 | $row['myid_last_msg'] = (int) $row['myid_last_msg']; |
| 610 | 616 | |
| 611 | 617 | // Not really a problem? |
| 612 | - if ($row['id_first_msg'] == $row['myid_first_msg'] && $row['id_last_msg'] == $row['myid_last_msg'] && $row['approved'] == $row['firstmsg_approved']) |
|
| 613 | - return false; |
|
| 618 | + if ($row['id_first_msg'] == $row['myid_first_msg'] && $row['id_last_msg'] == $row['myid_last_msg'] && $row['approved'] == $row['firstmsg_approved']) { |
|
| 619 | + return false; |
|
| 620 | + } |
|
| 614 | 621 | |
| 615 | 622 | $memberStartedID = (int) getMsgMemberID($row['myid_first_msg']); |
| 616 | 623 | $memberUpdatedID = (int) getMsgMemberID($row['myid_last_msg']); |
@@ -634,15 +641,19 @@ discard block |
||
| 634 | 641 | 'message_function' => function ($row) use ($txt, &$context) |
| 635 | 642 | { |
| 636 | 643 | // A pretend error? |
| 637 | - if ($row['id_first_msg'] == $row['myid_first_msg'] && $row['id_last_msg'] == $row['myid_last_msg'] && $row['approved'] == $row['firstmsg_approved']) |
|
| 638 | - return false; |
|
| 644 | + if ($row['id_first_msg'] == $row['myid_first_msg'] && $row['id_last_msg'] == $row['myid_last_msg'] && $row['approved'] == $row['firstmsg_approved']) { |
|
| 645 | + return false; |
|
| 646 | + } |
|
| 639 | 647 | |
| 640 | - if ($row['id_first_msg'] != $row['myid_first_msg']) |
|
| 641 | - $context['repair_errors'][] = sprintf($txt['repair_stats_topics_1'], $row['id_topic'], $row['id_first_msg']); |
|
| 642 | - if ($row['id_last_msg'] != $row['myid_last_msg']) |
|
| 643 | - $context['repair_errors'][] = sprintf($txt['repair_stats_topics_2'], $row['id_topic'], $row['id_last_msg']); |
|
| 644 | - if ($row['approved'] != $row['firstmsg_approved']) |
|
| 645 | - $context['repair_errors'][] = sprintf($txt['repair_stats_topics_5'], $row['id_topic']); |
|
| 648 | + if ($row['id_first_msg'] != $row['myid_first_msg']) { |
|
| 649 | + $context['repair_errors'][] = sprintf($txt['repair_stats_topics_1'], $row['id_topic'], $row['id_first_msg']); |
|
| 650 | + } |
|
| 651 | + if ($row['id_last_msg'] != $row['myid_last_msg']) { |
|
| 652 | + $context['repair_errors'][] = sprintf($txt['repair_stats_topics_2'], $row['id_topic'], $row['id_last_msg']); |
|
| 653 | + } |
|
| 654 | + if ($row['approved'] != $row['firstmsg_approved']) { |
|
| 655 | + $context['repair_errors'][] = sprintf($txt['repair_stats_topics_5'], $row['id_topic']); |
|
| 656 | + } |
|
| 646 | 657 | |
| 647 | 658 | return true; |
| 648 | 659 | }, |
@@ -671,8 +682,9 @@ discard block |
||
| 671 | 682 | $row['my_num_replies'] = (int) $row['my_num_replies']; |
| 672 | 683 | |
| 673 | 684 | // Not really a problem? |
| 674 | - if ($row['my_num_replies'] == $row['num_replies']) |
|
| 675 | - return false; |
|
| 685 | + if ($row['my_num_replies'] == $row['num_replies']) { |
|
| 686 | + return false; |
|
| 687 | + } |
|
| 676 | 688 | |
| 677 | 689 | $smcFunc['db_query']('', ' |
| 678 | 690 | UPDATE {db_prefix}topics |
@@ -689,11 +701,13 @@ discard block |
||
| 689 | 701 | global $txt, $context; |
| 690 | 702 | |
| 691 | 703 | // Just joking? |
| 692 | - if ($row['my_num_replies'] == $row['num_replies']) |
|
| 693 | - return false; |
|
| 704 | + if ($row['my_num_replies'] == $row['num_replies']) { |
|
| 705 | + return false; |
|
| 706 | + } |
|
| 694 | 707 | |
| 695 | - if ($row['num_replies'] != $row['my_num_replies']) |
|
| 696 | - $context['repair_errors'][] = sprintf($txt['repair_stats_topics_3'], $row['id_topic'], $row['num_replies']); |
|
| 708 | + if ($row['num_replies'] != $row['my_num_replies']) { |
|
| 709 | + $context['repair_errors'][] = sprintf($txt['repair_stats_topics_3'], $row['id_topic'], $row['num_replies']); |
|
| 710 | + } |
|
| 697 | 711 | |
| 698 | 712 | return true; |
| 699 | 713 | }, |
@@ -1262,8 +1276,9 @@ discard block |
||
| 1262 | 1276 | $inserts = array(); |
| 1263 | 1277 | while ($row = $smcFunc['db_fetch_assoc']($result)) |
| 1264 | 1278 | { |
| 1265 | - foreach (text2words($row['subject']) as $word) |
|
| 1266 | - $inserts[] = array($word, $row['id_topic']); |
|
| 1279 | + foreach (text2words($row['subject']) as $word) { |
|
| 1280 | + $inserts[] = array($word, $row['id_topic']); |
|
| 1281 | + } |
|
| 1267 | 1282 | if (count($inserts) > 500) |
| 1268 | 1283 | { |
| 1269 | 1284 | $smcFunc['db_insert']('ignore', |
@@ -1276,13 +1291,14 @@ discard block |
||
| 1276 | 1291 | } |
| 1277 | 1292 | } |
| 1278 | 1293 | |
| 1279 | - if (!empty($inserts)) |
|
| 1280 | - $smcFunc['db_insert']('ignore', |
|
| 1294 | + if (!empty($inserts)) { |
|
| 1295 | + $smcFunc['db_insert']('ignore', |
|
| 1281 | 1296 | '{db_prefix}log_search_subjects', |
| 1282 | 1297 | array('word' => 'string', 'id_topic' => 'int'), |
| 1283 | 1298 | $inserts, |
| 1284 | 1299 | array('word', 'id_topic') |
| 1285 | 1300 | ); |
| 1301 | + } |
|
| 1286 | 1302 | }, |
| 1287 | 1303 | 'message_function' => function ($row) |
| 1288 | 1304 | { |
@@ -1541,8 +1557,9 @@ discard block |
||
| 1541 | 1557 | $current_step++; |
| 1542 | 1558 | |
| 1543 | 1559 | // Already done this? |
| 1544 | - if ($_GET['step'] > $current_step) |
|
| 1545 | - continue; |
|
| 1560 | + if ($_GET['step'] > $current_step) { |
|
| 1561 | + continue; |
|
| 1562 | + } |
|
| 1546 | 1563 | |
| 1547 | 1564 | // If we're fixing it but it ain't broke why try? |
| 1548 | 1565 | if ($do_fix && !in_array($error_type, $to_fix)) |
@@ -1571,14 +1588,16 @@ discard block |
||
| 1571 | 1588 | while (!$done) |
| 1572 | 1589 | { |
| 1573 | 1590 | // Make sure there's at least one ID to test. |
| 1574 | - if (isset($test['substeps']) && empty($step_max)) |
|
| 1575 | - break; |
|
| 1591 | + if (isset($test['substeps']) && empty($step_max)) { |
|
| 1592 | + break; |
|
| 1593 | + } |
|
| 1576 | 1594 | |
| 1577 | 1595 | // What is the testing query (Changes if we are testing or fixing) |
| 1578 | - if (!$do_fix) |
|
| 1579 | - $test_query = 'check_query'; |
|
| 1580 | - else |
|
| 1581 | - $test_query = isset($test['fix_query']) ? 'fix_query' : 'check_query'; |
|
| 1596 | + if (!$do_fix) { |
|
| 1597 | + $test_query = 'check_query'; |
|
| 1598 | + } else { |
|
| 1599 | + $test_query = isset($test['fix_query']) ? 'fix_query' : 'check_query'; |
|
| 1600 | + } |
|
| 1582 | 1601 | |
| 1583 | 1602 | // Do the test... |
| 1584 | 1603 | $request = $smcFunc['db_query']('', |
@@ -1588,10 +1607,11 @@ discard block |
||
| 1588 | 1607 | ); |
| 1589 | 1608 | |
| 1590 | 1609 | // Does it need a fix? |
| 1591 | - if (!empty($test['check_type']) && $test['check_type'] == 'count') |
|
| 1592 | - list ($needs_fix) = $smcFunc['db_fetch_row']($request); |
|
| 1593 | - else |
|
| 1594 | - $needs_fix = $smcFunc['db_num_rows']($request); |
|
| 1610 | + if (!empty($test['check_type']) && $test['check_type'] == 'count') { |
|
| 1611 | + list ($needs_fix) = $smcFunc['db_fetch_row']($request); |
|
| 1612 | + } else { |
|
| 1613 | + $needs_fix = $smcFunc['db_num_rows']($request); |
|
| 1614 | + } |
|
| 1595 | 1615 | |
| 1596 | 1616 | $total_queries++; |
| 1597 | 1617 | |
@@ -1603,8 +1623,9 @@ discard block |
||
| 1603 | 1623 | // Assume need to fix. |
| 1604 | 1624 | $found_errors = true; |
| 1605 | 1625 | |
| 1606 | - if (isset($test['message'])) |
|
| 1607 | - $context['repair_errors'][] = $txt[$test['message']]; |
|
| 1626 | + if (isset($test['message'])) { |
|
| 1627 | + $context['repair_errors'][] = $txt[$test['message']]; |
|
| 1628 | + } |
|
| 1608 | 1629 | |
| 1609 | 1630 | // One per row! |
| 1610 | 1631 | elseif (isset($test['messages'])) |
@@ -1614,10 +1635,11 @@ discard block |
||
| 1614 | 1635 | $variables = $test['messages']; |
| 1615 | 1636 | foreach ($variables as $k => $v) |
| 1616 | 1637 | { |
| 1617 | - if ($k == 0 && isset($txt[$v])) |
|
| 1618 | - $variables[$k] = $txt[$v]; |
|
| 1619 | - elseif ($k > 0 && isset($row[$v])) |
|
| 1620 | - $variables[$k] = $row[$v]; |
|
| 1638 | + if ($k == 0 && isset($txt[$v])) { |
|
| 1639 | + $variables[$k] = $txt[$v]; |
|
| 1640 | + } elseif ($k > 0 && isset($row[$v])) { |
|
| 1641 | + $variables[$k] = $row[$v]; |
|
| 1642 | + } |
|
| 1621 | 1643 | } |
| 1622 | 1644 | $context['repair_errors'][] = call_user_func_array('sprintf', $variables); |
| 1623 | 1645 | } |
@@ -1628,13 +1650,15 @@ discard block |
||
| 1628 | 1650 | { |
| 1629 | 1651 | // Find out if there are actually errors. |
| 1630 | 1652 | $found_errors = false; |
| 1631 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
| 1632 | - $found_errors |= $test['message_function']($row); |
|
| 1653 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
| 1654 | + $found_errors |= $test['message_function']($row); |
|
| 1655 | + } |
|
| 1633 | 1656 | } |
| 1634 | 1657 | |
| 1635 | 1658 | // Actually have something to fix? |
| 1636 | - if ($found_errors) |
|
| 1637 | - $to_fix[] = $error_type; |
|
| 1659 | + if ($found_errors) { |
|
| 1660 | + $to_fix[] = $error_type; |
|
| 1661 | + } |
|
| 1638 | 1662 | } |
| 1639 | 1663 | |
| 1640 | 1664 | // We want to fix, we need to fix - so work out what exactly to do! |
@@ -1644,8 +1668,9 @@ discard block |
||
| 1644 | 1668 | if (isset($test['fix_collect'])) |
| 1645 | 1669 | { |
| 1646 | 1670 | $ids = array(); |
| 1647 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
| 1648 | - $ids[] = $row[$test['fix_collect']['index']]; |
|
| 1671 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
| 1672 | + $ids[] = $row[$test['fix_collect']['index']]; |
|
| 1673 | + } |
|
| 1649 | 1674 | if (!empty($ids)) |
| 1650 | 1675 | { |
| 1651 | 1676 | // Fix it! |
@@ -1654,30 +1679,34 @@ discard block |
||
| 1654 | 1679 | } |
| 1655 | 1680 | |
| 1656 | 1681 | // Simply executing a fix it query? |
| 1657 | - elseif (isset($test['fix_it_query'])) |
|
| 1658 | - $smcFunc['db_query']('', |
|
| 1682 | + elseif (isset($test['fix_it_query'])) { |
|
| 1683 | + $smcFunc['db_query']('', |
|
| 1659 | 1684 | $test['fix_it_query'], |
| 1660 | 1685 | array( |
| 1661 | 1686 | ) |
| 1662 | 1687 | ); |
| 1688 | + } |
|
| 1663 | 1689 | |
| 1664 | 1690 | // Do we have some processing to do? |
| 1665 | 1691 | elseif (isset($test['fix_processing'])) |
| 1666 | 1692 | { |
| 1667 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
| 1668 | - $test['fix_processing']($row); |
|
| 1693 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
| 1694 | + $test['fix_processing']($row); |
|
| 1695 | + } |
|
| 1669 | 1696 | } |
| 1670 | 1697 | |
| 1671 | 1698 | // What about the full set of processing? |
| 1672 | - elseif (isset($test['fix_full_processing'])) |
|
| 1673 | - $test['fix_full_processing']($request); |
|
| 1699 | + elseif (isset($test['fix_full_processing'])) { |
|
| 1700 | + $test['fix_full_processing']($request); |
|
| 1701 | + } |
|
| 1674 | 1702 | |
| 1675 | 1703 | // Do we have other things we need to fix as a result? |
| 1676 | 1704 | if (!empty($test['force_fix'])) |
| 1677 | 1705 | { |
| 1678 | - foreach ($test['force_fix'] as $item) |
|
| 1679 | - if (!in_array($item, $to_fix)) |
|
| 1706 | + foreach ($test['force_fix'] as $item) { |
|
| 1707 | + if (!in_array($item, $to_fix)) |
|
| 1680 | 1708 | $to_fix[] = $item; |
| 1709 | + } |
|
| 1681 | 1710 | } |
| 1682 | 1711 | } |
| 1683 | 1712 | } |
@@ -1695,16 +1724,17 @@ discard block |
||
| 1695 | 1724 | if ($_GET['substep'] <= $step_max) |
| 1696 | 1725 | { |
| 1697 | 1726 | pauseRepairProcess($to_fix, $error_type, $step_max); |
| 1727 | + } else { |
|
| 1728 | + $done = true; |
|
| 1698 | 1729 | } |
| 1699 | - else |
|
| 1700 | - $done = true; |
|
| 1730 | + } else { |
|
| 1731 | + $done = true; |
|
| 1701 | 1732 | } |
| 1702 | - else |
|
| 1703 | - $done = true; |
|
| 1704 | 1733 | |
| 1705 | 1734 | // Don't allow more than 1000 queries at a time. |
| 1706 | - if ($total_queries >= 1000) |
|
| 1707 | - pauseRepairProcess($to_fix, $error_type, $step_max, true); |
|
| 1735 | + if ($total_queries >= 1000) { |
|
| 1736 | + pauseRepairProcess($to_fix, $error_type, $step_max, true); |
|
| 1737 | + } |
|
| 1708 | 1738 | } |
| 1709 | 1739 | |
| 1710 | 1740 | // Keep going. |
@@ -1717,8 +1747,9 @@ discard block |
||
| 1717 | 1747 | if ($do_fix) |
| 1718 | 1748 | { |
| 1719 | 1749 | $key = array_search($error_type, $to_fix); |
| 1720 | - if ($key !== false && isset($to_fix[$key])) |
|
| 1721 | - unset($to_fix[$key]); |
|
| 1750 | + if ($key !== false && isset($to_fix[$key])) { |
|
| 1751 | + unset($to_fix[$key]); |
|
| 1752 | + } |
|
| 1722 | 1753 | } |
| 1723 | 1754 | |
| 1724 | 1755 | // Are we done? |
@@ -1741,10 +1772,11 @@ discard block |
||
| 1741 | 1772 | static $createOnce = false; |
| 1742 | 1773 | |
| 1743 | 1774 | // Have we already created it? |
| 1744 | - if ($createOnce) |
|
| 1745 | - return; |
|
| 1746 | - else |
|
| 1747 | - $createOnce = true; |
|
| 1775 | + if ($createOnce) { |
|
| 1776 | + return; |
|
| 1777 | + } else { |
|
| 1778 | + $createOnce = true; |
|
| 1779 | + } |
|
| 1748 | 1780 | |
| 1749 | 1781 | // Back to the forum's default language. |
| 1750 | 1782 | loadLanguage('Admin', $language); |
@@ -1759,8 +1791,9 @@ discard block |
||
| 1759 | 1791 | 'cat_name' => $txt['salvaged_category_name'], |
| 1760 | 1792 | ) |
| 1761 | 1793 | ); |
| 1762 | - if ($smcFunc['db_num_rows']($result) != 0) |
|
| 1763 | - list ($salvageCatID) = $smcFunc['db_fetch_row']($result); |
|
| 1794 | + if ($smcFunc['db_num_rows']($result) != 0) { |
|
| 1795 | + list ($salvageCatID) = $smcFunc['db_fetch_row']($result); |
|
| 1796 | + } |
|
| 1764 | 1797 | $smcFunc['db_free_result']($result); |
| 1765 | 1798 | |
| 1766 | 1799 | if (empty($salvageCatID)) |
@@ -1792,8 +1825,9 @@ discard block |
||
| 1792 | 1825 | 'board_name' => $txt['salvaged_board_name'], |
| 1793 | 1826 | ) |
| 1794 | 1827 | ); |
| 1795 | - if ($smcFunc['db_num_rows']($result) != 0) |
|
| 1796 | - list ($salvageBoardID) = $smcFunc['db_fetch_row']($result); |
|
| 1828 | + if ($smcFunc['db_num_rows']($result) != 0) { |
|
| 1829 | + list ($salvageBoardID) = $smcFunc['db_fetch_row']($result); |
|
| 1830 | + } |
|
| 1797 | 1831 | $smcFunc['db_free_result']($result); |
| 1798 | 1832 | |
| 1799 | 1833 | if (empty($salvageBoardID)) |
@@ -232,7 +232,7 @@ discard block |
||
| 232 | 232 | LEFT JOIN {db_prefix}topics AS t ON (t.id_topic = m.id_topic) |
| 233 | 233 | WHERE t.id_topic IS NULL |
| 234 | 234 | GROUP BY m.id_topic, m.id_board', |
| 235 | - 'fix_processing' => function ($row) use ($smcFunc) |
|
| 235 | + 'fix_processing' => function($row) use ($smcFunc) |
|
| 236 | 236 | { |
| 237 | 237 | global $salvageBoardID; |
| 238 | 238 | |
@@ -318,7 +318,7 @@ discard block |
||
| 318 | 318 | // Remove all topics that have zero messages in the messages table. |
| 319 | 319 | 'fix_collect' => array( |
| 320 | 320 | 'index' => 'id_topic', |
| 321 | - 'process' => function ($topics) use ($smcFunc) |
|
| 321 | + 'process' => function($topics) use ($smcFunc) |
|
| 322 | 322 | { |
| 323 | 323 | $smcFunc['db_query']('', ' |
| 324 | 324 | DELETE FROM {db_prefix}topics |
@@ -355,7 +355,7 @@ discard block |
||
| 355 | 355 | AND p.id_poll IS NULL |
| 356 | 356 | GROUP BY o.id_poll, t.id_topic, t.id_board, t.id_member_started, m.member_name |
| 357 | 357 | ', |
| 358 | - 'fix_processing' => function ($row) use ($smcFunc, $txt) |
|
| 358 | + 'fix_processing' => function($row) use ($smcFunc, $txt) |
|
| 359 | 359 | { |
| 360 | 360 | global $salvageBoardID; |
| 361 | 361 | |
@@ -366,7 +366,7 @@ discard block |
||
| 366 | 366 | { |
| 367 | 367 | // Only if we don't have a reasonable idea of where to put it. |
| 368 | 368 | createSalvageArea(); |
| 369 | - $row['id_board'] = (int)$salvageBoardID; |
|
| 369 | + $row['id_board'] = (int) $salvageBoardID; |
|
| 370 | 370 | } |
| 371 | 371 | |
| 372 | 372 | if (empty($row['id_topic'])) |
@@ -492,7 +492,7 @@ discard block |
||
| 492 | 492 | LEFT JOIN {db_prefix}topics AS t ON (t.id_poll = p.id_poll) |
| 493 | 493 | WHERE p.id_poll BETWEEN {STEP_LOW} AND {STEP_HIGH} |
| 494 | 494 | AND t.id_poll IS NULL', |
| 495 | - 'fix_processing' => function ($row) use ($smcFunc, $txt) |
|
| 495 | + 'fix_processing' => function($row) use ($smcFunc, $txt) |
|
| 496 | 496 | { |
| 497 | 497 | global $salvageBoardID; |
| 498 | 498 | |
@@ -603,7 +603,7 @@ discard block |
||
| 603 | 603 | WHERE t.id_topic BETWEEN {STEP_LOW} AND {STEP_HIGH} |
| 604 | 604 | GROUP BY t.id_topic, t.id_first_msg, t.id_last_msg, t.approved, mf.approved |
| 605 | 605 | ORDER BY t.id_topic', |
| 606 | - 'fix_processing' => function ($row) use ($smcFunc) |
|
| 606 | + 'fix_processing' => function($row) use ($smcFunc) |
|
| 607 | 607 | { |
| 608 | 608 | $row['firstmsg_approved'] = (int) $row['firstmsg_approved']; |
| 609 | 609 | $row['myid_first_msg'] = (int) $row['myid_first_msg']; |
@@ -632,7 +632,7 @@ discard block |
||
| 632 | 632 | ) |
| 633 | 633 | ); |
| 634 | 634 | }, |
| 635 | - 'message_function' => function ($row) use ($txt, &$context) |
|
| 635 | + 'message_function' => function($row) use ($txt, &$context) |
|
| 636 | 636 | { |
| 637 | 637 | // A pretend error? |
| 638 | 638 | if ($row['id_first_msg'] == $row['myid_first_msg'] && $row['id_last_msg'] == $row['myid_last_msg'] && $row['approved'] == $row['firstmsg_approved']) |
@@ -666,7 +666,7 @@ discard block |
||
| 666 | 666 | WHERE t.id_topic BETWEEN {STEP_LOW} AND {STEP_HIGH} |
| 667 | 667 | GROUP BY t.id_topic, t.num_replies, mf.approved |
| 668 | 668 | ORDER BY t.id_topic', |
| 669 | - 'fix_processing' => function ($row) |
|
| 669 | + 'fix_processing' => function($row) |
|
| 670 | 670 | { |
| 671 | 671 | global $smcFunc; |
| 672 | 672 | $row['my_num_replies'] = (int) $row['my_num_replies']; |
@@ -685,7 +685,7 @@ discard block |
||
| 685 | 685 | ) |
| 686 | 686 | ); |
| 687 | 687 | }, |
| 688 | - 'message_function' => function ($row) |
|
| 688 | + 'message_function' => function($row) |
|
| 689 | 689 | { |
| 690 | 690 | global $txt, $context; |
| 691 | 691 | |
@@ -716,7 +716,7 @@ discard block |
||
| 716 | 716 | GROUP BY t.id_topic, t.unapproved_posts |
| 717 | 717 | HAVING unapproved_posts != COUNT(mu.id_msg) |
| 718 | 718 | ORDER BY t.id_topic', |
| 719 | - 'fix_processing' => function ($row) |
|
| 719 | + 'fix_processing' => function($row) |
|
| 720 | 720 | { |
| 721 | 721 | global $smcFunc; |
| 722 | 722 | $row['my_unapproved_posts'] = (int) $row['my_unapproved_posts']; |
@@ -756,7 +756,7 @@ discard block |
||
| 756 | 756 | WHERE b.id_board IS NULL |
| 757 | 757 | AND t.id_topic BETWEEN {STEP_LOW} AND {STEP_HIGH} |
| 758 | 758 | GROUP BY t.id_board', |
| 759 | - 'fix_processing' => function ($row) |
|
| 759 | + 'fix_processing' => function($row) |
|
| 760 | 760 | { |
| 761 | 761 | global $smcFunc, $salvageCatID, $txt; |
| 762 | 762 | createSalvageArea(); |
@@ -803,7 +803,7 @@ discard block |
||
| 803 | 803 | ORDER BY b.id_cat, b.id_board', |
| 804 | 804 | 'fix_collect' => array( |
| 805 | 805 | 'index' => 'id_cat', |
| 806 | - 'process' => function ($cats) |
|
| 806 | + 'process' => function($cats) |
|
| 807 | 807 | { |
| 808 | 808 | global $smcFunc, $salvageCatID; |
| 809 | 809 | createSalvageArea(); |
@@ -839,7 +839,7 @@ discard block |
||
| 839 | 839 | // Last step-make sure all non-guest posters still exist. |
| 840 | 840 | 'fix_collect' => array( |
| 841 | 841 | 'index' => 'id_msg', |
| 842 | - 'process' => function ($msgs) |
|
| 842 | + 'process' => function($msgs) |
|
| 843 | 843 | { |
| 844 | 844 | global $smcFunc; |
| 845 | 845 | $smcFunc['db_query']('', ' |
@@ -866,7 +866,7 @@ discard block |
||
| 866 | 866 | ORDER BY b.id_parent, b.id_board', |
| 867 | 867 | 'fix_collect' => array( |
| 868 | 868 | 'index' => 'id_parent', |
| 869 | - 'process' => function ($parents) |
|
| 869 | + 'process' => function($parents) |
|
| 870 | 870 | { |
| 871 | 871 | global $smcFunc, $salvageBoardID, $salvageCatID; |
| 872 | 872 | createSalvageArea(); |
@@ -900,7 +900,7 @@ discard block |
||
| 900 | 900 | AND p.id_poll IS NULL', |
| 901 | 901 | 'fix_collect' => array( |
| 902 | 902 | 'index' => 'id_poll', |
| 903 | - 'process' => function ($polls) |
|
| 903 | + 'process' => function($polls) |
|
| 904 | 904 | { |
| 905 | 905 | global $smcFunc; |
| 906 | 906 | $smcFunc['db_query']('', ' |
@@ -932,7 +932,7 @@ discard block |
||
| 932 | 932 | ORDER BY cal.id_topic', |
| 933 | 933 | 'fix_collect' => array( |
| 934 | 934 | 'index' => 'id_topic', |
| 935 | - 'process' => function ($events) |
|
| 935 | + 'process' => function($events) |
|
| 936 | 936 | { |
| 937 | 937 | global $smcFunc; |
| 938 | 938 | $smcFunc['db_query']('', ' |
@@ -962,7 +962,7 @@ discard block |
||
| 962 | 962 | AND lt.id_member BETWEEN {STEP_LOW} AND {STEP_HIGH}', |
| 963 | 963 | 'fix_collect' => array( |
| 964 | 964 | 'index' => 'id_topic', |
| 965 | - 'process' => function ($topics) |
|
| 965 | + 'process' => function($topics) |
|
| 966 | 966 | { |
| 967 | 967 | global $smcFunc; |
| 968 | 968 | $smcFunc['db_query']('', ' |
@@ -992,7 +992,7 @@ discard block |
||
| 992 | 992 | GROUP BY lt.id_member', |
| 993 | 993 | 'fix_collect' => array( |
| 994 | 994 | 'index' => 'id_member', |
| 995 | - 'process' => function ($members) |
|
| 995 | + 'process' => function($members) |
|
| 996 | 996 | { |
| 997 | 997 | global $smcFunc; |
| 998 | 998 | $smcFunc['db_query']('', ' |
@@ -1022,7 +1022,7 @@ discard block |
||
| 1022 | 1022 | GROUP BY lb.id_board', |
| 1023 | 1023 | 'fix_collect' => array( |
| 1024 | 1024 | 'index' => 'id_board', |
| 1025 | - 'process' => function ($boards) |
|
| 1025 | + 'process' => function($boards) |
|
| 1026 | 1026 | { |
| 1027 | 1027 | global $smcFunc; |
| 1028 | 1028 | $smcFunc['db_query']('', ' |
@@ -1052,7 +1052,7 @@ discard block |
||
| 1052 | 1052 | GROUP BY lb.id_member', |
| 1053 | 1053 | 'fix_collect' => array( |
| 1054 | 1054 | 'index' => 'id_member', |
| 1055 | - 'process' => function ($members) use ($smcFunc) |
|
| 1055 | + 'process' => function($members) use ($smcFunc) |
|
| 1056 | 1056 | { |
| 1057 | 1057 | $smcFunc['db_query']('', ' |
| 1058 | 1058 | DELETE FROM {db_prefix}log_boards |
@@ -1081,7 +1081,7 @@ discard block |
||
| 1081 | 1081 | GROUP BY lmr.id_board', |
| 1082 | 1082 | 'fix_collect' => array( |
| 1083 | 1083 | 'index' => 'id_board', |
| 1084 | - 'process' => function ($boards) use ($smcFunc) |
|
| 1084 | + 'process' => function($boards) use ($smcFunc) |
|
| 1085 | 1085 | { |
| 1086 | 1086 | $smcFunc['db_query']('', ' |
| 1087 | 1087 | DELETE FROM {db_prefix}log_mark_read |
@@ -1110,7 +1110,7 @@ discard block |
||
| 1110 | 1110 | GROUP BY lmr.id_member', |
| 1111 | 1111 | 'fix_collect' => array( |
| 1112 | 1112 | 'index' => 'id_member', |
| 1113 | - 'process' => function ($members) use ($smcFunc) |
|
| 1113 | + 'process' => function($members) use ($smcFunc) |
|
| 1114 | 1114 | { |
| 1115 | 1115 | $smcFunc['db_query']('', ' |
| 1116 | 1116 | DELETE FROM {db_prefix}log_mark_read |
@@ -1139,7 +1139,7 @@ discard block |
||
| 1139 | 1139 | GROUP BY pmr.id_pm', |
| 1140 | 1140 | 'fix_collect' => array( |
| 1141 | 1141 | 'index' => 'id_pm', |
| 1142 | - 'process' => function ($pms) use ($smcFunc) |
|
| 1142 | + 'process' => function($pms) use ($smcFunc) |
|
| 1143 | 1143 | { |
| 1144 | 1144 | $smcFunc['db_query']('', ' |
| 1145 | 1145 | DELETE FROM {db_prefix}pm_recipients |
@@ -1169,7 +1169,7 @@ discard block |
||
| 1169 | 1169 | GROUP BY pmr.id_member', |
| 1170 | 1170 | 'fix_collect' => array( |
| 1171 | 1171 | 'index' => 'id_member', |
| 1172 | - 'process' => function ($members) |
|
| 1172 | + 'process' => function($members) |
|
| 1173 | 1173 | { |
| 1174 | 1174 | global $smcFunc; |
| 1175 | 1175 | $smcFunc['db_query']('', ' |
@@ -1199,7 +1199,7 @@ discard block |
||
| 1199 | 1199 | AND mem.id_member IS NULL', |
| 1200 | 1200 | 'fix_collect' => array( |
| 1201 | 1201 | 'index' => 'id_pm', |
| 1202 | - 'process' => function ($guestMessages) |
|
| 1202 | + 'process' => function($guestMessages) |
|
| 1203 | 1203 | { |
| 1204 | 1204 | global $smcFunc; |
| 1205 | 1205 | $smcFunc['db_query']('', ' |
@@ -1229,7 +1229,7 @@ discard block |
||
| 1229 | 1229 | GROUP BY ln.id_member', |
| 1230 | 1230 | 'fix_collect' => array( |
| 1231 | 1231 | 'index' => 'id_member', |
| 1232 | - 'process' => function ($members) use ($smcFunc) |
|
| 1232 | + 'process' => function($members) use ($smcFunc) |
|
| 1233 | 1233 | { |
| 1234 | 1234 | $smcFunc['db_query']('', ' |
| 1235 | 1235 | DELETE FROM {db_prefix}log_notify |
@@ -1256,7 +1256,7 @@ discard block |
||
| 1256 | 1256 | LEFT JOIN {db_prefix}log_search_subjects AS lss ON (lss.id_topic = t.id_topic) |
| 1257 | 1257 | WHERE t.id_topic BETWEEN {STEP_LOW} AND {STEP_HIGH} |
| 1258 | 1258 | AND lss.id_topic IS NULL', |
| 1259 | - 'fix_full_processing' => function ($result) |
|
| 1259 | + 'fix_full_processing' => function($result) |
|
| 1260 | 1260 | { |
| 1261 | 1261 | global $smcFunc; |
| 1262 | 1262 | |
@@ -1285,7 +1285,7 @@ discard block |
||
| 1285 | 1285 | array('word', 'id_topic') |
| 1286 | 1286 | ); |
| 1287 | 1287 | }, |
| 1288 | - 'message_function' => function ($row) |
|
| 1288 | + 'message_function' => function($row) |
|
| 1289 | 1289 | { |
| 1290 | 1290 | global $txt, $context; |
| 1291 | 1291 | |
@@ -1313,7 +1313,7 @@ discard block |
||
| 1313 | 1313 | AND t.id_topic IS NULL', |
| 1314 | 1314 | 'fix_collect' => array( |
| 1315 | 1315 | 'index' => 'id_topic', |
| 1316 | - 'process' => function ($deleteTopics) |
|
| 1316 | + 'process' => function($deleteTopics) |
|
| 1317 | 1317 | { |
| 1318 | 1318 | global $smcFunc; |
| 1319 | 1319 | $smcFunc['db_query']('', ' |
@@ -1343,7 +1343,7 @@ discard block |
||
| 1343 | 1343 | AND mem.id_member IS NULL', |
| 1344 | 1344 | 'fix_collect' => array( |
| 1345 | 1345 | 'index' => 'id_member', |
| 1346 | - 'process' => function ($members) |
|
| 1346 | + 'process' => function($members) |
|
| 1347 | 1347 | { |
| 1348 | 1348 | global $smcFunc; |
| 1349 | 1349 | $smcFunc['db_query']('', ' |
@@ -1372,7 +1372,7 @@ discard block |
||
| 1372 | 1372 | AND p.id_poll IS NULL', |
| 1373 | 1373 | 'fix_collect' => array( |
| 1374 | 1374 | 'index' => 'id_poll', |
| 1375 | - 'process' => function ($polls) |
|
| 1375 | + 'process' => function($polls) |
|
| 1376 | 1376 | { |
| 1377 | 1377 | global $smcFunc; |
| 1378 | 1378 | $smcFunc['db_query']('', ' |
@@ -1401,7 +1401,7 @@ discard block |
||
| 1401 | 1401 | AND lrc.id_report IS NULL', |
| 1402 | 1402 | 'fix_collect' => array( |
| 1403 | 1403 | 'index' => 'id_report', |
| 1404 | - 'process' => function ($reports) |
|
| 1404 | + 'process' => function($reports) |
|
| 1405 | 1405 | { |
| 1406 | 1406 | global $smcFunc; |
| 1407 | 1407 | $smcFunc['db_query']('', ' |
@@ -1430,7 +1430,7 @@ discard block |
||
| 1430 | 1430 | AND lr.id_report IS NULL', |
| 1431 | 1431 | 'fix_collect' => array( |
| 1432 | 1432 | 'index' => 'id_report', |
| 1433 | - 'process' => function ($reports) |
|
| 1433 | + 'process' => function($reports) |
|
| 1434 | 1434 | { |
| 1435 | 1435 | global $smcFunc; |
| 1436 | 1436 | $smcFunc['db_query']('', ' |
@@ -1460,7 +1460,7 @@ discard block |
||
| 1460 | 1460 | GROUP BY lgr.id_member', |
| 1461 | 1461 | 'fix_collect' => array( |
| 1462 | 1462 | 'index' => 'id_member', |
| 1463 | - 'process' => function ($members) |
|
| 1463 | + 'process' => function($members) |
|
| 1464 | 1464 | { |
| 1465 | 1465 | global $smcFunc; |
| 1466 | 1466 | $smcFunc['db_query']('', ' |
@@ -1490,7 +1490,7 @@ discard block |
||
| 1490 | 1490 | GROUP BY lgr.id_group', |
| 1491 | 1491 | 'fix_collect' => array( |
| 1492 | 1492 | 'index' => 'id_group', |
| 1493 | - 'process' => function ($groups) |
|
| 1493 | + 'process' => function($groups) |
|
| 1494 | 1494 | { |
| 1495 | 1495 | global $smcFunc; |
| 1496 | 1496 | $smcFunc['db_query']('', ' |
@@ -14,8 +14,9 @@ discard block |
||
| 14 | 14 | * @version 2.1 Beta 4 |
| 15 | 15 | */ |
| 16 | 16 | |
| 17 | -if (!defined('SMF')) |
|
| 17 | +if (!defined('SMF')) { |
|
| 18 | 18 | die('No direct access...'); |
| 19 | +} |
|
| 19 | 20 | |
| 20 | 21 | /** |
| 21 | 22 | * Turn off/on notification for a particular board. |
@@ -34,8 +35,9 @@ discard block |
||
| 34 | 35 | is_not_guest(); |
| 35 | 36 | |
| 36 | 37 | // You have to specify a board to turn notifications on! |
| 37 | - if (empty($board)) |
|
| 38 | - fatal_lang_error('no_board', false); |
|
| 38 | + if (empty($board)) { |
|
| 39 | + fatal_lang_error('no_board', false); |
|
| 40 | + } |
|
| 39 | 41 | |
| 40 | 42 | // No subaction: find out what to do. |
| 41 | 43 | if (isset($_GET['mode'])) |
@@ -48,16 +50,16 @@ discard block |
||
| 48 | 50 | require_once($sourcedir . '/Subs-Notify.php'); |
| 49 | 51 | setNotifyPrefs($user_info['id'], array('board_notify_' . $board => $alertPref)); |
| 50 | 52 | |
| 51 | - if ($mode > 1) |
|
| 52 | - // Turn notification on. (note this just blows smoke if it's already on.) |
|
| 53 | + if ($mode > 1) { |
|
| 54 | + // Turn notification on. (note this just blows smoke if it's already on.) |
|
| 53 | 55 | $smcFunc['db_insert']('ignore', |
| 54 | 56 | '{db_prefix}log_notify', |
| 55 | 57 | array('id_member' => 'int', 'id_board' => 'int'), |
| 56 | 58 | array($user_info['id'], $board), |
| 57 | 59 | array('id_member', 'id_board') |
| 58 | 60 | ); |
| 59 | - else |
|
| 60 | - $smcFunc['db_query']('', ' |
|
| 61 | + } else { |
|
| 62 | + $smcFunc['db_query']('', ' |
|
| 61 | 63 | DELETE FROM {db_prefix}log_notify |
| 62 | 64 | WHERE id_member = {int:current_member} |
| 63 | 65 | AND id_board = {int:current_board}', |
@@ -66,6 +68,7 @@ discard block |
||
| 66 | 68 | 'current_member' => $user_info['id'], |
| 67 | 69 | ) |
| 68 | 70 | ); |
| 71 | + } |
|
| 69 | 72 | } |
| 70 | 73 | |
| 71 | 74 | // Back to the board! |
@@ -80,10 +83,10 @@ discard block |
||
| 80 | 83 | ), |
| 81 | 84 | ); |
| 82 | 85 | $context['sub_template'] = 'generic_xml'; |
| 86 | + } else { |
|
| 87 | + redirectexit('board=' . $board . '.' . $_REQUEST['start']); |
|
| 88 | + } |
|
| 83 | 89 | } |
| 84 | - else |
|
| 85 | - redirectexit('board=' . $board . '.' . $_REQUEST['start']); |
|
| 86 | -} |
|
| 87 | 90 | |
| 88 | 91 | /** |
| 89 | 92 | * Turn off/on unread replies subscription for a topic as well as sets individual topic's alert preferences |
@@ -107,8 +110,9 @@ discard block |
||
| 107 | 110 | $mode = (int) $_GET['mode']; |
| 108 | 111 | $alertPref = $mode <= 1 ? 0 : ($mode == 2 ? 1 : 3); |
| 109 | 112 | |
| 110 | - if (empty($mode)) |
|
| 111 | - $mode = 1; |
|
| 113 | + if (empty($mode)) { |
|
| 114 | + $mode = 1; |
|
| 115 | + } |
|
| 112 | 116 | |
| 113 | 117 | $request = $smcFunc['db_query']('', ' |
| 114 | 118 | SELECT id_member, id_topic, id_msg, unwatched |
@@ -131,8 +135,7 @@ discard block |
||
| 131 | 135 | 'id_msg' => 0, |
| 132 | 136 | 'unwatched' => empty($mode) ? 1 : 0, |
| 133 | 137 | ); |
| 134 | - } |
|
| 135 | - else |
|
| 138 | + } else |
|
| 136 | 139 | { |
| 137 | 140 | $insert = false; |
| 138 | 141 | $log['unwatched'] = empty($mode) ? 1 : 0; |
@@ -159,9 +162,8 @@ discard block |
||
| 159 | 162 | array($user_info['id'], $log['id_topic']), |
| 160 | 163 | array('id_member', 'id_board') |
| 161 | 164 | ); |
| 162 | - } |
|
| 163 | - else |
|
| 164 | - $smcFunc['db_query']('', ' |
|
| 165 | + } else { |
|
| 166 | + $smcFunc['db_query']('', ' |
|
| 165 | 167 | DELETE FROM {db_prefix}log_notify |
| 166 | 168 | WHERE id_topic = {int:topic} |
| 167 | 169 | AND id_member = {int:member}', |
@@ -169,6 +171,7 @@ discard block |
||
| 169 | 171 | 'topic' => $log['id_topic'], |
| 170 | 172 | 'member' => $user_info['id'], |
| 171 | 173 | )); |
| 174 | + } |
|
| 172 | 175 | } |
| 173 | 176 | } |
| 174 | 177 | |
@@ -184,9 +187,9 @@ discard block |
||
| 184 | 187 | ), |
| 185 | 188 | ); |
| 186 | 189 | $context['sub_template'] = 'generic_xml'; |
| 190 | + } else { |
|
| 191 | + redirectexit('topic=' . $topic . '.' . $_REQUEST['start']); |
|
| 192 | + } |
|
| 187 | 193 | } |
| 188 | - else |
|
| 189 | - redirectexit('topic=' . $topic . '.' . $_REQUEST['start']); |
|
| 190 | -} |
|
| 191 | 194 | |
| 192 | 195 | ?> |
| 193 | 196 | \ No newline at end of file |
