@@ -67,8 +67,9 @@ discard block |
||
67 | 67 | foreach ($context['categories'] as $category) |
68 | 68 | { |
69 | 69 | // If theres no parent boards we can see, avoid showing an empty category (unless its collapsed) |
70 | - if (empty($category['boards']) && !$category['is_collapsed']) |
|
71 | - continue; |
|
70 | + if (empty($category['boards']) && !$category['is_collapsed']) { |
|
71 | + continue; |
|
72 | + } |
|
72 | 73 | |
73 | 74 | echo ' |
74 | 75 | <div class="main_container"> |
@@ -76,9 +77,10 @@ discard block |
||
76 | 77 | <h3 class="catbg">'; |
77 | 78 | |
78 | 79 | // If this category even can collapse, show a link to collapse it. |
79 | - if ($category['can_collapse']) |
|
80 | - echo ' |
|
80 | + if ($category['can_collapse']) { |
|
81 | + echo ' |
|
81 | 82 | <span id="category_', $category['id'], '_upshrink" class="', $category['is_collapsed'] ? 'toggle_down' : 'toggle_up', ' floatright" data-collapsed="', (int) $category['is_collapsed'], '" title="', !$category['is_collapsed'] ? $txt['hide_category'] : $txt['show_category'], '" style="display: none;"></span>'; |
83 | + } |
|
82 | 84 | |
83 | 85 | echo ' |
84 | 86 | ', $category['link'], ' |
@@ -105,17 +107,19 @@ discard block |
||
105 | 107 | </a>'; |
106 | 108 | |
107 | 109 | // Has it outstanding posts for approval? |
108 | - if ($board['can_approve_posts'] && ($board['unapproved_posts'] || $board['unapproved_topics'])) |
|
109 | - echo ' |
|
110 | + if ($board['can_approve_posts'] && ($board['unapproved_posts'] || $board['unapproved_topics'])) { |
|
111 | + echo ' |
|
110 | 112 | <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>'; |
113 | + } |
|
111 | 114 | |
112 | 115 | echo ' |
113 | 116 | <p class="board_description">', $board['description'], '</p>'; |
114 | 117 | |
115 | 118 | // Show the "Moderators: ". Each has name, href, link, and id. (but we're gonna use link_moderators.) |
116 | - if (!empty($board['link_moderators'])) |
|
117 | - echo ' |
|
119 | + if (!empty($board['link_moderators'])) { |
|
120 | + echo ' |
|
118 | 121 | <p class="moderators">', count($board['link_moderators']) == 1 ? $txt['moderator'] : $txt['moderators'], ': ', implode(', ', $board['link_moderators']), '</p>'; |
122 | + } |
|
119 | 123 | |
120 | 124 | // Show some basic information about the number of posts, etc. |
121 | 125 | echo ' |
@@ -127,9 +131,10 @@ discard block |
||
127 | 131 | </div> |
128 | 132 | <div class="lastpost ',!empty($board['last_post']['id']) ? 'lpr_border' : 'hidden', '">'; |
129 | 133 | |
130 | - if (!empty($board['last_post']['id'])) |
|
131 | - echo ' |
|
134 | + if (!empty($board['last_post']['id'])) { |
|
135 | + echo ' |
|
132 | 136 | <p>', $board['last_post']['last_post_message'], '</p>'; |
137 | + } |
|
133 | 138 | echo ' |
134 | 139 | </div>'; |
135 | 140 | // Show the "Child Boards: ". (there's a link_children but we're going to bold the new ones...) |
@@ -141,14 +146,16 @@ discard block |
||
141 | 146 | id, name, description, new (is it new?), topics (#), posts (#), href, link, and last_post. */ |
142 | 147 | foreach ($board['children'] as $child) |
143 | 148 | { |
144 | - if (!$child['is_redirect']) |
|
145 | - $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>'; |
|
146 | - else |
|
147 | - $child['link'] = '<a href="' . $child['href'] . '" title="' . comma_format($child['posts']) . ' ' . $txt['redirects'] . ' - ' . $child['short_description'] . '">' . $child['name'] . '</a>'; |
|
149 | + if (!$child['is_redirect']) { |
|
150 | + $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>'; |
|
151 | + } else { |
|
152 | + $child['link'] = '<a href="' . $child['href'] . '" title="' . comma_format($child['posts']) . ' ' . $txt['redirects'] . ' - ' . $child['short_description'] . '">' . $child['name'] . '</a>'; |
|
153 | + } |
|
148 | 154 | |
149 | 155 | // Has it posts awaiting approval? |
150 | - if ($child['can_approve_posts'] && ($child['unapproved_posts'] || $child['unapproved_topics'])) |
|
151 | - $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>'; |
|
156 | + if ($child['can_approve_posts'] && ($child['unapproved_posts'] || $child['unapproved_topics'])) { |
|
157 | + $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>'; |
|
158 | + } |
|
152 | 159 | |
153 | 160 | $children[] = $child['new'] ? '<span class="strong">' . $child['link'] . '</span>' : '<span>' . $child['link'] . '</span>'; |
154 | 161 | } |
@@ -172,10 +179,11 @@ discard block |
||
172 | 179 | </div>'; |
173 | 180 | |
174 | 181 | // Show the mark all as read button? |
175 | - if ($context['user']['is_logged'] && !empty($context['categories'])) |
|
176 | - echo ' |
|
182 | + if ($context['user']['is_logged'] && !empty($context['categories'])) { |
|
183 | + echo ' |
|
177 | 184 | <div class="mark_read">', template_button_strip($context['mark_read_button'], 'right'), '</div>'; |
178 | -} |
|
185 | + } |
|
186 | + } |
|
179 | 187 | |
180 | 188 | /** |
181 | 189 | * The lower part of the outer layer of the board index |
@@ -192,8 +200,9 @@ discard block |
||
192 | 200 | { |
193 | 201 | global $context, $options, $txt; |
194 | 202 | |
195 | - if (empty($context['info_center'])) |
|
196 | - return; |
|
203 | + if (empty($context['info_center'])) { |
|
204 | + return; |
|
205 | + } |
|
197 | 206 | |
198 | 207 | // Here's where the "Info Center" starts... |
199 | 208 | echo ' |
@@ -293,14 +302,15 @@ discard block |
||
293 | 302 | /* Each post in latest_posts has: |
294 | 303 | board (with an id, name, and link.), topic (the topic's id.), poster (with id, name, and link.), |
295 | 304 | subject, short_subject (shortened with...), time, link, and href. */ |
296 | - foreach ($context['latest_posts'] as $post) |
|
297 | - echo ' |
|
305 | + foreach ($context['latest_posts'] as $post) { |
|
306 | + echo ' |
|
298 | 307 | <tr class="windowbg"> |
299 | 308 | <td class="recentpost"><strong>', $post['link'], '</strong></td> |
300 | 309 | <td class="recentposter">', $post['poster']['link'], '</td> |
301 | 310 | <td class="recentboard">', $post['board']['link'], '</td> |
302 | 311 | <td class="recenttime">', $post['time'], '</td> |
303 | 312 | </tr>'; |
313 | + } |
|
304 | 314 | echo ' |
305 | 315 | </table>'; |
306 | 316 | } |
@@ -324,9 +334,10 @@ discard block |
||
324 | 334 | </div>'; |
325 | 335 | |
326 | 336 | // Holidays like "Christmas", "Chanukah", and "We Love [Unknown] Day" :P. |
327 | - if (!empty($context['calendar_holidays'])) |
|
328 | - echo ' |
|
337 | + if (!empty($context['calendar_holidays'])) { |
|
338 | + echo ' |
|
329 | 339 | <p class="inline holiday"><span>', $txt['calendar_prompt'], '</span> ', implode(', ', $context['calendar_holidays']), '</p>'; |
340 | + } |
|
330 | 341 | |
331 | 342 | // People's birthdays. Like mine. And yours, I guess. Kidding. |
332 | 343 | if (!empty($context['calendar_birthdays'])) |
@@ -335,9 +346,10 @@ discard block |
||
335 | 346 | <p class="inline"> |
336 | 347 | <span class="birthday">', $context['calendar_only_today'] ? $txt['birthdays'] : $txt['birthdays_upcoming'], '</span>'; |
337 | 348 | // Each member in calendar_birthdays has: id, name (person), age (if they have one set?), is_last. (last in list?), and is_today (birthday is today?) |
338 | - foreach ($context['calendar_birthdays'] as $member) |
|
339 | - echo ' |
|
349 | + foreach ($context['calendar_birthdays'] as $member) { |
|
350 | + echo ' |
|
340 | 351 | <a href="', $scripturl, '?action=profile;u=', $member['id'], '">', $member['is_today'] ? '<strong class="fix_rtl_names">' : '', $member['name'], $member['is_today'] ? '</strong>' : '', isset($member['age']) ? ' (' . $member['age'] . ')' : '', '</a>', $member['is_last'] ? '' : ', '; |
352 | + } |
|
341 | 353 | echo ' |
342 | 354 | </p>'; |
343 | 355 | } |
@@ -351,9 +363,10 @@ discard block |
||
351 | 363 | |
352 | 364 | // Each event in calendar_events should have: |
353 | 365 | // title, href, is_last, can_edit (are they allowed?), modify_href, and is_today. |
354 | - foreach ($context['calendar_events'] as $event) |
|
355 | - echo ' |
|
366 | + foreach ($context['calendar_events'] as $event) { |
|
367 | + echo ' |
|
356 | 368 | ', $event['can_edit'] ? '<a href="' . $event['modify_href'] . '" title="' . $txt['calendar_edit'] . '"><span class="generic_icons calendar_modify"></span></a> ' : '', $event['href'] == '' ? '' : '<a href="' . $event['href'] . '">', $event['is_today'] ? '<strong>' . $event['title'] . '</strong>' : $event['title'], $event['href'] == '' ? '' : '</a>', $event['is_last'] ? '<br>' : ', '; |
369 | + } |
|
357 | 370 | echo ' |
358 | 371 | </p>'; |
359 | 372 | } |
@@ -398,15 +411,19 @@ discard block |
||
398 | 411 | |
399 | 412 | // Handle hidden users and buddies. |
400 | 413 | $bracketList = array(); |
401 | - if ($context['show_buddies']) |
|
402 | - $bracketList[] = comma_format($context['num_buddies']) . ' ' . ($context['num_buddies'] == 1 ? $txt['buddy'] : $txt['buddies']); |
|
403 | - if (!empty($context['num_spiders'])) |
|
404 | - $bracketList[] = comma_format($context['num_spiders']) . ' ' . ($context['num_spiders'] == 1 ? $txt['spider'] : $txt['spiders']); |
|
405 | - if (!empty($context['num_users_hidden'])) |
|
406 | - $bracketList[] = comma_format($context['num_users_hidden']) . ' ' . ($context['num_spiders'] == 1 ? $txt['hidden'] : $txt['hidden_s']); |
|
414 | + if ($context['show_buddies']) { |
|
415 | + $bracketList[] = comma_format($context['num_buddies']) . ' ' . ($context['num_buddies'] == 1 ? $txt['buddy'] : $txt['buddies']); |
|
416 | + } |
|
417 | + if (!empty($context['num_spiders'])) { |
|
418 | + $bracketList[] = comma_format($context['num_spiders']) . ' ' . ($context['num_spiders'] == 1 ? $txt['spider'] : $txt['spiders']); |
|
419 | + } |
|
420 | + if (!empty($context['num_users_hidden'])) { |
|
421 | + $bracketList[] = comma_format($context['num_users_hidden']) . ' ' . ($context['num_spiders'] == 1 ? $txt['hidden'] : $txt['hidden_s']); |
|
422 | + } |
|
407 | 423 | |
408 | - if (!empty($bracketList)) |
|
409 | - echo ' (' . implode(', ', $bracketList) . ')'; |
|
424 | + if (!empty($bracketList)) { |
|
425 | + echo ' (' . implode(', ', $bracketList) . ')'; |
|
426 | + } |
|
410 | 427 | |
411 | 428 | echo $context['show_who'] ? '</a>' : '', ' |
412 | 429 | |
@@ -420,9 +437,10 @@ discard block |
||
420 | 437 | ', sprintf($txt['users_active'], $modSettings['lastActive']), ': ', implode(', ', $context['list_users_online']); |
421 | 438 | |
422 | 439 | // Showing membergroups? |
423 | - if (!empty($settings['show_group_key']) && !empty($context['membergroups'])) |
|
424 | - echo ' |
|
440 | + if (!empty($settings['show_group_key']) && !empty($context['membergroups'])) { |
|
441 | + echo ' |
|
425 | 442 | <span class="membergroups">' . implode(', ', $context['membergroups']) . '</span>'; |
443 | + } |
|
426 | 444 | } |
427 | 445 | |
428 | 446 | echo ' |