Completed
Pull Request — release-2.1 (#4184)
by Mert
10:08
created
Themes/default/MessageIndex.template.php 1 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 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 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'] ? '<span class="strong">' . $child['link'] . '</span>' : '<span>' . $child['link'] . '</span>';
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.