Completed
Branch release-2.1 (e49a83)
by Michael
08:59
created
Themes/default/ManageSmileys.template.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -188,7 +188,7 @@
 block discarded – undo
188 188
 					</dd>
189 189
 				</dl>
190 190
 				<input type="submit" name="smiley_save" value="', $txt['smileys_save'], '" class="button_submit">
191
-				<input type="submit" name="deletesmiley" value="', $txt['smileys_delete'], '" data-confirm="', $txt['smileys_delete_confirm'] ,'" class="button_submit you_sure">
191
+				<input type="submit" name="deletesmiley" value="', $txt['smileys_delete'], '" data-confirm="', $txt['smileys_delete_confirm'], '" class="button_submit you_sure">
192 192
 			</div>
193 193
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
194 194
 			<input type="hidden" name="smiley" value="', $context['current_smiley']['id'], '">
Please login to merge, or discard this patch.
Themes/default/index.template.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
 
86 86
 	// Show right to left, the language code, and the character set for ease of translating.
87 87
 	echo '<!DOCTYPE html>
88
-	<html', $context['right_to_left'] ? ' dir="rtl"' : '', !empty($txt['lang_locale']) ? ' lang="' . str_replace("_", "-", substr($txt['lang_locale'], 0, strcspn($txt['lang_locale'], "."))) . '"' : '' , '>
88
+	<html', $context['right_to_left'] ? ' dir="rtl"' : '', !empty($txt['lang_locale']) ? ' lang="' . str_replace("_", "-", substr($txt['lang_locale'], 0, strcspn($txt['lang_locale'], "."))) . '"' : '', '>
89 89
 <head>
90 90
 	<meta charset="', $context['character_set'], '">';
91 91
 
@@ -210,7 +210,7 @@  discard block
 block discarded – undo
210 210
 		// Thirdly, alerts
211 211
 		echo '
212 212
 			<li>
213
-				<a href="', $scripturl, '?action=profile;area=showalerts;u=', $context['user']['id'] ,'"', !empty($context['self_alerts']) ? ' class="active"' : '', ' id="alerts_menu_top">', $txt['alerts'], !empty($context['user']['alerts']) ? ' <span class="amt">' . $context['user']['alerts'] . '</span>' : '', '</a>
213
+				<a href="', $scripturl, '?action=profile;area=showalerts;u=', $context['user']['id'], '"', !empty($context['self_alerts']) ? ' class="active"' : '', ' id="alerts_menu_top">', $txt['alerts'], !empty($context['user']['alerts']) ? ' <span class="amt">' . $context['user']['alerts'] . '</span>' : '', '</a>
214 214
 				<div id="alerts_menu" class="top_menu scrollable"></div>
215 215
 			</li>';
216 216
 
@@ -327,7 +327,7 @@  discard block
 block discarded – undo
327 327
 				<a class="menu_icon mobile_user_menu"></a>
328 328
 				<div id="mobile_user_menu" class="popup_container">
329 329
 					<div class="popup_window description">
330
-						<div class="popup_heading">', $txt['mobile_user_menu'],'
330
+						<div class="popup_heading">', $txt['mobile_user_menu'], '
331 331
 						<a href="javascript:void(0);" class="generic_icons hide_popup"></a></div>
332 332
 						', template_menu(), '
333 333
 					</div>
@@ -374,7 +374,7 @@  discard block
 block discarded – undo
374 374
 	// There is now a global "Go to top" link at the right.
375 375
 		echo '
376 376
 		<ul>
377
-			<li class="floatright"><a href="', $scripturl, '?action=help">', $txt['help'], '</a> ', (!empty($modSettings['requireAgreement'])) ? '| <a href="'. $scripturl. '?action=help;sa=rules">'. $txt['terms_and_rules']. '</a>' : '', ' | <a href="#top_section">', $txt['go_up'], ' &#9650;</a></li>
377
+			<li class="floatright"><a href="', $scripturl, '?action=help">', $txt['help'], '</a> ', (!empty($modSettings['requireAgreement'])) ? '| <a href="' . $scripturl . '?action=help;sa=rules">' . $txt['terms_and_rules'] . '</a>' : '', ' | <a href="#top_section">', $txt['go_up'], ' &#9650;</a></li>
378 378
 			<li class="copyright">', theme_copyright(), '</li>
379 379
 		</ul>';
380 380
 
@@ -479,9 +479,9 @@  discard block
 block discarded – undo
479 479
 	foreach ($context['menu_buttons'] as $act => $button)
480 480
 	{
481 481
 		echo '
482
-						<li class="button_', $act, '', !empty($button['sub_buttons']) ? ' subsections"' :'"', '>
482
+						<li class="button_', $act, '', !empty($button['sub_buttons']) ? ' subsections"' : '"', '>
483 483
 							<a', $button['active_button'] ? ' class="active"' : '', ' href="', $button['href'], '"', isset($button['target']) ? ' target="' . $button['target'] . '"' : '', '>
484
-								', $button['icon'],'<span class="textmenu">', $button['title'], '</span>
484
+								', $button['icon'], '<span class="textmenu">', $button['title'], '</span>
485 485
 							</a>';
486 486
 
487 487
 		if (!empty($button['sub_buttons']))
@@ -492,8 +492,8 @@  discard block
 block discarded – undo
492 492
 			foreach ($button['sub_buttons'] as $childbutton)
493 493
 			{
494 494
 				echo '
495
-								<li', !empty($childbutton['sub_buttons']) ? ' class="subsections"' :'', '>
496
-									<a href="', $childbutton['href'], '"' , isset($childbutton['target']) ? ' target="' . $childbutton['target'] . '"' : '', '>
495
+								<li', !empty($childbutton['sub_buttons']) ? ' class="subsections"' : '', '>
496
+									<a href="', $childbutton['href'], '"', isset($childbutton['target']) ? ' target="' . $childbutton['target'] . '"' : '', '>
497 497
 										', $childbutton['title'], '
498 498
 									</a>';
499 499
 				// 3rd level menus :)
@@ -505,7 +505,7 @@  discard block
 block discarded – undo
505 505
 					foreach ($childbutton['sub_buttons'] as $grandchildbutton)
506 506
 						echo '
507 507
 										<li>
508
-											<a href="', $grandchildbutton['href'], '"' , isset($grandchildbutton['target']) ? ' target="' . $grandchildbutton['target'] . '"' : '', '>
508
+											<a href="', $grandchildbutton['href'], '"', isset($grandchildbutton['target']) ? ' target="' . $grandchildbutton['target'] . '"' : '', '>
509 509
 												', $grandchildbutton['title'], '
510 510
 											</a>
511 511
 										</li>';
@@ -553,7 +553,7 @@  discard block
 block discarded – undo
553 553
 				$value['id'] = $key;
554 554
 
555 555
 			$button = '
556
-				<a class="button button_strip_' . $key . (!empty($value['active']) ? ' active' : '') . (isset($value['class']) ? ' '. $value['class'] : '') . '" ' . (!empty($value['url']) ? 'href="'. $value['url'] .'"' : '') . ' ' . (isset($value['custom']) ? ' ' . $value['custom'] : '') . '>' . $txt[$value['text']] . '</a>';
556
+				<a class="button button_strip_' . $key . (!empty($value['active']) ? ' active' : '') . (isset($value['class']) ? ' ' . $value['class'] : '') . '" ' . (!empty($value['url']) ? 'href="' . $value['url'] . '"' : '') . ' ' . (isset($value['custom']) ? ' ' . $value['custom'] : '') . '>' . $txt[$value['text']] . '</a>';
557 557
 
558 558
 			if (!empty($value['sub_buttons']))
559 559
 			{
@@ -587,7 +587,7 @@  discard block
 block discarded – undo
587 587
 		return;
588 588
 
589 589
 	echo '
590
-		<div class="buttonlist', !empty($direction) ? ' float' . $direction : '', '"', (empty($buttons) ? ' style="display: none;"' : ''), (!empty($strip_options['id']) ? ' id="' . $strip_options['id'] . '"': ''), '>
590
+		<div class="buttonlist', !empty($direction) ? ' float' . $direction : '', '"', (empty($buttons) ? ' style="display: none;"' : ''), (!empty($strip_options['id']) ? ' id="' . $strip_options['id'] . '"' : ''), '>
591 591
 			',implode('', $buttons), '
592 592
 		</div>';
593 593
 }
Please login to merge, or discard this patch.
Themes/default/ReportToMod.template.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -90,7 +90,7 @@
 block discarded – undo
90 90
 
91 91
 	echo '
92 92
 					</dl>
93
-					<input type="submit" name="preview" value="', $txt['preview'] , '" class="button_submit">
93
+					<input type="submit" name="preview" value="', $txt['preview'], '" class="button_submit">
94 94
 					<input type="submit" name="save" value="', $txt['rtm10'], '" style="margin-left: 1ex;" class="button_submit">
95 95
 					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
96 96
 				</div>
Please login to merge, or discard this patch.
Themes/default/Help.template.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -24,8 +24,8 @@  discard block
 block discarded – undo
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
 block discarded – undo
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)
Please login to merge, or discard this patch.
Themes/default/ManageMaintenance.template.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -285,7 +285,7 @@  discard block
 block discarded – undo
285 285
 		</div>
286 286
 		<div class="cat_bar">
287 287
 			<h3 class="catbg">
288
-				<a href="', $scripturl, '?action=helpadmin;help=maintenance_members" onclick="return reqOverlayDiv(this.href);" class="help"><span class="generic_icons help" title="', $txt['help'],'"></span></a> ', $txt['maintain_members'], '
288
+				<a href="', $scripturl, '?action=helpadmin;help=maintenance_members" onclick="return reqOverlayDiv(this.href);" class="help"><span class="generic_icons help" title="', $txt['help'], '"></span></a> ', $txt['maintain_members'], '
289 289
 			</h3>
290 290
 		</div>
291 291
 		<div class="windowbg2 noup">
@@ -436,7 +436,7 @@  discard block
 block discarded – undo
436 436
 	echo '
437 437
 						</div>
438 438
 					</div>
439
-					<input type="submit" value="', $txt['maintain_old_remove'] ,'" data-confirm="', $txt['maintain_old_confirm'] ,'" class="button_submit you_sure">
439
+					<input type="submit" value="', $txt['maintain_old_remove'], '" data-confirm="', $txt['maintain_old_confirm'], '" class="button_submit you_sure">
440 440
 					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
441 441
 					<input type="hidden" name="', $context['admin-maint_token_var'], '" value="', $context['admin-maint_token'], '">
442 442
 				</form>
Please login to merge, or discard this patch.
Themes/default/Login.template.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
 		<div class="login">
127 127
 			<div class="cat_bar">
128 128
 				<h3 class="catbg">
129
-					', $txt['tfa_profile_label'] ,'
129
+					', $txt['tfa_profile_label'], '
130 130
 				</h3>
131 131
 			</div>
132 132
 			<div class="roundframe noup">';
@@ -312,7 +312,7 @@  discard block
 block discarded – undo
312 312
 	echo '
313 313
 			<strong>', $txt['password'], ':</strong>
314 314
 			<input type="password" name="', $context['sessionCheckType'], '_pass" size="24" class="input_password">
315
-			<a href="', $scripturl, '?action=helpadmin;help=securityDisable_why" onclick="return reqOverlayDiv(this.href);" class="help"><span class="generic_icons help" title="', $txt['help'],'"></span></a><br>
315
+			<a href="', $scripturl, '?action=helpadmin;help=securityDisable_why" onclick="return reqOverlayDiv(this.href);" class="help"><span class="generic_icons help" title="', $txt['help'], '"></span></a><br>
316 316
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
317 317
 			<input type="hidden" name="', $context['admin-login_token_var'], '" value="', $context['admin-login_token'], '">
318 318
 			<input type="submit" style="margin-top: 1em;" value="', $txt['login'], '" class="button_submit">';
Please login to merge, or discard this patch.
Themes/default/Xml.template.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
 <smf>
48 48
 	<subject><![CDATA[', cleanXml($context['message']['subject']), ']]></subject>
49 49
 	<message id="msg_', $context['message']['id'], '"><![CDATA[', cleanXml($context['message']['body']), ']]></message>
50
-	<reason time="', $context['message']['reason']['time'] ,'" name="', $context['message']['reason']['name'] ,'"><![CDATA[', cleanXml($context['message']['reason']['text']), ']]></reason>
50
+	<reason time="', $context['message']['reason']['time'], '" name="', $context['message']['reason']['name'], '"><![CDATA[', cleanXml($context['message']['reason']['text']), ']]></reason>
51 51
 </smf>';
52 52
 
53 53
 }
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
 		// Build our string of info about when and why it was modified
68 68
 
69 69
 		$modified = empty($context['message']['modified']['time']) ? '' : sprintf($txt['last_edit_by'], $context['message']['modified']['time'], $context['message']['modified']['name']);
70
-		$modified .= empty($context['message']['modified']['reason']) ? '' : ' '. sprintf($txt['last_edit_reason'], $context['message']['modified']['reason']);
70
+		$modified .= empty($context['message']['modified']['reason']) ? '' : ' ' . sprintf($txt['last_edit_reason'], $context['message']['modified']['reason']);
71 71
 
72 72
 		echo '
73 73
 		<modified><![CDATA[', empty($modified) ? '' : cleanXml('&#171; <em>' . $modified . '</em>&#187;'), ']]></modified>
Please login to merge, or discard this patch.
Themes/default/ManageMembergroups.template.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -343,7 +343,7 @@  discard block
 block discarded – undo
343 343
 	echo '
344 344
 				</dl>
345 345
 				<input type="submit" name="save" value="', $txt['membergroups_edit_save'], '" class="button_submit">', $context['group']['allow_delete'] ? '
346
-				<input type="submit" name="delete" value="'. $txt['membergroups_delete'] .'" data-confirm="'. ($context['is_moderator_group'] ? $txt['membergroups_confirm_delete_mod'] : $txt['membergroups_confirm_delete']) .'" class="button_submit you_sure">' : '', '
346
+				<input type="submit" name="delete" value="'. $txt['membergroups_delete'] . '" data-confirm="' . ($context['is_moderator_group'] ? $txt['membergroups_confirm_delete_mod'] : $txt['membergroups_confirm_delete']) . '" class="button_submit you_sure">' : '', '
347 347
 			</div>
348 348
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
349 349
 			<input type="hidden" name="', $context['admin-mmg_token_var'], '" value="', $context['admin-mmg_token'], '">
@@ -530,7 +530,7 @@  discard block
 block discarded – undo
530 530
 
531 531
 	echo '
532 532
 	<div id="admincenter">
533
-		<form action="', $scripturl, '?action=', $context['current_action'], (isset($context['admin_area']) ? ';area=' . $context['admin_area'] : '') , ';sa=members;group=', $context['group']['id'], '" method="post" accept-charset="', $context['character_set'], '" id="view_group">
533
+		<form action="', $scripturl, '?action=', $context['current_action'], (isset($context['admin_area']) ? ';area=' . $context['admin_area'] : ''), ';sa=members;group=', $context['group']['id'], '" method="post" accept-charset="', $context['character_set'], '" id="view_group">
534 534
 			<div class="cat_bar">
535 535
 				<h3 class="catbg">', $context['page_title'], '</h3>
536 536
 			</div>
@@ -549,7 +549,7 @@  discard block
 block discarded – undo
549 549
 						<strong>' . $txt['membergroups_members_description'] . ':</strong>
550 550
 					</dt>
551 551
 					<dd>
552
-						', $context['group']['description'] ,'
552
+						', $context['group']['description'], '
553 553
 					</dd>';
554 554
 
555 555
 	echo '
@@ -557,7 +557,7 @@  discard block
 block discarded – undo
557 557
 						<strong>', $txt['membergroups_members_top'], ':</strong>
558 558
 					</dt>
559 559
 					<dd>
560
-						', $context['total_members'] ,'
560
+						', $context['total_members'], '
561 561
 					</dd>';
562 562
 	// Any group moderators to show?
563 563
 	if (!empty($context['group']['moderators']))
@@ -571,7 +571,7 @@  discard block
 block discarded – undo
571 571
 						<strong>', $txt['membergroups_members_group_moderators'], ':</strong>
572 572
 					</dt>
573 573
 					<dd>
574
-						', implode(', ', $moderators) ,'
574
+						', implode(', ', $moderators), '
575 575
 					</dd>';
576 576
 	}
577 577
 
@@ -597,7 +597,7 @@  discard block
 block discarded – undo
597 597
 	echo '
598 598
 						<th><a href="', $scripturl, '?action=', $context['current_action'], (isset($context['admin_area']) ? ';area=' . $context['admin_area'] : ''), ';sa=members;start=', $context['start'], ';sort=active', $context['sort_by'] == 'active' && $context['sort_direction'] == 'up' ? ';desc' : '', ';group=', $context['group']['id'], '">', $txt['membergroups_members_last_active'], $context['sort_by'] == 'active' ? '<span class="generic_icons sort_' . $context['sort_direction'] . '"></span>' : '', '</a></th>
599 599
 						<th><a href="', $scripturl, '?action=', $context['current_action'], (isset($context['admin_area']) ? ';area=' . $context['admin_area'] : ''), ';sa=members;start=', $context['start'], ';sort=registered', $context['sort_by'] == 'registered' && $context['sort_direction'] == 'up' ? ';desc' : '', ';group=', $context['group']['id'], '">', $txt['date_registered'], $context['sort_by'] == 'registered' ? '<span class="generic_icons sort_' . $context['sort_direction'] . '"></span>' : '', '</a></th>
600
-						<th ', empty($context['group']['assignable']) ? ' colspan="2"' : '', '><a href="', $scripturl, '?action=', $context['current_action'], (isset($context['admin_area']) ? ';area=' . $context['admin_area'] : ''), ';sa=members;start=', $context['start'], ';sort=posts', $context['sort_by'] == 'posts' && $context['sort_direction'] == 'up' ? ';desc' : '', ';group=', $context['group']['id'], '">', $txt['posts'], $context['sort_by'] == 'posts' ? ' <span class="generic_icons sort_' . $context['sort_direction'] . '"></span>' : '','</a></th>';
600
+						<th ', empty($context['group']['assignable']) ? ' colspan="2"' : '', '><a href="', $scripturl, '?action=', $context['current_action'], (isset($context['admin_area']) ? ';area=' . $context['admin_area'] : ''), ';sa=members;start=', $context['start'], ';sort=posts', $context['sort_by'] == 'posts' && $context['sort_direction'] == 'up' ? ';desc' : '', ';group=', $context['group']['id'], '">', $txt['posts'], $context['sort_by'] == 'posts' ? ' <span class="generic_icons sort_' . $context['sort_direction'] . '"></span>' : '', '</a></th>';
601 601
 	if (!empty($context['group']['assignable']))
602 602
 		echo '
603 603
 						<th style="width: 4%"><input type="checkbox" class="input_check" onclick="invertAll(this, this.form);"></th>';
Please login to merge, or discard this patch.
Themes/default/Who.template.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -244,7 +244,7 @@
 block discarded – undo
244 244
 	// SMF itself
245 245
 	echo '
246 246
 		<div class="cat_bar">
247
-			<h3 class="catbg">', $txt['credits_forum'],' ', $txt['credits_copyright'], '</h3>
247
+			<h3 class="catbg">', $txt['credits_forum'], ' ', $txt['credits_copyright'], '</h3>
248 248
 		</div>
249 249
 		<div class="windowbg noup">
250 250
 			', $context['copyrights']['smf'], '
Please login to merge, or discard this patch.