Completed
Push — release-2.1 ( 22b3cf...3bcfde )
by Michael
12:41 queued 06:00
created
Themes/default/MessageIndex.template.php 2 patches
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 					<div class="info">
45 45
 						<a class="subject mobile_subject" href="', $board['href'], '" id="b', $board['id'], '">
46 46
 							', $board['name'], '
47
-							<p class="board_description mobile_display">', $board['description'] , '</p>
47
+							<p class="board_description mobile_display">', $board['description'], '</p>
48 48
 						</a>';
49 49
 
50 50
 			// Has it outstanding posts for approval?
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 						<a href="', $scripturl, '?action=moderate;area=postmod;sa=', ($board['unapproved_topics'] > 0 ? 'topics' : 'posts'), ';brd=', $board['id'], ';', $context['session_var'], '=', $context['session_id'], '" title="', sprintf($txt['unapproved_posts'], $board['unapproved_topics'], $board['unapproved_posts']), '" class="moderation_link">(!)</a>';
54 54
 
55 55
 			echo '
56
-						<p class="board_description">', $board['description'] , '</p>';
56
+						<p class="board_description">', $board['description'], '</p>';
57 57
 
58 58
 			// Show the "Moderators: ". Each has name, href, link, and id. (but we're gonna use link_moderators.)
59 59
 			if (!empty($board['moderators']) || !empty($board['moderator_groups']))
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
 	// Mobile action buttons (top)
120 120
 	echo '
121 121
 		<div class="mobile_buttons floatright">
122
-			<a class="button mobile_act">', $txt['mobile_action'],'</a>
122
+			<a class="button mobile_act">', $txt['mobile_action'], '</a>
123 123
 		</div>';
124 124
 
125 125
 		echo '
@@ -219,7 +219,7 @@  discard block
 block discarded – undo
219 219
 					<img src="', $topic['first_post']['icon_url'], '" alt="">
220 220
 					', $topic['is_posted_in'] ? '<img class="posted" src="' . $settings['images_url'] . '/icons/profile_sm.png" alt="">' : '', '
221 221
 				</div>
222
-					<div class="info', !empty($context['can_quick_mod']) ? '' : ' info_block','">
222
+					<div class="info', !empty($context['can_quick_mod']) ? '' : ' info_block', '">
223 223
 						<div ', (!empty($topic['quick_mod']['modify']) ? 'id="topic_' . $topic['first_post']['id'] . '"  ondblclick="oQuickModifyTopic.modify_topic(\'' . $topic['id'] . '\', \'' . $topic['first_post']['id'] . '\');"' : ''), '>';
224 224
 
225 225
 			// Now we handle the icons
@@ -251,7 +251,7 @@  discard block
 block discarded – undo
251 251
 								</span>
252 252
 							</div>
253 253
 							<p class="floatleft">', $txt['started_by'], ' ', $topic['first_post']['member']['link'], '</p>
254
-							', !empty($topic['pages']) ? '<span id="pages'. $topic['first_post']['id']. '" class="topic_pages">&nbsp;'. $topic['pages']. '</span>' : '','
254
+							', !empty($topic['pages']) ? '<span id="pages' . $topic['first_post']['id'] . '" class="topic_pages">&nbsp;' . $topic['pages'] . '</span>' : '', '
255 255
 							<br class="clear">
256 256
 						</div>
257 257
 					</div>
@@ -305,7 +305,7 @@  discard block
 block discarded – undo
305 305
 			foreach ($context['qmod_actions'] as $qmod_action)
306 306
 				if ($context['can_' . $qmod_action])
307 307
 					echo '
308
-						<option value="' . $qmod_action . '">' . $txt['quick_mod_'  . $qmod_action] . '</option>';
308
+						<option value="' . $qmod_action . '">' . $txt['quick_mod_' . $qmod_action] . '</option>';
309 309
 
310 310
 			echo '
311 311
 					</select>';
@@ -332,7 +332,7 @@  discard block
 block discarded – undo
332 332
 	// Mobile action buttons (bottom)
333 333
 	echo '
334 334
 		<div class="mobile_buttons floatright">
335
-			<a class="button mobile_act">', $txt['mobile_action'],'</a>
335
+			<a class="button mobile_act">', $txt['mobile_action'], '</a>
336 336
 		</div>';
337 337
 
338 338
 		echo '
@@ -382,7 +382,7 @@  discard block
 block discarded – undo
382 382
 	echo '
383 383
 			<div id="mobile_action" class="popup_container">
384 384
 				<div class="popup_window description">
385
-					<div class="popup_heading">', $txt['mobile_action'],'
385
+					<div class="popup_heading">', $txt['mobile_action'], '
386 386
 					<a href="javascript:void(0);" class="generic_icons hide_popup"></a></div>
387 387
 					', template_button_strip($context['normal_buttons']), '
388 388
 				</div>
Please login to merge, or discard this patch.
Braces   +94 added lines, -65 removed lines patch added patch discarded remove patch
@@ -48,17 +48,19 @@  discard block
 block discarded – undo
48 48
 						</a>';
49 49
 
50 50
 			// Has it outstanding posts for approval?
51
-			if ($board['can_approve_posts'] && ($board['unapproved_posts'] || $board['unapproved_topics']))
52
-				echo '
51
+			if ($board['can_approve_posts'] && ($board['unapproved_posts'] || $board['unapproved_topics'])) {
52
+							echo '
53 53
 						<a href="', $scripturl, '?action=moderate;area=postmod;sa=', ($board['unapproved_topics'] > 0 ? 'topics' : 'posts'), ';brd=', $board['id'], ';', $context['session_var'], '=', $context['session_id'], '" title="', sprintf($txt['unapproved_posts'], $board['unapproved_topics'], $board['unapproved_posts']), '" class="moderation_link">(!)</a>';
54
+			}
54 55
 
55 56
 			echo '
56 57
 						<p class="board_description">', $board['description'] , '</p>';
57 58
 
58 59
 			// Show the "Moderators: ". Each has name, href, link, and id. (but we're gonna use link_moderators.)
59
-			if (!empty($board['moderators']) || !empty($board['moderator_groups']))
60
-				echo '
60
+			if (!empty($board['moderators']) || !empty($board['moderator_groups'])) {
61
+							echo '
61 62
 						<p class="moderators">', count($board['link_moderators']) === 1 ? $txt['moderator'] : $txt['moderators'], ': ', implode(', ', $board['link_moderators']), '</p>';
63
+			}
62 64
 
63 65
 			// Show some basic information about the number of posts, etc.
64 66
 			echo '
@@ -70,9 +72,10 @@  discard block
 block discarded – undo
70 72
 					</div>
71 73
 					<div class="lastpost lpr_border">';
72 74
 
73
-			if (!empty($board['last_post']['id']))
74
-				echo '
75
+			if (!empty($board['last_post']['id'])) {
76
+							echo '
75 77
 						<p>', $board['last_post']['last_post_message'], '</p>';
78
+			}
76 79
 			echo '
77 80
 					</div>';
78 81
 
@@ -85,14 +88,16 @@  discard block
 block discarded – undo
85 88
 						id, name, description, new (is it new?), topics (#), posts (#), href, link, and last_post. */
86 89
 				foreach ($board['children'] as $child)
87 90
 				{
88
-					if (!$child['is_redirect'])
89
-						$child['link'] = '<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'] . ($child['new'] ? '</a> <a  ' . ($child['new'] ? 'class="new_posts" ' : '') . 'href="' . $scripturl . '?action=unread;board=' . $child['id'] . '" title="' . $txt['new_posts'] . ' (' . $txt['board_topics'] . ': ' . comma_format($child['topics']) . ', ' . $txt['posts'] . ': ' . comma_format($child['posts']) . ')"><span class="new_posts">' . $txt['new'] . '</span>' : '') . '</a>';
90
-					else
91
-						$child['link'] = '<a href="' . $child['href'] . '" title="' . comma_format($child['posts']) . ' ' . $txt['redirects'] . '">' . $child['name'] . '</a>';
91
+					if (!$child['is_redirect']) {
92
+											$child['link'] = '<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'] . ($child['new'] ? '</a> <a  ' . ($child['new'] ? 'class="new_posts" ' : '') . 'href="' . $scripturl . '?action=unread;board=' . $child['id'] . '" title="' . $txt['new_posts'] . ' (' . $txt['board_topics'] . ': ' . comma_format($child['topics']) . ', ' . $txt['posts'] . ': ' . comma_format($child['posts']) . ')"><span class="new_posts">' . $txt['new'] . '</span>' : '') . '</a>';
93
+					} else {
94
+											$child['link'] = '<a href="' . $child['href'] . '" title="' . comma_format($child['posts']) . ' ' . $txt['redirects'] . '">' . $child['name'] . '</a>';
95
+					}
92 96
 
93 97
 					// Has it posts awaiting approval?
94
-					if ($child['can_approve_posts'] && ($child['unapproved_posts'] | $child['unapproved_topics']))
95
-						$child['link'] .= ' <a href="' . $scripturl . '?action=moderate;area=postmod;sa=' . ($child['unapproved_topics'] > 0 ? 'topics' : 'posts') . ';brd=' . $child['id'] . ';' . $context['session_var'] . '=' . $context['session_id'] . '" title="' . sprintf($txt['unapproved_posts'], $child['unapproved_topics'], $child['unapproved_posts']) . '" class="moderation_link">(!)</a>';
98
+					if ($child['can_approve_posts'] && ($child['unapproved_posts'] | $child['unapproved_topics'])) {
99
+											$child['link'] .= ' <a href="' . $scripturl . '?action=moderate;area=postmod;sa=' . ($child['unapproved_topics'] > 0 ? 'topics' : 'posts') . ';brd=' . $child['id'] . ';' . $context['session_var'] . '=' . $context['session_id'] . '" title="' . sprintf($txt['unapproved_posts'], $child['unapproved_topics'], $child['unapproved_posts']) . '" class="moderation_link">(!)</a>';
100
+					}
96 101
 
97 102
 					$children[] = $child['new'] ? '<strong>' . $child['link'] . '</strong>' : $child['link'];
98 103
 				}
@@ -111,8 +116,9 @@  discard block
 block discarded – undo
111 116
 	}
112 117
 
113 118
 	// They can only mark read if they are logged in and it's enabled!
114
-	if (!$context['user']['is_logged'])
115
-		unset($context['normal_buttons']['markread']);
119
+	if (!$context['user']['is_logged']) {
120
+			unset($context['normal_buttons']['markread']);
121
+	}
116 122
 
117 123
 	if (!$context['no_topic_listing'])
118 124
 	{
@@ -135,13 +141,15 @@  discard block
 block discarded – undo
135 141
 	<div id="description_board" class="generic_list_wrapper">
136 142
 		<h3>', $context['name'], '</h3>
137 143
 		<p>';
138
-	if ($context['description'] != '')
139
-	echo '
144
+	if ($context['description'] != '') {
145
+		echo '
140 146
 		', $context['description'], '&nbsp;';
147
+	}
141 148
 
142
-	if (!empty($context['moderators']))
143
-	echo '
149
+	if (!empty($context['moderators'])) {
150
+		echo '
144 151
 		', count($context['moderators']) === 1 ? $txt['moderator'] : $txt['moderators'], ': ', implode(', ', $context['link_moderators']), '.';
152
+	}
145 153
 
146 154
 	echo '
147 155
 		</p>
@@ -149,9 +157,10 @@  discard block
 block discarded – undo
149 157
 		}
150 158
 
151 159
 		// If Quick Moderation is enabled start the form.
152
-		if (!empty($context['can_quick_mod']) && $options['display_quick_mod'] > 0 && !empty($context['topics']))
153
-			echo '
160
+		if (!empty($context['can_quick_mod']) && $options['display_quick_mod'] > 0 && !empty($context['topics'])) {
161
+					echo '
154 162
 	<form action="', $scripturl, '?action=quickmod;board=', $context['current_board'], '.', $context['start'], '" method="post" accept-charset="', $context['character_set'], '" class="clear" name="quickModForm" id="quickModForm">';
163
+		}
155 164
 
156 165
 		echo '
157 166
 		<div id="messageindex">';
@@ -159,10 +168,11 @@  discard block
 block discarded – undo
159 168
 		{
160 169
 		echo '
161 170
 			<div class="information">';
162
-			if ($settings['display_who_viewing'] == 1)
163
-				echo count($context['view_members']), ' ', count($context['view_members']) === 1 ? $txt['who_member'] : $txt['members'];
164
-		else
165
-				echo empty($context['view_members_list']) ? '0 ' . $txt['members'] : implode(', ', $context['view_members_list']) . (empty($context['view_num_hidden']) || $context['can_moderate_forum'] ? '' : ' (+ ' . $context['view_num_hidden'] . ' ' . $txt['hidden'] . ')');
171
+			if ($settings['display_who_viewing'] == 1) {
172
+							echo count($context['view_members']), ' ', count($context['view_members']) === 1 ? $txt['who_member'] : $txt['members'];
173
+			} else {
174
+						echo empty($context['view_members_list']) ? '0 ' . $txt['members'] : implode(', ', $context['view_members_list']) . (empty($context['view_num_hidden']) || $context['can_moderate_forum'] ? '' : ' (+ ' . $context['view_num_hidden'] . ' ' . $txt['hidden'] . ')');
175
+		}
166 176
 			echo $txt['who_and'], $context['view_num_guests'], ' ', $context['view_num_guests'] == 1 ? $txt['guest'] : $txt['guests'], $txt['who_viewing_board'];
167 177
 
168 178
 		echo '
@@ -181,19 +191,22 @@  discard block
 block discarded – undo
181 191
 					<div class="lastpost">', $context['topics_headers']['last_post'], '</div>';
182 192
 
183 193
 			// Show a "select all" box for quick moderation?
184
-			if (!empty($context['can_quick_mod']) && $options['display_quick_mod'] == 1)
185
-				echo '
194
+			if (!empty($context['can_quick_mod']) && $options['display_quick_mod'] == 1) {
195
+							echo '
186 196
 					<div class="moderation"><input type="checkbox" onclick="invertAll(this, this.form, \'topics[]\');" class="input_check"></div>';
197
+			}
187 198
 
188 199
 			// If it's on in "image" mode, don't show anything but the column.
189
-			elseif (!empty($context['can_quick_mod']))
190
-				echo '
200
+			elseif (!empty($context['can_quick_mod'])) {
201
+							echo '
191 202
 					<div class="moderation">&nbsp;</div>';
203
+			}
192 204
 		}
193 205
 		// No topics.... just say, "sorry bub".
194
-		else
195
-			echo '
206
+		else {
207
+					echo '
196 208
 					<h3 class="titlebg">', $txt['topic_alert_none'], '</h3>';
209
+		}
197 210
 
198 211
 		echo '
199 212
 		</div>';
@@ -225,21 +238,26 @@  discard block
 block discarded – undo
225 238
 			// Now we handle the icons
226 239
 			echo '
227 240
 							<div class="icons floatright">';
228
-			if ($topic['is_watched'])
229
-				echo '
241
+			if ($topic['is_watched']) {
242
+							echo '
230 243
 								<span class="generic_icons watch" title="', $txt['watching_this_topic'], '"></span>';
231
-			if ($topic['is_locked'])
232
-				echo '
244
+			}
245
+			if ($topic['is_locked']) {
246
+							echo '
233 247
 								<span class="generic_icons lock"></span>';
234
-			if ($topic['is_sticky'])
235
-				echo '
248
+			}
249
+			if ($topic['is_sticky']) {
250
+							echo '
236 251
 								<span class="generic_icons sticky"></span>';
237
-			if ($topic['is_redirect'])
238
-				echo '
252
+			}
253
+			if ($topic['is_redirect']) {
254
+							echo '
239 255
 								<span class="generic_icons move"></span>';
240
-			if ($topic['is_poll'])
241
-				echo '
256
+			}
257
+			if ($topic['is_poll']) {
258
+							echo '
242 259
 								<span class="generic_icons poll"></span>';
260
+			}
243 261
 			echo '
244 262
 							</div>';
245 263
 
@@ -265,26 +283,31 @@  discard block
 block discarded – undo
265 283
 			{
266 284
 				echo '
267 285
 					<div class="moderation">';
268
-				if ($options['display_quick_mod'] == 1)
269
-					echo '
286
+				if ($options['display_quick_mod'] == 1) {
287
+									echo '
270 288
 						<input type="checkbox" name="topics[]" value="', $topic['id'], '" class="input_check">';
271
-				else
289
+				} else
272 290
 				{
273 291
 					// Check permissions on each and show only the ones they are allowed to use.
274
-					if ($topic['quick_mod']['remove'])
275
-						echo '<a href="', $scripturl, '?action=quickmod;board=', $context['current_board'], '.', $context['start'], ';actions%5B', $topic['id'], '%5D=remove;', $context['session_var'], '=', $context['session_id'], '" class="you_sure"><span class="generic_icons delete" title="', $txt['remove_topic'], '"></span></a>';
292
+					if ($topic['quick_mod']['remove']) {
293
+											echo '<a href="', $scripturl, '?action=quickmod;board=', $context['current_board'], '.', $context['start'], ';actions%5B', $topic['id'], '%5D=remove;', $context['session_var'], '=', $context['session_id'], '" class="you_sure"><span class="generic_icons delete" title="', $txt['remove_topic'], '"></span></a>';
294
+					}
276 295
 
277
-					if ($topic['quick_mod']['lock'])
278
-						echo '<a href="', $scripturl, '?action=quickmod;board=', $context['current_board'], '.', $context['start'], ';actions%5B', $topic['id'], '%5D=lock;', $context['session_var'], '=', $context['session_id'], '" class="you_sure"><span class="generic_icons lock" title="', $topic['is_locked'] ? $txt['set_unlock'] : $txt['set_lock'], '"></span></a>';
296
+					if ($topic['quick_mod']['lock']) {
297
+											echo '<a href="', $scripturl, '?action=quickmod;board=', $context['current_board'], '.', $context['start'], ';actions%5B', $topic['id'], '%5D=lock;', $context['session_var'], '=', $context['session_id'], '" class="you_sure"><span class="generic_icons lock" title="', $topic['is_locked'] ? $txt['set_unlock'] : $txt['set_lock'], '"></span></a>';
298
+					}
279 299
 
280
-					if ($topic['quick_mod']['lock'] || $topic['quick_mod']['remove'])
281
-						echo '<br>';
300
+					if ($topic['quick_mod']['lock'] || $topic['quick_mod']['remove']) {
301
+											echo '<br>';
302
+					}
282 303
 
283
-					if ($topic['quick_mod']['sticky'])
284
-						echo '<a href="', $scripturl, '?action=quickmod;board=', $context['current_board'], '.', $context['start'], ';actions%5B', $topic['id'], '%5D=sticky;', $context['session_var'], '=', $context['session_id'], '" class="you_sure"><span class="generic_icons sticky" title="', $topic['is_sticky'] ? $txt['set_nonsticky'] : $txt['set_sticky'], '"></span></a>';
304
+					if ($topic['quick_mod']['sticky']) {
305
+											echo '<a href="', $scripturl, '?action=quickmod;board=', $context['current_board'], '.', $context['start'], ';actions%5B', $topic['id'], '%5D=sticky;', $context['session_var'], '=', $context['session_id'], '" class="you_sure"><span class="generic_icons sticky" title="', $topic['is_sticky'] ? $txt['set_nonsticky'] : $txt['set_sticky'], '"></span></a>';
306
+					}
285 307
 
286
-					if ($topic['quick_mod']['move'])
287
-						echo '<a href="', $scripturl, '?action=movetopic;current_board=', $context['current_board'], ';board=', $context['current_board'], '.', $context['start'], ';topic=', $topic['id'], '.0"><span class="generic_icons move" title="', $txt['move_topic'], '"></span></a>';
308
+					if ($topic['quick_mod']['move']) {
309
+											echo '<a href="', $scripturl, '?action=movetopic;current_board=', $context['current_board'], ';board=', $context['current_board'], '.', $context['start'], ';topic=', $topic['id'], '.0"><span class="generic_icons move" title="', $txt['move_topic'], '"></span></a>';
310
+					}
288 311
 				}
289 312
 				echo '
290 313
 					</div>';
@@ -302,18 +325,20 @@  discard block
 block discarded – undo
302 325
 					<select class="qaction" name="qaction"', $context['can_move'] ? ' onchange="this.form.move_to.disabled = (this.options[this.selectedIndex].value != \'move\');"' : '', '>
303 326
 						<option value="">--------</option>';
304 327
 
305
-			foreach ($context['qmod_actions'] as $qmod_action)
306
-				if ($context['can_' . $qmod_action])
328
+			foreach ($context['qmod_actions'] as $qmod_action) {
329
+							if ($context['can_' . $qmod_action])
307 330
 					echo '
308 331
 						<option value="' . $qmod_action . '">' . $txt['quick_mod_'  . $qmod_action] . '</option>';
332
+			}
309 333
 
310 334
 			echo '
311 335
 					</select>';
312 336
 
313 337
 			// Show a list of boards they can move the topic to.
314
-			if ($context['can_move'])
315
-				echo '
338
+			if ($context['can_move']) {
339
+							echo '
316 340
 			<span id="quick_mod_jump_to">&nbsp;</span>';
341
+			}
317 342
 
318 343
 			echo '
319 344
 					<input type="submit" value="', $txt['quick_mod_go'], '" onclick="return document.forms.quickModForm.qaction.value != \'\' &amp;&amp; confirm(\'', $txt['quickmod_confirm'], '\');" class="button_submit qaction">
@@ -324,10 +349,11 @@  discard block
 block discarded – undo
324 349
 	</div>';
325 350
 
326 351
 		// Finish off the form - again.
327
-		if (!empty($context['can_quick_mod']) && $options['display_quick_mod'] > 0 && !empty($context['topics']))
328
-			echo '
352
+		if (!empty($context['can_quick_mod']) && $options['display_quick_mod'] > 0 && !empty($context['topics'])) {
353
+					echo '
329 354
 	<input type="hidden" name="' . $context['session_var'] . '" value="' . $context['session_id'] . '">
330 355
 	</form>';
356
+		}
331 357
 
332 358
 	// Mobile action buttons (bottom)
333 359
 	echo '
@@ -346,8 +372,8 @@  discard block
 block discarded – undo
346 372
 	// Show breadcrumbs at the bottom too.
347 373
 	theme_linktree();
348 374
 
349
-	if (!empty($context['can_quick_mod']) && $options['display_quick_mod'] == 1 && !empty($context['topics']) && $context['can_move'])
350
-		echo '
375
+	if (!empty($context['can_quick_mod']) && $options['display_quick_mod'] == 1 && !empty($context['topics']) && $context['can_move']) {
376
+			echo '
351 377
 			<script>
352 378
 				if (typeof(window.XMLHttpRequest) != "undefined")
353 379
 					aJumpTo[aJumpTo.length] = new JumpTo({
@@ -366,6 +392,7 @@  discard block
 block discarded – undo
366 392
 						sCustomName: "move_to"
367 393
 					});
368 394
 			</script>';
395
+	}
369 396
 
370 397
 	// Javascript for inline editing.
371 398
 	echo '
@@ -401,8 +428,8 @@  discard block
 block discarded – undo
401 428
 		<div class="information">
402 429
 			<p class="floatright" id="message_index_jump_to">&nbsp;</p>';
403 430
 
404
-	if (empty($context['no_topic_listing']))
405
-		echo '
431
+	if (empty($context['no_topic_listing'])) {
432
+			echo '
406 433
 			<p class="floatleft">', !empty($modSettings['enableParticipation']) && $context['user']['is_logged'] ? '
407 434
 				<img src="' . $settings['images_url'] . '/icons/profile_sm.png" alt="" class="centericon"> ' . $txt['participation_caption'] . '<br>' : '', '
408 435
 				'. ($modSettings['pollMode'] == '1' ? '<span class="generic_icons poll centericon"></span> ' . $txt['poll'] : '') . '<br>
@@ -412,9 +439,10 @@  discard block
 block discarded – undo
412 439
 				<span class="generic_icons lock centericon"></span> ' . $txt['locked_topic'] . '<br>
413 440
 				<span class="generic_icons sticky centericon"></span> ' . $txt['sticky_topic'] . '<br>
414 441
 			</p>';
442
+	}
415 443
 
416
-	if (!empty($context['jump_to']))
417
-		echo '
444
+	if (!empty($context['jump_to'])) {
445
+			echo '
418 446
 			<script>
419 447
 				if (typeof(window.XMLHttpRequest) != "undefined")
420 448
 					aJumpTo[aJumpTo.length] = new JumpTo({
@@ -430,6 +458,7 @@  discard block
 block discarded – undo
430 458
 						sGoButtonLabel: "', $txt['quick_mod_go'], '"
431 459
 					});
432 460
 			</script>';
461
+	}
433 462
 
434 463
 	echo '
435 464
 			<br class="clear">
Please login to merge, or discard this patch.
Themes/default/Likes.template.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -24,8 +24,8 @@
 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="likes_popup">
31 31
 		<div class="windowbg">
Please login to merge, or discard this patch.
Themes/default/Search.template.php 2 patches
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -297,7 +297,7 @@  discard block
 block discarded – undo
297 297
 							<input type="checkbox" onclick="invertAll(this, this.form, \'topics[]\');" class="input_check">';
298 298
 				echo '
299 299
 				</span>
300
-				<span class="generic_icons filter"></span>&nbsp;', $txt['mlist_search_results'],':&nbsp;',$context['search_params']['search'],'
300
+				<span class="generic_icons filter"></span>&nbsp;', $txt['mlist_search_results'], ':&nbsp;', $context['search_params']['search'], '
301 301
 			</h3>
302 302
 		</div>';
303 303
 
@@ -316,7 +316,7 @@  discard block
 block discarded – undo
316 316
 		{
317 317
 
318 318
 			echo '
319
-			<div class="', $topic['css_class'] ,'">
319
+			<div class="', $topic['css_class'], '">
320 320
 				<div class="flow_auto">';
321 321
 
322 322
 			foreach ($topic['matches'] as $message)
@@ -325,7 +325,7 @@  discard block
 block discarded – undo
325 325
 					<div class="topic_details floatleft" style="width: 94%">
326 326
 						<div class="counter">', $message['counter'], '</div>
327 327
 						<h5>', $topic['board']['link'], ' / <a href="', $scripturl, '?topic=', $topic['id'], '.msg', $message['id'], '#msg', $message['id'], '">', $message['subject_highlighted'], '</a></h5>
328
-						<span class="smalltext">&#171;&nbsp;',$txt['by'],'&nbsp;<strong>', $message['member']['link'], '</strong>&nbsp;',$txt['on'],'&nbsp;<em>', $message['time'], '</em>&nbsp;&#187;</span>
328
+						<span class="smalltext">&#171;&nbsp;',$txt['by'], '&nbsp;<strong>', $message['member']['link'], '</strong>&nbsp;', $txt['on'], '&nbsp;<em>', $message['time'], '</em>&nbsp;&#187;</span>
329 329
 					</div>';
330 330
 
331 331
 				if (!empty($options['display_quick_mod']))
@@ -342,11 +342,11 @@  discard block
 block discarded – undo
342 342
 					{
343 343
 						if ($topic['quick_mod']['remove'])
344 344
 							echo '
345
-						<a href="', $scripturl, '?action=quickmod;board='. $topic['board']['id']. '.0;actions%5B', $topic['id'], '%5D=remove;', $context['session_var'], '=', $context['session_id'], '" class="you_sure"><span class="generic_icons delete" title="', $txt['remove_topic'], '"></span></a>';
345
+						<a href="', $scripturl, '?action=quickmod;board=' . $topic['board']['id'] . '.0;actions%5B', $topic['id'], '%5D=remove;', $context['session_var'], '=', $context['session_id'], '" class="you_sure"><span class="generic_icons delete" title="', $txt['remove_topic'], '"></span></a>';
346 346
 
347 347
 						if ($topic['quick_mod']['lock'])
348 348
 							echo '
349
-						<a href="', $scripturl, '?action=quickmod;board='. $topic['board']['id']. '.0;actions%5B', $topic['id'], '%5D=lock;', $context['session_var'], '=', $context['session_id'], '" class="you_sure"><span class="generic_icons lock" title="', $topic['is_locked'] ? $txt['set_unlock'] : $txt['set_lock'], '"></span></a>';
349
+						<a href="', $scripturl, '?action=quickmod;board=' . $topic['board']['id'] . '.0;actions%5B', $topic['id'], '%5D=lock;', $context['session_var'], '=', $context['session_id'], '" class="you_sure"><span class="generic_icons lock" title="', $topic['is_locked'] ? $txt['set_unlock'] : $txt['set_lock'], '"></span></a>';
350 350
 
351 351
 						if ($topic['quick_mod']['lock'] || $topic['quick_mod']['remove'])
352 352
 							echo '
@@ -354,7 +354,7 @@  discard block
 block discarded – undo
354 354
 
355 355
 						if ($topic['quick_mod']['sticky'])
356 356
 							echo '
357
-						<a href="', $scripturl, '?action=quickmod;board='. $topic['board']['id']. '.0;actions%5B', $topic['id'], '%5D=sticky;', $context['session_var'], '=', $context['session_id'], '" class="you_sure"><span class="generic_icons sticky" title="', $topic['is_sticky'] ? $txt['set_nonsticky'] : $txt['set_sticky'], '"></span></a>';
357
+						<a href="', $scripturl, '?action=quickmod;board=' . $topic['board']['id'] . '.0;actions%5B', $topic['id'], '%5D=sticky;', $context['session_var'], '=', $context['session_id'], '" class="you_sure"><span class="generic_icons sticky" title="', $topic['is_sticky'] ? $txt['set_nonsticky'] : $txt['set_sticky'], '"></span></a>';
358 358
 
359 359
 						if ($topic['quick_mod']['move'])
360 360
 							echo '
@@ -393,7 +393,7 @@  discard block
 block discarded – undo
393 393
 			foreach ($context['qmod_actions'] as $qmod_action)
394 394
 				if ($context['can_' . $qmod_action])
395 395
 					echo '
396
-							<option value="' . $qmod_action . '">' . $txt['quick_mod_'  . $qmod_action] . '</option>';
396
+							<option value="' . $qmod_action . '">' . $txt['quick_mod_' . $qmod_action] . '</option>';
397 397
 
398 398
 			echo '
399 399
 					</select>';
@@ -421,7 +421,7 @@  discard block
 block discarded – undo
421 421
 		echo '
422 422
 		<div class="cat_bar">
423 423
 			<h3 class="catbg">
424
-				<span class="generic_icons filter"></span>&nbsp;', $txt['mlist_search_results'],':&nbsp;',$context['search_params']['search'],'
424
+				<span class="generic_icons filter"></span>&nbsp;', $txt['mlist_search_results'], ':&nbsp;', $context['search_params']['search'], '
425 425
 			</h3>
426 426
 		</div>
427 427
 		<div class="pagesection">
@@ -437,7 +437,7 @@  discard block
 block discarded – undo
437 437
 			foreach ($topic['matches'] as $message)
438 438
 			{
439 439
 				echo '
440
-				<div class="', $topic['css_class'] ,'">
440
+				<div class="', $topic['css_class'], '">
441 441
 					<div class="counter">', $message['counter'], '</div>
442 442
 					<div class="topic_details">
443 443
 						<h5>', $topic['board']['link'], ' / <a href="', $scripturl, '?topic=', $topic['id'], '.', $message['start'], ';topicseen#msg', $message['id'], '">', $message['subject_highlighted'], '</a></h5>
Please login to merge, or discard this patch.
Braces   +85 added lines, -60 removed lines patch added patch discarded remove patch
@@ -25,13 +25,15 @@  discard block
 block discarded – undo
25 25
 			</h3>
26 26
 		</div>';
27 27
 
28
-	if (!empty($context['search_errors']))
29
-		echo '
28
+	if (!empty($context['search_errors'])) {
29
+			echo '
30 30
 		<div class="errorbox">', implode('<br>', $context['search_errors']['messages']), '</div>';
31
+	}
31 32
 
32
-	if (!empty($context['search_ignored']))
33
-		echo '
33
+	if (!empty($context['search_ignored'])) {
34
+			echo '
34 35
 		<p class="noticebox">', $txt['search_warning_ignored_word' . (count($context['search_ignored']) == 1 ? '' : 's')], ': ', implode(', ', $context['search_ignored']), '</p>';
36
+	}
35 37
 
36 38
 	echo '
37 39
 		<fieldset id="advanced_search">
@@ -43,9 +45,10 @@  discard block
 block discarded – undo
43 45
 					<dd>
44 46
 						<input type="search" name="search" id="searchfor" ', !empty($context['search_params']['search']) ? ' value="' . $context['search_params']['search'] . '"' : '', ' maxlength="', $context['search_string_limit'], '" size="40" class="input_text">';
45 47
 
46
-	if (empty($modSettings['search_simple_fulltext']))
47
-		echo '
48
+	if (empty($modSettings['search_simple_fulltext'])) {
49
+			echo '
48 50
 						<em class="smalltext">', $txt['search_example'], '</em>';
51
+	}
49 52
 
50 53
 	echo '
51 54
 					</dd>
@@ -112,11 +115,12 @@  discard block
 block discarded – undo
112 115
 	}
113 116
 
114 117
 	// If $context['search_params']['topic'] is set, that means we're searching just one topic.
115
-	if (!empty($context['search_params']['topic']))
116
-		echo '
118
+	if (!empty($context['search_params']['topic'])) {
119
+			echo '
117 120
 				<p>', $txt['search_specific_topic'], ' &quot;', $context['search_topic']['link'], '&quot;.</p>
118 121
 				<input type="hidden" name="topic" value="', $context['search_topic']['id'], '">
119 122
 				<input type="submit" name="b_search" value="', $txt['search'], '" class="button_submit">';
123
+	}
120 124
 
121 125
 	echo '
122 126
 			</div>
@@ -147,14 +151,15 @@  discard block
 block discarded – undo
147 151
 
148 152
 			foreach ($category['boards'] as $board)
149 153
 			{
150
-				if ($i == $limit)
151
-					echo '
154
+				if ($i == $limit) {
155
+									echo '
152 156
 							</ul>
153 157
 						</li>
154 158
 					</ul>
155 159
 					<ul class="ignoreboards floatright">
156 160
 						<li class="category">
157 161
 							<ul>';
162
+				}
158 163
 
159 164
 				echo '
160 165
 								<li class="board">
@@ -242,13 +247,15 @@  discard block
 block discarded – undo
242 247
 		<div class="roundframe">';
243 248
 
244 249
 		// Did they make any typos or mistakes, perhaps?
245
-		if (isset($context['did_you_mean']))
246
-			echo '
250
+		if (isset($context['did_you_mean'])) {
251
+					echo '
247 252
 			<p>', $txt['search_did_you_mean'], ' <a href="', $scripturl, '?action=search2;params=', $context['did_you_mean_params'], '">', $context['did_you_mean'], '</a>.</p>';
253
+		}
248 254
 
249
-		if (!empty($context['search_ignored']))
250
-			echo '
255
+		if (!empty($context['search_ignored'])) {
256
+					echo '
251 257
 			<p>', $txt['search_warning_ignored_word' . (count($context['search_ignored']) == 1 ? '' : 's')], ': ', implode(', ', $context['search_ignored']), '</p>';
258
+		}
252 259
 
253 260
 		echo '
254 261
 			<form action="', $scripturl, '?action=search2" method="post" accept-charset="', $context['character_set'], '">
@@ -270,10 +277,11 @@  discard block
 block discarded – undo
270 277
 					<input type="hidden" name="maxage" value="', !empty($context['search_params']['maxage']) ? $context['search_params']['maxage'] : '9999', '">
271 278
 					<input type="hidden" name="sort" value="', !empty($context['search_params']['sort']) ? $context['search_params']['sort'] : 'relevance', '">
272 279
 				</div>';
273
-		if (!empty($context['search_params']['brd']))
274
-			foreach ($context['search_params']['brd'] as $board_id)
280
+		if (!empty($context['search_params']['brd'])) {
281
+					foreach ($context['search_params']['brd'] as $board_id)
275 282
 				echo '
276 283
 				<input type="hidden" name="brd[', $board_id, ']" value="', $board_id, '">';
284
+		}
277 285
 
278 286
 		echo '
279 287
 			</form>
@@ -284,17 +292,19 @@  discard block
 block discarded – undo
284 292
 	if ($context['compact'])
285 293
 	{
286 294
 		// Quick moderation set to checkboxes? Oh, how fun :/.
287
-		if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1)
288
-			echo '
295
+		if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1) {
296
+					echo '
289 297
 	<form action="', $scripturl, '?action=quickmod" method="post" accept-charset="', $context['character_set'], '" name="topicForm">';
298
+		}
290 299
 
291 300
 	echo '
292 301
 		<div class="cat_bar">
293 302
 			<h3 class="catbg">
294 303
 				<span class="floatright">';
295
-					if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1)
296
-					echo '
304
+					if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1) {
305
+										echo '
297 306
 							<input type="checkbox" onclick="invertAll(this, this.form, \'topics[]\');" class="input_check">';
307
+					}
298 308
 				echo '
299 309
 				</span>
300 310
 				<span class="generic_icons filter"></span>&nbsp;', $txt['mlist_search_results'],':&nbsp;',$context['search_params']['search'],'
@@ -302,14 +312,15 @@  discard block
 block discarded – undo
302 312
 		</div>';
303 313
 
304 314
 		// was anything even found?
305
-		if (!empty($context['topics']))
306
-		echo'
315
+		if (!empty($context['topics'])) {
316
+				echo'
307 317
 		<div class="pagesection">
308 318
 			<span>', $context['page_index'], '</span>
309 319
 		</div>';
310
-		else
311
-			echo '
320
+		} else {
321
+					echo '
312 322
 			<div class="roundframe">', $txt['find_no_results'], '</div>';
323
+		}
313 324
 
314 325
 		// while we have results to show ...
315 326
 		while ($topic = $context['get_topics']())
@@ -337,38 +348,43 @@  discard block
 block discarded – undo
337 348
 					{
338 349
 						echo '
339 350
 						<input type="checkbox" name="topics[]" value="', $topic['id'], '" class="input_check">';
340
-					}
341
-					else
351
+					} else
342 352
 					{
343
-						if ($topic['quick_mod']['remove'])
344
-							echo '
353
+						if ($topic['quick_mod']['remove']) {
354
+													echo '
345 355
 						<a href="', $scripturl, '?action=quickmod;board='. $topic['board']['id']. '.0;actions%5B', $topic['id'], '%5D=remove;', $context['session_var'], '=', $context['session_id'], '" class="you_sure"><span class="generic_icons delete" title="', $txt['remove_topic'], '"></span></a>';
356
+						}
346 357
 
347
-						if ($topic['quick_mod']['lock'])
348
-							echo '
358
+						if ($topic['quick_mod']['lock']) {
359
+													echo '
349 360
 						<a href="', $scripturl, '?action=quickmod;board='. $topic['board']['id']. '.0;actions%5B', $topic['id'], '%5D=lock;', $context['session_var'], '=', $context['session_id'], '" class="you_sure"><span class="generic_icons lock" title="', $topic['is_locked'] ? $txt['set_unlock'] : $txt['set_lock'], '"></span></a>';
361
+						}
350 362
 
351
-						if ($topic['quick_mod']['lock'] || $topic['quick_mod']['remove'])
352
-							echo '
363
+						if ($topic['quick_mod']['lock'] || $topic['quick_mod']['remove']) {
364
+													echo '
353 365
 						<br>';
366
+						}
354 367
 
355
-						if ($topic['quick_mod']['sticky'])
356
-							echo '
368
+						if ($topic['quick_mod']['sticky']) {
369
+													echo '
357 370
 						<a href="', $scripturl, '?action=quickmod;board='. $topic['board']['id']. '.0;actions%5B', $topic['id'], '%5D=sticky;', $context['session_var'], '=', $context['session_id'], '" class="you_sure"><span class="generic_icons sticky" title="', $topic['is_sticky'] ? $txt['set_nonsticky'] : $txt['set_sticky'], '"></span></a>';
371
+						}
358 372
 
359
-						if ($topic['quick_mod']['move'])
360
-							echo '
373
+						if ($topic['quick_mod']['move']) {
374
+													echo '
361 375
 						<a href="', $scripturl, '?action=movetopic;topic=', $topic['id'], '.0"><span class="generic_icons move" title="', $txt['move_topic'], '"></span></a>';
376
+						}
362 377
 					}
363 378
 
364 379
 					echo '
365 380
 					</div>';
366 381
 				}
367 382
 
368
-				if ($message['body_highlighted'] != '')
369
-					echo '
383
+				if ($message['body_highlighted'] != '') {
384
+									echo '
370 385
 					<br class="clear">
371 386
 					<div class="list_posts double_height">', $message['body_highlighted'], '</div>';
387
+				}
372 388
 			}
373 389
 
374 390
 			echo '
@@ -376,11 +392,12 @@  discard block
 block discarded – undo
376 392
 			</div>';
377 393
 
378 394
 		}
379
-		if (!empty($context['topics']))
380
-		echo '
395
+		if (!empty($context['topics'])) {
396
+				echo '
381 397
 		<div class="pagesection">
382 398
 			<span>', $context['page_index'], '</span>
383 399
 		</div>';
400
+		}
384 401
 
385 402
 		if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1 && !empty($context['topics']))
386 403
 		{
@@ -390,17 +407,19 @@  discard block
 block discarded – undo
390 407
 					<select class="qaction" name="qaction"', $context['can_move'] ? ' onchange="this.form.move_to.disabled = (this.options[this.selectedIndex].value != \'move\');"' : '', '>
391 408
 						<option value="">--------</option>';
392 409
 
393
-			foreach ($context['qmod_actions'] as $qmod_action)
394
-				if ($context['can_' . $qmod_action])
410
+			foreach ($context['qmod_actions'] as $qmod_action) {
411
+							if ($context['can_' . $qmod_action])
395 412
 					echo '
396 413
 							<option value="' . $qmod_action . '">' . $txt['quick_mod_'  . $qmod_action] . '</option>';
414
+			}
397 415
 
398 416
 			echo '
399 417
 					</select>';
400 418
 
401
-			if ($context['can_move'])
402
-				echo '
419
+			if ($context['can_move']) {
420
+							echo '
403 421
 				<span id="quick_mod_jump_to">&nbsp;</span>';
422
+			}
404 423
 
405 424
 			echo '
406 425
 					<input type="hidden" name="redirect_url" value="', $scripturl . '?action=search2;params=' . $context['params'], '">
@@ -410,13 +429,13 @@  discard block
 block discarded – undo
410 429
 		}
411 430
 
412 431
 
413
-		if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1 && !empty($context['topics']))
414
-			echo '
432
+		if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1 && !empty($context['topics'])) {
433
+					echo '
415 434
 			<input type="hidden" name="' . $context['session_var'] . '" value="' . $context['session_id'] . '">
416 435
 		</form>';
436
+		}
417 437
 
418
-	}
419
-	else
438
+	} else
420 439
 	{
421 440
 		echo '
422 441
 		<div class="cat_bar">
@@ -428,9 +447,10 @@  discard block
 block discarded – undo
428 447
 			<span>', $context['page_index'], '</span>
429 448
 		</div>';
430 449
 
431
-		if (empty($context['topics']))
432
-			echo '
450
+		if (empty($context['topics'])) {
451
+					echo '
433 452
 		<div class="information">(', $txt['search_no_results'], ')</div>';
453
+		}
434 454
 
435 455
 		while ($topic = $context['get_topics']())
436 456
 		{
@@ -445,23 +465,27 @@  discard block
 block discarded – undo
445 465
 					</div>
446 466
 					<div class="list_posts">', $message['body_highlighted'], '</div>';
447 467
 
448
-			if ($topic['can_reply'])
449
-				echo '
468
+			if ($topic['can_reply']) {
469
+							echo '
450 470
 						<ul class="quickbuttons">';
471
+			}
451 472
 
452 473
 				// If they *can* reply?
453
-			if ($topic['can_reply'])
454
-				echo '
474
+			if ($topic['can_reply']) {
475
+							echo '
455 476
 							<li><a href="', $scripturl . '?action=post;topic=' . $topic['id'] . '.' . $message['start'], '"><span class="generic_icons reply_button"></span>', $txt['reply'], '</a></li>';
477
+			}
456 478
 
457 479
 				// If they *can* quote?
458
-			if ($topic['can_quote'])
459
-				echo '
480
+			if ($topic['can_quote']) {
481
+							echo '
460 482
 							<li><a href="', $scripturl . '?action=post;topic=' . $topic['id'] . '.' . $message['start'] . ';quote=' . $message['id'] . '"><span class="generic_icons quote"></span>', $txt['quote_action'], '</a></li>';
483
+			}
461 484
 
462
-			if ($topic['can_reply'])
463
-				echo '
485
+			if ($topic['can_reply']) {
486
+							echo '
464 487
 						</ul>';
488
+			}
465 489
 			echo '
466 490
 					<br class="clear">
467 491
 				</div>';
@@ -480,8 +504,8 @@  discard block
 block discarded – undo
480 504
 		<div class="smalltext righttext" id="search_jump_to">&nbsp;</div>
481 505
 		<script>';
482 506
 
483
-	if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1 && !empty($context['topics']) && $context['can_move'])
484
-		echo '
507
+	if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1 && !empty($context['topics']) && $context['can_move']) {
508
+			echo '
485 509
 				if (typeof(window.XMLHttpRequest) != "undefined")
486 510
 					aJumpTo[aJumpTo.length] = new JumpTo({
487 511
 						sContainerId: "quick_mod_jump_to",
@@ -496,6 +520,7 @@  discard block
 block discarded – undo
496 520
 						bDisabled: true,
497 521
 						sCustomName: "move_to"
498 522
 					});';
523
+	}
499 524
 
500 525
 	echo '
501 526
 			if (typeof(window.XMLHttpRequest) != "undefined")
Please login to merge, or discard this patch.
Themes/default/ManageBans.template.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -134,7 +134,7 @@  discard block
 block discarded – undo
134 134
 							<input type="text" name="email" value="', $context['ban_suggestions']['email'], '" size="44" onfocus="document.getElementById(\'email_check\').checked = true;" class="input_text">
135 135
 						</dd>
136 136
 						<dt>
137
-							<input type="checkbox" name="ban_suggestions[]" id="user_check" value="user" class="input_check"', !empty($context['ban_suggestions']['user']) ||  isset($context['ban']['from_user']) ? ' checked' : '', '>
137
+							<input type="checkbox" name="ban_suggestions[]" id="user_check" value="user" class="input_check"', !empty($context['ban_suggestions']['user']) || isset($context['ban']['from_user']) ? ' checked' : '', '>
138 138
 							<label for="user_check">', $txt['ban_on_username'], '</label>:
139 139
 						</dt>
140 140
 						<dd>
@@ -156,10 +156,10 @@  discard block
 block discarded – undo
156 156
 					foreach ($ban_ips as $ip)
157 157
 						echo '
158 158
 						<dt>
159
-							<input type="checkbox" id="suggestions_', $key ,'_', $count, '" name="ban_suggestions[', $key ,'][]"', !empty($context['ban_suggestions']['saved_triggers'][$key]) && in_array($ip, $context['ban_suggestions']['saved_triggers'][$key]) ? ' checked' : '', ' value="', $ip, '" class="input_check">
159
+							<input type="checkbox" id="suggestions_', $key, '_', $count, '" name="ban_suggestions[', $key, '][]"', !empty($context['ban_suggestions']['saved_triggers'][$key]) && in_array($ip, $context['ban_suggestions']['saved_triggers'][$key]) ? ' checked' : '', ' value="', $ip, '" class="input_check">
160 160
 						</dt>
161 161
 						<dd>
162
-							<label for="suggestions_', $key ,'_', $count++, '">', $ip, '</label>
162
+							<label for="suggestions_', $key, '_', $count++, '">', $ip, '</label>
163 163
 						</dd>';
164 164
 
165 165
 					echo '
Please login to merge, or discard this patch.
Braces   +24 added lines, -16 removed lines patch added patch discarded remove patch
@@ -26,9 +26,10 @@  discard block
 block discarded – undo
26 26
 				</h3>
27 27
 			</div>';
28 28
 
29
-	if ($context['ban']['is_new'])
30
-		echo '
29
+	if ($context['ban']['is_new']) {
30
+			echo '
31 31
 			<div class="information noup">', $txt['ban_add_notes'], '</div>';
32
+	}
32 33
 
33 34
 	// If there were errors creating the ban, show them.
34 35
 	if (!empty($context['error_messages']))
@@ -38,9 +39,10 @@  discard block
 block discarded – undo
38 39
 				<strong>', $txt['ban_errors_detected'], '</strong>
39 40
 				<ul>';
40 41
 
41
-		foreach ($context['error_messages'] as $error)
42
-			echo '
42
+		foreach ($context['error_messages'] as $error) {
43
+					echo '
43 44
 					<li class="error">', $error, '</li>';
45
+		}
44 46
 
45 47
 		echo '
46 48
 				</ul>
@@ -57,8 +59,8 @@  discard block
 block discarded – undo
57 59
 					<input type="text" id="ban_name" name="ban_name" value="', $context['ban']['name'], '" size="45" maxlength="60" class="input_text">
58 60
 				</dd>';
59 61
 
60
-	if (isset($context['ban']['reason']))
61
-		echo '
62
+	if (isset($context['ban']['reason'])) {
63
+			echo '
62 64
 				<dt>
63 65
 					<strong><label for="reason">', $txt['ban_reason'], ':</label></strong><br>
64 66
 					<span class="smalltext">', $txt['ban_reason_desc'], '</span>
@@ -66,9 +68,10 @@  discard block
 block discarded – undo
66 68
 				<dd>
67 69
 					<textarea name="reason" id="reason" cols="40" rows="3" style="min-height: 64px; max-height: 64px; min-width: 50%; max-width: 99%;">', $context['ban']['reason'], '</textarea>
68 70
 				</dd>';
71
+	}
69 72
 
70
-	if (isset($context['ban']['notes']))
71
-		echo '
73
+	if (isset($context['ban']['notes'])) {
74
+			echo '
72 75
 				<dt>
73 76
 					<strong><label for="ban_notes">', $txt['ban_notes'], ':</label></strong><br>
74 77
 					<span class="smalltext">', $txt['ban_notes_desc'], '</span>
@@ -76,6 +79,7 @@  discard block
 block discarded – undo
76 79
 				<dd>
77 80
 					<textarea name="notes" id="ban_notes" cols="40" rows="3" style="min-height: 64px; max-height: 64px; min-width: 50%; max-width: 99%;">', $context['ban']['notes'], '</textarea>
78 81
 				</dd>';
82
+	}
79 83
 
80 84
 	echo '
81 85
 				</dl>
@@ -115,8 +119,8 @@  discard block
 block discarded – undo
115 119
 							<input type="text" name="main_ip" value="', $context['ban_suggestions']['main_ip'], '" size="44" onfocus="document.getElementById(\'main_ip_check\').checked = true;" class="input_text">
116 120
 						</dd>';
117 121
 
118
-		if (empty($modSettings['disableHostnameLookup']))
119
-			echo '
122
+		if (empty($modSettings['disableHostnameLookup'])) {
123
+					echo '
120 124
 						<dt>
121 125
 							<input type="checkbox" name="ban_suggestions[]" id="hostname_check" value="hostname" class="input_check"', !empty($context['ban_suggestions']['hostname']) ? ' checked' : '', '>
122 126
 							<label for="hostname_check">', $txt['ban_on_hostname'], '</label>
@@ -124,6 +128,7 @@  discard block
 block discarded – undo
124 128
 						<dd>
125 129
 							<input type="text" name="hostname" value="', $context['ban_suggestions']['hostname'], '" size="44" onfocus="document.getElementById(\'hostname_check\').checked = true;" class="input_text">
126 130
 						</dd>';
131
+		}
127 132
 
128 133
 		echo '
129 134
 						<dt>
@@ -153,14 +158,15 @@  discard block
 block discarded – undo
153 158
 					<dl class="settings">';
154 159
 
155 160
 					$count = 0;
156
-					foreach ($ban_ips as $ip)
157
-						echo '
161
+					foreach ($ban_ips as $ip) {
162
+											echo '
158 163
 						<dt>
159 164
 							<input type="checkbox" id="suggestions_', $key ,'_', $count, '" name="ban_suggestions[', $key ,'][]"', !empty($context['ban_suggestions']['saved_triggers'][$key]) && in_array($ip, $context['ban_suggestions']['saved_triggers'][$key]) ? ' checked' : '', ' value="', $ip, '" class="input_check">
160 165
 						</dt>
161 166
 						<dd>
162 167
 							<label for="suggestions_', $key ,'_', $count++, '">', $ip, '</label>
163 168
 						</dd>';
169
+					}
164 170
 
165 171
 					echo '
166 172
 					</dl>';
@@ -202,8 +208,8 @@  discard block
 block discarded – undo
202 208
 		addLoadEvent(fUpdateStatus);';
203 209
 
204 210
 	// Auto suggest only needed for adding new bans, not editing
205
-	if ($context['ban']['is_new'] && empty($_REQUEST['u']))
206
-		echo '
211
+	if ($context['ban']['is_new'] && empty($_REQUEST['u'])) {
212
+			echo '
207 213
 			var oAddMemberSuggest = new smc_AutoSuggest({
208 214
 			sSelf: \'oAddMemberSuggest\',
209 215
 			sSessionId: smf_session_id,
@@ -221,6 +227,7 @@  discard block
 block discarded – undo
221 227
 			return true;
222 228
 		}
223 229
 		oAddMemberSuggest.registerCallback(\'onBeforeUpdate\', \'onUpdateName\');';
230
+	}
224 231
 
225 232
 	echo '
226 233
 		function confirmBan(aForm)
@@ -268,8 +275,8 @@  discard block
 block discarded – undo
268 275
 							<input type="text" name="main_ip" value="', $context['ban_trigger']['ip']['value'], '" size="44" onfocus="document.getElementById(\'main_ip_check\').checked = true;" class="input_text">
269 276
 						</dd>';
270 277
 
271
-				if (empty($modSettings['disableHostnameLookup']))
272
-					echo '
278
+				if (empty($modSettings['disableHostnameLookup'])) {
279
+									echo '
273 280
 							<dt>
274 281
 								<input type="checkbox" name="ban_suggestions[]" id="hostname_check" value="hostname" class="input_check"', $context['ban_trigger']['hostname']['selected'] ? ' checked' : '', '>
275 282
 								<label for="hostname_check">', $txt['ban_on_hostname'], '</label>
@@ -277,6 +284,7 @@  discard block
 block discarded – undo
277 284
 							<dd>
278 285
 								<input type="text" name="hostname" value="', $context['ban_trigger']['hostname']['value'], '" size="44" onfocus="document.getElementById(\'hostname_check\').checked = true;" class="input_text">
279 286
 							</dd>';
287
+				}
280 288
 
281 289
 				echo '
282 290
 						<dt>
Please login to merge, or discard this patch.
Themes/default/ManageSmileys.template.php 2 patches
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.
Braces   +55 added lines, -41 removed lines patch added patch discarded remove patch
@@ -65,18 +65,19 @@  discard block
 block discarded – undo
65 65
 					</dt>
66 66
 					<dd>
67 67
 						', $modSettings['smileys_url'], '/';
68
-		if ($context['current_set']['id'] == 'default')
69
-			echo '<strong>default</strong><input type="hidden" name="smiley_sets_path" id="smiley_sets_path" value="default">';
70
-		elseif (empty($context['smiley_set_dirs']))
71
-			echo '
68
+		if ($context['current_set']['id'] == 'default') {
69
+					echo '<strong>default</strong><input type="hidden" name="smiley_sets_path" id="smiley_sets_path" value="default">';
70
+		} elseif (empty($context['smiley_set_dirs'])) {
71
+					echo '
72 72
 						<input type="text" name="smiley_sets_path" id="smiley_sets_path" value="', $context['current_set']['path'], '" class="input_text"> ';
73
-		else
73
+		} else
74 74
 		{
75 75
 			echo '
76 76
 						<select name="smiley_sets_path" id="smiley_sets_path">';
77
-			foreach ($context['smiley_set_dirs'] as $smiley_set_dir)
78
-				echo '
77
+			foreach ($context['smiley_set_dirs'] as $smiley_set_dir) {
78
+							echo '
79 79
 							<option value="', $smiley_set_dir['id'], '"', $smiley_set_dir['current'] ? ' selected' : '', $smiley_set_dir['selectable'] ? '' : ' disabled', '>', $smiley_set_dir['id'], '</option>';
80
+			}
80 81
 			echo '
81 82
 						</select> ';
82 83
 		}
@@ -91,14 +92,15 @@  discard block
 block discarded – undo
91 92
 					</dd>';
92 93
 
93 94
 		// If this is a new smiley set they have the option to import smileys already in the directory.
94
-		if ($context['current_set']['is_new'] && !empty($modSettings['smiley_enable']))
95
-			echo '
95
+		if ($context['current_set']['is_new'] && !empty($modSettings['smiley_enable'])) {
96
+					echo '
96 97
 					<dt>
97 98
 						<strong><label for="smiley_sets_import">', $txt['smiley_set_import_directory'], '</label>: </strong>
98 99
 					</dt>
99 100
 					<dd>
100 101
 						<input type="checkbox" name="smiley_sets_import" id="smiley_sets_import" value="1" class="input_check">
101 102
 					</dd>';
103
+		}
102 104
 
103 105
 		echo '
104 106
 				</dl>
@@ -132,9 +134,10 @@  discard block
 block discarded – undo
132 134
 					<dd>
133 135
 						<img src="', $modSettings['smileys_url'], '/', $modSettings['smiley_sets_default'], '/', $context['current_smiley']['filename'], '" id="preview" alt=""> (', $txt['smiley_preview_using'], ': <select name="set" onchange="updatePreview();">';
134 136
 
135
-		foreach ($context['smiley_sets'] as $smiley_set)
136
-			echo '
137
+		foreach ($context['smiley_sets'] as $smiley_set) {
138
+					echo '
137 139
 						<option value="', $smiley_set['path'], '"', $context['selected_set'] == $smiley_set['path'] ? ' selected' : '', '>', $smiley_set['name'], '</option>';
140
+		}
138 141
 
139 142
 		echo '
140 143
 						</select>)
@@ -149,16 +152,17 @@  discard block
 block discarded – undo
149 152
 						<strong><label for="smiley_filename">', $txt['smileys_filename'], '</label>: </strong>
150 153
 					</dt>
151 154
 					<dd>';
152
-			if (empty($context['filenames']))
153
-				echo '
155
+			if (empty($context['filenames'])) {
156
+							echo '
154 157
 						<input type="text" name="smiley_filename" id="smiley_filename" value="', $context['current_smiley']['filename'], '" class="input_text">';
155
-			else
158
+			} else
156 159
 			{
157 160
 				echo '
158 161
 						<select name="smiley_filename" id="smiley_filename" onchange="updatePreview();">';
159
-				foreach ($context['filenames'] as $filename)
160
-					echo '
162
+				foreach ($context['filenames'] as $filename) {
163
+									echo '
161 164
 							<option value="', $filename['id'], '"', $filename['selected'] ? ' selected' : '', '>', $filename['id'], '</option>';
165
+				}
162 166
 				echo '
163 167
 						</select>';
164 168
 			}
@@ -227,9 +231,10 @@  discard block
 block discarded – undo
227 231
 						<dd>
228 232
 							', $txt['smiley_preview_using'], ': <select name="set" onchange="updatePreview();selectMethod(\'existing\');">';
229 233
 
230
-		foreach ($context['smiley_sets'] as $smiley_set)
231
-			echo '
234
+		foreach ($context['smiley_sets'] as $smiley_set) {
235
+					echo '
232 236
 							<option value="', $smiley_set['path'], '"', $context['selected_set'] == $smiley_set['path'] ? ' selected' : '', '>', $smiley_set['name'], '</option>';
237
+		}
233 238
 
234 239
 		echo '
235 240
 							</select>
@@ -238,16 +243,17 @@  discard block
 block discarded – undo
238 243
 							<strong><label for="smiley_filename">', $txt['smileys_filename'], '</label>: </strong>
239 244
 						</dt>
240 245
 						<dd>';
241
-	if (empty($context['filenames']))
242
-		echo '
246
+	if (empty($context['filenames'])) {
247
+			echo '
243 248
 							<input type="text" name="smiley_filename" id="smiley_filename" value="', $context['current_smiley']['filename'], '" onchange="selectMethod(\'existing\');" class="input_text">';
244
-	else
249
+	} else
245 250
 	{
246 251
 		echo '
247 252
 								<select name="smiley_filename" id="smiley_filename" onchange="updatePreview();selectMethod(\'existing\');">';
248
-		foreach ($context['filenames'] as $filename)
249
-			echo '
253
+		foreach ($context['filenames'] as $filename) {
254
+					echo '
250 255
 								<option value="', $filename['id'], '"', $filename['selected'] ? ' selected' : '', '>', $filename['id'], '</option>';
256
+		}
251 257
 		echo '
252 258
 							</select>';
253 259
 	}
@@ -275,14 +281,15 @@  discard block
 block discarded – undo
275 281
 				</fieldset>
276 282
 
277 283
 				<dl id="uploadMore" style="display: none;" class="settings">';
278
-	foreach ($context['smiley_sets'] as $smiley_set)
279
-		echo '
284
+	foreach ($context['smiley_sets'] as $smiley_set) {
285
+			echo '
280 286
 					<dt>
281 287
 						', $txt['smileys_add_upload_for1'], ' <strong>', $smiley_set['name'], '</strong> ', $txt['smileys_add_upload_for2'], ':
282 288
 					</dt>
283 289
 					<dd>
284 290
 						<input type="file" name="individual_', $smiley_set['name'], '" onchange="selectMethod(\'upload\');" class="input_file">
285 291
 					</dd>';
292
+	}
286 293
 	echo '
287 294
 				</dl>
288 295
 			</div>
@@ -351,24 +358,27 @@  discard block
 block discarded – undo
351 358
 				<strong>', empty($context['move_smiley']) ? $txt['smileys_move_select_smiley'] : $txt['smileys_move_select_destination'], '...</strong><br>';
352 359
 		foreach ($location['rows'] as $row)
353 360
 		{
354
-			if (!empty($context['move_smiley']))
355
-				echo '
361
+			if (!empty($context['move_smiley'])) {
362
+							echo '
356 363
 					<a href="', $scripturl, '?action=admin;area=smileys;sa=setorder;location=', $location['id'], ';source=', $context['move_smiley'], ';row=', $row[0]['row'], ';reorder=1;', $context['session_var'], '=', $context['session_id'], '"><span class="generic_icons select_below" title="', $txt['smileys_move_here'], '"></span></a>';
364
+			}
357 365
 
358 366
 			foreach ($row as $smiley)
359 367
 			{
360
-				if (empty($context['move_smiley']))
361
-					echo '<a href="', $scripturl, '?action=admin;area=smileys;sa=setorder;move=', $smiley['id'], '"><img src="', $modSettings['smileys_url'], '/', $modSettings['smiley_sets_default'], '/', $smiley['filename'], '" style="padding: 2px; border: 0px solid black;" alt="', $smiley['description'], '"></a>';
362
-				else
363
-					echo '<img src="', $modSettings['smileys_url'], '/', $modSettings['smiley_sets_default'], '/', $smiley['filename'], '" style="padding: 2px;', $smiley['selected'] ? ' border: 2px solid red' : '', ';" alt="', $smiley['description'], '"><a href="', $scripturl, '?action=admin;area=smileys;sa=setorder;location=', $location['id'], ';source=', $context['move_smiley'], ';after=', $smiley['id'], ';reorder=1;', $context['session_var'], '=', $context['session_id'], '" title="', $txt['smileys_move_here'], '"><span class="generic_icons select_below" title="', $txt['smileys_move_here'], '"></span></a>';
368
+				if (empty($context['move_smiley'])) {
369
+									echo '<a href="', $scripturl, '?action=admin;area=smileys;sa=setorder;move=', $smiley['id'], '"><img src="', $modSettings['smileys_url'], '/', $modSettings['smiley_sets_default'], '/', $smiley['filename'], '" style="padding: 2px; border: 0px solid black;" alt="', $smiley['description'], '"></a>';
370
+				} else {
371
+									echo '<img src="', $modSettings['smileys_url'], '/', $modSettings['smiley_sets_default'], '/', $smiley['filename'], '" style="padding: 2px;', $smiley['selected'] ? ' border: 2px solid red' : '', ';" alt="', $smiley['description'], '"><a href="', $scripturl, '?action=admin;area=smileys;sa=setorder;location=', $location['id'], ';source=', $context['move_smiley'], ';after=', $smiley['id'], ';reorder=1;', $context['session_var'], '=', $context['session_id'], '" title="', $txt['smileys_move_here'], '"><span class="generic_icons select_below" title="', $txt['smileys_move_here'], '"></span></a>';
372
+				}
364 373
 			}
365 374
 
366 375
 			echo '
367 376
 				<br>';
368 377
 		}
369
-		if (!empty($context['move_smiley']))
370
-			echo '
378
+		if (!empty($context['move_smiley'])) {
379
+					echo '
371 380
 				<a href="', $scripturl, '?action=admin;area=smileys;sa=setorder;location=', $location['id'], ';source=', $context['move_smiley'], ';row=', $location['last_row'], ';reorder=1;', $context['session_var'], '=', $context['session_id'], '"><span class="generic_icons select_below" title="', $txt['smileys_move_here'], '"></span></a>';
381
+		}
372 382
 		echo '
373 383
 			</div>
374 384
 		<input type="hidden" name="reorder" value="1">
@@ -404,14 +414,15 @@  discard block
 block discarded – undo
404 414
 			</div>
405 415
 			<div class="windowbg2">
406 416
 				<dl class="settings">';
407
-	if (!$context['new_icon'])
408
-		echo '
417
+	if (!$context['new_icon']) {
418
+			echo '
409 419
 					<dt>
410 420
 						<strong>', $txt['smiley_preview'], ': </strong>
411 421
 					</dt>
412 422
 					<dd>
413 423
 						<img src="', $context['icon']['image_url'], '" alt="', $context['icon']['title'], '">
414 424
 					</dd>';
425
+	}
415 426
 	echo '
416 427
 					<dt>
417 428
 						<strong><label for="icon_filename">', $txt['smileys_filename'], '</label>: </strong><br><span class="smalltext">', $txt['icons_filename_all_png'], '</span>
@@ -436,9 +447,10 @@  discard block
 block discarded – undo
436 447
 	{
437 448
 		echo '
438 449
 							<optgroup label="', $category['name'], '">';
439
-		foreach ($category['boards'] as $board)
440
-			echo '
450
+		foreach ($category['boards'] as $board) {
451
+					echo '
441 452
 								<option value="', $board['id'], '"', $board['selected'] ? ' selected' : '', '>', $board['child_level'] > 0 ? str_repeat('==', $board['child_level'] - 1) . '=&gt;' : '', ' ', $board['name'], '</option>';
453
+		}
442 454
 		echo '
443 455
 							</optgroup>';
444 456
 	}
@@ -453,19 +465,21 @@  discard block
 block discarded – undo
453 465
 							<option value="0"', empty($context['icon']['after']) ? ' selected' : '', '>', $txt['icons_location_first_icon'], '</option>';
454 466
 
455 467
 	// Print the list of all the icons it can be put after...
456
-	foreach ($context['icons'] as $id => $data)
457
-		if (empty($context['icon']['id']) || $id != $context['icon']['id'])
468
+	foreach ($context['icons'] as $id => $data) {
469
+			if (empty($context['icon']['id']) || $id != $context['icon']['id'])
458 470
 			echo '
459 471
 							<option value="', $id, '"', !empty($context['icon']['after']) && $id == $context['icon']['after'] ? ' selected' : '', '>', $txt['icons_location_after'], ': ', $data['title'], '</option>';
472
+	}
460 473
 
461 474
 	echo '
462 475
 						</select>
463 476
 					</dd>
464 477
 				</dl>';
465 478
 
466
-	if (!$context['new_icon'])
467
-		echo '
479
+	if (!$context['new_icon']) {
480
+			echo '
468 481
 				<input type="hidden" name="icon" value="', $context['icon']['id'], '">';
482
+	}
469 483
 
470 484
 	echo '
471 485
 				<input type="submit" name="icons_save" value="', $txt['smileys_save'], '" class="button_submit">
Please login to merge, or discard this patch.
Themes/default/index.template.php 2 patches
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.
Braces   +87 added lines, -59 removed lines patch added patch discarded remove patch
@@ -72,9 +72,10 @@  discard block
 block discarded – undo
72 72
 
73 73
 	// Allow css/js files to be disable for this specific theme.
74 74
 	// Add the identifier as an array key. IE array('smf_script'); Some external files might not add identifiers, on those cases SMF uses its filename as reference.
75
-	if (!isset($settings['disable_files']))
76
-		$settings['disable_files'] = array();
77
-}
75
+	if (!isset($settings['disable_files'])) {
76
+			$settings['disable_files'] = array();
77
+	}
78
+	}
78 79
 
79 80
 /**
80 81
  * The main sub template above the content.
@@ -111,8 +112,9 @@  discard block
 block discarded – undo
111 112
 		echo '
112 113
 	<meta';
113 114
 
114
-		foreach ($meta_tag as $meta_key => $meta_value)
115
-			echo ' ', $meta_key, '="', $meta_value, '"';
115
+		foreach ($meta_tag as $meta_key => $meta_value) {
116
+					echo ' ', $meta_key, '="', $meta_value, '"';
117
+		}
116 118
 
117 119
 		echo '>';
118 120
 	}
@@ -123,14 +125,16 @@  discard block
 block discarded – undo
123 125
 	<meta name="theme-color" content="#557EA0">';
124 126
 
125 127
 	// Please don't index these Mr Robot.
126
-	if (!empty($context['robot_no_index']))
127
-		echo '
128
+	if (!empty($context['robot_no_index'])) {
129
+			echo '
128 130
 	<meta name="robots" content="noindex">';
131
+	}
129 132
 
130 133
 	// Present a canonical url for search engines to prevent duplicate content in their indices.
131
-	if (!empty($context['canonical_url']))
132
-		echo '
134
+	if (!empty($context['canonical_url'])) {
135
+			echo '
133 136
 	<link rel="canonical" href="', $context['canonical_url'], '">';
137
+	}
134 138
 
135 139
 	// Show all the relative links, such as help, search, contents, and the like.
136 140
 	echo '
@@ -139,10 +143,11 @@  discard block
 block discarded – undo
139 143
 	<link rel="search" href="' . $scripturl . '?action=search">' : '');
140 144
 
141 145
 	// If RSS feeds are enabled, advertise the presence of one.
142
-	if (!empty($modSettings['xmlnews_enable']) && (!empty($modSettings['allow_guestAccess']) || $context['user']['is_logged']))
143
-		echo '
146
+	if (!empty($modSettings['xmlnews_enable']) && (!empty($modSettings['allow_guestAccess']) || $context['user']['is_logged'])) {
147
+			echo '
144 148
 	<link rel="alternate" type="application/rss+xml" title="', $context['forum_name_html_safe'], ' - ', $txt['rss'], '" href="', $scripturl, '?type=rss2;action=.xml">
145 149
 	<link rel="alternate" type="application/rss+xml" title="', $context['forum_name_html_safe'], ' - ', $txt['atom'], '" href="', $scripturl, '?type=atom;action=.xml">';
150
+	}
146 151
 
147 152
 	// If we're viewing a topic, these should be the previous and next topics, respectively.
148 153
 	if (!empty($context['links']['next']))
@@ -158,9 +163,10 @@  discard block
 block discarded – undo
158 163
 	}
159 164
 
160 165
 	// If we're in a board, or a topic for that matter, the index will be the board's index.
161
-	if (!empty($context['current_board']))
162
-		echo '
166
+	if (!empty($context['current_board'])) {
167
+			echo '
163 168
 	<link rel="index" href="', $scripturl, '?board=', $context['current_board'], '.0">';
169
+	}
164 170
 
165 171
 	// Output any remaining HTML headers. (from mods, maybe?)
166 172
 	echo $context['html_headers'];
@@ -191,8 +197,9 @@  discard block
 block discarded – undo
191 197
 		<ul class="floatleft" id="top_info">
192 198
 			<li>
193 199
 				<a href="', $scripturl, '?action=profile"', !empty($context['self_profile']) ? ' class="active"' : '', ' id="profile_menu_top" onclick="return false;">';
194
-					if (!empty($context['user']['avatar']))
195
-						echo $context['user']['avatar']['image'];
200
+					if (!empty($context['user']['avatar'])) {
201
+											echo $context['user']['avatar']['image'];
202
+					}
196 203
 					echo $context['user']['name'], '</a>
197 204
 				<div id="profile_menu" class="top_menu"></div>
198 205
 			</li>';
@@ -219,11 +226,12 @@  discard block
 block discarded – undo
219 226
 		</ul>';
220 227
 	}
221 228
 	// Otherwise they're a guest. Ask them to either register or login.
222
-	else
223
-		echo '
229
+	else {
230
+			echo '
224 231
 		<ul class="floatleft welcome">
225 232
 			<li>', sprintf($txt[$context['can_register'] ? 'welcome_guest_register' : 'welcome_guest'], $txt['guest_title'], $context['forum_name_html_safe'], $scripturl . '?action=login', 'return reqOverlayDiv(this.href, ' . JavaScriptEscape($txt['login']) . ');', $scripturl . '?action=signup'), '</li>
226 233
 		</ul>';
234
+	}
227 235
 
228 236
 	if (!empty($modSettings['userLanguage']) && !empty($context['languages']) && count($context['languages']) > 1)
229 237
 	{
@@ -231,9 +239,10 @@  discard block
 block discarded – undo
231 239
 		<form id="languages_form" method="get" class="floatright">
232 240
 			<select id="language_select" name="language" onchange="this.form.submit()">';
233 241
 
234
-		foreach ($context['languages'] as $language)
235
-			echo '
242
+		foreach ($context['languages'] as $language) {
243
+					echo '
236 244
 				<option value="', $language['filename'], '"', isset($context['user']['language']) && $context['user']['language'] == $language['filename'] ? ' selected="selected"' : '', '>', str_replace('-utf8', '', $language['name']), '</option>';
245
+		}
237 246
 
238 247
 		echo '
239 248
 			</select>
@@ -257,31 +266,36 @@  discard block
 block discarded – undo
257 266
 				<option value="all"', ($selected == 'all' ? ' selected' : ''), '>', $txt['search_entireforum'], ' </option>';
258 267
 
259 268
 		// Can't limit it to a specific topic if we are not in one
260
-		if (!empty($context['current_topic']))
261
-			echo '
269
+		if (!empty($context['current_topic'])) {
270
+					echo '
262 271
 				<option value="topic"', ($selected == 'current_topic' ? ' selected' : ''), '>', $txt['search_thistopic'], '</option>';
272
+		}
263 273
 
264 274
 		// Can't limit it to a specific board if we are not in one
265
-		if (!empty($context['current_board']))
266
-			echo '
275
+		if (!empty($context['current_board'])) {
276
+					echo '
267 277
 				<option value="board"', ($selected == 'current_board' ? ' selected' : ''), '>', $txt['search_thisbrd'], '</option>';
278
+		}
268 279
 		
269 280
 		// Can't search for members if we can't see the memberlist
270
-		if (!empty($context['allow_memberlist']))
271
-			echo '
281
+		if (!empty($context['allow_memberlist'])) {
282
+					echo '
272 283
 				<option value="members"', ($selected == 'members' ? ' selected' : ''), '>', $txt['search_members'], ' </option>';
284
+		}
273 285
 				
274 286
 		echo '
275 287
 			</select>';
276 288
 
277 289
 		// Search within current topic?
278
-		if (!empty($context['current_topic']))
279
-			echo '
290
+		if (!empty($context['current_topic'])) {
291
+					echo '
280 292
 			<input type="hidden" name="sd_topic" value="', $context['current_topic'], '">';
293
+		}
281 294
 		// If we're on a certain board, limit it to this board ;).
282
-		elseif (!empty($context['current_board']))
283
-			echo '
295
+		elseif (!empty($context['current_board'])) {
296
+					echo '
284 297
 			<input type="hidden" name="sd_brd" value="', $context['current_board'], '">';
298
+		}
285 299
 
286 300
 		echo '
287 301
 			<input type="submit" name="search2" value="', $txt['search'], '" class="button_submit">
@@ -311,12 +325,13 @@  discard block
 block discarded – undo
311 325
 						', $context['current_time'], '
312 326
 					</div>';
313 327
 	// Show a random news item? (or you could pick one from news_lines...)
314
-	if (!empty($settings['enable_news']) && !empty($context['random_news_line']))
315
-		echo '
328
+	if (!empty($settings['enable_news']) && !empty($context['random_news_line'])) {
329
+			echo '
316 330
 					<div class="news">
317 331
 						<h2>', $txt['news'], ': </h2>
318 332
 						<p>', $context['random_news_line'], '</p>
319 333
 					</div>';
334
+	}
320 335
 
321 336
 	echo '
322 337
 					<hr class="clear">
@@ -379,9 +394,10 @@  discard block
 block discarded – undo
379 394
 		</ul>';
380 395
 
381 396
 	// Show the load time?
382
-	if ($context['show_load_time'])
383
-		echo '
397
+	if ($context['show_load_time']) {
398
+			echo '
384 399
 		<p>', sprintf($txt['page_created_full'], $context['load_time'], $context['load_queries']), '</p>';
400
+	}
385 401
 
386 402
 	echo '
387 403
 	</div>';
@@ -411,19 +427,21 @@  discard block
 block discarded – undo
411 427
 	global $context, $shown_linktree, $scripturl, $txt;
412 428
 
413 429
 	// If linktree is empty, just return - also allow an override.
414
-	if (empty($context['linktree']) || (!empty($context['dont_default_linktree']) && !$force_show))
415
-		return;
430
+	if (empty($context['linktree']) || (!empty($context['dont_default_linktree']) && !$force_show)) {
431
+			return;
432
+	}
416 433
 
417 434
 	echo '
418 435
 				<div class="navigate_section">
419 436
 					<ul>';
420 437
 
421
-	if ($context['user']['is_logged'])
422
-	echo '
438
+	if ($context['user']['is_logged']) {
439
+		echo '
423 440
 						<li class="unread_links">
424 441
 							<a href="', $scripturl, '?action=unread" title="', $txt['unread_since_visit'], '">', $txt['view_unread_category'], '</a>
425 442
 							<a href="', $scripturl, '?action=unreadreplies" title="', $txt['show_unread_replies'], '">', $txt['unread_replies'], '</a>
426 443
 						</li>';
444
+	}
427 445
 
428 446
 	// Each tree item has a URL and name. Some may have extra_before and extra_after.
429 447
 	foreach ($context['linktree'] as $link_num => $tree)
@@ -434,25 +452,29 @@  discard block
 block discarded – undo
434 452
 		// Don't show a separator for the first one.
435 453
 		// Better here. Always points to the next level when the linktree breaks to a second line.
436 454
 		// Picked a better looking HTML entity, and added support for RTL plus a span for styling.
437
-		if ($link_num != 0)
438
-			echo '
455
+		if ($link_num != 0) {
456
+					echo '
439 457
 							<span class="dividers">', $context['right_to_left'] ? ' &#9668; ' : ' &#9658; ', '</span>';
458
+		}
440 459
 
441 460
 		// Show something before the link?
442
-		if (isset($tree['extra_before']))
443
-			echo $tree['extra_before'], ' ';
461
+		if (isset($tree['extra_before'])) {
462
+					echo $tree['extra_before'], ' ';
463
+		}
444 464
 
445 465
 		// Show the link, including a URL if it should have one.
446
-		if (isset($tree['url']))
447
-			echo '
466
+		if (isset($tree['url'])) {
467
+					echo '
448 468
 					<a href="' . $tree['url'] . '"><span>' . $tree['name'] . '</span></a>';
449
-		else
450
-			echo '
469
+		} else {
470
+					echo '
451 471
 					<span>' . $tree['name'] . '</span>';
472
+		}
452 473
 
453 474
 		// Show something after the link...?
454
-		if (isset($tree['extra_after']))
455
-			echo ' ', $tree['extra_after'];
475
+		if (isset($tree['extra_after'])) {
476
+					echo ' ', $tree['extra_after'];
477
+		}
456 478
 
457 479
 		echo '
458 480
 						</li>';
@@ -502,13 +524,14 @@  discard block
 block discarded – undo
502 524
 					echo '
503 525
 									<ul>';
504 526
 
505
-					foreach ($childbutton['sub_buttons'] as $grandchildbutton)
506
-						echo '
527
+					foreach ($childbutton['sub_buttons'] as $grandchildbutton) {
528
+											echo '
507 529
 										<li>
508 530
 											<a href="', $grandchildbutton['href'], '"' , isset($grandchildbutton['target']) ? ' target="' . $grandchildbutton['target'] . '"' : '', '>
509 531
 												', $grandchildbutton['title'], '
510 532
 											</a>
511 533
 										</li>';
534
+					}
512 535
 
513 536
 					echo '
514 537
 									</ul>';
@@ -539,8 +562,9 @@  discard block
 block discarded – undo
539 562
 {
540 563
 	global $context, $txt;
541 564
 
542
-	if (!is_array($strip_options))
543
-		$strip_options = array();
565
+	if (!is_array($strip_options)) {
566
+			$strip_options = array();
567
+	}
544 568
 
545 569
 	// Create the buttons...
546 570
 	$buttons = array();
@@ -549,8 +573,9 @@  discard block
 block discarded – undo
549 573
 		// As of 2.1, the 'test' for each button happens while the array is being generated. The extra 'test' check here is deprecated but kept for backward compatibility (update your mods, folks!)
550 574
 		if (!isset($value['test']) || !empty($context[$value['test']]))
551 575
 		{
552
-			if (!isset($value['id']))
553
-				$value['id'] = $key;
576
+			if (!isset($value['id'])) {
577
+							$value['id'] = $key;
578
+			}
554 579
 
555 580
 			$button = '
556 581
 				<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>';
@@ -563,13 +588,15 @@  discard block
 block discarded – undo
563 588
 							<div class="overview">';
564 589
 				foreach ($value['sub_buttons'] as $element)
565 590
 				{
566
-					if (isset($element['test']) && empty($context[$element['test']]))
567
-						continue;
591
+					if (isset($element['test']) && empty($context[$element['test']])) {
592
+											continue;
593
+					}
568 594
 
569 595
 					$button .= '
570 596
 								<a href="' . $element['url'] . '"><strong>' . $txt[$element['text']] . '</strong>';
571
-					if (isset($txt[$element['text'] . '_desc']))
572
-						$button .= '<br /><span>' . $txt[$element['text'] . '_desc'] . '</span>';
597
+					if (isset($txt[$element['text'] . '_desc'])) {
598
+											$button .= '<br /><span>' . $txt[$element['text'] . '_desc'] . '</span>';
599
+					}
573 600
 					$button .= '</a>';
574 601
 				}
575 602
 				$button .= '
@@ -583,8 +610,9 @@  discard block
 block discarded – undo
583 610
 	}
584 611
 
585 612
 	// No buttons? No button strip either.
586
-	if (empty($buttons))
587
-		return;
613
+	if (empty($buttons)) {
614
+			return;
615
+	}
588 616
 
589 617
 	echo '
590 618
 		<div class="buttonlist', !empty($direction) ? ' float' . $direction : '', '"', (empty($buttons) ? ' style="display: none;"' : ''), (!empty($strip_options['id']) ? ' id="' . $strip_options['id'] . '"': ''), '>
Please login to merge, or discard this patch.
Themes/default/Memberlist.template.php 1 patch
Braces   +27 added lines, -18 removed lines patch added patch discarded remove patch
@@ -26,9 +26,10 @@  discard block
 block discarded – undo
26 26
 		<div class="cat_bar">
27 27
 			<h3 class="catbg">
28 28
 				<span class="floatleft">', $txt['members_list'], '</span>';
29
-		if (!isset($context['old_search']))
30
-				echo '
29
+		if (!isset($context['old_search'])) {
30
+						echo '
31 31
 				<span class="floatright">', $context['letter_links'], '</span>';
32
+		}
32 33
 		echo '
33 34
 			</h3>
34 35
 		</div>';
@@ -43,19 +44,22 @@  discard block
 block discarded – undo
43 44
 	foreach ($context['columns'] as $key => $column)
44 45
 	{
45 46
 		// @TODO maybe find something nicer?
46
-		if ($key == 'email_address' && !$context['can_send_email'])
47
-			continue;
47
+		if ($key == 'email_address' && !$context['can_send_email']) {
48
+					continue;
49
+		}
48 50
 
49 51
 		// This is a selected column, so underline it or some such.
50
-		if ($column['selected'])
51
-			echo '
52
+		if ($column['selected']) {
53
+					echo '
52 54
 					<th scope="col" class="', $key, isset($column['class']) ? ' ' . $column['class'] : '', ' selected" style="width: auto;"' . (isset($column['colspan']) ? ' colspan="' . $column['colspan'] . '"' : '') . '>
53 55
 						<a href="' . $column['href'] . '" rel="nofollow">' . $column['label'] . '</a><span class="generic_icons sort_' . $context['sort_direction'] . '"></span></th>';
56
+		}
54 57
 		// This is just some column... show the link and be done with it.
55
-		else
56
-			echo '
58
+		else {
59
+					echo '
57 60
 					<th scope="col" class="', $key, isset($column['class']) ? ' ' . $column['class'] : '', '"', isset($column['width']) ? ' style="width: ' . $column['width'] . '"' : '', isset($column['colspan']) ? ' colspan="' . $column['colspan'] . '"' : '', '>
58 61
 						', $column['link'], '</th>';
62
+		}
59 63
 	}
60 64
 	echo '
61 65
 				</tr>
@@ -74,9 +78,10 @@  discard block
 block discarded – undo
74 78
 					</td>
75 79
 					<td class="lefttext">', $member['link'], '</td>';
76 80
 
77
-		if (!isset($context['disabled_fields']['website']))
78
-			echo '
81
+		if (!isset($context['disabled_fields']['website'])) {
82
+					echo '
79 83
 					<td class="centertext website_url">', $member['website']['url'] != '' ? '<a href="' . $member['website']['url'] . '" target="_blank" class="new_win"><span class="generic_icons www" title="' . $member['website']['title'] . '"></span></a>' : '', '</td>';
84
+		}
80 85
 
81 86
 		// Group and date.
82 87
 		echo '
@@ -89,11 +94,12 @@  discard block
 block discarded – undo
89 94
 					<td class="centertext" style="white-space: nowrap; width: 15px">', $member['posts'], '</td>
90 95
 					<td class="centertext statsbar" style="width: 120px">';
91 96
 
92
-			if (!empty($member['post_percent']))
93
-				echo '
97
+			if (!empty($member['post_percent'])) {
98
+							echo '
94 99
 						<div class="bar" style="width: ', $member['post_percent'] + 4, 'px;">
95 100
 							<div style="width: ', $member['post_percent'], 'px;"></div>
96 101
 						</div>';
102
+			}
97 103
 
98 104
 			echo '
99 105
 					</td>';
@@ -102,9 +108,10 @@  discard block
 block discarded – undo
102 108
 		// Show custom fields marked to be shown here
103 109
 		if (!empty($context['custom_profile_fields']['columns']))
104 110
 		{
105
-			foreach ($context['custom_profile_fields']['columns'] as $key => $column)
106
-				echo '
111
+			foreach ($context['custom_profile_fields']['columns'] as $key => $column) {
112
+							echo '
107 113
 					<td class="righttext">', $member['options'][$key], '</td>';
114
+			}
108 115
 		}
109 116
 
110 117
 		echo '
@@ -112,11 +119,12 @@  discard block
 block discarded – undo
112 119
 		}
113 120
 	}
114 121
 	// No members?
115
-	else
116
-		echo '
122
+	else {
123
+			echo '
117 124
 				<tr>
118 125
 					<td colspan="', $context['colspan'], '" class="windowbg">', $txt['search_no_results'], '</td>
119 126
 				</tr>';
127
+	}
120 128
 
121 129
 				echo '
122 130
 			</tbody>
@@ -129,9 +137,10 @@  discard block
 block discarded – undo
129 137
 			<div class="pagelinks floatleft">', $context['page_index'], '</div>';
130 138
 
131 139
 	// If it is displaying the result of a search show a "search again" link to edit their criteria.
132
-	if (isset($context['old_search']))
133
-		echo '
140
+	if (isset($context['old_search'])) {
141
+			echo '
134 142
 			<a class="button_link" href="', $scripturl, '?action=mlist;sa=search;search=', $context['old_search_value'], '">', $txt['mlist_search_again'], '</a>';
143
+	}
135 144
 	echo '
136 145
 		</div>
137 146
 	</div>';
Please login to merge, or discard this patch.
Themes/default/ReportToMod.template.php 2 patches
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.
Braces   +6 added lines, -5 removed lines patch added patch discarded remove patch
@@ -62,16 +62,17 @@
 block discarded – undo
62 62
 					<div id="error_box" class="errorbox">
63 63
 						<ul id="error_list">';
64 64
 
65
-		foreach ($context['post_errors'] as $key => $error)
66
-			echo '
65
+		foreach ($context['post_errors'] as $key => $error) {
66
+					echo '
67 67
 							<li id="error_', $key, '" class="error">', $error, '</li>';
68
+		}
68 69
 
69 70
 		echo '
70 71
 						</ul>';
71
-	}
72
-	else
73
-		echo '
72
+	} else {
73
+			echo '
74 74
 						<div style="display:none" id="error_box" class="errorbox">';
75
+	}
75 76
 
76 77
 	echo '
77 78
 					</div>';
Please login to merge, or discard this patch.
Themes/default/ManageBoards.template.php 1 patch
Braces   +90 added lines, -62 removed lines patch added patch discarded remove patch
@@ -25,18 +25,20 @@  discard block
 block discarded – undo
25 25
 		</div>
26 26
 		<div class="windowbg2 noup">';
27 27
 
28
-	if (!empty($context['move_board']))
29
-		echo '
28
+	if (!empty($context['move_board'])) {
29
+			echo '
30 30
 		<div class="noticebox">
31 31
 			', $context['move_title'], ' [<a href="', $scripturl, '?action=admin;area=manageboards">', $txt['mboards_cancel_moving'], '</a>]', '
32 32
 		</div>';
33
+	}
33 34
 
34 35
 	// No categories so show a label.
35
-	if (empty($context['categories']))
36
-		echo '
36
+	if (empty($context['categories'])) {
37
+			echo '
37 38
 		<div class="windowbg centertext">
38 39
 			', $txt['mboards_no_cats'], '
39 40
 		</div>';
41
+	}
40 42
 
41 43
 	// Loop through every category, listing the boards in each as we go.
42 44
 	foreach ($context['categories'] as $category)
@@ -54,9 +56,10 @@  discard block
 block discarded – undo
54 56
 		<form action="', $scripturl, '?action=admin;area=manageboards;sa=newboard;cat=', $category['id'], '" method="post" accept-charset="', $context['character_set'], '">
55 57
 				<ul id="category_', $category['id'], '" class="nolist">';
56 58
 
57
-		if (!empty($category['move_link']))
58
-			echo '
59
+		if (!empty($category['move_link'])) {
60
+					echo '
59 61
 					<li><a href="', $category['move_link']['href'], '" title="', $category['move_link']['label'], '"><span class="generic_icons select_above"></span></a></li>';
62
+		}
60 63
 
61 64
 		$recycle_board = '<a href="' . $scripturl . '?action=admin;area=manageboards;sa=settings"> <img src="' . $settings['images_url'] . '/post/recycled.png" alt="' . $txt['recycle_board'] . '" title="' . $txt['recycle_board'] . '"></a>';
62 65
 		$redirect_board = '<img src="' . $settings['images_url'] . '/new_redirect.png" alt="' . $txt['redirect_board_desc'] . '" title="' . $txt['redirect_board_desc'] . '">';
@@ -81,9 +84,10 @@  discard block
 block discarded – undo
81 84
 				echo '
82 85
 					<li class="windowbg" style="padding-', $context['right_to_left'] ? 'right' : 'left', ': ', 5 + 30 * $board['move_links'][0]['child_level'], 'px;">';
83 86
 
84
-				foreach ($board['move_links'] as $link)
85
-					echo '
87
+				foreach ($board['move_links'] as $link) {
88
+									echo '
86 89
 						<a href="', $link['href'], '" class="move_links" title="', $link['label'], '"><span class="generic_icons select_', $link['class'], '" title="', $link['label'], '"></span></a>';
90
+				}
87 91
 
88 92
 				echo '
89 93
 					</li>';
@@ -132,9 +136,10 @@  discard block
 block discarded – undo
132 136
 						<select name="cat_order">';
133 137
 
134 138
 		// Print every existing category into a select box.
135
-		foreach ($context['category_order'] as $order)
136
-			echo '
139
+		foreach ($context['category_order'] as $order) {
140
+					echo '
137 141
 							<option', $order['selected'] ? ' selected' : '', ' value="', $order['id'], '">', $order['name'], '</option>';
142
+		}
138 143
 		echo '
139 144
 						</select>
140 145
 					</dd>';
@@ -168,21 +173,23 @@  discard block
 block discarded – undo
168 173
 	echo '
169 174
 				</dl>';
170 175
 
171
-	if (isset($context['category']['is_new']))
172
-		echo '
176
+	if (isset($context['category']['is_new'])) {
177
+			echo '
173 178
 					<input type="submit" name="add" value="', $txt['mboards_add_cat_button'], '" onclick="return !isEmptyText(this.form.cat_name);" tabindex="', $context['tabindex']++, '" class="button_submit">';
174
-	else
175
-		echo '
179
+	} else {
180
+			echo '
176 181
 					<input type="submit" name="edit" value="', $txt['modify'], '" onclick="return !isEmptyText(this.form.cat_name);" tabindex="', $context['tabindex']++, '" class="button_submit">
177 182
 					<input type="submit" name="delete" value="', $txt['mboards_delete_cat'], '" data-confirm="', $txt['catConfirm'], '" class="button_submit you_sure">';
183
+	}
178 184
 	echo '
179 185
 					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
180 186
 					<input type="hidden" name="', $context[$context['token_check'] . '_token_var'], '" value="', $context[$context['token_check'] . '_token'], '">';
181 187
 
182 188
 	// If this category is empty we don't bother with the next confirmation screen.
183
-	if ($context['category']['is_empty'])
184
-		echo '
189
+	if ($context['category']['is_empty']) {
190
+			echo '
185 191
 					<input type="hidden" name="empty" value="1">';
192
+	}
186 193
 
187 194
 	echo '
188 195
 			</div>
@@ -209,9 +216,10 @@  discard block
 block discarded – undo
209 216
 				<p>', $txt['mboards_delete_cat_contains'], ':</p>
210 217
 				<ul>';
211 218
 
212
-	foreach ($context['category']['children'] as $child)
213
-		echo '
219
+	foreach ($context['category']['children'] as $child) {
220
+			echo '
214 221
 					<li>', $child, '</li>';
222
+	}
215 223
 
216 224
 	echo '
217 225
 				</ul>
@@ -225,10 +233,11 @@  discard block
 block discarded – undo
225 233
 					<label for="delete_action1"><input type="radio" id="delete_action1" name="delete_action" value="1" class="input_radio"', count($context['category_order']) == 1 ? ' disabled' : '', '>', $txt['mboards_delete_option2'], '</label>:
226 234
 					<select name="cat_to"', count($context['category_order']) == 1 ? ' disabled' : '', '>';
227 235
 
228
-	foreach ($context['category_order'] as $cat)
229
-		if ($cat['id'] != 0)
236
+	foreach ($context['category_order'] as $cat) {
237
+			if ($cat['id'] != 0)
230 238
 			echo '
231 239
 						<option value="', $cat['id'], '">', $cat['true_name'], '</option>';
240
+	}
232 241
 
233 242
 	echo '
234 243
 					</select>
@@ -272,9 +281,10 @@  discard block
 block discarded – undo
272 281
 					</dt>
273 282
 					<dd>
274 283
 						<select name="new_cat" onchange="if (this.form.order) {this.form.order.disabled = this.options[this.selectedIndex].value != 0; this.form.board_order.disabled = this.options[this.selectedIndex].value != 0 || this.form.order.options[this.form.order.selectedIndex].value == \'\';}">';
275
-		foreach ($context['categories'] as $category)
276
-			echo '
284
+		foreach ($context['categories'] as $category) {
285
+					echo '
277 286
 							<option', $category['selected'] ? ' selected' : '', ' value="', $category['id'], '">', $category['name'], '</option>';
287
+		}
278 288
 		echo '
279 289
 						</select>
280 290
 					</dd>';
@@ -301,9 +311,10 @@  discard block
 block discarded – undo
301 311
 	echo '
302 312
 						<select id="board_order" name="board_order"', !isset($context['board']['is_new']) ? ' disabled' : '', '>
303 313
 							', !isset($context['board']['is_new']) ? '<option value="">(' . $txt['mboards_unchanged'] . ')</option>' : '';
304
-	foreach ($context['board_order'] as $order)
305
-		echo '
314
+	foreach ($context['board_order'] as $order) {
315
+			echo '
306 316
 							<option', $order['selected'] ? ' selected' : '', ' value="', $order['id'], '">', $order['name'], '</option>';
317
+	}
307 318
 	echo '
308 319
 						</select>
309 320
 					</dd>';
@@ -332,13 +343,15 @@  discard block
 block discarded – undo
332 343
 					<dd>
333 344
 						<select name="profile">';
334 345
 
335
-	if (isset($context['board']['is_new']))
336
-		echo '
346
+	if (isset($context['board']['is_new'])) {
347
+			echo '
337 348
 							<option value="-1">[', $txt['permission_profile_inherit'], ']</option>';
349
+	}
338 350
 
339
-	foreach ($context['profiles'] as $id => $profile)
340
-		echo '
351
+	foreach ($context['profiles'] as $id => $profile) {
352
+			echo '
341 353
 							<option value="', $id, '"', $id == $context['board']['profile'] ? ' selected' : '', '>', $profile['name'], '</option>';
354
+	}
342 355
 
343 356
 	echo '
344 357
 						</select>
@@ -351,8 +364,8 @@  discard block
 block discarded – undo
351 364
 					</dt>
352 365
 					<dd>';
353 366
 
354
-	if (!empty($modSettings['deny_boards_access']))
355
-		echo '
367
+	if (!empty($modSettings['deny_boards_access'])) {
368
+			echo '
356 369
 						<table>
357 370
 							<tr>
358 371
 								<td></td>
@@ -360,10 +373,11 @@  discard block
 block discarded – undo
360 373
 								<th>', $txt['permissions_option_off'], '</th>
361 374
 								<th>', $txt['permissions_option_deny'], '</th>
362 375
 							</tr>';
376
+	}
363 377
 
364 378
 	// List all the membergroups so the user can choose who may access this board.
365
-	foreach ($context['groups'] as $group)
366
-		if (empty($modSettings['deny_boards_access']))
379
+	foreach ($context['groups'] as $group) {
380
+			if (empty($modSettings['deny_boards_access']))
367 381
 			echo '
368 382
 						<label for="groups_', $group['id'], '">
369 383
 							<input type="checkbox" name="groups[', $group['id'], ']" value="allow" id="groups_', $group['id'], '"', in_array($group['id'], $context['board_managers']) ? ' checked disabled' : ($group['allow'] ? ' checked' : ''), ' class="input_check">
@@ -371,8 +385,9 @@  discard block
 block discarded – undo
371 385
 								', $group['name'], '
372 386
 							</span>
373 387
 						</label><br>';
374
-		else
375
-			echo '
388
+	}
389
+		else {
390
+					echo '
376 391
 							<tr>
377 392
 								<td>
378 393
 									<label for="groups_', $group['id'], '_a">
@@ -392,16 +407,17 @@  discard block
 block discarded – undo
392 407
 								</td>
393 408
 								<td></td>
394 409
 							</tr>';
410
+		}
395 411
 
396
-	if (empty($modSettings['deny_boards_access']))
397
-		echo '
412
+	if (empty($modSettings['deny_boards_access'])) {
413
+			echo '
398 414
 						<span class="select_all_box">
399 415
 							<em>', $txt['check_all'], '</em> <input type="checkbox" class="input_check" onclick="invertAll(this, this.form, \'groups[\');">
400 416
 						</span>
401 417
 						<br><br>
402 418
 					</dd>';
403
-	else
404
-		echo '
419
+	} else {
420
+			echo '
405 421
 							<tr class="select_all_box">
406 422
 								<td>
407 423
 								</td>
@@ -420,6 +436,7 @@  discard block
 block discarded – undo
420 436
 							</tr>
421 437
 						</table>
422 438
 					</dd>';
439
+	}
423 440
 
424 441
 	// Options to choose moderators, specify as announcement board and choose whether to count posts here.
425 442
 	echo '
@@ -474,8 +491,8 @@  discard block
 block discarded – undo
474 491
 					</dl>
475 492
 				</div>';
476 493
 
477
-		if ($context['board']['redirect'])
478
-			echo '
494
+		if ($context['board']['redirect']) {
495
+					echo '
479 496
 				<div id="reset_redirect_div">
480 497
 					<dl class="settings">
481 498
 						<dt>
@@ -488,6 +505,7 @@  discard block
 block discarded – undo
488 505
 						</dd>
489 506
 					</dl>
490 507
 				</div>';
508
+		}
491 509
 	}
492 510
 
493 511
 	echo '
@@ -515,9 +533,10 @@  discard block
 block discarded – undo
515 533
 							<select name="boardtheme" id="boardtheme" onchange="refreshOptions();">
516 534
 								<option value="0"', $context['board']['theme'] == 0 ? ' selected' : '', '>', $txt['mboards_theme_default'], '</option>';
517 535
 
518
-	foreach ($context['themes'] as $theme)
519
-		echo '
536
+	foreach ($context['themes'] as $theme) {
537
+			echo '
520 538
 									<option value="', $theme['id'], '"', $context['board']['theme'] == $theme['id'] ? ' selected' : '', '>', $theme['name'], '</option>';
539
+	}
521 540
 
522 541
 	echo '
523 542
 							</select>
@@ -536,9 +555,10 @@  discard block
 block discarded – undo
536 555
 					</dl>
537 556
 				</div>';
538 557
 
539
-	if (!empty($context['board']['is_recycle']))
540
-		echo '
558
+	if (!empty($context['board']['is_recycle'])) {
559
+			echo '
541 560
 				<div class="noticebox">', $txt['mboards_recycle_disabled_delete'], '</div>';
561
+	}
542 562
 
543 563
 	echo '
544 564
 				<input type="hidden" name="rid" value="', $context['redirect_location'], '">
@@ -546,21 +566,24 @@  discard block
 block discarded – undo
546 566
 				<input type="hidden" name="', $context['admin-be-' . $context['board']['id'] . '_token_var'], '" value="', $context['admin-be-' . $context['board']['id'] . '_token'], '">';
547 567
 
548 568
 	// If this board has no children don't bother with the next confirmation screen.
549
-	if ($context['board']['no_children'])
550
-		echo '
569
+	if ($context['board']['no_children']) {
570
+			echo '
551 571
 				<input type="hidden" name="no_children" value="1">';
572
+	}
552 573
 
553
-	if (isset($context['board']['is_new']))
554
-		echo '
574
+	if (isset($context['board']['is_new'])) {
575
+			echo '
555 576
 				<input type="hidden" name="cur_cat" value="', $context['board']['category'], '">
556 577
 				<input type="submit" name="add" value="', $txt['mboards_new_board'], '" onclick="return !isEmptyText(this.form.board_name);" class="button_submit">';
557
-	else
558
-		echo '
578
+	} else {
579
+			echo '
559 580
 				<input type="submit" name="edit" value="', $txt['modify'], '" onclick="return !isEmptyText(this.form.board_name);" class="button_submit">';
581
+	}
560 582
 
561
-	if (!isset($context['board']['is_new']) && empty($context['board']['is_recycle']))
562
-		echo '
583
+	if (!isset($context['board']['is_new']) && empty($context['board']['is_recycle'])) {
584
+			echo '
563 585
 				<input type="submit" name="delete" value="', $txt['mboards_delete_board'], '" data-confirm="', $txt['boardConfirm'], '" class="button_submit you_sure">';
586
+	}
564 587
 	echo '
565 588
 			</div>
566 589
 		</form>
@@ -581,12 +604,13 @@  discard block
 block discarded – undo
581 604
 		sItemListContainerId: \'moderator_container\',
582 605
 		aListItems: [';
583 606
 
584
-	foreach ($context['board']['moderators'] as $id_member => $member_name)
585
-		echo '
607
+	foreach ($context['board']['moderators'] as $id_member => $member_name) {
608
+			echo '
586 609
 					{
587 610
 						sItemId: ', JavaScriptEscape($id_member), ',
588 611
 						sItemName: ', JavaScriptEscape($member_name), '
589 612
 					}', $id_member == $context['board']['last_moderator_id'] ? '' : ',';
613
+	}
590 614
 
591 615
 	echo '
592 616
 		]
@@ -606,12 +630,13 @@  discard block
 block discarded – undo
606 630
 		sItemListContainerId: \'moderator_group_container\',
607 631
 		aListItems: [';
608 632
 
609
-	foreach ($context['board']['moderator_groups'] as $id_group => $group_name)
610
-		echo '
633
+	foreach ($context['board']['moderator_groups'] as $id_group => $group_name) {
634
+			echo '
611 635
 					{
612 636
 						sItemId: ', JavaScriptEscape($id_group), ',
613 637
 						sItemName: ', JavaScriptEscape($group_name), '
614 638
 					}', $id_group == $context['board']['last_moderator_group_id'] ? '' : ',';
639
+	}
615 640
 
616 641
 		echo '
617 642
 			]
@@ -637,9 +662,10 @@  discard block
 block discarded – undo
637 662
 		echo '
638 663
 			document.getElementById("redirect_address_div").style.display = redirectEnabled ? "" : "none";';
639 664
 
640
-		if ($context['board']['redirect'])
641
-			echo '
665
+		if ($context['board']['redirect']) {
666
+					echo '
642 667
 			document.getElementById("reset_redirect_div").style.display = redirectEnabled ? "" : "none";';
668
+		}
643 669
 	}
644 670
 
645 671
 	echo '
@@ -668,9 +694,10 @@  discard block
 block discarded – undo
668 694
 				<p>', $txt['mboards_delete_board_contains'], '</p>
669 695
 					<ul>';
670 696
 
671
-	foreach ($context['children'] as $child)
672
-		echo '
697
+	foreach ($context['children'] as $child) {
698
+			echo '
673 699
 						<li>', $child['node']['name'], '</li>';
700
+	}
674 701
 
675 702
 	echo '
676 703
 					</ul>
@@ -684,10 +711,11 @@  discard block
 block discarded – undo
684 711
 					<label for="delete_action1"><input type="radio" id="delete_action1" name="delete_action" value="1" class="input_radio"', empty($context['can_move_children']) ? ' disabled' : '', '>', $txt['mboards_delete_board_option2'], '</label>:
685 712
 					<select name="board_to"', empty($context['can_move_children']) ? ' disabled' : '', '>';
686 713
 
687
-	foreach ($context['board_order'] as $board)
688
-		if ($board['id'] != $context['board']['id'] && empty($board['is_child']))
714
+	foreach ($context['board_order'] as $board) {
715
+			if ($board['id'] != $context['board']['id'] && empty($board['is_child']))
689 716
 			echo '
690 717
 						<option value="', $board['id'], '">', $board['name'], '</option>';
718
+	}
691 719
 
692 720
 	echo '
693 721
 					</select>
Please login to merge, or discard this patch.