@@ -523,7 +523,6 @@ discard block |
||
523 | 523 | /** |
524 | 524 | * Copy image. |
525 | 525 | * Used when imagecopyresample() is not available. |
526 | - |
|
527 | 526 | * @param resource $dst_img The destination image - a GD image resource |
528 | 527 | * @param resource $src_img The source image - a GD image resource |
529 | 528 | * @param int $dst_x The "x" coordinate of the destination image |
@@ -754,7 +753,6 @@ discard block |
||
754 | 753 | |
755 | 754 | /** |
756 | 755 | * Writes a gif file to disk as a png file. |
757 | - |
|
758 | 756 | * @param resource $gif A gif image resource |
759 | 757 | * @param string $lpszFileName The name of the file |
760 | 758 | * @param int $background_color The background color |
@@ -419,7 +419,7 @@ |
||
419 | 419 | |
420 | 420 | if (checkImagick()) |
421 | 421 | { |
422 | - $imagick = New Imagick($destName); |
|
422 | + $imagick = new Imagick($destName); |
|
423 | 423 | $src_width = empty($src_width) ? $imagick->getImageWidth() : $src_width; |
424 | 424 | $src_height = empty($src_height) ? $imagick->getImageHeight() : $src_height; |
425 | 425 | $dest_width = empty($max_width) ? $src_width : $max_width; |
@@ -273,7 +273,6 @@ |
||
273 | 273 | * Modify any setting related to topics. |
274 | 274 | * Requires the admin_forum permission. |
275 | 275 | * Accessed from ?action=admin;area=postsettings;sa=topics. |
276 | - |
|
277 | 276 | * @param bool $return_config Whether or not to return the config_vars array (used for admin search) |
278 | 277 | * @return void|array Returns nothing or returns $config_vars if $return_config is true |
279 | 278 | * @uses Admin template, edit_topic_settings sub-template. |
@@ -130,7 +130,6 @@ |
||
130 | 130 | * |
131 | 131 | * @param int $closed 1 for counting closed reports, 0 for open ones. |
132 | 132 | * @return integer How many reports. |
133 | - |
|
134 | 133 | */ |
135 | 134 | function countReports($closed = 0) |
136 | 135 | { |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | $smcFunc['db_query']('', ' |
50 | 50 | UPDATE {db_prefix}log_reported |
51 | 51 | SET {raw:action} = {string:value} |
52 | - '. (is_array($report_id) ? 'WHERE id_report IN ({array_int:id_report})' : 'WHERE id_report = {int:id_report}') .' |
|
52 | + '. (is_array($report_id) ? 'WHERE id_report IN ({array_int:id_report})' : 'WHERE id_report = {int:id_report}') . ' |
|
53 | 53 | ' . $board_query, |
54 | 54 | array( |
55 | 55 | 'action' => $action, |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | ) |
98 | 98 | ); |
99 | 99 | |
100 | - while($row = $smcFunc['db_fetch_assoc']($request)) |
|
100 | + while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
101 | 101 | $extra[$row['id_report']] = array( |
102 | 102 | 'report' => $row['id_report'], |
103 | 103 | 'member' => $row['id_member'], |
@@ -237,7 +237,7 @@ discard block |
||
237 | 237 | else |
238 | 238 | { |
239 | 239 | $query_this_board = '{query_wanna_see_board}' . (!empty($modSettings['recycle_enable']) && $modSettings['recycle_board'] > 0 ? ' |
240 | - AND b.id_board != {int:recycle_board}' : ''). ' |
|
240 | + AND b.id_board != {int:recycle_board}' : '') . ' |
|
241 | 241 | AND m.id_msg >= {int:max_id_msg}'; |
242 | 242 | $query_parameters['max_id_msg'] = max(0, $modSettings['maxMsgID'] - 100 - $_REQUEST['start'] * 6); |
243 | 243 | $query_parameters['recycle_board'] = $modSettings['recycle_board']; |
@@ -1124,7 +1124,7 @@ discard block |
||
1124 | 1124 | ); |
1125 | 1125 | else |
1126 | 1126 | $request = $smcFunc['db_query']('', ' |
1127 | - SELECT DISTINCT t.id_topic,'.$_REQUEST['sort'].' |
|
1127 | + SELECT DISTINCT t.id_topic,'.$_REQUEST['sort'] . ' |
|
1128 | 1128 | FROM {db_prefix}topics AS t |
1129 | 1129 | INNER JOIN {db_prefix}messages AS m ON (m.id_topic = t.id_topic AND m.id_member = {int:current_member})' . (strpos($_REQUEST['sort'], 'ms.') === false ? '' : ' |
1130 | 1130 | INNER JOIN {db_prefix}messages AS ms ON (ms.id_msg = t.id_first_msg)') . (strpos($_REQUEST['sort'], 'mems.') === false ? '' : ' |
@@ -1391,7 +1391,7 @@ discard block |
||
1391 | 1391 | if ($is_topics) |
1392 | 1392 | { |
1393 | 1393 | $context['recent_buttons'] = array( |
1394 | - 'markread' => array('text' => !empty($context['no_board_limits']) ? 'mark_as_read' : 'mark_read_short', 'image' => 'markread.png', 'custom' => 'data-confirm="'. $txt['are_sure_mark_read'] .'"', 'class' => 'you_sure', 'url' => $scripturl . '?action=markasread;sa=' . (!empty($context['no_board_limits']) ? 'all' : 'board' . $context['querystring_board_limits']) . ';' . $context['session_var'] . '=' . $context['session_id']), |
|
1394 | + 'markread' => array('text' => !empty($context['no_board_limits']) ? 'mark_as_read' : 'mark_read_short', 'image' => 'markread.png', 'custom' => 'data-confirm="' . $txt['are_sure_mark_read'] . '"', 'class' => 'you_sure', 'url' => $scripturl . '?action=markasread;sa=' . (!empty($context['no_board_limits']) ? 'all' : 'board' . $context['querystring_board_limits']) . ';' . $context['session_var'] . '=' . $context['session_id']), |
|
1395 | 1395 | ); |
1396 | 1396 | |
1397 | 1397 | if ($context['showCheckboxes']) |
@@ -1407,7 +1407,7 @@ discard block |
||
1407 | 1407 | elseif (!$is_topics && isset($context['topics_to_mark'])) |
1408 | 1408 | { |
1409 | 1409 | $context['recent_buttons'] = array( |
1410 | - 'markread' => array('text' => 'mark_as_read', 'image' => 'markread.png', 'custom' => 'data-confirm="'. $txt['are_sure_mark_read'] .'"', 'class' => 'you_sure', 'url' => $scripturl . '?action=markasread;sa=unreadreplies;topics=' . $context['topics_to_mark'] . ';' . $context['session_var'] . '=' . $context['session_id']), |
|
1410 | + 'markread' => array('text' => 'mark_as_read', 'image' => 'markread.png', 'custom' => 'data-confirm="' . $txt['are_sure_mark_read'] . '"', 'class' => 'you_sure', 'url' => $scripturl . '?action=markasread;sa=unreadreplies;topics=' . $context['topics_to_mark'] . ';' . $context['session_var'] . '=' . $context['session_id']), |
|
1411 | 1411 | ); |
1412 | 1412 | |
1413 | 1413 | if ($context['showCheckboxes']) |
@@ -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 |
@@ -555,7 +555,7 @@ |
||
555 | 555 | 'subject' => $row_liked_message['subject'], |
556 | 556 | 'num' => $row_liked_message['likes'], |
557 | 557 | 'href' => $scripturl . '?msg=' . $row_liked_message['id_msg'], |
558 | - 'link' => '<a href="' . $scripturl . '?msg=' . $row_liked_message['id_msg'] .'">' . $row_liked_message['subject'] . '</a>' |
|
558 | + 'link' => '<a href="' . $scripturl . '?msg=' . $row_liked_message['id_msg'] . '">' . $row_liked_message['subject'] . '</a>' |
|
559 | 559 | ); |
560 | 560 | |
561 | 561 | if ($max_liked_message < $row_liked_message['likes']) |
@@ -101,9 +101,9 @@ discard block |
||
101 | 101 | } |
102 | 102 | |
103 | 103 | /** |
104 | - * Determine if the browser is Opera or not |
|
105 | - * @return boolean Whether or not this is Opera |
|
106 | - */ |
|
104 | + * Determine if the browser is Opera or not |
|
105 | + * @return boolean Whether or not this is Opera |
|
106 | + */ |
|
107 | 107 | function isOpera() |
108 | 108 | { |
109 | 109 | if (!isset($this->_browsers['is_opera'])) |
@@ -112,9 +112,9 @@ discard block |
||
112 | 112 | } |
113 | 113 | |
114 | 114 | /** |
115 | - * Determine if the browser is IE or not |
|
116 | - * @return boolean true Whether or not the browser is IE |
|
117 | - */ |
|
115 | + * Determine if the browser is IE or not |
|
116 | + * @return boolean true Whether or not the browser is IE |
|
117 | + */ |
|
118 | 118 | function isIe() |
119 | 119 | { |
120 | 120 | // I'm IE, Yes I'm the real IE; All you other IEs are just imitating. |
@@ -124,9 +124,9 @@ discard block |
||
124 | 124 | } |
125 | 125 | |
126 | 126 | /** |
127 | - * Determine if the browser is IE11 or not |
|
128 | - * @return boolean Whether or not the browser is IE11 |
|
129 | - */ |
|
127 | + * Determine if the browser is IE11 or not |
|
128 | + * @return boolean Whether or not the browser is IE11 |
|
129 | + */ |
|
130 | 130 | function isIe11() |
131 | 131 | { |
132 | 132 | // IE11 is a bit different than earlier versions |
@@ -137,9 +137,9 @@ discard block |
||
137 | 137 | } |
138 | 138 | |
139 | 139 | /** |
140 | - * Determine if the browser is Edge or not |
|
141 | - * @return boolean Whether or not the browser is Edge |
|
142 | - */ |
|
140 | + * Determine if the browser is Edge or not |
|
141 | + * @return boolean Whether or not the browser is Edge |
|
142 | + */ |
|
143 | 143 | function isEdge() |
144 | 144 | { |
145 | 145 | if (!isset($this->_browsers['is_edge'])) |
@@ -148,9 +148,9 @@ discard block |
||
148 | 148 | } |
149 | 149 | |
150 | 150 | /** |
151 | - * Determine if the browser is a Webkit based one or not |
|
152 | - * @return boolean Whether or not this is a Webkit-based browser |
|
153 | - */ |
|
151 | + * Determine if the browser is a Webkit based one or not |
|
152 | + * @return boolean Whether or not this is a Webkit-based browser |
|
153 | + */ |
|
154 | 154 | function isWebkit() |
155 | 155 | { |
156 | 156 | if (!isset($this->_browsers['is_webkit'])) |
@@ -159,9 +159,9 @@ discard block |
||
159 | 159 | } |
160 | 160 | |
161 | 161 | /** |
162 | - * Determine if the browser is Firefox or one of its variants |
|
163 | - * @return boolean Whether or not this is Firefox (or one of its variants) |
|
164 | - */ |
|
162 | + * Determine if the browser is Firefox or one of its variants |
|
163 | + * @return boolean Whether or not this is Firefox (or one of its variants) |
|
164 | + */ |
|
165 | 165 | function isFirefox() |
166 | 166 | { |
167 | 167 | if (!isset($this->_browsers['is_firefox'])) |
@@ -170,9 +170,9 @@ discard block |
||
170 | 170 | } |
171 | 171 | |
172 | 172 | /** |
173 | - * Determine if the browser is WebTv or not |
|
174 | - * @return boolean Whether or not this is WebTV |
|
175 | - */ |
|
173 | + * Determine if the browser is WebTv or not |
|
174 | + * @return boolean Whether or not this is WebTV |
|
175 | + */ |
|
176 | 176 | function isWebTv() |
177 | 177 | { |
178 | 178 | if (!isset($this->_browsers['is_web_tv'])) |
@@ -181,9 +181,9 @@ discard block |
||
181 | 181 | } |
182 | 182 | |
183 | 183 | /** |
184 | - * Determine if the browser is konqueror or not |
|
185 | - * @return boolean Whether or not this is Konqueror |
|
186 | - */ |
|
184 | + * Determine if the browser is konqueror or not |
|
185 | + * @return boolean Whether or not this is Konqueror |
|
186 | + */ |
|
187 | 187 | function isKonqueror() |
188 | 188 | { |
189 | 189 | if (!isset($this->_browsers['is_konqueror'])) |
@@ -192,9 +192,9 @@ discard block |
||
192 | 192 | } |
193 | 193 | |
194 | 194 | /** |
195 | - * Determine if the browser is Gecko or not |
|
196 | - * @return boolean Whether or not this is a Gecko-based browser |
|
197 | - */ |
|
195 | + * Determine if the browser is Gecko or not |
|
196 | + * @return boolean Whether or not this is a Gecko-based browser |
|
197 | + */ |
|
198 | 198 | function isGecko() |
199 | 199 | { |
200 | 200 | if (!isset($this->_browsers['is_gecko'])) |
@@ -203,9 +203,9 @@ discard block |
||
203 | 203 | } |
204 | 204 | |
205 | 205 | /** |
206 | - * Determine if the browser is Opera Mini or not |
|
207 | - * @return boolean Whether or not this is Opera Mini |
|
208 | - */ |
|
206 | + * Determine if the browser is Opera Mini or not |
|
207 | + * @return boolean Whether or not this is Opera Mini |
|
208 | + */ |
|
209 | 209 | function isOperaMini() |
210 | 210 | { |
211 | 211 | if (!isset($this->_browsers['is_opera_mini'])) |
@@ -216,9 +216,9 @@ discard block |
||
216 | 216 | } |
217 | 217 | |
218 | 218 | /** |
219 | - * Determine if the browser is Opera Mobile or not |
|
220 | - * @return boolean Whether or not this is Opera Mobile |
|
221 | - */ |
|
219 | + * Determine if the browser is Opera Mobile or not |
|
220 | + * @return boolean Whether or not this is Opera Mobile |
|
221 | + */ |
|
222 | 222 | function isOperaMobi() |
223 | 223 | { |
224 | 224 | if (!isset($this->_browsers['is_opera_mobi'])) |
@@ -694,7 +694,6 @@ |
||
694 | 694 | * It shows as the maintain_forum admin area. |
695 | 695 | * It is accessed from ?action=admin;area=maintain;sa=database;activity=optimize. |
696 | 696 | * It also updates the optimize scheduled task such that the tables are not automatically optimized again too soon. |
697 | - |
|
698 | 697 | * @uses the optimize sub template |
699 | 698 | */ |
700 | 699 | function OptimizeTables() |
@@ -563,7 +563,7 @@ discard block |
||
563 | 563 | WHERE table_name = {string:cur_table} |
564 | 564 | AND (data_type = \'character varying\' or data_type = \'text\')', |
565 | 565 | array( |
566 | - 'cur_table' => $db_prefix.$cur_table, |
|
566 | + 'cur_table' => $db_prefix . $cur_table, |
|
567 | 567 | ) |
568 | 568 | ); |
569 | 569 | else |
@@ -588,7 +588,7 @@ discard block |
||
588 | 588 | WHERE i.indrelid = {string:cur_table}::regclass |
589 | 589 | AND i.indisprimary', |
590 | 590 | array( |
591 | - 'cur_table' => $db_prefix.$cur_table, |
|
591 | + 'cur_table' => $db_prefix . $cur_table, |
|
592 | 592 | ) |
593 | 593 | ); |
594 | 594 | else |
@@ -2291,7 +2291,6 @@ |
||
2291 | 2291 | list ($hookData['class'], $hookData['method']) = explode('::', $modFunc); |
2292 | 2292 | $hookData['pureFunc'] = $hookData['method']; |
2293 | 2293 | } |
2294 | - |
|
2295 | 2294 | else |
2296 | 2295 | $hookData['pureFunc'] = $modFunc; |
2297 | 2296 |
@@ -272,13 +272,13 @@ |
||
272 | 272 | $context['post_error']['messages'][] = $txt['mc_warning_template_error_no_body']; |
273 | 273 | // Add in few replacements. |
274 | 274 | /** |
275 | - * These are the defaults: |
|
276 | - * - {MEMBER} - Member Name. => current user for review |
|
277 | - * - {MESSAGE} - Link to Offending Post. (If Applicable) => not applicable here, so not replaced |
|
278 | - * - {FORUMNAME} - Forum Name. |
|
279 | - * - {SCRIPTURL} - Web address of forum. |
|
280 | - * - {REGARDS} - Standard email sign-off. |
|
281 | - */ |
|
275 | + * These are the defaults: |
|
276 | + * - {MEMBER} - Member Name. => current user for review |
|
277 | + * - {MESSAGE} - Link to Offending Post. (If Applicable) => not applicable here, so not replaced |
|
278 | + * - {FORUMNAME} - Forum Name. |
|
279 | + * - {SCRIPTURL} - Web address of forum. |
|
280 | + * - {REGARDS} - Standard email sign-off. |
|
281 | + */ |
|
282 | 282 | $find = array( |
283 | 283 | '{MEMBER}', |
284 | 284 | '{FORUMNAME}', |
@@ -793,7 +793,7 @@ discard block |
||
793 | 793 | if (!$this->connection) |
794 | 794 | { |
795 | 795 | $this->error = 'bad_server'; |
796 | - $this->last_message = 'Invalid Server'; |
|
796 | + $this->last_message = 'Invalid Server'; |
|
797 | 797 | return; |
798 | 798 | } |
799 | 799 | |
@@ -801,7 +801,7 @@ discard block |
||
801 | 801 | if (!$this->check_response(220)) |
802 | 802 | { |
803 | 803 | $this->error = 'bad_response'; |
804 | - $this->last_message = 'Bad Response'; |
|
804 | + $this->last_message = 'Bad Response'; |
|
805 | 805 | return; |
806 | 806 | } |
807 | 807 |
@@ -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! |