@@ -20,17 +20,19 @@ discard block |
||
| 20 | 20 | echo ' |
| 21 | 21 | <form action="', $scripturl, '?action=search2" method="post" accept-charset="', $context['character_set'], '" name="searchform" id="searchform">'; |
| 22 | 22 | |
| 23 | - if (!empty($context['search_errors'])) |
|
| 24 | - echo ' |
|
| 23 | + if (!empty($context['search_errors'])) { |
|
| 24 | + echo ' |
|
| 25 | 25 | <div class="errorbox"> |
| 26 | 26 | ', implode('<br>', $context['search_errors']['messages']), ' |
| 27 | 27 | </div>'; |
| 28 | + } |
|
| 28 | 29 | |
| 29 | - if (!empty($context['search_ignored'])) |
|
| 30 | - echo ' |
|
| 30 | + if (!empty($context['search_ignored'])) { |
|
| 31 | + echo ' |
|
| 31 | 32 | <div class="noticebox"> |
| 32 | 33 | ', $txt['search_warning_ignored_word' . (count($context['search_ignored']) == 1 ? '' : 's')], ': ', implode(', ', $context['search_ignored']), ' |
| 33 | 34 | </div>'; |
| 35 | + } |
|
| 34 | 36 | |
| 35 | 37 | echo ' |
| 36 | 38 | <div class="cat_bar"> |
@@ -48,9 +50,10 @@ discard block |
||
| 48 | 50 | <dd> |
| 49 | 51 | <input type="search" name="search" id="searchfor" ', !empty($context['search_params']['search']) ? ' value="' . $context['search_params']['search'] . '"' : '', ' maxlength="', $context['search_string_limit'], '" size="40">'; |
| 50 | 52 | |
| 51 | - if (empty($modSettings['search_simple_fulltext'])) |
|
| 52 | - echo ' |
|
| 53 | + if (empty($modSettings['search_simple_fulltext'])) { |
|
| 54 | + echo ' |
|
| 53 | 55 | <br><em class="smalltext">', $txt['search_example'], '</em>'; |
| 56 | + } |
|
| 54 | 57 | |
| 55 | 58 | echo ' |
| 56 | 59 | </dd> |
@@ -114,21 +117,23 @@ discard block |
||
| 114 | 117 | <input type="hidden" name="advanced" value="1">'; |
| 115 | 118 | |
| 116 | 119 | // Require an image to be typed to save spamming? |
| 117 | - if ($context['require_verification']) |
|
| 118 | - echo ' |
|
| 120 | + if ($context['require_verification']) { |
|
| 121 | + echo ' |
|
| 119 | 122 | <p> |
| 120 | 123 | <strong>', $txt['verification'], ':</strong> |
| 121 | 124 | ', template_control_verification($context['visual_verification_id'], 'all'), ' |
| 122 | 125 | </p>'; |
| 126 | + } |
|
| 123 | 127 | |
| 124 | 128 | // If $context['search_params']['topic'] is set, that means we're searching just one topic. |
| 125 | - if (!empty($context['search_params']['topic'])) |
|
| 126 | - echo ' |
|
| 129 | + if (!empty($context['search_params']['topic'])) { |
|
| 130 | + echo ' |
|
| 127 | 131 | <p> |
| 128 | 132 | ', $txt['search_specific_topic'], ' "', $context['search_topic']['link'], '". |
| 129 | 133 | </p> |
| 130 | 134 | <input type="hidden" name="topic" value="', $context['search_topic']['id'], '"> |
| 131 | 135 | <input type="submit" name="b_search" value="', $txt['search'], '" class="button">'; |
| 136 | + } |
|
| 132 | 137 | |
| 133 | 138 | echo ' |
| 134 | 139 | </div>'; |
@@ -158,14 +163,15 @@ discard block |
||
| 158 | 163 | |
| 159 | 164 | foreach ($category['boards'] as $board) |
| 160 | 165 | { |
| 161 | - if ($i == $limit) |
|
| 162 | - echo ' |
|
| 166 | + if ($i == $limit) { |
|
| 167 | + echo ' |
|
| 163 | 168 | </ul> |
| 164 | 169 | </li> |
| 165 | 170 | </ul> |
| 166 | 171 | <ul class="ignoreboards floatright"> |
| 167 | 172 | <li class="category"> |
| 168 | 173 | <ul>'; |
| 174 | + } |
|
| 169 | 175 | |
| 170 | 176 | echo ' |
| 171 | 177 | <li class="board"> |
@@ -253,17 +259,19 @@ discard block |
||
| 253 | 259 | <div class="roundframe noup">'; |
| 254 | 260 | |
| 255 | 261 | // Did they make any typos or mistakes, perhaps? |
| 256 | - if (isset($context['did_you_mean'])) |
|
| 257 | - echo ' |
|
| 262 | + if (isset($context['did_you_mean'])) { |
|
| 263 | + echo ' |
|
| 258 | 264 | <p> |
| 259 | 265 | ', $txt['search_did_you_mean'], ' <a href="', $scripturl, '?action=search2;params=', $context['did_you_mean_params'], '">', $context['did_you_mean'], '</a>. |
| 260 | 266 | </p>'; |
| 267 | + } |
|
| 261 | 268 | |
| 262 | - if (!empty($context['search_ignored'])) |
|
| 263 | - echo ' |
|
| 269 | + if (!empty($context['search_ignored'])) { |
|
| 270 | + echo ' |
|
| 264 | 271 | <p> |
| 265 | 272 | ', $txt['search_warning_ignored_word' . (count($context['search_ignored']) == 1 ? '' : 's')], ': ', implode(', ', $context['search_ignored']), ' |
| 266 | 273 | </p>'; |
| 274 | + } |
|
| 267 | 275 | |
| 268 | 276 | echo ' |
| 269 | 277 | <form action="', $scripturl, '?action=search2" method="post" accept-charset="', $context['character_set'], '"> |
@@ -286,10 +294,11 @@ discard block |
||
| 286 | 294 | <input type="hidden" name="sort" value="', !empty($context['search_params']['sort']) ? $context['search_params']['sort'] : 'relevance', '"> |
| 287 | 295 | </div>'; |
| 288 | 296 | |
| 289 | - if (!empty($context['search_params']['brd'])) |
|
| 290 | - foreach ($context['search_params']['brd'] as $board_id) |
|
| 297 | + if (!empty($context['search_params']['brd'])) { |
|
| 298 | + foreach ($context['search_params']['brd'] as $board_id) |
|
| 291 | 299 | echo ' |
| 292 | 300 | <input type="hidden" name="brd[', $board_id, ']" value="', $board_id, '">'; |
| 301 | + } |
|
| 293 | 302 | |
| 294 | 303 | echo ' |
| 295 | 304 | </form> |
@@ -300,18 +309,20 @@ discard block |
||
| 300 | 309 | if ($context['compact']) |
| 301 | 310 | { |
| 302 | 311 | // Quick moderation set to checkboxes? Oh, how fun :/ |
| 303 | - if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1) |
|
| 304 | - echo ' |
|
| 312 | + if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1) { |
|
| 313 | + echo ' |
|
| 305 | 314 | <form action="', $scripturl, '?action=quickmod" method="post" accept-charset="', $context['character_set'], '" name="topicForm">'; |
| 315 | + } |
|
| 306 | 316 | |
| 307 | 317 | echo ' |
| 308 | 318 | <div class="cat_bar"> |
| 309 | 319 | <h3 class="catbg"> |
| 310 | 320 | <span class="floatright">'; |
| 311 | 321 | |
| 312 | - if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1) |
|
| 313 | - echo ' |
|
| 322 | + if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1) { |
|
| 323 | + echo ' |
|
| 314 | 324 | <input type="checkbox" onclick="invertAll(this, this.form, \'topics[]\');">'; |
| 325 | + } |
|
| 315 | 326 | echo ' |
| 316 | 327 | </span> |
| 317 | 328 | <span class="generic_icons filter"></span> ', $txt['mlist_search_results'], ': ', $context['search_params']['search'], ' |
@@ -319,15 +330,15 @@ discard block |
||
| 319 | 330 | </div>'; |
| 320 | 331 | |
| 321 | 332 | // Was anything even found? |
| 322 | - if (!empty($context['topics'])) |
|
| 323 | - echo ' |
|
| 333 | + if (!empty($context['topics'])) { |
|
| 334 | + echo ' |
|
| 324 | 335 | <div class="pagesection"> |
| 325 | 336 | <span>', $context['page_index'], '</span> |
| 326 | 337 | </div>'; |
| 327 | - |
|
| 328 | - else |
|
| 329 | - echo ' |
|
| 338 | + } else { |
|
| 339 | + echo ' |
|
| 330 | 340 | <div class="roundframe noup">', $txt['find_no_results'], '</div>'; |
| 341 | + } |
|
| 331 | 342 | |
| 332 | 343 | // While we have results to show ... |
| 333 | 344 | while ($topic = $context['get_topics']()) |
@@ -350,31 +361,35 @@ discard block |
||
| 350 | 361 | echo ' |
| 351 | 362 | <span class="floatright">'; |
| 352 | 363 | |
| 353 | - if ($options['display_quick_mod'] == 1) |
|
| 354 | - echo ' |
|
| 364 | + if ($options['display_quick_mod'] == 1) { |
|
| 365 | + echo ' |
|
| 355 | 366 | <input type="checkbox" name="topics[]" value="', $topic['id'], '">'; |
| 356 | - |
|
| 357 | - else |
|
| 367 | + } else |
|
| 358 | 368 | { |
| 359 | - if ($topic['quick_mod']['remove']) |
|
| 360 | - echo ' |
|
| 369 | + if ($topic['quick_mod']['remove']) { |
|
| 370 | + echo ' |
|
| 361 | 371 | <a href="', $scripturl, '?action=quickmod;board=' . $topic['board']['id'] . '.0;actions%5B', $topic['id'], '%5D=remove;', $context['session_var'], '=', $context['session_id'], '" class="you_sure"><span class="generic_icons delete" title="', $txt['remove_topic'], '"></span></a>'; |
| 372 | + } |
|
| 362 | 373 | |
| 363 | - if ($topic['quick_mod']['lock']) |
|
| 364 | - echo ' |
|
| 374 | + if ($topic['quick_mod']['lock']) { |
|
| 375 | + echo ' |
|
| 365 | 376 | <a href="', $scripturl, '?action=quickmod;board=' . $topic['board']['id'] . '.0;actions%5B', $topic['id'], '%5D=lock;', $context['session_var'], '=', $context['session_id'], '" class="you_sure"><span class="generic_icons lock" title="', $topic['is_locked'] ? $txt['set_unlock'] : $txt['set_lock'], '"></span></a>'; |
| 377 | + } |
|
| 366 | 378 | |
| 367 | - if ($topic['quick_mod']['lock'] || $topic['quick_mod']['remove']) |
|
| 368 | - echo ' |
|
| 379 | + if ($topic['quick_mod']['lock'] || $topic['quick_mod']['remove']) { |
|
| 380 | + echo ' |
|
| 369 | 381 | <br>'; |
| 382 | + } |
|
| 370 | 383 | |
| 371 | - if ($topic['quick_mod']['sticky']) |
|
| 372 | - echo ' |
|
| 384 | + if ($topic['quick_mod']['sticky']) { |
|
| 385 | + echo ' |
|
| 373 | 386 | <a href="', $scripturl, '?action=quickmod;board=' . $topic['board']['id'] . '.0;actions%5B', $topic['id'], '%5D=sticky;', $context['session_var'], '=', $context['session_id'], '" class="you_sure"><span class="generic_icons sticky" title="', $topic['is_sticky'] ? $txt['set_nonsticky'] : $txt['set_sticky'], '"></span></a>'; |
| 387 | + } |
|
| 374 | 388 | |
| 375 | - if ($topic['quick_mod']['move']) |
|
| 376 | - echo ' |
|
| 389 | + if ($topic['quick_mod']['move']) { |
|
| 390 | + echo ' |
|
| 377 | 391 | <a href="', $scripturl, '?action=movetopic;topic=', $topic['id'], '.0"><span class="generic_icons move" title="', $txt['move_topic'], '"></span></a>'; |
| 392 | + } |
|
| 378 | 393 | } |
| 379 | 394 | |
| 380 | 395 | echo ' |
@@ -384,20 +399,22 @@ discard block |
||
| 384 | 399 | echo ' |
| 385 | 400 | </div><!-- .block -->'; |
| 386 | 401 | |
| 387 | - if ($message['body_highlighted'] != '') |
|
| 388 | - echo ' |
|
| 402 | + if ($message['body_highlighted'] != '') { |
|
| 403 | + echo ' |
|
| 389 | 404 | <div class="list_posts double_height">', $message['body_highlighted'], '</div>'; |
| 405 | + } |
|
| 390 | 406 | } |
| 391 | 407 | |
| 392 | 408 | echo ' |
| 393 | 409 | </div><!-- $topic[css_class] -->'; |
| 394 | 410 | } |
| 395 | 411 | |
| 396 | - if (!empty($context['topics'])) |
|
| 397 | - echo ' |
|
| 412 | + if (!empty($context['topics'])) { |
|
| 413 | + echo ' |
|
| 398 | 414 | <div class="pagesection"> |
| 399 | 415 | <span>', $context['page_index'], '</span> |
| 400 | 416 | </div>'; |
| 417 | + } |
|
| 401 | 418 | |
| 402 | 419 | if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1 && !empty($context['topics'])) |
| 403 | 420 | { |
@@ -406,17 +423,19 @@ discard block |
||
| 406 | 423 | <select class="qaction" name="qaction"', $context['can_move'] ? ' onchange="this.form.move_to.disabled = (this.options[this.selectedIndex].value != \'move\');"' : '', '> |
| 407 | 424 | <option value="">--------</option>'; |
| 408 | 425 | |
| 409 | - foreach ($context['qmod_actions'] as $qmod_action) |
|
| 410 | - if ($context['can_' . $qmod_action]) |
|
| 426 | + foreach ($context['qmod_actions'] as $qmod_action) { |
|
| 427 | + if ($context['can_' . $qmod_action]) |
|
| 411 | 428 | echo ' |
| 412 | 429 | <option value="' . $qmod_action . '">' . $txt['quick_mod_' . $qmod_action] . '</option>'; |
| 430 | + } |
|
| 413 | 431 | |
| 414 | 432 | echo ' |
| 415 | 433 | </select>'; |
| 416 | 434 | |
| 417 | - if ($context['can_move']) |
|
| 418 | - echo ' |
|
| 435 | + if ($context['can_move']) { |
|
| 436 | + echo ' |
|
| 419 | 437 | <span id="quick_mod_jump_to"></span>'; |
| 438 | + } |
|
| 420 | 439 | |
| 421 | 440 | echo ' |
| 422 | 441 | <input type="hidden" name="redirect_url" value="', $scripturl . '?action=search2;params=' . $context['params'], '"> |
@@ -425,12 +444,12 @@ discard block |
||
| 425 | 444 | } |
| 426 | 445 | |
| 427 | 446 | |
| 428 | - if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1 && !empty($context['topics'])) |
|
| 429 | - echo ' |
|
| 447 | + if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1 && !empty($context['topics'])) { |
|
| 448 | + echo ' |
|
| 430 | 449 | <input type="hidden" name="' . $context['session_var'] . '" value="' . $context['session_id'] . '"> |
| 431 | 450 | </form>'; |
| 432 | - } |
|
| 433 | - else |
|
| 451 | + } |
|
| 452 | + } else |
|
| 434 | 453 | { |
| 435 | 454 | echo ' |
| 436 | 455 | <div class="cat_bar"> |
@@ -442,9 +461,10 @@ discard block |
||
| 442 | 461 | <span>', $context['page_index'], '</span> |
| 443 | 462 | </div>'; |
| 444 | 463 | |
| 445 | - if (empty($context['topics'])) |
|
| 446 | - echo ' |
|
| 464 | + if (empty($context['topics'])) { |
|
| 465 | + echo ' |
|
| 447 | 466 | <div class="information">(', $txt['search_no_results'], ')</div>'; |
| 467 | + } |
|
| 448 | 468 | |
| 449 | 469 | while ($topic = $context['get_topics']()) |
| 450 | 470 | { |
@@ -479,8 +499,8 @@ discard block |
||
| 479 | 499 | <div class="smalltext righttext" id="search_jump_to"></div> |
| 480 | 500 | <script>'; |
| 481 | 501 | |
| 482 | - if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1 && !empty($context['topics']) && $context['can_move']) |
|
| 483 | - echo ' |
|
| 502 | + if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1 && !empty($context['topics']) && $context['can_move']) { |
|
| 503 | + echo ' |
|
| 484 | 504 | if (typeof(window.XMLHttpRequest) != "undefined") |
| 485 | 505 | aJumpTo[aJumpTo.length] = new JumpTo({ |
| 486 | 506 | sContainerId: "quick_mod_jump_to", |
@@ -495,6 +515,7 @@ discard block |
||
| 495 | 515 | bDisabled: true, |
| 496 | 516 | sCustomName: "move_to" |
| 497 | 517 | });'; |
| 518 | + } |
|
| 498 | 519 | |
| 499 | 520 | echo ' |
| 500 | 521 | if (typeof(window.XMLHttpRequest) != "undefined") |