@@ -222,7 +222,6 @@ |
||
| 222 | 222 | |
| 223 | 223 | $this->_validLikes['can_like'] = ($this->_user['id'] == $topicOwner ? 'cannot_like_content' : (allowedTo('likes_like') ? true : 'cannot_like_content')); |
| 224 | 224 | } |
| 225 | - |
|
| 226 | 225 | else |
| 227 | 226 | { |
| 228 | 227 | // Modders: This will give you whatever the user offers up in terms of liking, e.g. $this->_type=msg, $this->_content=1 |
@@ -1252,7 +1252,6 @@ |
||
| 1252 | 1252 | if (!empty($modSettings['enableAllMessages']) && $topic_length < $modSettings['enableAllMessages']) |
| 1253 | 1253 | $pages .= ' <a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.0;all">' . $txt['all'] . '</a>'; |
| 1254 | 1254 | } |
| 1255 | - |
|
| 1256 | 1255 | else |
| 1257 | 1256 | $pages = ''; |
| 1258 | 1257 | |
@@ -93,7 +93,6 @@ |
||
| 93 | 93 | |
| 94 | 94 | continue; |
| 95 | 95 | } |
| 96 | - |
|
| 97 | 96 | elseif (empty($row['show_online']) && empty($membersOnlineOptions['show_hidden'])) |
| 98 | 97 | { |
| 99 | 98 | // Just increase the stats and don't add this hidden user to any list. |
@@ -881,7 +881,6 @@ discard block |
||
| 881 | 881 | $is_writable = true; |
| 882 | 882 | break; |
| 883 | 883 | } |
| 884 | - |
|
| 885 | 884 | else |
| 886 | 885 | { |
| 887 | 886 | // Convert the chmod value from octal (0777) to text ("777"). |
@@ -935,8 +934,9 @@ discard block |
||
| 935 | 934 | { |
| 936 | 935 | // Wait for a response that isn't continued with -, but don't wait too long. |
| 937 | 936 | $time = time(); |
| 938 | - do |
|
| 939 | - $this->last_message = fgets($this->connection, 1024); |
|
| 937 | + do { |
|
| 938 | + $this->last_message = fgets($this->connection, 1024); |
|
| 939 | + } |
|
| 940 | 940 | while ((strlen($this->last_message) < 4 || strpos($this->last_message, ' ') === 0 || strpos($this->last_message, ' ', 3) !== 3) && time() - $time < 5); |
| 941 | 941 | |
| 942 | 942 | // Was the desired response returned? |
@@ -957,8 +957,9 @@ discard block |
||
| 957 | 957 | // Request a passive connection - this means, we'll talk to you, you don't talk to us. |
| 958 | 958 | @fwrite($this->connection, 'PASV' . "\r\n"); |
| 959 | 959 | $time = time(); |
| 960 | - do |
|
| 961 | - $response = fgets($this->connection, 1024); |
|
| 960 | + do { |
|
| 961 | + $response = fgets($this->connection, 1024); |
|
| 962 | + } |
|
| 962 | 963 | while (strpos($response, ' ', 3) !== 3 && time() - $time < 5); |
| 963 | 964 | |
| 964 | 965 | // If it's not 227, we weren't given an IP and port, which means it failed. |
@@ -1080,8 +1081,9 @@ discard block |
||
| 1080 | 1081 | |
| 1081 | 1082 | @fwrite($this->connection, 'PWD' . "\r\n"); |
| 1082 | 1083 | $time = time(); |
| 1083 | - do |
|
| 1084 | - $response = fgets($this->connection, 1024); |
|
| 1084 | + do { |
|
| 1085 | + $response = fgets($this->connection, 1024); |
|
| 1086 | + } |
|
| 1085 | 1087 | while ($response[3] != ' ' && time() - $time < 5); |
| 1086 | 1088 | |
| 1087 | 1089 | // Check for 257! |
@@ -425,7 +425,8 @@ discard block |
||
| 425 | 425 | if (!empty($day['events'])) |
| 426 | 426 | { |
| 427 | 427 | // Sort events by start time (all day events will be listed first) |
| 428 | - uasort($day['events'], function($a, $b) { |
|
| 428 | + uasort($day['events'], function($a, $b) |
|
| 429 | + { |
|
| 429 | 430 | if ($a['start_timestamp'] == $b['start_timestamp']) |
| 430 | 431 | return 0; |
| 431 | 432 | |
@@ -619,7 +620,8 @@ discard block |
||
| 619 | 620 | if (!empty($day['events'])) |
| 620 | 621 | { |
| 621 | 622 | // Sort events by start time (all day events will be listed first) |
| 622 | - uasort($day['events'], function($a, $b) { |
|
| 623 | + uasort($day['events'], function($a, $b) |
|
| 624 | + { |
|
| 623 | 625 | if ($a['start_timestamp'] == $b['start_timestamp']) |
| 624 | 626 | return 0; |
| 625 | 627 | return ($a['start_timestamp'] < $b['start_timestamp']) ? -1 : 1; |
@@ -89,7 +89,9 @@ |
||
| 89 | 89 | <li><a href="#" onclick="showSSIBlock('ssi_quickSearch'); return false;">Quick Search Box</a></li> |
| 90 | 90 | <li><a href="#" onclick="showSSIBlock('ssi_recentAttachments'); return false;">Recent Attachments</a></li> |
| 91 | 91 | </ul> |
| 92 | - <?php if ($user_info['is_admin']) { ?> |
|
| 92 | + <?php if ($user_info['is_admin']) |
|
| 93 | +{ |
|
| 94 | +?> |
|
| 93 | 95 | <h3>Advanced Functions <img class="help" title="Functions that require additional tweaking, not just copy and paste." src="<?php echo $settings['images_url']; ?>/helptopics.png" alt=""></h3> |
| 94 | 96 | <ul> |
| 95 | 97 | <li><a href="#" onclick="showSSIBlock('ssi_showPoll'); return false;">Show Single Poll</a></li> |
@@ -310,7 +310,6 @@ discard block |
||
| 310 | 310 | $replacement .= $precedingStyle . $extra_attr . $afterStyle; |
| 311 | 311 | } |
| 312 | 312 | } |
| 313 | - |
|
| 314 | 313 | elseif (preg_match('~</([A-Za-z]+)>~', $part, $matches) === 1) |
| 315 | 314 | { |
| 316 | 315 | // Is this the element that we've been waiting for to be closed? |
@@ -570,7 +569,6 @@ discard block |
||
| 570 | 569 | $parts[$i + 2] = str_repeat("\t", $listDepth) . '[/list]'; |
| 571 | 570 | $parts[$i + 3] = ''; |
| 572 | 571 | } |
| 573 | - |
|
| 574 | 572 | else |
| 575 | 573 | { |
| 576 | 574 | // We're in a list item. |
@@ -609,7 +607,6 @@ discard block |
||
| 609 | 607 | $parts[$i + 2] = ''; |
| 610 | 608 | $parts[$i + 3] = ''; |
| 611 | 609 | } |
| 612 | - |
|
| 613 | 610 | else |
| 614 | 611 | { |
| 615 | 612 | // Remove the trailing breaks from the list item. |
@@ -498,7 +498,7 @@ |
||
| 498 | 498 | log_error(sprintf($txt['smiley_set_dir_not_found'], $set_names[array_search($set, $context['smiley_sets'])])); |
| 499 | 499 | |
| 500 | 500 | $context['smiley_sets'] = array_filter($context['smiley_sets'], function($v) use ($set) |
| 501 | - { |
|
| 501 | + { |
|
| 502 | 502 | return $v != $set; |
| 503 | 503 | }); |
| 504 | 504 | } |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | // Set a list of common functions. |
| 99 | 99 | $ent_list = '&(?:#' . (empty($modSettings['disableEntityCheck']) ? '\d{1,7}' : '021') . '|quot|amp|lt|gt|nbsp);'; |
| 100 | 100 | $ent_check = empty($modSettings['disableEntityCheck']) ? function($string) |
| 101 | - { |
|
| 101 | + { |
|
| 102 | 102 | $string = preg_replace_callback('~(&#(\d{1,7}|x[0-9a-fA-F]{1,6});)~', 'entity_fix__callback', $string); |
| 103 | 103 | return $string; |
| 104 | 104 | } : function($string) |
@@ -2147,7 +2147,6 @@ discard block |
||
| 2147 | 2147 | loadLanguage('index+Modifications'); |
| 2148 | 2148 | $context['template_layers'] = array(); |
| 2149 | 2149 | } |
| 2150 | - |
|
| 2151 | 2150 | else |
| 2152 | 2151 | { |
| 2153 | 2152 | // Custom templates to load, or just default? |
@@ -2525,14 +2524,12 @@ discard block |
||
| 2525 | 2524 | $fileUrl = $settings['default_theme_url'] . '/css/' . $fileName; |
| 2526 | 2525 | $filePath = $settings['default_theme_dir'] . '/css/' . $fileName; |
| 2527 | 2526 | } |
| 2528 | - |
|
| 2529 | 2527 | else |
| 2530 | 2528 | { |
| 2531 | 2529 | $fileUrl = false; |
| 2532 | 2530 | $filePath = false; |
| 2533 | 2531 | } |
| 2534 | 2532 | } |
| 2535 | - |
|
| 2536 | 2533 | else |
| 2537 | 2534 | { |
| 2538 | 2535 | $fileUrl = $settings[$themeRef . '_url'] . '/css/' . $fileName; |
@@ -2639,14 +2636,12 @@ discard block |
||
| 2639 | 2636 | $fileUrl = $settings['default_theme_url'] . '/scripts/' . $fileName; |
| 2640 | 2637 | $filePath = $settings['default_theme_dir'] . '/scripts/' . $fileName; |
| 2641 | 2638 | } |
| 2642 | - |
|
| 2643 | 2639 | else |
| 2644 | 2640 | { |
| 2645 | 2641 | $fileUrl = false; |
| 2646 | 2642 | $filePath = false; |
| 2647 | 2643 | } |
| 2648 | 2644 | } |
| 2649 | - |
|
| 2650 | 2645 | else |
| 2651 | 2646 | { |
| 2652 | 2647 | $fileUrl = $settings[$themeRef . '_url'] . '/scripts/' . $fileName; |