| @@ -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> | 
| @@ -268,7 +268,7 @@ discard block | ||
| 268 | 268 | if (!empty($message['custom_fields']['below_avatar'])) | 
| 269 | 269 | foreach ($message['custom_fields']['below_avatar'] as $custom) | 
| 270 | 270 | echo ' | 
| 271 | - <li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>'; | |
| 271 | + <li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>'; | |
| 272 | 272 | |
| 273 | 273 | if (!$message['member']['is_guest']) | 
| 274 | 274 | echo ' | 
| @@ -310,7 +310,7 @@ discard block | ||
| 310 | 310 | |
| 311 | 311 | foreach ($message['custom_fields']['icons'] as $custom) | 
| 312 | 312 | echo ' | 
| 313 | - <li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>'; | |
| 313 | + <li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>'; | |
| 314 | 314 | |
| 315 | 315 | echo ' | 
| 316 | 316 | </ol> | 
| @@ -368,7 +368,7 @@ discard block | ||
| 368 | 368 | if (!empty($message['custom_fields']['standard'])) | 
| 369 | 369 | foreach ($message['custom_fields']['standard'] as $custom) | 
| 370 | 370 | echo ' | 
| 371 | - <li class="custom ', $custom['col_name'] ,'">', $custom['title'], ': ', $custom['value'], '</li>'; | |
| 371 | + <li class="custom ', $custom['col_name'], '">', $custom['title'], ': ', $custom['value'], '</li>'; | |
| 372 | 372 | |
| 373 | 373 | // Are we showing the warning status? | 
| 374 | 374 | if ($message['member']['can_see_warning']) | 
| @@ -379,7 +379,7 @@ discard block | ||
| 379 | 379 | if (!empty($message['custom_fields']['bottom_poster'])) | 
| 380 | 380 | foreach ($message['custom_fields']['bottom_poster'] as $custom) | 
| 381 | 381 | echo ' | 
| 382 | - <li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>'; | |
| 382 | + <li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>'; | |
| 383 | 383 | } | 
| 384 | 384 | |
| 385 | 385 | // Done with the information about the poster... on to the post itself. | 
| @@ -478,7 +478,7 @@ discard block | ||
| 478 | 478 | |
| 479 | 479 | foreach ($message['custom_fields']['above_signature'] as $custom) | 
| 480 | 480 | echo ' | 
| 481 | - <li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>'; | |
| 481 | + <li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>'; | |
| 482 | 482 | |
| 483 | 483 | echo ' | 
| 484 | 484 | </ul> | 
| @@ -499,7 +499,7 @@ discard block | ||
| 499 | 499 | |
| 500 | 500 | foreach ($message['custom_fields']['below_signature'] as $custom) | 
| 501 | 501 | echo ' | 
| 502 | - <li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>'; | |
| 502 | + <li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>'; | |
| 503 | 503 | |
| 504 | 504 | echo ' | 
| 505 | 505 | </ul> | 
| @@ -631,7 +631,7 @@ discard block | ||
| 631 | 631 |  	while ($message = $context['get_pmessage']('subject')) | 
| 632 | 632 |  	{ | 
| 633 | 633 | echo ' | 
| 634 | - <tr class="windowbg', $message['is_unread'] ? ' unread_pm' : '','"> | |
| 634 | + <tr class="windowbg', $message['is_unread'] ? ' unread_pm' : '', '"> | |
| 635 | 635 | <td class="table_icon"> | 
| 636 | 636 | <script> | 
| 637 | 637 |  				currentLabels[', $message['id'], '] = {'; | 
| @@ -903,12 +903,12 @@ discard block | ||
| 903 | 903 | // You can only reply if they are not a guest... | 
| 904 | 904 | if (!$message['member']['is_guest']) | 
| 905 | 905 | echo ' | 
| 906 | - <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'], ' | |
| 907 | - <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']; | |
| 906 | + <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'], ' | |
| 907 | + <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']; | |
| 908 | 908 | // This is for "forwarding" - even if the member is gone. | 
| 909 | 909 | else | 
| 910 | 910 | echo ' | 
| 911 | - <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']; | |
| 911 | + <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']; | |
| 912 | 912 | } | 
| 913 | 913 | |
| 914 | 914 | echo ' | 
| @@ -1008,7 +1008,7 @@ discard block | ||
| 1008 | 1008 | <div class="', empty($context['error_type']) || $context['error_type'] != 'serious' ? 'noticebox' : 'errorbox', '"', empty($context['post_error']['messages']) ? ' style="display: none"' : '', ' id="errors"> | 
| 1009 | 1009 | <dl> | 
| 1010 | 1010 | <dt> | 
| 1011 | - <strong id="error_serious">', $txt['error_while_submitting'] , '</strong> | |
| 1011 | + <strong id="error_serious">', $txt['error_while_submitting'], '</strong> | |
| 1012 | 1012 | </dt> | 
| 1013 | 1013 | <dd class="error" id="error_list"> | 
| 1014 | 1014 |  						', empty($context['post_error']['messages']) ? '' : implode('<br>', $context['post_error']['messages']), ' | 
| @@ -1064,7 +1064,7 @@ discard block | ||
| 1064 | 1064 | <span', (isset($context['post_error']['no_subject']) ? ' class="error"' : ''), ' id="caption_subject">', $txt['subject'], ':</span> | 
| 1065 | 1065 | </dt> | 
| 1066 | 1066 | <dd id="pm_subject"> | 
| 1067 | - <input type="text" name="subject" value="', $context['subject'], '" tabindex="', $context['tabindex']++, '" size="80" maxlength="80"',isset($context['post_error']['no_subject']) ? ' class="error"' : ' class="input_text"', '/> | |
| 1067 | + <input type="text" name="subject" value="', $context['subject'], '" tabindex="', $context['tabindex']++, '" size="80" maxlength="80"', isset($context['post_error']['no_subject']) ? ' class="error"' : ' class="input_text"', '/> | |
| 1068 | 1068 | </dd> | 
| 1069 | 1069 | </dl><hr>'; | 
| 1070 | 1070 | |
| @@ -1427,7 +1427,7 @@ discard block | ||
| 1427 | 1427 | echo ' | 
| 1428 | 1428 | <div class="padding"> | 
| 1429 | 1429 | <input type="submit" name="save" value="', $txt['save'], '" class="button_submit"> | 
| 1430 | - <input type="submit" name="delete" value="', $txt['quickmod_delete_selected'], '" data-confirm="', $txt['pm_labels_delete'] ,'" class="button_submit you_sure"> | |
| 1430 | + <input type="submit" name="delete" value="', $txt['quickmod_delete_selected'], '" data-confirm="', $txt['pm_labels_delete'], '" class="button_submit you_sure"> | |
| 1431 | 1431 | </div>'; | 
| 1432 | 1432 | |
| 1433 | 1433 | echo ' | 
| @@ -1591,7 +1591,7 @@ discard block | ||
| 1591 | 1591 | if (!empty($context['rules'])) | 
| 1592 | 1592 | echo ' | 
| 1593 | 1593 | <input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '"> | 
| 1594 | - <input type="submit" name="delselected" value="', $txt['pm_delete_selected_rule'], '" data-confirm="', $txt['pm_js_delete_rule_confirm'] ,'" class="button_submit smalltext you_sure">'; | |
| 1594 | + <input type="submit" name="delselected" value="', $txt['pm_delete_selected_rule'], '" data-confirm="', $txt['pm_js_delete_rule_confirm'], '" class="button_submit smalltext you_sure">'; | |
| 1595 | 1595 | |
| 1596 | 1596 | echo ' | 
| 1597 | 1597 | </div> | 
| @@ -1832,9 +1832,9 @@ discard block | ||
| 1832 | 1832 | |
| 1833 | 1833 | echo ' | 
| 1834 | 1834 |  				<select name="acttype[', $k, ']" id="acttype', $k, '" onchange="updateActionDef(', $k, '); rebuildRuleDesc();"> | 
| 1835 | - <option value="">', $txt['pm_rule_sel_action'] , ':</option> | |
| 1836 | - <option value="lab"', $action['t'] == 'lab' ? ' selected' : '', '>', $txt['pm_rule_label'] , '</option> | |
| 1837 | - <option value="del"', $action['t'] == 'del' ? ' selected' : '', '>', $txt['pm_rule_delete'] , '</option> | |
| 1835 | + <option value="">', $txt['pm_rule_sel_action'], ':</option> | |
| 1836 | + <option value="lab"', $action['t'] == 'lab' ? ' selected' : '', '>', $txt['pm_rule_label'], '</option> | |
| 1837 | + <option value="del"', $action['t'] == 'del' ? ' selected' : '', '>', $txt['pm_rule_delete'], '</option> | |
| 1838 | 1838 | </select> | 
| 1839 | 1839 | <span id="labdiv', $k, '"> | 
| 1840 | 1840 | <select name="labdef[', $k, ']" id="labdef', $k, '" onchange="rebuildRuleDesc();"> | 
| @@ -1951,7 +1951,7 @@ discard block | ||
| 1951 | 1951 | </div> | 
| 1952 | 1952 | <ul class="quickbuttons"> | 
| 1953 | 1953 | <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> | 
| 1954 | - <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> | |
| 1954 | + <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> | |
| 1955 | 1955 | </ul> | 
| 1956 | 1956 | </div>'; | 
| 1957 | 1957 | } | 
| @@ -39,7 +39,7 @@ | ||
| 39 | 39 | |
| 40 | 40 | foreach ($category['boards'] as $board) | 
| 41 | 41 | echo ' | 
| 42 | -									<option value="', $board['id'], '"', $board['selected'] ? ' selected' : '', $board['id'] == $context['current_board'] ? ' disabled' : '', '>', $board['child_level'] > 0 ? str_repeat('==', $board['child_level']-1) . '=> ' : '', $board['name'], '</option>'; | |
| 42 | +									<option value="', $board['id'], '"', $board['selected'] ? ' selected' : '', $board['id'] == $context['current_board'] ? ' disabled' : '', '>', $board['child_level'] > 0 ? str_repeat('==', $board['child_level'] - 1) . '=> ' : '', $board['name'], '</option>'; | |
| 43 | 43 | echo ' | 
| 44 | 44 | </optgroup>'; | 
| 45 | 45 | } | 
| @@ -24,8 +24,8 @@ discard block | ||
| 24 | 24 | <meta charset="', $context['character_set'], '"> | 
| 25 | 25 | <meta name="robots" content="noindex"> | 
| 26 | 26 | <title>', $context['page_title'], '</title> | 
| 27 | - <link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'] ,'"> | |
| 28 | - <script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'] ,'"></script> | |
| 27 | + <link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'], '"> | |
| 28 | + <script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'], '"></script> | |
| 29 | 29 | </head> | 
| 30 | 30 | <body id="help_popup"> | 
| 31 | 31 | <div class="windowbg description"> | 
| @@ -50,8 +50,8 @@ discard block | ||
| 50 | 50 | <title>', $txt['find_members'], '</title> | 
| 51 | 51 | <meta charset="', $context['character_set'], '"> | 
| 52 | 52 | <meta name="robots" content="noindex"> | 
| 53 | - <link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'] ,'"> | |
| 54 | - <script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'] ,'"></script> | |
| 53 | + <link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'], '"> | |
| 54 | + <script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'], '"></script> | |
| 55 | 55 | <script> | 
| 56 | 56 | var membersAdded = []; | 
| 57 | 57 | function addMember(name) | 
| @@ -181,14 +181,14 @@ discard block | ||
| 181 | 181 |  		{ | 
| 182 | 182 | collapsedDiv.show(\'slow\'); | 
| 183 | 183 | icon.removeClass(\'toggle_down\').addClass(\'toggle_up\'); | 
| 184 | - icon.prop(\'title\', '. JavaScriptEscape($txt['hide']) .'); | |
| 184 | + icon.prop(\'title\', '. JavaScriptEscape($txt['hide']) . '); | |
| 185 | 185 | } | 
| 186 | 186 | |
| 187 | 187 | else | 
| 188 | 188 |  		{ | 
| 189 | 189 | collapsedDiv.hide(\'slow\'); | 
| 190 | 190 | icon.removeClass(\'toggle_up\').addClass(\'toggle_down\'); | 
| 191 | - icon.prop(\'title\', '. JavaScriptEscape($txt['show']) .'); | |
| 191 | + icon.prop(\'title\', '. JavaScriptEscape($txt['show']) . '); | |
| 192 | 192 | } | 
| 193 | 193 | |
| 194 | 194 | });', true); | 
| @@ -641,7 +641,7 @@ discard block | ||
| 641 | 641 | |
| 642 | 642 | // Setup the correct template, even though I'll admit we ain't downloading ;) | 
| 643 | 643 | $context['sub_template'] = 'downloaded'; | 
| 644 | -	$allowext = array('.zip','.tgz','.gz'); | |
| 644 | +	$allowext = array('.zip', '.tgz', '.gz'); | |
| 645 | 645 | // @todo Use FTP if the Packages directory is not writable. | 
| 646 | 646 | |
| 647 | 647 | // Check the file was even sent! | 
| @@ -653,13 +653,13 @@ discard block | ||
| 653 | 653 | // Make sure it has a sane filename. | 
| 654 | 654 |  	$_FILES['package']['name'] = preg_replace(array('/\s/', '/\.[\.]+/', '/[^\w_\.\-]/'), array('_', '.', ''), $_FILES['package']['name']); | 
| 655 | 655 | $extension = substr(strrchr(strtolower($_FILES['package']['name']), '.'), 0); | 
| 656 | - if(!in_array($extension, $allowext)) | |
| 656 | + if (!in_array($extension, $allowext)) | |
| 657 | 657 |  	{ | 
| 658 | 658 |  		fatal_lang_error('package_upload_error_supports', false, array('zip, tgz, tar.gz')); | 
| 659 | 659 | } | 
| 660 | 660 | |
| 661 | 661 | // We only need the filename... | 
| 662 | - $extension = ($extension == '.gz') ? '.tar.gz' : $extension ; | |
| 662 | + $extension = ($extension == '.gz') ? '.tar.gz' : $extension; | |
| 663 | 663 | $packageName = time() . $extension; | 
| 664 | 664 | |
| 665 | 665 | // Setup the destination and throw an error if the file is already there! | 
| @@ -659,7 +659,7 @@ discard block | ||
| 659 | 659 | |
| 660 | 660 | // Remove the phrase parts and extract the words. | 
| 661 | 661 |  	$wordArray = preg_replace('~(?:^|\s)(?:[-]?)"(?:[^"]+)"(?:$|\s)~' . ($context['utf8'] ? 'u' : ''), ' ', $search_params['search']); | 
| 662 | -	$wordArray = explode(' ',  $smcFunc['htmlspecialchars'](un_htmlspecialchars($wordArray), ENT_QUOTES)); | |
| 662 | +	$wordArray = explode(' ', $smcFunc['htmlspecialchars'](un_htmlspecialchars($wordArray), ENT_QUOTES)); | |
| 663 | 663 | |
| 664 | 664 | // A minus sign in front of a word excludes the word.... so... | 
| 665 | 665 | $excludedWords = array(); | 
| @@ -1104,7 +1104,7 @@ discard block | ||
| 1104 | 1104 | SELECT | 
| 1105 | 1105 |  							{int:id_search}, | 
| 1106 | 1106 | t.id_topic, | 
| 1107 | - ' . $relevance. ', | |
| 1107 | + ' . $relevance . ', | |
| 1108 | 1108 | ' . (empty($userQuery) ? 't.id_first_msg' : 'm.id_msg') . ', | 
| 1109 | 1109 | 1 | 
| 1110 | 1110 | FROM ' . $subject_query['from'] . (empty($subject_query['inner_join']) ? '' : ' | 
| @@ -1339,7 +1339,7 @@ discard block | ||
| 1339 | 1339 | if (empty($subject_query['where'])) | 
| 1340 | 1340 | continue; | 
| 1341 | 1341 | |
| 1342 | -						$ignoreRequest = $smcFunc['db_search_query']('insert_log_search_topics', ($smcFunc['db_support_ignore'] ? ( ' | |
| 1342 | +						$ignoreRequest = $smcFunc['db_search_query']('insert_log_search_topics', ($smcFunc['db_support_ignore'] ? (' | |
| 1343 | 1343 |  							INSERT IGNORE INTO {db_prefix}' . ($createTemporary ? 'tmp_' : '') . 'log_search_topics | 
| 1344 | 1344 |  								(' . ($createTemporary ? '' : 'id_search, ') . 'id_topic)') : '') . ' | 
| 1345 | 1345 | SELECT ' . ($createTemporary ? '' : $_SESSION['search_cache']['id_search'] . ', ') . 't.id_topic | 
| @@ -1568,7 +1568,7 @@ discard block | ||
| 1568 | 1568 | } | 
| 1569 | 1569 | $main_query['select']['relevance'] = substr($relevance, 0, -3) . ') / ' . $new_weight_total . ' AS relevance'; | 
| 1570 | 1570 | |
| 1571 | -					$ignoreRequest = $smcFunc['db_search_query']('insert_log_search_results_no_index', ($smcFunc['db_support_ignore'] ? ( ' | |
| 1571 | +					$ignoreRequest = $smcFunc['db_search_query']('insert_log_search_results_no_index', ($smcFunc['db_support_ignore'] ? (' | |
| 1572 | 1572 |  						INSERT IGNORE INTO ' . '{db_prefix}log_search_results | 
| 1573 | 1573 |  							(' . implode(', ', array_keys($main_query['select'])) . ')') : '') . ' | 
| 1574 | 1574 | SELECT | 
| @@ -1636,7 +1636,7 @@ discard block | ||
| 1636 | 1636 | $relevance = substr($relevance, 0, -3) . ') / ' . $weight_total . ' AS relevance'; | 
| 1637 | 1637 | |
| 1638 | 1638 | $usedIDs = array_flip(empty($inserts) ? array() : array_keys($inserts)); | 
| 1639 | -					$ignoreRequest = $smcFunc['db_search_query']('insert_log_search_results_sub_only', ($smcFunc['db_support_ignore'] ? ( ' | |
| 1639 | +					$ignoreRequest = $smcFunc['db_search_query']('insert_log_search_results_sub_only', ($smcFunc['db_support_ignore'] ? (' | |
| 1640 | 1640 |  						INSERT IGNORE INTO {db_prefix}log_search_results | 
| 1641 | 1641 | (id_search, id_topic, relevance, id_msg, num_matches)') : '') . ' | 
| 1642 | 1642 | SELECT | 
| @@ -2102,7 +2102,7 @@ discard block | ||
| 2102 | 2102 | $query = trim($query, "\*+"); | 
| 2103 | 2103 |  		$query = strtr($smcFunc['htmlspecialchars']($query), array('\\\'' => '\'')); | 
| 2104 | 2104 | |
| 2105 | -		$body_highlighted = preg_replace_callback('/((<[^>]*)|' . preg_quote(strtr($query, array('\'' => ''')), '/') . ')/i' . ($context['utf8'] ? 'u' : ''), function ($m) | |
| 2105 | +		$body_highlighted = preg_replace_callback('/((<[^>]*)|' . preg_quote(strtr($query, array('\'' => ''')), '/') . ')/i' . ($context['utf8'] ? 'u' : ''), function($m) | |
| 2106 | 2106 |  		{ | 
| 2107 | 2107 |  			return isset($m[2]) && "$m[2]" == "$m[1]" ? stripslashes("$m[1]") : "<strong class=\"highlight\">$m[1]</strong>"; | 
| 2108 | 2108 | }, $body_highlighted); | 
| @@ -91,7 +91,7 @@ discard block | ||
| 91 | 91 | |
| 92 | 92 |  	$table = str_replace('{db_prefix}', $db_prefix, $table); | 
| 93 | 93 | |
| 94 | -	$pg_tables = array('pg_catalog','information_schema'); | |
| 94 | +	$pg_tables = array('pg_catalog', 'information_schema'); | |
| 95 | 95 | |
| 96 | 96 |  	$request = $smcFunc['db_query']('', ' | 
| 97 | 97 | SELECT pg_relation_size(C.oid) AS "size" | 
| @@ -289,7 +289,7 @@ discard block | ||
| 289 | 289 |  { | 
| 290 | 290 | static $ver; | 
| 291 | 291 | |
| 292 | - if(!empty($ver)) | |
| 292 | + if (!empty($ver)) | |
| 293 | 293 | return $ver; | 
| 294 | 294 | |
| 295 | 295 | global $smcFunc; | 
| @@ -393,7 +393,7 @@ discard block | ||
| 393 | 393 | 'class' => 'centercol', | 
| 394 | 394 | ), | 
| 395 | 395 | 'data' => array( | 
| 396 | - 'function' => function ($rowData) | |
| 396 | + 'function' => function($rowData) | |
| 397 | 397 |  					{ | 
| 398 | 398 | return $rowData['selected'] ? '<span class="generic_icons valid"></span>' : ''; | 
| 399 | 399 | }, | 
| @@ -453,7 +453,7 @@ discard block | ||
| 453 | 453 | 'class' => 'centercol', | 
| 454 | 454 | ), | 
| 455 | 455 | 'data' => array( | 
| 456 | - 'function' => function ($rowData) | |
| 456 | + 'function' => function($rowData) | |
| 457 | 457 |  					{ | 
| 458 | 458 |  						return $rowData['selected'] ? '' : sprintf('<input type="checkbox" name="smiley_set[%1$d]" class="input_check">', $rowData['id']); | 
| 459 | 459 | }, | 
| @@ -997,7 +997,7 @@ discard block | ||
| 997 | 997 | 'value' => $txt['smileys_location'], | 
| 998 | 998 | ), | 
| 999 | 999 | 'data' => array( | 
| 1000 | - 'function' => function ($rowData) use ($txt) | |
| 1000 | + 'function' => function($rowData) use ($txt) | |
| 1001 | 1001 |  						{ | 
| 1002 | 1002 | if (empty($rowData['hidden'])) | 
| 1003 | 1003 | return $txt['smileys_location_form']; | 
| @@ -1017,7 +1017,7 @@ discard block | ||
| 1017 | 1017 | 'value' => $txt['smileys_description'], | 
| 1018 | 1018 | ), | 
| 1019 | 1019 | 'data' => array( | 
| 1020 | - 'function' => function ($rowData) use ($context, $txt, $modSettings, $smcFunc) | |
| 1020 | + 'function' => function($rowData) use ($context, $txt, $modSettings, $smcFunc) | |
| 1021 | 1021 |  						{ | 
| 1022 | 1022 | if (empty($modSettings['smileys_dir']) || !is_dir($modSettings['smileys_dir'])) | 
| 1023 | 1023 | return $smcFunc['htmlspecialchars']($rowData['description']); | 
| @@ -1557,7 +1557,7 @@ discard block | ||
| 1557 | 1557 | 'action' => $smcFunc['htmlspecialchars'](strtr($action['destination'], array($boarddir => '.'))) | 
| 1558 | 1558 | ); | 
| 1559 | 1559 | |
| 1560 | - $file = $packagesdir . '/temp/' . $base_path . $action['filename']; | |
| 1560 | + $file = $packagesdir . '/temp/' . $base_path . $action['filename']; | |
| 1561 | 1561 | if (isset($action['filename']) && (!file_exists($file) || !is_writable(dirname($action['destination'])))) | 
| 1562 | 1562 |  			{ | 
| 1563 | 1563 | $context['has_failure'] = true; | 
| @@ -1601,7 +1601,7 @@ discard block | ||
| 1601 | 1601 |  		{ | 
| 1602 | 1602 | updateSettings(array( | 
| 1603 | 1603 | 'smiley_sets_known' => $modSettings['smiley_sets_known'] . ',' . basename($action['action']), | 
| 1604 | - 'smiley_sets_names' => $modSettings['smiley_sets_names'] . "\n" . $smileyInfo['name'] . (count($context['actions']) > 1 ? ' ' . (!empty($action['description']) ? $smcFunc['htmlspecialchars']($action['description']) : basename($action['action'])) : ''), | |
| 1604 | + 'smiley_sets_names' => $modSettings['smiley_sets_names'] . "\n" . $smileyInfo['name'] . (count($context['actions']) > 1 ? ' ' . (!empty($action['description']) ? $smcFunc['htmlspecialchars']($action['description']) : basename($action['action'])) : ''), | |
| 1605 | 1605 | )); | 
| 1606 | 1606 | } | 
| 1607 | 1607 | |
| @@ -1613,7 +1613,7 @@ discard block | ||
| 1613 | 1613 |  			'{db_prefix}log_packages', | 
| 1614 | 1614 | array( | 
| 1615 | 1615 | 'filename' => 'string', 'name' => 'string', 'package_id' => 'string', 'version' => 'string', | 
| 1616 | - 'id_member_installed' => 'int', 'member_installed' => 'string','time_installed' => 'int', | |
| 1616 | + 'id_member_installed' => 'int', 'member_installed' => 'string', 'time_installed' => 'int', | |
| 1617 | 1617 | 'install_state' => 'int', 'failed_steps' => 'string', 'themes_installed' => 'string', | 
| 1618 | 1618 | 'member_removed' => 'int', 'db_changes' => 'string', 'credits' => 'string', | 
| 1619 | 1619 | ), | 
| @@ -1862,7 +1862,7 @@ discard block | ||
| 1862 | 1862 | 'columns' => array( | 
| 1863 | 1863 | 'icon' => array( | 
| 1864 | 1864 | 'data' => array( | 
| 1865 | - 'function' => function ($rowData) use ($settings, $smcFunc) | |
| 1865 | + 'function' => function($rowData) use ($settings, $smcFunc) | |
| 1866 | 1866 |  					{ | 
| 1867 | 1867 |  						$images_url = $settings[file_exists(sprintf('%1$s/images/post/%2$s.png', $settings['theme_dir'], $rowData['filename'])) ? 'actual_images_url' : 'default_images_url']; | 
| 1868 | 1868 |  						return sprintf('<img src="%1$s/post/%2$s.png" alt="%3$s">', $images_url, $rowData['filename'], $smcFunc['htmlspecialchars']($rowData['title'])); | 
| @@ -1896,7 +1896,7 @@ discard block | ||
| 1896 | 1896 | 'value' => $txt['icons_board'], | 
| 1897 | 1897 | ), | 
| 1898 | 1898 | 'data' => array( | 
| 1899 | - 'function' => function ($rowData) use ($txt) | |
| 1899 | + 'function' => function($rowData) use ($txt) | |
| 1900 | 1900 |  					{ | 
| 1901 | 1901 | return empty($rowData['board_name']) ? $txt['icons_edit_icons_all_boards'] : $rowData['board_name']; | 
| 1902 | 1902 | }, | 
| @@ -586,7 +586,7 @@ discard block | ||
| 586 | 586 | 'member_name' => $regOptions['username'], | 
| 587 | 587 | 'email_address' => $regOptions['email'], | 
| 588 | 588 | 'passwd' => hash_password($regOptions['username'], $regOptions['password']), | 
| 589 | - 'password_salt' => substr(md5(mt_rand()), 0, 4) , | |
| 589 | + 'password_salt' => substr(md5(mt_rand()), 0, 4), | |
| 590 | 590 | 'posts' => 0, | 
| 591 | 591 | 'date_registered' => time(), | 
| 592 | 592 | 'member_ip' => $regOptions['interface'] == 'admin' ? '127.0.0.1' : $user_info['ip'], | 
| @@ -676,7 +676,7 @@ discard block | ||
| 676 | 676 | 'time_offset', | 
| 677 | 677 | ); | 
| 678 | 678 | $knownInets = array( | 
| 679 | - 'member_ip','member_ip2', | |
| 679 | + 'member_ip', 'member_ip2', | |
| 680 | 680 | ); | 
| 681 | 681 | |
| 682 | 682 | // Call an optional function to validate the users' input. | 
| @@ -904,7 +904,7 @@ discard block | ||
| 904 | 904 |  	$checkName = strtr($name, array('_' => '\\_', '%' => '\\%')); | 
| 905 | 905 | |
| 906 | 906 | //when we got no wildcard we can use equal -> fast | 
| 907 | - $operator = (strpos($checkName, '%') || strpos($checkName, '_') ? 'LIKE' : '=' ); | |
| 907 | + $operator = (strpos($checkName, '%') || strpos($checkName, '_') ? 'LIKE' : '='); | |
| 908 | 908 | |
| 909 | 909 | // Make sure they don't want someone else's name. | 
| 910 | 910 |  	$request = $smcFunc['db_query']('', ' | 
| @@ -1273,7 +1273,7 @@ discard block | ||
| 1273 | 1273 | $user_info['buddies'][] = $userReceiver; | 
| 1274 | 1274 | |
| 1275 | 1275 | // And add a nice alert. Don't abuse though! | 
| 1276 | -		if ((cache_get_data('Buddy-sent-'. $user_info['id'] .'-'. $userReceiver, 86400)) == null) | |
| 1276 | +		if ((cache_get_data('Buddy-sent-' . $user_info['id'] . '-' . $userReceiver, 86400)) == null) | |
| 1277 | 1277 |  		{ | 
| 1278 | 1278 |  			$smcFunc['db_insert']('insert', | 
| 1279 | 1279 |  				'{db_prefix}background_tasks', | 
| @@ -1288,7 +1288,7 @@ discard block | ||
| 1288 | 1288 | ); | 
| 1289 | 1289 | |
| 1290 | 1290 | // Store this in a cache entry to avoid creating multiple alerts. Give it a long life cycle. | 
| 1291 | -			cache_put_data('Buddy-sent-'. $user_info['id'] .'-'. $userReceiver, '1', 86400); | |
| 1291 | +			cache_put_data('Buddy-sent-' . $user_info['id'] . '-' . $userReceiver, '1', 86400); | |
| 1292 | 1292 | } | 
| 1293 | 1293 | } | 
| 1294 | 1294 | |
| @@ -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']) |