@@ -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 | });', true); |
194 | 194 | } |
@@ -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! |
@@ -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($smcFunc['random_int']()), 0, 4) , |
|
589 | + 'password_salt' => substr(md5($smcFunc['random_int']()), 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 |
@@ -283,11 +283,11 @@ discard block |
||
283 | 283 | if (removeItems == 0) |
284 | 284 | { |
285 | 285 | e.preventDefault(); |
286 | - return alert("'. $txt['select_item_check'] .'"); |
|
286 | + return alert("'. $txt['select_item_check'] . '"); |
|
287 | 287 | } |
288 | 288 | |
289 | 289 | |
290 | - return confirm("'. $txt['ban_remove_selected_confirm'] .'"); |
|
290 | + return confirm("'. $txt['ban_remove_selected_confirm'] . '"); |
|
291 | 291 | });', |
292 | 292 | ); |
293 | 293 | |
@@ -486,7 +486,7 @@ discard block |
||
486 | 486 | array( |
487 | 487 | 'position' => 'below_table_data', |
488 | 488 | 'value' => ' |
489 | - <input type="submit" name="remove_selection" value="' . $txt['ban_remove_selected_triggers'] . '" class="button"> <a class="button" href="' . $scripturl . '?action=admin;area=ban;sa=edittrigger;bg=' . $ban_group_id . '">' . $txt['ban_add_trigger'] . '</a>', |
|
489 | + <input type="submit" name="remove_selection" value="' . $txt['ban_remove_selected_triggers'] . '" class="button"> <a class="button" href="' . $scripturl . '?action=admin;area=ban;sa=edittrigger;bg=' . $ban_group_id . '">' . $txt['ban_add_trigger'] . '</a>', |
|
490 | 490 | 'style' => 'text-align: right;', |
491 | 491 | ), |
492 | 492 | array( |
@@ -506,11 +506,11 @@ discard block |
||
506 | 506 | if (removeItems == 0) |
507 | 507 | { |
508 | 508 | e.preventDefault(); |
509 | - return alert("'. $txt['select_item_check'] .'"); |
|
509 | + return alert("'. $txt['select_item_check'] . '"); |
|
510 | 510 | } |
511 | 511 | |
512 | 512 | |
513 | - return confirm("'. $txt['ban_remove_selected_confirm'] .'"); |
|
513 | + return confirm("'. $txt['ban_remove_selected_confirm'] . '"); |
|
514 | 514 | });', |
515 | 515 | ); |
516 | 516 | createList($listOptions); |
@@ -1257,7 +1257,7 @@ discard block |
||
1257 | 1257 | ); |
1258 | 1258 | if (empty($value)) |
1259 | 1259 | { |
1260 | - $deletes = array('id_theme' => 1 , 'variable' => $row['col_name'], 'id_member' => $memID); |
|
1260 | + $deletes = array('id_theme' => 1, 'variable' => $row['col_name'], 'id_member' => $memID); |
|
1261 | 1261 | unset($user_profile[$memID]['options'][$row['col_name']]); |
1262 | 1262 | } |
1263 | 1263 | else |
@@ -1285,7 +1285,7 @@ discard block |
||
1285 | 1285 | array('id_theme', 'variable', 'id_member') |
1286 | 1286 | ); |
1287 | 1287 | if (!empty($deletes)) |
1288 | - $smcFunc['db_query']('',' |
|
1288 | + $smcFunc['db_query']('', ' |
|
1289 | 1289 | DELETE FROM {db_prefix}themes |
1290 | 1290 | WHERE id_theme = {int:id_theme} AND |
1291 | 1291 | variable = {string:variable} AND |
@@ -262,8 +262,8 @@ discard block |
||
262 | 262 | |
263 | 263 | case 'datetime': |
264 | 264 | if (preg_match('~^(\d{4})-([0-1]?\d)-([0-3]?\d) ([0-1]?\d|2[0-3]):([0-5]\d):([0-5]\d)$~', $replacement, $datetime_matches) === 1) |
265 | - return 'str_to_date('. |
|
266 | - sprintf('\'%04d-%02d-%02d %02d:%02d:%02d\'', $datetime_matches[1], $datetime_matches[2], $datetime_matches[3], $datetime_matches[4], $datetime_matches[5] ,$datetime_matches[6]). |
|
265 | + return 'str_to_date(' . |
|
266 | + sprintf('\'%04d-%02d-%02d %02d:%02d:%02d\'', $datetime_matches[1], $datetime_matches[2], $datetime_matches[3], $datetime_matches[4], $datetime_matches[5], $datetime_matches[6]) . |
|
267 | 267 | ',\'%Y-%m-%d %h:%i:%s\')'; |
268 | 268 | else |
269 | 269 | smf_db_error_backtrace('Wrong value type sent to the database. Datetime expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__); |
@@ -414,7 +414,7 @@ discard block |
||
414 | 414 | $old_pos = 0; |
415 | 415 | $pos = -1; |
416 | 416 | // Remove the string escape for better runtime |
417 | - $db_string_1 = str_replace('\\\'','',$db_string); |
|
417 | + $db_string_1 = str_replace('\\\'', '', $db_string); |
|
418 | 418 | while (true) |
419 | 419 | { |
420 | 420 | $pos = strpos($db_string_1, '\'', $pos + 1); |
@@ -800,7 +800,7 @@ discard block |
||
800 | 800 | { |
801 | 801 | $count = count($insertRows); |
802 | 802 | $ai = 0; |
803 | - for($i = 0; $i < $count; $i++) |
|
803 | + for ($i = 0; $i < $count; $i++) |
|
804 | 804 | { |
805 | 805 | $old_id = $smcFunc['db_insert_id'](); |
806 | 806 | |
@@ -826,13 +826,13 @@ discard block |
||
826 | 826 | $count2 = count($indexed_columns); |
827 | 827 | for ($x = 0; $x < $count2; $x++) |
828 | 828 | { |
829 | - $where_string += key($indexed_columns[$x]) . ' = '. $insertRows[$i][$x]; |
|
829 | + $where_string += key($indexed_columns[$x]) . ' = ' . $insertRows[$i][$x]; |
|
830 | 830 | if (($x + 1) < $count2) |
831 | 831 | $where_string += ' AND '; |
832 | 832 | } |
833 | 833 | |
834 | - $request = $smcFunc['db_query']('',' |
|
835 | - SELECT `'. $keys[0] . '` FROM ' . $table .' |
|
834 | + $request = $smcFunc['db_query']('', ' |
|
835 | + SELECT `'. $keys[0] . '` FROM ' . $table . ' |
|
836 | 836 | WHERE ' . $where_string . ' LIMIT 1', |
837 | 837 | array() |
838 | 838 | ); |
@@ -861,7 +861,7 @@ discard block |
||
861 | 861 | $return_var = array(); |
862 | 862 | $count = count($insertRows); |
863 | 863 | $start = smf_db_insert_id($table, $keys[0]); |
864 | - for ($i = 0; $i < $count; $i++ ) |
|
864 | + for ($i = 0; $i < $count; $i++) |
|
865 | 865 | $return_var[] = $start + $i; |
866 | 866 | } |
867 | 867 | return $return_var; |
@@ -998,7 +998,7 @@ discard block |
||
998 | 998 | mysqli_stmt_bind_param($mysql_error_data_prep, 'iissssssis', |
999 | 999 | $error_array[0], $error_array[1], $error_array[2], $error_array[3], $error_array[4], $error_array[5], $error_array[6], |
1000 | 1000 | $error_array[7], $error_array[8], $error_array[9]); |
1001 | - mysqli_stmt_execute ($mysql_error_data_prep); |
|
1001 | + mysqli_stmt_execute($mysql_error_data_prep); |
|
1002 | 1002 | } |
1003 | 1003 | |
1004 | 1004 | /** |
@@ -1012,7 +1012,7 @@ discard block |
||
1012 | 1012 | */ |
1013 | 1013 | function smf_db_custom_order($field, $array_values, $desc = false) |
1014 | 1014 | { |
1015 | - $return = 'CASE '. $field . ' '; |
|
1015 | + $return = 'CASE ' . $field . ' '; |
|
1016 | 1016 | $count = count($array_values); |
1017 | 1017 | $then = ($desc ? ' THEN -' : ' THEN '); |
1018 | 1018 |
@@ -145,7 +145,7 @@ discard block |
||
145 | 145 | } |
146 | 146 | if ($c === $n) { |
147 | 147 | $q = $delta; |
148 | - for ($k = static::BASE;; $k += static::BASE) { |
|
148 | + for ($k = static::BASE; ; $k += static::BASE) { |
|
149 | 149 | $t = $this->calculateThreshold($k, $bias); |
150 | 150 | if ($q < $t) { |
151 | 151 | break; |
@@ -221,7 +221,7 @@ discard block |
||
221 | 221 | $oldi = $i; |
222 | 222 | $w = 1; |
223 | 223 | |
224 | - for ($k = static::BASE;; $k += static::BASE) { |
|
224 | + for ($k = static::BASE; ; $k += static::BASE) { |
|
225 | 225 | $digit = static::$decodeTable[$input[$pos++]]; |
226 | 226 | $i = $i + ($digit * $w); |
227 | 227 | $t = $this->calculateThreshold($k, $bias); |
@@ -230,7 +230,7 @@ discard block |
||
230 | 230 | |
231 | 231 | foreach ($message['custom_fields']['above_member'] as $custom) |
232 | 232 | echo ' |
233 | - <li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>'; |
|
233 | + <li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>'; |
|
234 | 234 | |
235 | 235 | echo ' |
236 | 236 | </ul> |
@@ -279,7 +279,7 @@ discard block |
||
279 | 279 | if (!empty($message['custom_fields']['below_avatar'])) |
280 | 280 | foreach ($message['custom_fields']['below_avatar'] as $custom) |
281 | 281 | echo ' |
282 | - <li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>'; |
|
282 | + <li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>'; |
|
283 | 283 | |
284 | 284 | if (!$message['member']['is_guest']) |
285 | 285 | echo ' |
@@ -321,7 +321,7 @@ discard block |
||
321 | 321 | |
322 | 322 | foreach ($message['custom_fields']['icons'] as $custom) |
323 | 323 | echo ' |
324 | - <li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>'; |
|
324 | + <li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>'; |
|
325 | 325 | |
326 | 326 | echo ' |
327 | 327 | </ol> |
@@ -385,7 +385,7 @@ discard block |
||
385 | 385 | if (!empty($message['custom_fields']['standard'])) |
386 | 386 | foreach ($message['custom_fields']['standard'] as $custom) |
387 | 387 | echo ' |
388 | - <li class="custom ', $custom['col_name'] ,'">', $custom['title'], ': ', $custom['value'], '</li>'; |
|
388 | + <li class="custom ', $custom['col_name'], '">', $custom['title'], ': ', $custom['value'], '</li>'; |
|
389 | 389 | |
390 | 390 | // Are we showing the warning status? |
391 | 391 | if ($message['member']['can_see_warning']) |
@@ -396,7 +396,7 @@ discard block |
||
396 | 396 | if (!empty($message['custom_fields']['bottom_poster'])) |
397 | 397 | foreach ($message['custom_fields']['bottom_poster'] as $custom) |
398 | 398 | echo ' |
399 | - <li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>'; |
|
399 | + <li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>'; |
|
400 | 400 | } |
401 | 401 | |
402 | 402 | // Done with the information about the poster... on to the post itself. |
@@ -497,7 +497,7 @@ discard block |
||
497 | 497 | |
498 | 498 | foreach ($message['custom_fields']['above_signature'] as $custom) |
499 | 499 | echo ' |
500 | - <li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>'; |
|
500 | + <li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>'; |
|
501 | 501 | |
502 | 502 | echo ' |
503 | 503 | </ul> |
@@ -520,7 +520,7 @@ discard block |
||
520 | 520 | |
521 | 521 | foreach ($message['custom_fields']['below_signature'] as $custom) |
522 | 522 | echo ' |
523 | - <li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>'; |
|
523 | + <li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>'; |
|
524 | 524 | |
525 | 525 | echo ' |
526 | 526 | </ul> |
@@ -656,7 +656,7 @@ discard block |
||
656 | 656 | while ($message = $context['get_pmessage']('subject')) |
657 | 657 | { |
658 | 658 | echo ' |
659 | - <tr class="windowbg', $message['is_unread'] ? ' unread_pm' : '','"> |
|
659 | + <tr class="windowbg', $message['is_unread'] ? ' unread_pm' : '', '"> |
|
660 | 660 | <td class="table_icon pm_icon"> |
661 | 661 | <script> |
662 | 662 | currentLabels[', $message['id'], '] = {'; |
@@ -680,7 +680,7 @@ discard block |
||
680 | 680 | <td class="pm_time">', $message['time'], '</td> |
681 | 681 | <td class="pm_subject"> |
682 | 682 | ', ($context['display_mode'] != 0 && $context['current_pm'] == $message['id'] ? '<img src="' . $settings['images_url'] . '/selected.png" alt="*">' : ''), '<a href="', ($context['display_mode'] == 0 || $context['current_pm'] == $message['id'] ? '' : ($scripturl . '?action=pm;pmid=' . $message['id'] . ';kstart;f=' . $context['folder'] . ';start=' . $context['start'] . ';sort=' . $context['sort_by'] . ($context['sort_direction'] == 'up' ? ';' : ';desc') . ($context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : ''))), '#msg', $message['id'], '">', $message['subject'], $message['is_unread'] ? ' <span class="new_posts">' . $txt['new'] . '</span>' : '', '</a> |
683 | - <span class="pm_inline_time"><span class="generic_icons ', ($context['from_or_to']=='to' && count($message['recipients']['to'])>1) ? 'people' : 'members', '"></span> ', ($context['from_or_to'] == 'from' ? $message['member']['link'] : (empty($message['recipients']['to']) ? '' : implode(', ', $message['recipients']['to']))), ' <span class="generic_icons time_online"></span> ', $message['time'], '</span> |
|
683 | + <span class="pm_inline_time"><span class="generic_icons ', ($context['from_or_to'] == 'to' && count($message['recipients']['to']) > 1) ? 'people' : 'members', '"></span> ', ($context['from_or_to'] == 'from' ? $message['member']['link'] : (empty($message['recipients']['to']) ? '' : implode(', ', $message['recipients']['to']))), ' <span class="generic_icons time_online"></span> ', $message['time'], '</span> |
|
684 | 684 | </td> |
685 | 685 | <td class="pm_from_to"> |
686 | 686 | ', ($context['from_or_to'] == 'from' ? $message['member']['link'] : (empty($message['recipients']['to']) ? '' : implode(', ', $message['recipients']['to']))), ' |
@@ -957,13 +957,13 @@ discard block |
||
957 | 957 | // You can only reply if they are not a guest... |
958 | 958 | if (!$message['member']['is_guest']) |
959 | 959 | echo ' |
960 | - <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'], ' |
|
961 | - <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']; |
|
960 | + <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'], ' |
|
961 | + <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']; |
|
962 | 962 | |
963 | 963 | // This is for "forwarding" - even if the member is gone. |
964 | 964 | else |
965 | 965 | echo ' |
966 | - <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']; |
|
966 | + <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']; |
|
967 | 967 | } |
968 | 968 | |
969 | 969 | echo ' |
@@ -1063,7 +1063,7 @@ discard block |
||
1063 | 1063 | <div class="', empty($context['error_type']) || $context['error_type'] != 'serious' ? 'noticebox' : 'errorbox', '', empty($context['post_error']['messages']) ? ' hidden' : '', '" id="errors"> |
1064 | 1064 | <dl> |
1065 | 1065 | <dt> |
1066 | - <strong id="error_serious">', $txt['error_while_submitting'] , '</strong> |
|
1066 | + <strong id="error_serious">', $txt['error_while_submitting'], '</strong> |
|
1067 | 1067 | </dt> |
1068 | 1068 | <dd class="error" id="error_list"> |
1069 | 1069 | ', empty($context['post_error']['messages']) ? '' : implode('<br>', $context['post_error']['messages']), ' |
@@ -1119,7 +1119,7 @@ discard block |
||
1119 | 1119 | <span', (isset($context['post_error']['no_subject']) ? ' class="error"' : ''), ' id="caption_subject">', $txt['subject'], ':</span> |
1120 | 1120 | </dt> |
1121 | 1121 | <dd id="pm_subject"> |
1122 | - <input type="text" name="subject" value="', $context['subject'], '" tabindex="', $context['tabindex']++, '" size="80" maxlength="80"',isset($context['post_error']['no_subject']) ? ' class="error"' : '', '> |
|
1122 | + <input type="text" name="subject" value="', $context['subject'], '" tabindex="', $context['tabindex']++, '" size="80" maxlength="80"', isset($context['post_error']['no_subject']) ? ' class="error"' : '', '> |
|
1123 | 1123 | </dd> |
1124 | 1124 | </dl>'; |
1125 | 1125 | |
@@ -1472,7 +1472,7 @@ discard block |
||
1472 | 1472 | echo ' |
1473 | 1473 | <div class="block righttext"> |
1474 | 1474 | <input type="submit" name="save" value="', $txt['save'], '" class="button"> |
1475 | - <input type="submit" name="delete" value="', $txt['quickmod_delete_selected'], '" data-confirm="', $txt['pm_labels_delete'] ,'" class="button you_sure"> |
|
1475 | + <input type="submit" name="delete" value="', $txt['quickmod_delete_selected'], '" data-confirm="', $txt['pm_labels_delete'], '" class="button you_sure"> |
|
1476 | 1476 | </div>'; |
1477 | 1477 | |
1478 | 1478 | echo ' |
@@ -1636,7 +1636,7 @@ discard block |
||
1636 | 1636 | if (!empty($context['rules'])) |
1637 | 1637 | echo ' |
1638 | 1638 | <input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '"> |
1639 | - <input type="submit" name="delselected" value="', $txt['pm_delete_selected_rule'], '" data-confirm="', $txt['pm_js_delete_rule_confirm'] ,'" class="button smalltext you_sure">'; |
|
1639 | + <input type="submit" name="delselected" value="', $txt['pm_delete_selected_rule'], '" data-confirm="', $txt['pm_js_delete_rule_confirm'], '" class="button smalltext you_sure">'; |
|
1640 | 1640 | |
1641 | 1641 | echo ' |
1642 | 1642 | </div> |
@@ -1879,9 +1879,9 @@ discard block |
||
1879 | 1879 | |
1880 | 1880 | echo ' |
1881 | 1881 | <select name="acttype[', $k, ']" id="acttype', $k, '" onchange="updateActionDef(', $k, '); rebuildRuleDesc();"> |
1882 | - <option value="">', $txt['pm_rule_sel_action'] , ':</option> |
|
1883 | - <option value="lab"', $action['t'] == 'lab' ? ' selected' : '', '>', $txt['pm_rule_label'] , '</option> |
|
1884 | - <option value="del"', $action['t'] == 'del' ? ' selected' : '', '>', $txt['pm_rule_delete'] , '</option> |
|
1882 | + <option value="">', $txt['pm_rule_sel_action'], ':</option> |
|
1883 | + <option value="lab"', $action['t'] == 'lab' ? ' selected' : '', '>', $txt['pm_rule_label'], '</option> |
|
1884 | + <option value="del"', $action['t'] == 'del' ? ' selected' : '', '>', $txt['pm_rule_delete'], '</option> |
|
1885 | 1885 | </select> |
1886 | 1886 | <span id="labdiv', $k, '"> |
1887 | 1887 | <select name="labdef[', $k, ']" id="labdef', $k, '" onchange="rebuildRuleDesc();"> |
@@ -1993,7 +1993,7 @@ discard block |
||
1993 | 1993 | </div> |
1994 | 1994 | <ul class="quickbuttons"> |
1995 | 1995 | <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> |
1996 | - <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> |
|
1996 | + <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> |
|
1997 | 1997 | </ul> |
1998 | 1998 | </div><!-- .windowbg -->'; |
1999 | 1999 | } |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | } |
73 | 73 | |
74 | 74 | echo ' |
75 | - <table class="table_grid" ', !empty($list_id) ? 'id="'.$list_id.'"' : '', ' ', !empty($cur_list['width']) ? ' style="width:' . $cur_list['width'] . '"' : '', '>'; |
|
75 | + <table class="table_grid" ', !empty($list_id) ? 'id="' . $list_id . '"' : '', ' ', !empty($cur_list['width']) ? ' style="width:' . $cur_list['width'] . '"' : '', '>'; |
|
76 | 76 | |
77 | 77 | // Show the column headers. |
78 | 78 | $header_count = count($cur_list['headers']); |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | // Loop through each column and add a table header. |
86 | 86 | foreach ($cur_list['headers'] as $col_header) |
87 | 87 | echo ' |
88 | - <th scope="col" id="header_', $list_id, '_', $col_header['id'], '" class="' , $col_header['id'], empty($col_header['class']) ? '' : ' '.$col_header['class'] , '"', empty($col_header['style']) ? '' : ' style="' . $col_header['style'] . '"', empty($col_header['colspan']) ? '' : ' colspan="' . $col_header['colspan'] . '"', '> |
|
88 | + <th scope="col" id="header_', $list_id, '_', $col_header['id'], '" class="', $col_header['id'], empty($col_header['class']) ? '' : ' ' . $col_header['class'], '"', empty($col_header['style']) ? '' : ' style="' . $col_header['style'] . '"', empty($col_header['colspan']) ? '' : ' colspan="' . $col_header['colspan'] . '"', '> |
|
89 | 89 | ', empty($col_header['href']) ? '' : '<a href="' . $col_header['href'] . '" rel="nofollow">', empty($col_header['label']) ? '' : $col_header['label'], empty($col_header['href']) ? '' : (empty($col_header['sort_image']) ? '</a>' : ' <span class="generic_icons sort_' . $col_header['sort_image'] . '"></span></a>'), ' |
90 | 90 | </th>'; |
91 | 91 | |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | if (!empty($row['data'])) |
118 | 118 | foreach ($row['data'] as $row_id => $row_data) |
119 | 119 | echo ' |
120 | - <td class="', $row_id, empty($row_data['class']) ? '' : ' ' . $row_data['class'] .'', '"', empty($row_data['style']) ? '' : ' style="' . $row_data['style'] . '"', '> |
|
120 | + <td class="', $row_id, empty($row_data['class']) ? '' : ' ' . $row_data['class'] . '', '"', empty($row_data['style']) ? '' : ' style="' . $row_data['style'] . '"', '> |
|
121 | 121 | ', $row_data['value'], ' |
122 | 122 | </td>'; |
123 | 123 |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | |
71 | 71 | echo ' |
72 | 72 | <div class="main_container"> |
73 | - <div class="cat_bar ', $category['is_collapsed'] ? 'collapsed' : '','" id="category_', $category['id'], '"> |
|
73 | + <div class="cat_bar ', $category['is_collapsed'] ? 'collapsed' : '', '" id="category_', $category['id'], '"> |
|
74 | 74 | <h3 class="catbg">'; |
75 | 75 | |
76 | 76 | // If this category even can collapse, show a link to collapse it. |
@@ -248,7 +248,7 @@ discard block |
||
248 | 248 | foreach ($board['children'] as $child) |
249 | 249 | { |
250 | 250 | if (!$child['is_redirect']) |
251 | - $child['link'] = ''. ($child['new'] ? '<a href="' . $scripturl . '?action=unread;board=' . $child['id'] . '" title="' . $txt['new_posts'] . ' (' . $txt['board_topics'] . ': ' . comma_format($child['topics']) . ', ' . $txt['posts'] . ': ' . comma_format($child['posts']) . ')" class="new_posts">' . $txt['new'] . '</a>' : '') . '<a href="' . $child['href'] . '" ' . ($child['new'] ? 'class="board_new_posts" ' : '') . 'title="' . ($child['new'] ? $txt['new_posts'] : $txt['old_posts']) . ' (' . $txt['board_topics'] . ': ' . comma_format($child['topics']) . ', ' . $txt['posts'] . ': ' . comma_format($child['posts']) . ')">' . $child['name'] . '</a>'; |
|
251 | + $child['link'] = '' . ($child['new'] ? '<a href="' . $scripturl . '?action=unread;board=' . $child['id'] . '" title="' . $txt['new_posts'] . ' (' . $txt['board_topics'] . ': ' . comma_format($child['topics']) . ', ' . $txt['posts'] . ': ' . comma_format($child['posts']) . ')" class="new_posts">' . $txt['new'] . '</a>' : '') . '<a href="' . $child['href'] . '" ' . ($child['new'] ? 'class="board_new_posts" ' : '') . 'title="' . ($child['new'] ? $txt['new_posts'] : $txt['old_posts']) . ' (' . $txt['board_topics'] . ': ' . comma_format($child['topics']) . ', ' . $txt['posts'] . ': ' . comma_format($child['posts']) . ')">' . $child['name'] . '</a>'; |
|
252 | 252 | else |
253 | 253 | $child['link'] = '<a href="' . $child['href'] . '" title="' . comma_format($child['posts']) . ' ' . $txt['redirects'] . ' - ' . $child['short_description'] . '">' . $child['name'] . '</a>'; |
254 | 254 |