Completed
Push — release-2.1 ( 8bc4bf...08aa48 )
by Mathias
07:00
created
Themes/default/Profile.template.php 1 patch
Spacing   +30 added lines, -31 removed lines patch added patch discarded remove patch
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
 
55 55
 	echo '
56 56
 		<div class="profile_user_avatar floatleft">
57
-			<a href="', $scripturl, '?action=profile;u=', $context['user']['id'], '">', $context['member']['avatar']['image'],'</a>
57
+			<a href="', $scripturl, '?action=profile;u=', $context['user']['id'], '">', $context['member']['avatar']['image'], '</a>
58 58
 		</div>
59 59
 		<div class="profile_user_info floatleft">
60 60
 			<span class="profile_username"><a href="', $scripturl, '?action=profile;u=', $context['user']['id'], '">', $context['user']['name'], '</a></span>
@@ -329,7 +329,7 @@  discard block
 block discarded – undo
329 329
 		echo '
330 330
 					<dt>', $txt['profile_warning_level'], ': </dt>
331 331
 					<dd>
332
-						<a href="', $scripturl, '?action=profile;u=', $context['id_member'], ';area=', ($context['can_issue_warning'] && !$context['user']['is_owner'] ? 'issuewarning' : 'viewwarning') , '">', $context['member']['warning'], '%</a>';
332
+						<a href="', $scripturl, '?action=profile;u=', $context['id_member'], ';area=', ($context['can_issue_warning'] && !$context['user']['is_owner'] ? 'issuewarning' : 'viewwarning'), '">', $context['member']['warning'], '%</a>';
333 333
 
334 334
 		// Can we provide information on what this means?
335 335
 		if (!empty($context['warning_status']))
@@ -347,7 +347,7 @@  discard block
 block discarded – undo
347 347
 		// If the person looking at the summary has permission, and the account isn't activated, give the viewer the ability to do it themselves.
348 348
 		if (!empty($context['activate_message']))
349 349
 			echo '
350
-					<dt class="clear"><span class="alert">', $context['activate_message'], '</span>&nbsp;(<a href="', $context['activate_link'], '"', ($context['activate_type'] == 4 ? ' class="you_sure" data-confirm="'. $txt['profileConfirm'] .'"' : ''), '>', $context['activate_link_text'], '</a>)</dt>';
350
+					<dt class="clear"><span class="alert">', $context['activate_message'], '</span>&nbsp;(<a href="', $context['activate_link'], '"', ($context['activate_type'] == 4 ? ' class="you_sure" data-confirm="' . $txt['profileConfirm'] . '"' : ''), '>', $context['activate_link_text'], '</a>)</dt>';
351 351
 
352 352
 		// If the current member is banned, show a message and possibly a link to the ban.
353 353
 		if (!empty($context['member']['bans']))
@@ -473,7 +473,7 @@  discard block
 block discarded – undo
473 473
 		foreach ($context['posts'] as $post)
474 474
 		{
475 475
 			echo '
476
-			<div class="', $post['css_class'] ,'">
476
+			<div class="', $post['css_class'], '">
477 477
 				<div class="counter">', $post['counter'], '</div>
478 478
 				<div class="topic_details">
479 479
 					<h5><strong><a href="', $scripturl, '?board=', $post['board']['id'], '.0">', $post['board']['name'], '</a> / <a href="', $scripturl, '?topic=', $post['topic'], '.', $post['start'], '#msg', $post['id'], '">', $post['subject'], '</a></strong></h5>
@@ -509,7 +509,7 @@  discard block
 block discarded – undo
509 509
 			// How about... even... remove it entirely?!
510 510
 			if ($post['can_delete'])
511 511
 				echo '
512
-						<li><a href="', $scripturl, '?action=deletemsg;msg=', $post['id'], ';topic=', $post['topic'], ';profile;u=', $context['member']['id'], ';start=', $context['start'], ';', $context['session_var'], '=', $context['session_id'], '" data-confirm="', $txt['remove_message'] ,'" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['remove'], '</a></li>';
512
+						<li><a href="', $scripturl, '?action=deletemsg;msg=', $post['id'], ';topic=', $post['topic'], ';profile;u=', $context['member']['id'], ';start=', $context['start'], ';', $context['session_var'], '=', $context['session_id'], '" data-confirm="', $txt['remove_message'], '" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['remove'], '</a></li>';
513 513
 
514 514
 			if ($post['can_reply'] || $post['can_quote'] || $post['can_delete'])
515 515
 				echo '
@@ -580,9 +580,9 @@  discard block
 block discarded – undo
580 580
 					<td>', $alert['time'], '</td>
581 581
 					<td>
582 582
 						<ul class="quickbuttons">
583
-							<li><a href="', $scripturl, '?action=profile;u=', $context['id_member'], ';area=showalerts;do=remove;aid=', $id ,';', $context['session_var'], '=', $context['session_id'], '" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['delete'] ,'</a></li>
584
-							<li><a href="', $scripturl, '?action=profile;u=', $context['id_member'], ';area=showalerts;do=', ($alert['is_read'] != 0 ? 'unread' : 'read') ,';aid=', $id ,';', $context['session_var'], '=', $context['session_id'], '"><span class="generic_icons ', $alert['is_read'] != 0 ? 'unread_button' : 'read_button','"></span>', ($alert['is_read'] != 0 ? $txt['mark_unread'] : $txt['mark_read_short']),'</a></li>
585
-							<li><input type="checkbox" name="mark[', $id ,']" value="', $id ,'"></li>
583
+							<li><a href="', $scripturl, '?action=profile;u=', $context['id_member'], ';area=showalerts;do=remove;aid=', $id, ';', $context['session_var'], '=', $context['session_id'], '" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['delete'], '</a></li>
584
+							<li><a href="', $scripturl, '?action=profile;u=', $context['id_member'], ';area=showalerts;do=', ($alert['is_read'] != 0 ? 'unread' : 'read'), ';aid=', $id, ';', $context['session_var'], '=', $context['session_id'], '"><span class="generic_icons ', $alert['is_read'] != 0 ? 'unread_button' : 'read_button', '"></span>', ($alert['is_read'] != 0 ? $txt['mark_unread'] : $txt['mark_read_short']), '</a></li>
585
+							<li><input type="checkbox" name="mark[', $id, ']" value="', $id, '"></li>
586 586
 						</ul>
587 587
 					</td>
588 588
 				</tr>';
@@ -592,17 +592,17 @@  discard block
 block discarded – undo
592 592
 			</table>
593 593
 			<div class="pagesection">
594 594
 				<div class="floatleft">
595
-					', $context['pagination'] ,'
595
+					', $context['pagination'], '
596 596
 				</div>
597 597
 				<div class="floatright">
598
-					', $txt['check_all'] ,': <input type="checkbox" name="select_all" id="select_all">
598
+					', $txt['check_all'], ': <input type="checkbox" name="select_all" id="select_all">
599 599
 					<select name="mark_as">
600
-						<option value="read">', $txt['quick_mod_markread'] ,'</option>
601
-						<option value="unread">', $txt['quick_mod_markunread'] ,'</option>
602
-						<option value="remove">', $txt['quick_mod_remove'] ,'</option>
600
+						<option value="read">', $txt['quick_mod_markread'], '</option>
601
+						<option value="unread">', $txt['quick_mod_markunread'], '</option>
602
+						<option value="remove">', $txt['quick_mod_remove'], '</option>
603 603
 					</select>
604 604
 					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
605
-					<input type="submit" name="req" value="', $txt['quick_mod_go'] ,'" class="button_submit you_sure">
605
+					<input type="submit" name="req" value="', $txt['quick_mod_go'], '" class="button_submit you_sure">
606 606
 				</div>
607 607
 			</div>
608 608
 		</form>';
@@ -659,7 +659,7 @@  discard block
 block discarded – undo
659 659
 				<div class="floatright">
660 660
 					<ul class="quickbuttons">
661 661
 						<li><a href="', $scripturl, '?action=post;', (empty($draft['topic']['id']) ? 'board=' . $draft['board']['id'] : 'topic=' . $draft['topic']['id']), '.0;id_draft=', $draft['id_draft'], '"><span class="generic_icons reply_button"></span>', $txt['draft_edit'], '</a></li>
662
-						<li><a href="', $scripturl, '?action=profile;u=', $context['member']['id'], ';area=showdrafts;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>
662
+						<li><a href="', $scripturl, '?action=profile;u=', $context['member']['id'], ';area=showdrafts;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>
663 663
 					</ul>
664 664
 				</div>
665 665
 			</div>';
@@ -715,7 +715,7 @@  discard block
 block discarded – undo
715 715
 	if (empty($context['buddies']))
716 716
 		echo '
717 717
 			<tr class="windowbg">
718
-				<td colspan="', allowedTo('moderate_forum') ? '10' : '9','"><strong>', $txt['no_buddies'], '</strong></td>
718
+				<td colspan="', allowedTo('moderate_forum') ? '10' : '9', '"><strong>', $txt['no_buddies'], '</strong></td>
719 719
 			</tr>';
720 720
 
721 721
 		// Now loop through each buddy showing info on each.
@@ -818,14 +818,14 @@  discard block
 block discarded – undo
818 818
 				<th scope="col">', $txt['email'], '</th>';
819 819
 
820 820
 	echo '
821
-				<th scope="col">', $txt['ignore_remove'] ,'</th>
821
+				<th scope="col">', $txt['ignore_remove'], '</th>
822 822
 			</tr>';
823 823
 
824 824
 	// If they don't have anyone on their ignore list, don't list it!
825 825
 	if (empty($context['ignore_list']))
826 826
 		echo '
827 827
 			<tr class="windowbg">
828
-				<td colspan="', allowedTo('moderate_forum') ? '4' : '3','"><strong>', $txt['no_ignore'], '</strong></td>
828
+				<td colspan="', allowedTo('moderate_forum') ? '4' : '3', '"><strong>', $txt['no_ignore'], '</strong></td>
829 829
 			</tr>';
830 830
 
831 831
 	// Now loop through each buddy showing info on each.
@@ -1063,7 +1063,7 @@  discard block
 block discarded – undo
1063 1063
 	else
1064 1064
 	{
1065 1065
 		echo '
1066
-		<div class="information">',$txt['showPermissions_help'],'</div>
1066
+		<div class="information">',$txt['showPermissions_help'], '</div>
1067 1067
 		<div id="permissions" class="flow_hidden">';
1068 1068
 
1069 1069
 		if (!empty($context['no_access_boards']))
@@ -1110,7 +1110,7 @@  discard block
 block discarded – undo
1110 1110
 
1111 1111
 				if ($permission['is_denied'])
1112 1112
 					echo '
1113
-									<span class="alert">', $txt['showPermissions_denied'], ':&nbsp;', implode(', ', $permission['groups']['denied']),'</span>';
1113
+									<span class="alert">', $txt['showPermissions_denied'], ':&nbsp;', implode(', ', $permission['groups']['denied']), '</span>';
1114 1114
 				else
1115 1115
 					echo '
1116 1116
 									', $txt['showPermissions_given'], ':&nbsp;', implode(', ', $permission['groups']['allowed']);
@@ -1843,7 +1843,7 @@  discard block
 block discarded – undo
1843 1843
 	{
1844 1844
 		echo '
1845 1845
 				<tr class="title_bar">
1846
-					<th>', $txt['alert_group_' . $alert_group],'</th>
1846
+					<th>', $txt['alert_group_' . $alert_group], '</th>
1847 1847
 					<th>', $txt['receive_alert'], '</th>
1848 1848
 					<th>', $txt['receive_mail'], '</th>
1849 1849
 				</tr>
@@ -1893,7 +1893,7 @@  discard block
 block discarded – undo
1893 1893
 		{
1894 1894
 			echo '
1895 1895
 				<tr class="windowbg">
1896
-					<td>', $txt['alert_' . $alert_id], isset($alert_details['help']) ? '<a href="' . $scripturl . '?action=helpadmin;help=' . $alert_details['help'] . '" onclick="return reqOverlayDiv(this.href);" class="help floatright"><span class="generic_icons help" title="'. $txt['help'].'"></span></a>' : '', '</td>';
1896
+					<td>', $txt['alert_' . $alert_id], isset($alert_details['help']) ? '<a href="' . $scripturl . '?action=helpadmin;help=' . $alert_details['help'] . '" onclick="return reqOverlayDiv(this.href);" class="help floatright"><span class="generic_icons help" title="' . $txt['help'] . '"></span></a>' : '', '</td>';
1897 1897
 
1898 1898
 			foreach ($context['alert_bits'] as $type => $bitmask)
1899 1899
 			{
@@ -2075,7 +2075,7 @@  discard block
 block discarded – undo
2075 2075
 						<a href="', $scripturl, '?action=profile;save;u=', $context['id_member'], ';area=groupmembership;', $context['session_var'], '=', $context['session_id'], ';gid=', $group['id'], ';', $context[$context['token_check'] . '_token_var'], '=', $context[$context['token_check'] . '_token'], '" class="button floatright">', $txt['join_group'], '</a>';
2076 2076
 				elseif ($group['type'] == 2 && $group['pending'])
2077 2077
 					echo '
2078
-						<span class="floatright">', $txt['approval_pending'],'</span>';
2078
+						<span class="floatright">', $txt['approval_pending'], '</span>';
2079 2079
 				elseif ($group['type'] == 2)
2080 2080
 					echo '
2081 2081
 						<a href="', $scripturl, '?action=profile;u=', $context['id_member'], ';area=groupmembership;request=', $group['id'], '" class="button floatright">', $txt['request_group'], '</a>';
@@ -2379,7 +2379,7 @@  discard block
 block discarded – undo
2379 2379
 			<div id="box_preview"', !empty($context['warning_data']['body_preview']) ? '' : ' style="display:none"', '>
2380 2380
 				<dl class="settings">
2381 2381
 					<dt>
2382
-						<strong>', $txt['preview'] , '</strong>
2382
+						<strong>', $txt['preview'], '</strong>
2383 2383
 					</dt>
2384 2384
 					<dd id="body_preview">
2385 2385
 						', !empty($context['warning_data']['body_preview']) ? $context['warning_data']['body_preview'] : '', '
@@ -2798,7 +2798,7 @@  discard block
 block discarded – undo
2798 2798
 								', !empty($context['member']['avatar']['allow_server_stored']) ? '<input type="radio" onclick="swap_avatar(this); return true;" name="avatar_choice" id="avatar_choice_server_stored" value="server_stored"' . ($context['member']['avatar']['choice'] == 'server_stored' ? ' checked="checked"' : '') . ' class="input_radio" /><label for="avatar_choice_server_stored"' . (isset($context['modify_error']['bad_avatar']) ? ' class="error"' : '') . '>' . $txt['choose_avatar_gallery'] . '</label><br />' : '', '
2799 2799
 								', !empty($context['member']['avatar']['allow_external']) ? '<input type="radio" onclick="swap_avatar(this); return true;" name="avatar_choice" id="avatar_choice_external" value="external"' . ($context['member']['avatar']['choice'] == 'external' ? ' checked="checked"' : '') . ' class="input_radio" /><label for="avatar_choice_external"' . (isset($context['modify_error']['bad_avatar']) ? ' class="error"' : '') . '>' . $txt['my_own_pic'] . '</label><br />' : '', '
2800 2800
 								', !empty($context['member']['avatar']['allow_upload']) ? '<input type="radio" onclick="swap_avatar(this); return true;" name="avatar_choice" id="avatar_choice_upload" value="upload"' . ($context['member']['avatar']['choice'] == 'upload' ? ' checked="checked"' : '') . ' class="input_radio" /><label for="avatar_choice_upload"' . (isset($context['modify_error']['bad_avatar']) ? ' class="error"' : '') . '>' . $txt['avatar_will_upload'] . '</label><br />' : '', '
2801
-								', !empty($context['member']['avatar']['allow_gravatar']) ? '<input type="radio" onclick="swap_avatar(this); return true;" name="avatar_choice" id="avatar_choice_gravatar" value="gravatar"'. ($context['member']['avatar']['choice'] == 'gravatar' ? ' checked="checked"' : '') . ' class="input_radio" /><label for="avatar_choice_gravatar"' . (isset($context['modify_error']['bad_avatar']) ? ' class="error"' : '') . '>' . $txt['use_gravatar'] . '</label>' : '', '
2801
+								', !empty($context['member']['avatar']['allow_gravatar']) ? '<input type="radio" onclick="swap_avatar(this); return true;" name="avatar_choice" id="avatar_choice_gravatar" value="gravatar"' . ($context['member']['avatar']['choice'] == 'gravatar' ? ' checked="checked"' : '') . ' class="input_radio" /><label for="avatar_choice_gravatar"' . (isset($context['modify_error']['bad_avatar']) ? ' class="error"' : '') . '>' . $txt['use_gravatar'] . '</label>' : '', '
2802 2802
 							</dt>
2803 2803
 							<dd>';
2804 2804
 
@@ -2965,7 +2965,7 @@  discard block
 block discarded – undo
2965 2965
 	echo '
2966 2966
 							<dt>
2967 2967
 								<strong><label for="easyformat">', $txt['time_format'], ':</label></strong><br>
2968
-								<a href="', $scripturl, '?action=helpadmin;help=time_format" onclick="return reqOverlayDiv(this.href);" class="help"><span class="generic_icons help" title="', $txt['help'],'"></span></a>
2968
+								<a href="', $scripturl, '?action=helpadmin;help=time_format" onclick="return reqOverlayDiv(this.href);" class="help"><span class="generic_icons help" title="', $txt['help'], '"></span></a>
2969 2969
 								<span class="smalltext">&nbsp;<label for="time_format">', $txt['date_format'], '</label></span>
2970 2970
 							</dt>
2971 2971
 							<dd>
@@ -3031,8 +3031,7 @@  discard block
 block discarded – undo
3031 3031
 							<div class="roundframe">
3032 3032
 								<div>
3033 3033
 		', !empty($context['tfa_backup']) ? '
3034
-									<div class="smalltext error">' . $txt['tfa_backup_used_desc'] . '</div>' :
3035
-			($modSettings['tfa_mode'] == 2 ? '
3034
+									<div class="smalltext error">' . $txt['tfa_backup_used_desc'] . '</div>' : ($modSettings['tfa_mode'] == 2 ? '
3036 3035
 									<div class="smalltext"><strong>' . $txt['tfa_forced_desc'] . '</strong></div>' : ''), '
3037 3036
 									<div class="smalltext">', $txt['tfa_desc'], '</div>
3038 3037
 									<div id="basicinfo" style="width: 60%">
@@ -3040,7 +3039,7 @@  discard block
 block discarded – undo
3040 3039
 											<div class="title_top">
3041 3040
 												<strong>', $txt['tfa_step1'], '</strong><br />
3042 3041
 												', !empty($context['tfa_pass_error']) ? '<div class="error smalltext">' . $txt['tfa_pass_invalid'] . '</div>' : '', '
3043
-												<input type="password" name="passwd" style="width: 200px;"', !empty($context['tfa_pass_error']) ? ' class="error"' : '', !empty($context['tfa_pass_value']) ? ' value="' . $context['tfa_pass_value'] . '"' : '' ,'>
3042
+												<input type="password" name="passwd" style="width: 200px;"', !empty($context['tfa_pass_error']) ? ' class="error"' : '', !empty($context['tfa_pass_value']) ? ' value="' . $context['tfa_pass_value'] . '"' : '', '>
3044 3043
 											</div>
3045 3044
 											<div class="title_top">
3046 3045
 												<strong>', $txt['tfa_step2'], '</strong>
@@ -3048,9 +3047,9 @@  discard block
 block discarded – undo
3048 3047
 												<div class="tfacode">', $context['tfa_secret'], '</div>
3049 3048
 											</div>
3050 3049
 											<div class="title_top">
3051
-												<strong>', $txt['tfa_step3'] , '</strong><br />
3050
+												<strong>', $txt['tfa_step3'], '</strong><br />
3052 3051
 												', !empty($context['tfa_error']) ? '<div class="error smalltext">' . $txt['tfa_code_invalid'] . '</div>' : '', '
3053
-												<input type="text" name="tfa_code" style="width: 200px;"', !empty($context['tfa_error']) ? ' class="error"' : '', !empty($context['tfa_value']) ? ' value="' . $context['tfa_value'] . '"' : '' ,'>
3052
+												<input type="text" name="tfa_code" style="width: 200px;"', !empty($context['tfa_error']) ? ' class="error"' : '', !empty($context['tfa_value']) ? ' value="' . $context['tfa_value'] . '"' : '', '>
3054 3053
 												<input type="submit" name="save" value="', $txt['tfa_enable'], '" class="button_submit" style="float: none;" />
3055 3054
 											</div>
3056 3055
 											<input type="hidden" name="', $context[$context['token_check'] . '_token_var'], '" value="', $context[$context['token_check'] . '_token'], '" />
Please login to merge, or discard this patch.