@@ -360,7 +360,7 @@ discard block |
||
| 360 | 360 | // INET. |
| 361 | 361 | elseif ($param_info['type'] == 'inet') |
| 362 | 362 | { |
| 363 | - if(count($search_params[$param_name]) === 1) |
|
| 363 | + if (count($search_params[$param_name]) === 1) |
|
| 364 | 364 | { |
| 365 | 365 | $query_parts[] = '(' . $param_info['db_fields'][0] . ' = {inet:' . $param_name . '})'; |
| 366 | 366 | $where_params[$param_name] = $search_params[$param_name][0]; |
@@ -368,8 +368,8 @@ discard block |
||
| 368 | 368 | elseif (count($search_params[$param_name]) === 2) |
| 369 | 369 | { |
| 370 | 370 | $query_parts[] = '(' . $param_info['db_fields'][0] . ' <= {inet:' . $param_name . '_high} and ' . $param_info['db_fields'][0] . ' >= {inet:' . $param_name . '_low})'; |
| 371 | - $where_params[$param_name.'_low'] = $search_params[$param_name]['low']; |
|
| 372 | - $where_params[$param_name.'_high'] = $search_params[$param_name]['high']; |
|
| 371 | + $where_params[$param_name . '_low'] = $search_params[$param_name]['low']; |
|
| 372 | + $where_params[$param_name . '_high'] = $search_params[$param_name]['high']; |
|
| 373 | 373 | } |
| 374 | 374 | |
| 375 | 375 | } |
@@ -592,7 +592,7 @@ discard block |
||
| 592 | 592 | 'Jessica "Suki" González', |
| 593 | 593 | 'Karl "RegularExpression" Benson', |
| 594 | 594 | 'Matthew "Labradoodle-360" Kerle', |
| 595 | - $user_info['is_admin'] ? 'Matt "Grudge" Wolf': 'Grudge', |
|
| 595 | + $user_info['is_admin'] ? 'Matt "Grudge" Wolf' : 'Grudge', |
|
| 596 | 596 | 'Michael "Thantos" Miller', |
| 597 | 597 | 'Norv', |
| 598 | 598 | 'Peter "Arantor" Spicer', |
@@ -824,13 +824,13 @@ discard block |
||
| 824 | 824 | $credit_info = $smcFunc['json_decode']($row['credits'], true); |
| 825 | 825 | |
| 826 | 826 | $copyright = empty($credit_info['copyright']) ? '' : $txt['credits_copyright'] . ' © ' . $smcFunc['htmlspecialchars']($credit_info['copyright']); |
| 827 | - $license = empty($credit_info['license']) ? '' : $txt['credits_license'] . ': ' . (!empty($credit_info['licenseurl']) ? '<a href="'. $smcFunc['htmlspecialchars']($credit_info['licenseurl']) .'">'. $smcFunc['htmlspecialchars']($credit_info['license']) .'</a>' : $smcFunc['htmlspecialchars']($credit_info['license'])); |
|
| 827 | + $license = empty($credit_info['license']) ? '' : $txt['credits_license'] . ': ' . (!empty($credit_info['licenseurl']) ? '<a href="' . $smcFunc['htmlspecialchars']($credit_info['licenseurl']) . '">' . $smcFunc['htmlspecialchars']($credit_info['license']) . '</a>' : $smcFunc['htmlspecialchars']($credit_info['license'])); |
|
| 828 | 828 | $version = $txt['credits_version'] . ' ' . $row['version']; |
| 829 | 829 | $title = (empty($credit_info['title']) ? $row['name'] : $smcFunc['htmlspecialchars']($credit_info['title'])) . ': ' . $version; |
| 830 | 830 | |
| 831 | 831 | // build this one out and stash it away |
| 832 | 832 | $mod_name = empty($credit_info['url']) ? $title : '<a href="' . $credit_info['url'] . '">' . $title . '</a>'; |
| 833 | - $mods[] = $mod_name . (!empty($license) ? ' | ' . $license : '') . (!empty($copyright) ? ' | ' . $copyright : ''); |
|
| 833 | + $mods[] = $mod_name . (!empty($license) ? ' | ' . $license : '') . (!empty($copyright) ? ' | ' . $copyright : ''); |
|
| 834 | 834 | } |
| 835 | 835 | cache_put_data('mods_credits', $mods, 86400); |
| 836 | 836 | } |
@@ -236,7 +236,7 @@ |
||
| 236 | 236 | $header = 'POST /cgi-bin/webscr HTTP/1.1' . "\r\n"; |
| 237 | 237 | $header .= 'content-type: application/x-www-form-urlencoded' . "\r\n"; |
| 238 | 238 | $header .= 'Host: www.' . (!empty($modSettings['paidsubs_test']) ? 'sandbox.' : '') . 'paypal.com' . "\r\n"; |
| 239 | - $header .= 'content-length: ' . strlen ($requestString) . "\r\n"; |
|
| 239 | + $header .= 'content-length: ' . strlen($requestString) . "\r\n"; |
|
| 240 | 240 | $header .= 'connection: close' . "\r\n\r\n"; |
| 241 | 241 | |
| 242 | 242 | // Open the connection. |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | // Just send a generic message. |
| 77 | 77 | else |
| 78 | 78 | $this->setResponse(array( |
| 79 | - 'text' => $this->_sa == 'add' ? 'attach_error_title' : 'attached_file_deleted_error', |
|
| 79 | + 'text' => $this->_sa == 'add' ? 'attach_error_title' : 'attached_file_deleted_error', |
|
| 80 | 80 | 'type' => 'error', |
| 81 | 81 | 'data' => false, |
| 82 | 82 | )); |
@@ -410,7 +410,7 @@ discard block |
||
| 410 | 410 | // Gotta urlencode the filename. |
| 411 | 411 | if ($this->_attachResults) |
| 412 | 412 | foreach ($this->_attachResults as $k => $v) |
| 413 | - $this->_attachResults[$k]['name'] = urlencode($this->_attachResults[$k]['name']); |
|
| 413 | + $this->_attachResults[$k]['name'] = urlencode($this->_attachResults[$k]['name']); |
|
| 414 | 414 | |
| 415 | 415 | $this->_response = array( |
| 416 | 416 | 'files' => $this->_attachResults ? $this->_attachResults : false, |
@@ -437,7 +437,7 @@ discard block |
||
| 437 | 437 | ob_start(); |
| 438 | 438 | |
| 439 | 439 | // Set the header. |
| 440 | - header('content-type: application/json; charset='. $context['character_set'] .''); |
|
| 440 | + header('content-type: application/json; charset=' . $context['character_set'] . ''); |
|
| 441 | 441 | |
| 442 | 442 | echo $smcFunc['json_encode']($this->_response ? $this->_response : array()); |
| 443 | 443 | |
@@ -704,7 +704,7 @@ |
||
| 704 | 704 | $mail_result = false; |
| 705 | 705 | } |
| 706 | 706 | } |
| 707 | - catch(ErrorException $e) |
|
| 707 | + catch (ErrorException $e) |
|
| 708 | 708 | { |
| 709 | 709 | log_error($e->getMessage(), 'general', $e->getFile(), $e->getLine()); |
| 710 | 710 | log_error(sprintf($txt['mail_send_unable'], $to)); |
@@ -231,7 +231,7 @@ discard block |
||
| 231 | 231 | |
| 232 | 232 | foreach ($message['custom_fields']['above_member'] as $custom) |
| 233 | 233 | echo ' |
| 234 | - <li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>'; |
|
| 234 | + <li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>'; |
|
| 235 | 235 | |
| 236 | 236 | echo ' |
| 237 | 237 | </ul> |
@@ -280,7 +280,7 @@ discard block |
||
| 280 | 280 | if (!empty($message['custom_fields']['below_avatar'])) |
| 281 | 281 | foreach ($message['custom_fields']['below_avatar'] as $custom) |
| 282 | 282 | echo ' |
| 283 | - <li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>'; |
|
| 283 | + <li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>'; |
|
| 284 | 284 | |
| 285 | 285 | if (!$message['member']['is_guest']) |
| 286 | 286 | echo ' |
@@ -322,7 +322,7 @@ discard block |
||
| 322 | 322 | |
| 323 | 323 | foreach ($message['custom_fields']['icons'] as $custom) |
| 324 | 324 | echo ' |
| 325 | - <li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>'; |
|
| 325 | + <li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>'; |
|
| 326 | 326 | |
| 327 | 327 | echo ' |
| 328 | 328 | </ol> |
@@ -386,7 +386,7 @@ discard block |
||
| 386 | 386 | if (!empty($message['custom_fields']['standard'])) |
| 387 | 387 | foreach ($message['custom_fields']['standard'] as $custom) |
| 388 | 388 | echo ' |
| 389 | - <li class="custom ', $custom['col_name'] ,'">', $custom['title'], ': ', $custom['value'], '</li>'; |
|
| 389 | + <li class="custom ', $custom['col_name'], '">', $custom['title'], ': ', $custom['value'], '</li>'; |
|
| 390 | 390 | |
| 391 | 391 | // Are we showing the warning status? |
| 392 | 392 | if ($message['member']['can_see_warning']) |
@@ -397,7 +397,7 @@ discard block |
||
| 397 | 397 | if (!empty($message['custom_fields']['bottom_poster'])) |
| 398 | 398 | foreach ($message['custom_fields']['bottom_poster'] as $custom) |
| 399 | 399 | echo ' |
| 400 | - <li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>'; |
|
| 400 | + <li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>'; |
|
| 401 | 401 | } |
| 402 | 402 | |
| 403 | 403 | // Done with the information about the poster... on to the post itself. |
@@ -498,7 +498,7 @@ discard block |
||
| 498 | 498 | |
| 499 | 499 | foreach ($message['custom_fields']['above_signature'] as $custom) |
| 500 | 500 | echo ' |
| 501 | - <li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>'; |
|
| 501 | + <li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>'; |
|
| 502 | 502 | |
| 503 | 503 | echo ' |
| 504 | 504 | </ul> |
@@ -521,7 +521,7 @@ discard block |
||
| 521 | 521 | |
| 522 | 522 | foreach ($message['custom_fields']['below_signature'] as $custom) |
| 523 | 523 | echo ' |
| 524 | - <li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>'; |
|
| 524 | + <li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>'; |
|
| 525 | 525 | |
| 526 | 526 | echo ' |
| 527 | 527 | </ul> |
@@ -657,7 +657,7 @@ discard block |
||
| 657 | 657 | while ($message = $context['get_pmessage']('subject')) |
| 658 | 658 | { |
| 659 | 659 | echo ' |
| 660 | - <tr class="windowbg', $message['is_unread'] ? ' unread_pm' : '','"> |
|
| 660 | + <tr class="windowbg', $message['is_unread'] ? ' unread_pm' : '', '"> |
|
| 661 | 661 | <td class="table_icon"> |
| 662 | 662 | <script> |
| 663 | 663 | currentLabels[', $message['id'], '] = {'; |
@@ -946,13 +946,13 @@ discard block |
||
| 946 | 946 | // You can only reply if they are not a guest... |
| 947 | 947 | if (!$message['member']['is_guest']) |
| 948 | 948 | echo ' |
| 949 | - <a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote;u=', $context['folder'] == 'sent' ? '' : $message['member']['id'], '">', $quote_button , '</a>', $context['menu_separator'], ' |
|
| 950 | - <a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';u=', $message['member']['id'], '">', $reply_button , '</a> ', $context['menu_separator']; |
|
| 949 | + <a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote;u=', $context['folder'] == 'sent' ? '' : $message['member']['id'], '">', $quote_button, '</a>', $context['menu_separator'], ' |
|
| 950 | + <a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';u=', $message['member']['id'], '">', $reply_button, '</a> ', $context['menu_separator']; |
|
| 951 | 951 | |
| 952 | 952 | // This is for "forwarding" - even if the member is gone. |
| 953 | 953 | else |
| 954 | 954 | echo ' |
| 955 | - <a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote">', $quote_button , '</a>', $context['menu_separator']; |
|
| 955 | + <a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote">', $quote_button, '</a>', $context['menu_separator']; |
|
| 956 | 956 | } |
| 957 | 957 | |
| 958 | 958 | echo ' |
@@ -1054,7 +1054,7 @@ discard block |
||
| 1054 | 1054 | <div class="', empty($context['error_type']) || $context['error_type'] != 'serious' ? 'noticebox' : 'errorbox', '"', empty($context['post_error']['messages']) ? ' style="display: none"' : '', ' id="errors"> |
| 1055 | 1055 | <dl> |
| 1056 | 1056 | <dt> |
| 1057 | - <strong id="error_serious">', $txt['error_while_submitting'] , '</strong> |
|
| 1057 | + <strong id="error_serious">', $txt['error_while_submitting'], '</strong> |
|
| 1058 | 1058 | </dt> |
| 1059 | 1059 | <dd class="error" id="error_list"> |
| 1060 | 1060 | ', empty($context['post_error']['messages']) ? '' : implode('<br>', $context['post_error']['messages']), ' |
@@ -1110,7 +1110,7 @@ discard block |
||
| 1110 | 1110 | <span', (isset($context['post_error']['no_subject']) ? ' class="error"' : ''), ' id="caption_subject">', $txt['subject'], ':</span> |
| 1111 | 1111 | </dt> |
| 1112 | 1112 | <dd id="pm_subject"> |
| 1113 | - <input type="text" name="subject" value="', $context['subject'], '" tabindex="', $context['tabindex']++, '" size="80" maxlength="80"',isset($context['post_error']['no_subject']) ? ' class="error"' : '', '> |
|
| 1113 | + <input type="text" name="subject" value="', $context['subject'], '" tabindex="', $context['tabindex']++, '" size="80" maxlength="80"', isset($context['post_error']['no_subject']) ? ' class="error"' : '', '> |
|
| 1114 | 1114 | </dd> |
| 1115 | 1115 | </dl>'; |
| 1116 | 1116 | |
@@ -1463,7 +1463,7 @@ discard block |
||
| 1463 | 1463 | echo ' |
| 1464 | 1464 | <div class="padding"> |
| 1465 | 1465 | <input type="submit" name="save" value="', $txt['save'], '" class="button"> |
| 1466 | - <input type="submit" name="delete" value="', $txt['quickmod_delete_selected'], '" data-confirm="', $txt['pm_labels_delete'] ,'" class="button you_sure"> |
|
| 1466 | + <input type="submit" name="delete" value="', $txt['quickmod_delete_selected'], '" data-confirm="', $txt['pm_labels_delete'], '" class="button you_sure"> |
|
| 1467 | 1467 | </div>'; |
| 1468 | 1468 | |
| 1469 | 1469 | echo ' |
@@ -1628,7 +1628,7 @@ discard block |
||
| 1628 | 1628 | if (!empty($context['rules'])) |
| 1629 | 1629 | echo ' |
| 1630 | 1630 | <input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '"> |
| 1631 | - <input type="submit" name="delselected" value="', $txt['pm_delete_selected_rule'], '" data-confirm="', $txt['pm_js_delete_rule_confirm'] ,'" class="button smalltext you_sure">'; |
|
| 1631 | + <input type="submit" name="delselected" value="', $txt['pm_delete_selected_rule'], '" data-confirm="', $txt['pm_js_delete_rule_confirm'], '" class="button smalltext you_sure">'; |
|
| 1632 | 1632 | |
| 1633 | 1633 | echo ' |
| 1634 | 1634 | </div> |
@@ -1871,9 +1871,9 @@ discard block |
||
| 1871 | 1871 | |
| 1872 | 1872 | echo ' |
| 1873 | 1873 | <select name="acttype[', $k, ']" id="acttype', $k, '" onchange="updateActionDef(', $k, '); rebuildRuleDesc();"> |
| 1874 | - <option value="">', $txt['pm_rule_sel_action'] , ':</option> |
|
| 1875 | - <option value="lab"', $action['t'] == 'lab' ? ' selected' : '', '>', $txt['pm_rule_label'] , '</option> |
|
| 1876 | - <option value="del"', $action['t'] == 'del' ? ' selected' : '', '>', $txt['pm_rule_delete'] , '</option> |
|
| 1874 | + <option value="">', $txt['pm_rule_sel_action'], ':</option> |
|
| 1875 | + <option value="lab"', $action['t'] == 'lab' ? ' selected' : '', '>', $txt['pm_rule_label'], '</option> |
|
| 1876 | + <option value="del"', $action['t'] == 'del' ? ' selected' : '', '>', $txt['pm_rule_delete'], '</option> |
|
| 1877 | 1877 | </select> |
| 1878 | 1878 | <span id="labdiv', $k, '"> |
| 1879 | 1879 | <select name="labdef[', $k, ']" id="labdef', $k, '" onchange="rebuildRuleDesc();"> |
@@ -1985,7 +1985,7 @@ discard block |
||
| 1985 | 1985 | </div> |
| 1986 | 1986 | <ul class="quickbuttons"> |
| 1987 | 1987 | <li><a href="', $scripturl, '?action=pm;sa=showpmdrafts;id_draft=', $draft['id_draft'], ';', $context['session_var'], '=', $context['session_id'], '"><span class="generic_icons modifybutton"></span>', $txt['draft_edit'], '</a></li> |
| 1988 | - <li><a href="', $scripturl, '?action=pm;sa=showpmdrafts;delete=', $draft['id_draft'], ';', $context['session_var'], '=', $context['session_id'], '" data-confirm="', $txt['draft_remove'] ,'?" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['draft_delete'], '</a></li> |
|
| 1988 | + <li><a href="', $scripturl, '?action=pm;sa=showpmdrafts;delete=', $draft['id_draft'], ';', $context['session_var'], '=', $context['session_id'], '" data-confirm="', $txt['draft_remove'], '?" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['draft_delete'], '</a></li> |
|
| 1989 | 1989 | </ul> |
| 1990 | 1990 | </div><!-- .windowbg -->'; |
| 1991 | 1991 | } |
@@ -140,7 +140,7 @@ |
||
| 140 | 140 | $max_age = $time - $cached['time'] + (5 * 86400); |
| 141 | 141 | header('content-type: ' . $cached['content_type']); |
| 142 | 142 | header('content-length: ' . $cached['size']); |
| 143 | - header('cache-control: public, max-age=' . $max_age ); |
|
| 143 | + header('cache-control: public, max-age=' . $max_age); |
|
| 144 | 144 | header('last-modified: ' . gmdate('D, d M Y H:i:s', $cached['time']) . ' GMT'); |
| 145 | 145 | header('etag: ' . $eTag); |
| 146 | 146 | echo base64_decode($cached['body']); |
@@ -250,7 +250,7 @@ discard block |
||
| 250 | 250 | } |
| 251 | 251 | $smcFunc['db_free_result']($request); |
| 252 | 252 | |
| 253 | - if($withSender) |
|
| 253 | + if ($withSender) |
|
| 254 | 254 | { |
| 255 | 255 | $senders = loadMemberData($senders); |
| 256 | 256 | foreach ($senders as $member) |
@@ -1896,7 +1896,7 @@ discard block |
||
| 1896 | 1896 | if (count($context['ip']) !== 2) |
| 1897 | 1897 | fatal_lang_error('invalid_tracking_ip', false); |
| 1898 | 1898 | |
| 1899 | - $ip_string = array('{inet:ip_address_low}','{inet:ip_address_high}'); |
|
| 1899 | + $ip_string = array('{inet:ip_address_low}', '{inet:ip_address_high}'); |
|
| 1900 | 1900 | $fields = array( |
| 1901 | 1901 | 'ip_address_low' => $context['ip']['low'], |
| 1902 | 1902 | 'ip_address_high' => $context['ip']['high'], |
@@ -1904,7 +1904,7 @@ discard block |
||
| 1904 | 1904 | |
| 1905 | 1905 | $ip_var = $context['ip']; |
| 1906 | 1906 | |
| 1907 | - if ($context['ip']['low'] !== $context['ip']['high']) |
|
| 1907 | + if ($context['ip']['low'] !== $context['ip']['high']) |
|
| 1908 | 1908 | $context['ip'] = $context['ip']['low'] . ' - ' . $context['ip']['high']; |
| 1909 | 1909 | else |
| 1910 | 1910 | $context['ip'] = $context['ip']['low']; |
@@ -461,7 +461,7 @@ |
||
| 461 | 461 | $fields = ''; |
| 462 | 462 | foreach ($context['print_custom_fields']['below_signature'] as $field) |
| 463 | 463 | if (!empty($field['output_html'])) |
| 464 | - $fields .= ' |
|
| 464 | + $fields .= ' |
|
| 465 | 465 | <li>' . $field['output_html'] . '</li>'; |
| 466 | 466 | |
| 467 | 467 | if (!empty($fields)) |