@@ -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 | } |
@@ -139,10 +139,10 @@ discard block |
||
139 | 139 | foreach ($context['posting_fields'] as $pf) |
140 | 140 | echo ' |
141 | 141 | <dt> |
142 | - ', $pf['dt'] ,' |
|
142 | + ', $pf['dt'], ' |
|
143 | 143 | </dt> |
144 | 144 | <dd> |
145 | - ', $pf['dd'] ,' |
|
145 | + ', $pf['dd'], ' |
|
146 | 146 | </dd>'; |
147 | 147 | |
148 | 148 | |
@@ -459,13 +459,13 @@ discard block |
||
459 | 459 | <p class="message" data-dz-message></p> |
460 | 460 | <p class="attached_BBC"> |
461 | 461 | <input type="text" name="attachBBC" value="" readonly> |
462 | - <a class="button_submit insertBBC">', $txt['attached_insertBBC'] ,'</a> |
|
462 | + <a class="button_submit insertBBC">', $txt['attached_insertBBC'], '</a> |
|
463 | 463 | </p> |
464 | 464 | <p class="progressBar" role="progressBar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0"><span></span></p> |
465 | 465 | </div> |
466 | 466 | <div class="attach-ui"> |
467 | - <a data-dz-remove class="button_submit delete">', $txt['modify_cancel'] ,'</a> |
|
468 | - <a class="button_submit start">', $txt['upload'] ,'</a> |
|
467 | + <a data-dz-remove class="button_submit delete">', $txt['modify_cancel'], '</a> |
|
468 | + <a class="button_submit start">', $txt['upload'], '</a> |
|
469 | 469 | </div> |
470 | 470 | </div> |
471 | 471 | </div> |
@@ -482,10 +482,10 @@ discard block |
||
482 | 482 | </dt> |
483 | 483 | <dd class="smalltext fallback"> |
484 | 484 | <div id="attachUpload" class="descbox"> |
485 | - <h5>', $txt['attach_drop_zone'] ,'</h5> |
|
486 | - <a class="button_submit" id="attach-cancelAll">', $txt['attached_cancelAll'] ,'</a> |
|
487 | - <a class="button_submit" id="attach-uploadAll">', $txt['attached_uploadAll'] ,'</a> |
|
488 | - <a class="button_submit fileinput-button">', $txt['attach_add'] ,'</a> |
|
485 | + <h5>', $txt['attach_drop_zone'], '</h5> |
|
486 | + <a class="button_submit" id="attach-cancelAll">', $txt['attached_cancelAll'], '</a> |
|
487 | + <a class="button_submit" id="attach-uploadAll">', $txt['attached_uploadAll'], '</a> |
|
488 | + <a class="button_submit fileinput-button">', $txt['attach_add'], '</a> |
|
489 | 489 | <div id="total-progress" class="progressBar" role="progressBar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0"><span></span></div> |
490 | 490 | <div class="fallback"> |
491 | 491 | <input type="file" multiple="multiple" name="attachment[]" id="attachment1" class="input_file fallback"> (<a href="javascript:void(0);" onclick="cleanFileInput(\'attachment1\');">', $txt['clean_attach'], '</a>) |
@@ -592,7 +592,7 @@ discard block |
||
592 | 592 | // Option to delete an event if user is editing one. |
593 | 593 | if ($context['make_event'] && !$context['event']['new']) |
594 | 594 | echo ' |
595 | - <input type="submit" name="deleteevent" value="', $txt['event_delete'], '" data-confirm="', $txt['event_delete_confirm'] ,'" class="button_submit you_sure">'; |
|
595 | + <input type="submit" name="deleteevent" value="', $txt['event_delete'], '" data-confirm="', $txt['event_delete_confirm'], '" class="button_submit you_sure">'; |
|
596 | 596 | |
597 | 597 | echo ' |
598 | 598 | </span> |
@@ -846,7 +846,7 @@ discard block |
||
846 | 846 | });'; |
847 | 847 | |
848 | 848 | echo ' |
849 | - var oEditorID = "', $context['post_box_name'] ,'"; |
|
849 | + var oEditorID = "', $context['post_box_name'], '"; |
|
850 | 850 | var oEditorObject = oEditorHandle_', $context['post_box_name'], '; |
851 | 851 | </script>'; |
852 | 852 | |
@@ -878,7 +878,7 @@ discard block |
||
878 | 878 | { |
879 | 879 | echo ' |
880 | 880 | <ul class="quickbuttons" id="msg_', $post['id'], '_quote"> |
881 | - <li style="display:none;" id="quoteSelected_', $post['id'], '" data-msgid="', $post['id'], '"><a href="javascript:void(0)"><span class="generic_icons quote_selected"></span>', $txt['quote_selected_action'] ,'</a></li> |
|
881 | + <li style="display:none;" id="quoteSelected_', $post['id'], '" data-msgid="', $post['id'], '"><a href="javascript:void(0)"><span class="generic_icons quote_selected"></span>', $txt['quote_selected_action'], '</a></li> |
|
882 | 882 | <li id="post_modify"><a href="#postmodify" onclick="return insertQuoteFast(', $post['id'], ');"><span class="generic_icons quote"></span>', $txt['quote'], '</a></li> |
883 | 883 | </ul>'; |
884 | 884 | } |
@@ -965,7 +965,7 @@ discard block |
||
965 | 965 | <head> |
966 | 966 | <meta charset="', $context['character_set'], '"> |
967 | 967 | <title>', $txt['spell_check'], '</title> |
968 | - <link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'] ,'"> |
|
968 | + <link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'], '"> |
|
969 | 969 | <style> |
970 | 970 | body, td |
971 | 971 | { |
@@ -998,8 +998,8 @@ discard block |
||
998 | 998 | var spell_formname = window.opener.spell_formname; |
999 | 999 | var spell_fieldname = window.opener.spell_fieldname; |
1000 | 1000 | </script> |
1001 | - <script src="', $settings['default_theme_url'], '/scripts/spellcheck.js', $modSettings['browser_cache'] ,'"></script> |
|
1002 | - <script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'] ,'"></script> |
|
1001 | + <script src="', $settings['default_theme_url'], '/scripts/spellcheck.js', $modSettings['browser_cache'], '"></script> |
|
1002 | + <script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'], '"></script> |
|
1003 | 1003 | <script> |
1004 | 1004 | ', $context['spell_js'], ' |
1005 | 1005 | </script> |
@@ -1041,7 +1041,7 @@ discard block |
||
1041 | 1041 | <head> |
1042 | 1042 | <meta charset="', $context['character_set'], '"> |
1043 | 1043 | <title>', $txt['retrieving_quote'], '</title> |
1044 | - <script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'] ,'"></script> |
|
1044 | + <script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'], '"></script> |
|
1045 | 1045 | </head> |
1046 | 1046 | <body> |
1047 | 1047 | ', $txt['retrieving_quote'], ' |
@@ -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) |
@@ -590,7 +590,7 @@ discard block |
||
590 | 590 | 'Shitiz "Dragooon" Garg', |
591 | 591 | 'Karl "RegularExpression" Benson', |
592 | 592 | 'Matthew "Labradoodle-360" Kerle', |
593 | - $user_info['is_admin'] ? 'Matt "Grudge" Wolf': 'Grudge', |
|
593 | + $user_info['is_admin'] ? 'Matt "Grudge" Wolf' : 'Grudge', |
|
594 | 594 | 'Michael "Thantos" Miller', |
595 | 595 | 'Norv', |
596 | 596 | 'Peter "Arantor" Spicer', |
@@ -813,13 +813,13 @@ discard block |
||
813 | 813 | $credit_info = smf_json_decode($row['credits'], true); |
814 | 814 | |
815 | 815 | $copyright = empty($credit_info['copyright']) ? '' : $txt['credits_copyright'] . ' © ' . $smcFunc['htmlspecialchars']($credit_info['copyright']); |
816 | - $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'])); |
|
816 | + $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'])); |
|
817 | 817 | $version = $txt['credits_version'] . ' ' . $row['version']; |
818 | 818 | $title = (empty($credit_info['title']) ? $row['name'] : $smcFunc['htmlspecialchars']($credit_info['title'])) . ': ' . $version; |
819 | 819 | |
820 | 820 | // build this one out and stash it away |
821 | 821 | $mod_name = empty($credit_info['url']) ? $title : '<a href="' . $credit_info['url'] . '">' . $title . '</a>'; |
822 | - $mods[] = $mod_name . (!empty($license) ? ' | ' . $license : '') . (!empty($copyright) ? ' | ' . $copyright : ''); |
|
822 | + $mods[] = $mod_name . (!empty($license) ? ' | ' . $license : '') . (!empty($copyright) ? ' | ' . $copyright : ''); |
|
823 | 823 | } |
824 | 824 | cache_put_data('mods_credits', $mods, 86400); |
825 | 825 | } |
@@ -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! |
@@ -232,7 +232,7 @@ discard block |
||
232 | 232 | LEFT JOIN {db_prefix}topics AS t ON (t.id_topic = m.id_topic) |
233 | 233 | WHERE t.id_topic IS NULL |
234 | 234 | GROUP BY m.id_topic, m.id_board', |
235 | - 'fix_processing' => function ($row) use ($smcFunc) |
|
235 | + 'fix_processing' => function($row) use ($smcFunc) |
|
236 | 236 | { |
237 | 237 | global $salvageBoardID; |
238 | 238 | |
@@ -319,7 +319,7 @@ discard block |
||
319 | 319 | // Remove all topics that have zero messages in the messages table. |
320 | 320 | 'fix_collect' => array( |
321 | 321 | 'index' => 'id_topic', |
322 | - 'process' => function ($topics) use ($smcFunc) |
|
322 | + 'process' => function($topics) use ($smcFunc) |
|
323 | 323 | { |
324 | 324 | $smcFunc['db_query']('', ' |
325 | 325 | DELETE FROM {db_prefix}topics |
@@ -357,21 +357,21 @@ discard block |
||
357 | 357 | AND p.id_poll IS NULL |
358 | 358 | GROUP BY o.id_poll |
359 | 359 | ', |
360 | - 'fix_processing' => function ($row) use ($smcFunc, $txt) |
|
360 | + 'fix_processing' => function($row) use ($smcFunc, $txt) |
|
361 | 361 | { |
362 | 362 | global $salvageBoardID; |
363 | 363 | |
364 | 364 | $row['poster_name'] = !empty($row['poster_name']) ? $row['poster_name'] : $txt['guest']; |
365 | 365 | $row['id_poster'] = !empty($row['id_poster']) ? $row['id_poster'] : 0; |
366 | 366 | |
367 | - if(empty($row['id_board'])) |
|
367 | + if (empty($row['id_board'])) |
|
368 | 368 | { |
369 | 369 | // Only if we don't have a reasonable idea of where to put it. |
370 | 370 | createSalvageArea(); |
371 | - $row['id_board'] = (int)$salvageBoardID; |
|
371 | + $row['id_board'] = (int) $salvageBoardID; |
|
372 | 372 | } |
373 | 373 | |
374 | - if(empty($row['id_topic'])) { |
|
374 | + if (empty($row['id_topic'])) { |
|
375 | 375 | $smcFunc['db_insert']('', |
376 | 376 | '{db_prefix}messages', |
377 | 377 | array( |
@@ -495,7 +495,7 @@ discard block |
||
495 | 495 | LEFT JOIN {db_prefix}topics AS t ON (t.id_poll = p.id_poll) |
496 | 496 | WHERE p.id_poll BETWEEN {STEP_LOW} AND {STEP_HIGH} |
497 | 497 | AND t.id_poll IS NULL', |
498 | - 'fix_processing' => function ($row) use ($smcFunc, $txt) |
|
498 | + 'fix_processing' => function($row) use ($smcFunc, $txt) |
|
499 | 499 | { |
500 | 500 | global $salvageBoardID; |
501 | 501 | |
@@ -610,7 +610,7 @@ discard block |
||
610 | 610 | WHERE t.id_topic BETWEEN {STEP_LOW} AND {STEP_HIGH} |
611 | 611 | GROUP BY t.id_topic, t.id_first_msg, t.id_last_msg, t.approved, mf.approved |
612 | 612 | ORDER BY t.id_topic', |
613 | - 'fix_processing' => function ($row) use ($smcFunc) |
|
613 | + 'fix_processing' => function($row) use ($smcFunc) |
|
614 | 614 | { |
615 | 615 | $row['firstmsg_approved'] = (int) $row['firstmsg_approved']; |
616 | 616 | $row['myid_first_msg'] = (int) $row['myid_first_msg']; |
@@ -639,7 +639,7 @@ discard block |
||
639 | 639 | ) |
640 | 640 | ); |
641 | 641 | }, |
642 | - 'message_function' => function ($row) use ($txt, &$context) |
|
642 | + 'message_function' => function($row) use ($txt, &$context) |
|
643 | 643 | { |
644 | 644 | // A pretend error? |
645 | 645 | if ($row['myid_first_msg'] == $row['myid_first_msg'] && $row['myid_first_msg'] == $row['myid_first_msg'] && $row['approved'] == $row['firstmsg_approved']) |
@@ -673,7 +673,7 @@ discard block |
||
673 | 673 | WHERE t.id_topic BETWEEN {STEP_LOW} AND {STEP_HIGH} |
674 | 674 | GROUP BY t.id_topic, t.num_replies, mf.approved |
675 | 675 | ORDER BY t.id_topic', |
676 | - 'fix_processing' => function ($row) |
|
676 | + 'fix_processing' => function($row) |
|
677 | 677 | { |
678 | 678 | |
679 | 679 | global $smcFunc; |
@@ -694,7 +694,7 @@ discard block |
||
694 | 694 | ); |
695 | 695 | |
696 | 696 | }, |
697 | - 'message_function' => function ($row) |
|
697 | + 'message_function' => function($row) |
|
698 | 698 | { |
699 | 699 | |
700 | 700 | global $txt, $context; |
@@ -727,7 +727,7 @@ discard block |
||
727 | 727 | GROUP BY t.id_topic, t.unapproved_posts |
728 | 728 | HAVING unapproved_posts != COUNT(mu.id_msg) |
729 | 729 | ORDER BY t.id_topic', |
730 | - 'fix_processing' => function ($row) |
|
730 | + 'fix_processing' => function($row) |
|
731 | 731 | { |
732 | 732 | |
733 | 733 | global $smcFunc; |
@@ -769,7 +769,7 @@ discard block |
||
769 | 769 | WHERE b.id_board IS NULL |
770 | 770 | AND t.id_topic BETWEEN {STEP_LOW} AND {STEP_HIGH} |
771 | 771 | GROUP BY t.id_board', |
772 | - 'fix_processing' => function ($row) |
|
772 | + 'fix_processing' => function($row) |
|
773 | 773 | { |
774 | 774 | |
775 | 775 | global $smcFunc, $salvageCatID, $txt; |
@@ -818,7 +818,7 @@ discard block |
||
818 | 818 | ORDER BY b.id_cat, b.id_board', |
819 | 819 | 'fix_collect' => array( |
820 | 820 | 'index' => 'id_cat', |
821 | - 'process' => function ($cats) |
|
821 | + 'process' => function($cats) |
|
822 | 822 | { |
823 | 823 | global $smcFunc, $salvageCatID; |
824 | 824 | createSalvageArea(); |
@@ -854,7 +854,7 @@ discard block |
||
854 | 854 | // Last step-make sure all non-guest posters still exist. |
855 | 855 | 'fix_collect' => array( |
856 | 856 | 'index' => 'id_msg', |
857 | - 'process' => function ($msgs) |
|
857 | + 'process' => function($msgs) |
|
858 | 858 | { |
859 | 859 | |
860 | 860 | global $smcFunc; |
@@ -883,7 +883,7 @@ discard block |
||
883 | 883 | ORDER BY b.id_parent, b.id_board', |
884 | 884 | 'fix_collect' => array( |
885 | 885 | 'index' => 'id_parent', |
886 | - 'process' => function ($parents) |
|
886 | + 'process' => function($parents) |
|
887 | 887 | { |
888 | 888 | global $smcFunc, $salvageBoardID, $salvageCatID; |
889 | 889 | createSalvageArea(); |
@@ -917,7 +917,7 @@ discard block |
||
917 | 917 | AND p.id_poll IS NULL', |
918 | 918 | 'fix_collect' => array( |
919 | 919 | 'index' => 'id_poll', |
920 | - 'process' => function ($polls) |
|
920 | + 'process' => function($polls) |
|
921 | 921 | { |
922 | 922 | |
923 | 923 | global $smcFunc; |
@@ -951,7 +951,7 @@ discard block |
||
951 | 951 | ORDER BY cal.id_topic', |
952 | 952 | 'fix_collect' => array( |
953 | 953 | 'index' => 'id_topic', |
954 | - 'process' => function ($events) |
|
954 | + 'process' => function($events) |
|
955 | 955 | { |
956 | 956 | |
957 | 957 | global $smcFunc; |
@@ -983,7 +983,7 @@ discard block |
||
983 | 983 | AND lt.id_member BETWEEN {STEP_LOW} AND {STEP_HIGH}', |
984 | 984 | 'fix_collect' => array( |
985 | 985 | 'index' => 'id_topic', |
986 | - 'process' => function ($topics) |
|
986 | + 'process' => function($topics) |
|
987 | 987 | { |
988 | 988 | |
989 | 989 | global $smcFunc; |
@@ -1015,7 +1015,7 @@ discard block |
||
1015 | 1015 | GROUP BY lt.id_member', |
1016 | 1016 | 'fix_collect' => array( |
1017 | 1017 | 'index' => 'id_member', |
1018 | - 'process' => function ($members) |
|
1018 | + 'process' => function($members) |
|
1019 | 1019 | { |
1020 | 1020 | |
1021 | 1021 | global $smcFunc; |
@@ -1047,7 +1047,7 @@ discard block |
||
1047 | 1047 | GROUP BY lb.id_board', |
1048 | 1048 | 'fix_collect' => array( |
1049 | 1049 | 'index' => 'id_board', |
1050 | - 'process' => function ($boards) |
|
1050 | + 'process' => function($boards) |
|
1051 | 1051 | { |
1052 | 1052 | |
1053 | 1053 | global $smcFunc; |
@@ -1079,7 +1079,7 @@ discard block |
||
1079 | 1079 | GROUP BY lb.id_member', |
1080 | 1080 | 'fix_collect' => array( |
1081 | 1081 | 'index' => 'id_member', |
1082 | - 'process' => function ($members) use ($smcFunc) |
|
1082 | + 'process' => function($members) use ($smcFunc) |
|
1083 | 1083 | { |
1084 | 1084 | $smcFunc['db_query']('', ' |
1085 | 1085 | DELETE FROM {db_prefix}log_boards |
@@ -1108,7 +1108,7 @@ discard block |
||
1108 | 1108 | GROUP BY lmr.id_board', |
1109 | 1109 | 'fix_collect' => array( |
1110 | 1110 | 'index' => 'id_board', |
1111 | - 'process' => function ($boards) use ($smcFunc) |
|
1111 | + 'process' => function($boards) use ($smcFunc) |
|
1112 | 1112 | { |
1113 | 1113 | $smcFunc['db_query']('', ' |
1114 | 1114 | DELETE FROM {db_prefix}log_mark_read |
@@ -1137,7 +1137,7 @@ discard block |
||
1137 | 1137 | GROUP BY lmr.id_member', |
1138 | 1138 | 'fix_collect' => array( |
1139 | 1139 | 'index' => 'id_member', |
1140 | - 'process' => function ($members) use ($smcFunc) |
|
1140 | + 'process' => function($members) use ($smcFunc) |
|
1141 | 1141 | { |
1142 | 1142 | $smcFunc['db_query']('', ' |
1143 | 1143 | DELETE FROM {db_prefix}log_mark_read |
@@ -1166,7 +1166,7 @@ discard block |
||
1166 | 1166 | GROUP BY pmr.id_pm', |
1167 | 1167 | 'fix_collect' => array( |
1168 | 1168 | 'index' => 'id_pm', |
1169 | - 'process' => function ($pms) use ($smcFunc) |
|
1169 | + 'process' => function($pms) use ($smcFunc) |
|
1170 | 1170 | { |
1171 | 1171 | $smcFunc['db_query']('', ' |
1172 | 1172 | DELETE FROM {db_prefix}pm_recipients |
@@ -1196,7 +1196,7 @@ discard block |
||
1196 | 1196 | GROUP BY pmr.id_member', |
1197 | 1197 | 'fix_collect' => array( |
1198 | 1198 | 'index' => 'id_member', |
1199 | - 'process' => function ($members) |
|
1199 | + 'process' => function($members) |
|
1200 | 1200 | { |
1201 | 1201 | |
1202 | 1202 | global $smcFunc; |
@@ -1228,7 +1228,7 @@ discard block |
||
1228 | 1228 | AND mem.id_member IS NULL', |
1229 | 1229 | 'fix_collect' => array( |
1230 | 1230 | 'index' => 'id_pm', |
1231 | - 'process' => function ($guestMessages) |
|
1231 | + 'process' => function($guestMessages) |
|
1232 | 1232 | { |
1233 | 1233 | |
1234 | 1234 | global $smcFunc; |
@@ -1260,7 +1260,7 @@ discard block |
||
1260 | 1260 | GROUP BY ln.id_member', |
1261 | 1261 | 'fix_collect' => array( |
1262 | 1262 | 'index' => 'id_member', |
1263 | - 'process' => function ($members) use ($smcFunc) |
|
1263 | + 'process' => function($members) use ($smcFunc) |
|
1264 | 1264 | { |
1265 | 1265 | $smcFunc['db_query']('', ' |
1266 | 1266 | DELETE FROM {db_prefix}log_notify |
@@ -1287,7 +1287,7 @@ discard block |
||
1287 | 1287 | LEFT JOIN {db_prefix}log_search_subjects AS lss ON (lss.id_topic = t.id_topic) |
1288 | 1288 | WHERE t.id_topic BETWEEN {STEP_LOW} AND {STEP_HIGH} |
1289 | 1289 | AND lss.id_topic IS NULL', |
1290 | - 'fix_full_processing' => function ($result) |
|
1290 | + 'fix_full_processing' => function($result) |
|
1291 | 1291 | { |
1292 | 1292 | |
1293 | 1293 | global $smcFunc; |
@@ -1319,7 +1319,7 @@ discard block |
||
1319 | 1319 | ); |
1320 | 1320 | |
1321 | 1321 | }, |
1322 | - 'message_function' => function ($row) |
|
1322 | + 'message_function' => function($row) |
|
1323 | 1323 | { |
1324 | 1324 | |
1325 | 1325 | global $txt, $context; |
@@ -1349,7 +1349,7 @@ discard block |
||
1349 | 1349 | AND t.id_topic IS NULL', |
1350 | 1350 | 'fix_collect' => array( |
1351 | 1351 | 'index' => 'id_topic', |
1352 | - 'process' => function ($deleteTopics) |
|
1352 | + 'process' => function($deleteTopics) |
|
1353 | 1353 | { |
1354 | 1354 | |
1355 | 1355 | global $smcFunc; |
@@ -1381,7 +1381,7 @@ discard block |
||
1381 | 1381 | AND mem.id_member IS NULL', |
1382 | 1382 | 'fix_collect' => array( |
1383 | 1383 | 'index' => 'id_member', |
1384 | - 'process' => function ($members) |
|
1384 | + 'process' => function($members) |
|
1385 | 1385 | { |
1386 | 1386 | |
1387 | 1387 | global $smcFunc; |
@@ -1412,7 +1412,7 @@ discard block |
||
1412 | 1412 | AND p.id_poll IS NULL', |
1413 | 1413 | 'fix_collect' => array( |
1414 | 1414 | 'index' => 'id_poll', |
1415 | - 'process' => function ($polls) |
|
1415 | + 'process' => function($polls) |
|
1416 | 1416 | { |
1417 | 1417 | |
1418 | 1418 | global $smcFunc; |
@@ -1443,7 +1443,7 @@ discard block |
||
1443 | 1443 | AND lrc.id_report IS NULL', |
1444 | 1444 | 'fix_collect' => array( |
1445 | 1445 | 'index' => 'id_report', |
1446 | - 'process' => function ($reports) |
|
1446 | + 'process' => function($reports) |
|
1447 | 1447 | { |
1448 | 1448 | |
1449 | 1449 | global $smcFunc; |
@@ -1474,7 +1474,7 @@ discard block |
||
1474 | 1474 | AND lr.id_report IS NULL', |
1475 | 1475 | 'fix_collect' => array( |
1476 | 1476 | 'index' => 'id_report', |
1477 | - 'process' => function ($reports) |
|
1477 | + 'process' => function($reports) |
|
1478 | 1478 | { |
1479 | 1479 | global $smcFunc; |
1480 | 1480 | $smcFunc['db_query']('', ' |
@@ -1504,7 +1504,7 @@ discard block |
||
1504 | 1504 | GROUP BY lgr.id_member', |
1505 | 1505 | 'fix_collect' => array( |
1506 | 1506 | 'index' => 'id_member', |
1507 | - 'process' => function ($members) |
|
1507 | + 'process' => function($members) |
|
1508 | 1508 | { |
1509 | 1509 | global $smcFunc; |
1510 | 1510 | $smcFunc['db_query']('', ' |
@@ -1534,7 +1534,7 @@ discard block |
||
1534 | 1534 | GROUP BY lgr.id_group', |
1535 | 1535 | 'fix_collect' => array( |
1536 | 1536 | 'index' => 'id_group', |
1537 | - 'process' => function ($groups) |
|
1537 | + 'process' => function($groups) |
|
1538 | 1538 | { |
1539 | 1539 | global $smcFunc; |
1540 | 1540 | $smcFunc['db_query']('', ' |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | } |
84 | 84 | |
85 | 85 | // add to top |
86 | - $content = implode('', $matches[0]).$content; |
|
86 | + $content = implode('', $matches[0]) . $content; |
|
87 | 87 | }; |
88 | 88 | |
89 | 89 | return $content; |
@@ -208,7 +208,7 @@ discard block |
||
208 | 208 | // loop the matches |
209 | 209 | foreach ($matches as $match) { |
210 | 210 | // get the path for the file that will be imported |
211 | - $importPath = dirname($source).'/'.$match['path']; |
|
211 | + $importPath = dirname($source) . '/' . $match['path']; |
|
212 | 212 | |
213 | 213 | // only replace the import with the content if we can grab the |
214 | 214 | // content of the file |
@@ -216,7 +216,7 @@ discard block |
||
216 | 216 | // check if current file was not imported previously in the same |
217 | 217 | // import chain. |
218 | 218 | if (in_array($importPath, $parents)) { |
219 | - throw new FileImportException('Failed to import file "'.$importPath.'": circular reference detected.'); |
|
219 | + throw new FileImportException('Failed to import file "' . $importPath . '": circular reference detected.'); |
|
220 | 220 | } |
221 | 221 | |
222 | 222 | // grab referenced file & minify it (which may include importing |
@@ -226,7 +226,7 @@ discard block |
||
226 | 226 | |
227 | 227 | // check if this is only valid for certain media |
228 | 228 | if (!empty($match['media'])) { |
229 | - $importContent = '@media '.$match['media'].'{'.$importContent.'}'; |
|
229 | + $importContent = '@media ' . $match['media'] . '{' . $importContent . '}'; |
|
230 | 230 | } |
231 | 231 | |
232 | 232 | // add to replacement array |
@@ -255,7 +255,7 @@ discard block |
||
255 | 255 | protected function importFiles($source, $content) |
256 | 256 | { |
257 | 257 | $extensions = array_keys($this->importExtensions); |
258 | - $regex = '/url\((["\']?)((?!["\']?data:).*?\.('.implode('|', $extensions).'))\\1\)/i'; |
|
258 | + $regex = '/url\((["\']?)((?!["\']?data:).*?\.(' . implode('|', $extensions) . '))\\1\)/i'; |
|
259 | 259 | if ($extensions && preg_match_all($regex, $content, $matches, PREG_SET_ORDER)) { |
260 | 260 | $search = array(); |
261 | 261 | $replace = array(); |
@@ -264,7 +264,7 @@ discard block |
||
264 | 264 | foreach ($matches as $match) { |
265 | 265 | // get the path for the file that will be imported |
266 | 266 | $path = $match[2]; |
267 | - $path = dirname($source).'/'.$path; |
|
267 | + $path = dirname($source) . '/' . $path; |
|
268 | 268 | $extension = $match[3]; |
269 | 269 | |
270 | 270 | // only replace the import with the content if we're able to get |
@@ -276,7 +276,7 @@ discard block |
||
276 | 276 | |
277 | 277 | // build replacement |
278 | 278 | $search[] = $match[0]; |
279 | - $replace[] = 'url('.$this->importExtensions[$extension].';base64,'.$importContent.')'; |
|
279 | + $replace[] = 'url(' . $this->importExtensions[$extension] . ';base64,' . $importContent . ')'; |
|
280 | 280 | } |
281 | 281 | } |
282 | 282 | |
@@ -463,9 +463,9 @@ discard block |
||
463 | 463 | // build replacement |
464 | 464 | $search[] = $match[0]; |
465 | 465 | if ($type == 'url') { |
466 | - $replace[] = 'url('.$url.')'; |
|
466 | + $replace[] = 'url(' . $url . ')'; |
|
467 | 467 | } elseif ($type == 'import') { |
468 | - $replace[] = '@import "'.$url.'"'; |
|
468 | + $replace[] = '@import "' . $url . '"'; |
|
469 | 469 | } |
470 | 470 | } |
471 | 471 | |
@@ -513,19 +513,19 @@ discard block |
||
513 | 513 | // practice, Webkit (especially Safari) seems to stumble over at least |
514 | 514 | // 0%, potentially other units as well. Only stripping 'px' for now. |
515 | 515 | // @see https://github.com/matthiasmullie/minify/issues/60 |
516 | - $content = preg_replace('/'.$before.'(-?0*(\.0+)?)(?<=0)px'.$after.'/', '\\1', $content); |
|
516 | + $content = preg_replace('/' . $before . '(-?0*(\.0+)?)(?<=0)px' . $after . '/', '\\1', $content); |
|
517 | 517 | |
518 | 518 | // strip 0-digits (.0 -> 0) |
519 | - $content = preg_replace('/'.$before.'\.0+'.$units.'?'.$after.'/', '0\\1', $content); |
|
519 | + $content = preg_replace('/' . $before . '\.0+' . $units . '?' . $after . '/', '0\\1', $content); |
|
520 | 520 | // strip trailing 0: 50.10 -> 50.1, 50.10px -> 50.1px |
521 | - $content = preg_replace('/'.$before.'(-?[0-9]+\.[0-9]+)0+'.$units.'?'.$after.'/', '\\1\\2', $content); |
|
521 | + $content = preg_replace('/' . $before . '(-?[0-9]+\.[0-9]+)0+' . $units . '?' . $after . '/', '\\1\\2', $content); |
|
522 | 522 | // strip trailing 0: 50.00 -> 50, 50.00px -> 50px |
523 | - $content = preg_replace('/'.$before.'(-?[0-9]+)\.0+'.$units.'?'.$after.'/', '\\1\\2', $content); |
|
523 | + $content = preg_replace('/' . $before . '(-?[0-9]+)\.0+' . $units . '?' . $after . '/', '\\1\\2', $content); |
|
524 | 524 | // strip leading 0: 0.1 -> .1, 01.1 -> 1.1 |
525 | - $content = preg_replace('/'.$before.'(-?)0+([0-9]*\.[0-9]+)'.$units.'?'.$after.'/', '\\1\\2\\3', $content); |
|
525 | + $content = preg_replace('/' . $before . '(-?)0+([0-9]*\.[0-9]+)' . $units . '?' . $after . '/', '\\1\\2\\3', $content); |
|
526 | 526 | |
527 | 527 | // strip negative zeroes (-0 -> 0) & truncate zeroes (00 -> 0) |
528 | - $content = preg_replace('/'.$before.'-?0+'.$units.'?'.$after.'/', '0\\1', $content); |
|
528 | + $content = preg_replace('/' . $before . '-?0+' . $units . '?' . $after . '/', '0\\1', $content); |
|
529 | 529 | |
530 | 530 | return $content; |
531 | 531 | } |
@@ -39,8 +39,8 @@ discard block |
||
39 | 39 | // when both paths have nothing in common, one of them is probably |
40 | 40 | // absolute while the other is relative |
41 | 41 | $cwd = getcwd(); |
42 | - $from = strpos($from, $cwd) === 0 ? $from : $cwd.'/'.$from; |
|
43 | - $to = strpos($to, $cwd) === 0 ? $to : $cwd.'/'.$to; |
|
42 | + $from = strpos($from, $cwd) === 0 ? $from : $cwd . '/' . $from; |
|
43 | + $to = strpos($to, $cwd) === 0 ? $to : $cwd . '/' . $to; |
|
44 | 44 | |
45 | 45 | // or traveling the tree via `..` |
46 | 46 | // attempt to resolve path, or assume it's fine if it doesn't exist |
@@ -147,7 +147,7 @@ discard block |
||
147 | 147 | } |
148 | 148 | |
149 | 149 | // normalize paths |
150 | - $path = $this->normalize($this->from.'/'.$path); |
|
150 | + $path = $this->normalize($this->from . '/' . $path); |
|
151 | 151 | |
152 | 152 | // strip shared ancestor paths |
153 | 153 | $shared = $this->shared($path, $this->to); |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | // add .. for every directory that needs to be traversed to new path |
158 | 158 | $to = str_repeat('../', mb_substr_count($to, '/')); |
159 | 159 | |
160 | - return $to.ltrim($path, '/'); |
|
160 | + return $to . ltrim($path, '/'); |
|
161 | 161 | } |
162 | 162 | |
163 | 163 | /** |