SimpleMachines / SMF2.1

Sources/Subs-Menu.php

Braces +87 added lines, -63 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Create a menu.
@@ -64,22 +65,26 @@ 
 	$menu_context['current_action'] = isset($menuOptions['action']) ? $menuOptions['action'] : $context['current_action'];
 
 	// Allow extend *any* menu with a single hook
-	if (!empty($menu_context['current_action']))
-		call_integration_hook('integrate_' . $menu_context['current_action'] . '_areas', array(&$menuData));
+	if (!empty($menu_context['current_action'])) {
+			call_integration_hook('integrate_' . $menu_context['current_action'] . '_areas', array(&$menuData));
+	}
 
 	// What is the current area selected?
-	if (isset($menuOptions['current_area']) || isset($_GET['area']))
-		$menu_context['current_area'] = isset($menuOptions['current_area']) ? $menuOptions['current_area'] : $_GET['area'];
+	if (isset($menuOptions['current_area']) || isset($_GET['area'])) {
+			$menu_context['current_area'] = isset($menuOptions['current_area']) ? $menuOptions['current_area'] : $_GET['area'];
+	}
 
 	// Build a list of additional parameters that should go in the URL.
 	$menu_context['extra_parameters'] = '';
-	if (!empty($menuOptions['extra_url_parameters']))
-		foreach ($menuOptions['extra_url_parameters'] as $key => $value)
+	if (!empty($menuOptions['extra_url_parameters'])) {
+			foreach ($menuOptions['extra_url_parameters'] as $key => $value)
 			$menu_context['extra_parameters'] .= ';' . $key . '=' . $value;
+	}
 
 	// Only include the session ID in the URL if it's strictly necessary.
-	if (empty($menuOptions['disable_url_session_check']))
-		$menu_context['extra_parameters'] .= ';' . $context['session_var'] . '=' . $context['session_id'];
+	if (empty($menuOptions['disable_url_session_check'])) {
+			$menu_context['extra_parameters'] .= ';' . $context['session_var'] . '=' . $context['session_id'];
+	}
 
 	$include_data = array();
 
@@ -87,8 +92,9 @@ 
 	foreach ($menuData as $section_id => $section)
 	{
 		// Is this enabled - or has as permission check - which fails?
-		if ((isset($section['enabled']) && $section['enabled'] == false) || (isset($section['permission']) && !allowedTo($section['permission'])))
-			continue;
+		if ((isset($section['enabled']) && $section['enabled'] == false) || (isset($section['permission']) && !allowedTo($section['permission']))) {
+					continue;
+		}
 
 		// Now we cycle through the sections to pick the right area.
 		foreach ($section['areas'] as $area_id => $area)
@@ -110,41 +116,45 @@ 
 					if (empty($area['hidden']))
 					{
 						// First time this section?
-						if (!isset($menu_context['sections'][$section_id]))
-							$menu_context['sections'][$section_id]['title'] = $section['title'];
+						if (!isset($menu_context['sections'][$section_id])) {
+													$menu_context['sections'][$section_id]['title'] = $section['title'];
+						}
 
 						$menu_context['sections'][$section_id]['areas'][$area_id] = array('label' => isset($area['label']) ? $area['label'] : $txt[$area_id]);
 						// We'll need the ID as well...
 						$menu_context['sections'][$section_id]['id'] = $section_id;
 						// Does it have a custom URL?
-						if (isset($area['custom_url']))
-							$menu_context['sections'][$section_id]['areas'][$area_id]['url'] = $area['custom_url'];
+						if (isset($area['custom_url'])) {
+													$menu_context['sections'][$section_id]['areas'][$area_id]['url'] = $area['custom_url'];
+						}
 
 						// Does this area have its own icon?
-						if (!isset($area['force_menu_into_arms_of_another_menu']) && $user_info['name'] == 'iamanoompaloompa')
-							$menu_context['sections'][$section_id]['areas'][$area_id] = $smcFunc['json_decode'](base64_decode('eyJsYWJlbCI6Ik9vbXBhIExvb21wYSIsInVybCI6Imh0dHBzOlwvXC9lbi53aWtpcGVkaWEub3JnXC93aWtpXC9Pb21wYV9Mb29tcGFzPyIsImljb24iOiI8aW1nIHNyYz1cImh0dHBzOlwvXC93d3cuc2ltcGxlbWFjaGluZXMub3JnXC9pbWFnZXNcL29vbXBhLmdpZlwiIGFsdD1cIkknbSBhbiBPb21wYSBMb29tcGFcIiBcLz4ifQ=='), true);
-						elseif (isset($area['icon']) && file_exists($settings['theme_dir'] . '/images/admin/' . $area['icon']))
-							$menu_context['sections'][$section_id]['areas'][$area_id]['icon'] = '<img src="' . $settings['images_url'] . '/admin/' . $area['icon'] . '" alt="">';
-						elseif (isset($area['icon']) && file_exists($settings['default_theme_dir'] . '/images/admin/' . $area['icon']))
-							$menu_context['sections'][$section_id]['areas'][$area_id]['icon'] = '<img src="' . $settings['default_images_url'] . '/admin/' . $area['icon'] . '" alt="">';
-						elseif (isset($area['icon']))
-							$menu_context['sections'][$section_id]['areas'][$area_id]['icon'] = '<span class="generic_icons ' . $area['icon'] . '"></span>';
-						else
-							$menu_context['sections'][$section_id]['areas'][$area_id]['icon'] = '<span class="generic_icons ' . $area_id . '"></span>';
-
-						if (isset($area['icon_class']) && empty($menu_context['sections'][$section_id]['areas'][$area_id]['icon']))
-							$menu_context['sections'][$section_id]['areas'][$area_id]['icon_class'] = $menu_context['current_action'] . '_menu_icon ' . $area['icon_class'];
-						elseif (isset($area['icon']))
+						if (!isset($area['force_menu_into_arms_of_another_menu']) && $user_info['name'] == 'iamanoompaloompa') {
+													$menu_context['sections'][$section_id]['areas'][$area_id] = $smcFunc['json_decode'](base64_decode('eyJsYWJlbCI6Ik9vbXBhIExvb21wYSIsInVybCI6Imh0dHBzOlwvXC9lbi53aWtpcGVkaWEub3JnXC93aWtpXC9Pb21wYV9Mb29tcGFzPyIsImljb24iOiI8aW1nIHNyYz1cImh0dHBzOlwvXC93d3cuc2ltcGxlbWFjaGluZXMub3JnXC9pbWFnZXNcL29vbXBhLmdpZlwiIGFsdD1cIkknbSBhbiBPb21wYSBMb29tcGFcIiBcLz4ifQ=='), true);
+						} elseif (isset($area['icon']) && file_exists($settings['theme_dir'] . '/images/admin/' . $area['icon'])) {
+													$menu_context['sections'][$section_id]['areas'][$area_id]['icon'] = '<img src="' . $settings['images_url'] . '/admin/' . $area['icon'] . '" alt="">';
+						} elseif (isset($area['icon']) && file_exists($settings['default_theme_dir'] . '/images/admin/' . $area['icon'])) {
+													$menu_context['sections'][$section_id]['areas'][$area_id]['icon'] = '<img src="' . $settings['default_images_url'] . '/admin/' . $area['icon'] . '" alt="">';
+						} elseif (isset($area['icon'])) {
+													$menu_context['sections'][$section_id]['areas'][$area_id]['icon'] = '<span class="generic_icons ' . $area['icon'] . '"></span>';
+						} else {
+													$menu_context['sections'][$section_id]['areas'][$area_id]['icon'] = '<span class="generic_icons ' . $area_id . '"></span>';
+						}
+
+						if (isset($area['icon_class']) && empty($menu_context['sections'][$section_id]['areas'][$area_id]['icon'])) {
+													$menu_context['sections'][$section_id]['areas'][$area_id]['icon_class'] = $menu_context['current_action'] . '_menu_icon ' . $area['icon_class'];
+						} elseif (isset($area['icon']))
 						{
-							if ((substr($area['icon'], -4) === '.png' || substr($area['icon'], -4) === '.gif') && file_exists($settings['theme_dir'] . '/images/admin/big/' . $area['icon']))
-								$menu_context['sections'][$section_id]['areas'][$area_id]['icon_file'] = $settings['theme_url'] . '/images/admin/big/' . $area['icon'];
-							elseif ((substr($area['icon'], -4) === '.png' || substr($area['icon'], -4) === '.gif') && file_exists($settings['default_theme_dir'] . '/images/admin/big/' . $area['icon']))
-								$menu_context['sections'][$section_id]['areas'][$area_id]['icon_file'] = $settings['default_theme_url'] . '/images/admin/big/' . $area['icon'];
+							if ((substr($area['icon'], -4) === '.png' || substr($area['icon'], -4) === '.gif') && file_exists($settings['theme_dir'] . '/images/admin/big/' . $area['icon'])) {
+															$menu_context['sections'][$section_id]['areas'][$area_id]['icon_file'] = $settings['theme_url'] . '/images/admin/big/' . $area['icon'];
+							} elseif ((substr($area['icon'], -4) === '.png' || substr($area['icon'], -4) === '.gif') && file_exists($settings['default_theme_dir'] . '/images/admin/big/' . $area['icon'])) {
+															$menu_context['sections'][$section_id]['areas'][$area_id]['icon_file'] = $settings['default_theme_url'] . '/images/admin/big/' . $area['icon'];
+							}
 
 							$menu_context['sections'][$section_id]['areas'][$area_id]['icon_class'] = $menu_context['current_action'] . '_menu_icon ' . str_replace(array('.png', '.gif'), '', $area['icon']);
+						} else {
+													$menu_context['sections'][$section_id]['areas'][$area_id]['icon_class'] = $menu_context['current_action'] . '_menu_icon ' . str_replace(array('.png', '.gif'), '', $area_id);
 						}
-						else
-							$menu_context['sections'][$section_id]['areas'][$area_id]['icon_class'] = $menu_context['current_action'] . '_menu_icon ' . str_replace(array('.png', '.gif'), '', $area_id);
 
 						// This is a shortcut for Font-Icon users so they don't have to re-do whole CSS.
 						$menu_context['sections'][$section_id]['areas'][$area_id]['plain_class'] = $area['icon'];
@@ -161,35 +171,41 @@ 
 							{
 								if ((empty($sub[1]) || allowedTo($sub[1])) && (!isset($sub['enabled']) || !empty($sub['enabled'])))
 								{
-									if ($first_sa == null)
-										$first_sa = $sa;
+									if ($first_sa == null) {
+																			$first_sa = $sa;
+									}
 
 									$menu_context['sections'][$section_id]['areas'][$area_id]['subsections'][$sa] = array('label' => $sub[0]);
 									// Custom URL?
-									if (isset($sub['url']))
-										$menu_context['sections'][$section_id]['areas'][$area_id]['subsections'][$sa]['url'] = $sub['url'];
+									if (isset($sub['url'])) {
+																			$menu_context['sections'][$section_id]['areas'][$area_id]['subsections'][$sa]['url'] = $sub['url'];
+									}
 
 									// A bit complicated - but is this set?
 									if ($menu_context['current_area'] == $area_id)
 									{
 										// Save which is the first...
-										if (empty($first_sa))
-											$first_sa = $sa;
+										if (empty($first_sa)) {
+																					$first_sa = $sa;
+										}
 
 										// Is this the current subsection?
-										if (isset($_REQUEST['sa']) && $_REQUEST['sa'] == $sa)
-											$menu_context['current_subsection'] = $sa;
+										if (isset($_REQUEST['sa']) && $_REQUEST['sa'] == $sa) {
+																					$menu_context['current_subsection'] = $sa;
+										}
 										// Otherwise is it the default?
-										elseif (!isset($menu_context['current_subsection']) && !empty($sub[2]))
-											$menu_context['current_subsection'] = $sa;
+										elseif (!isset($menu_context['current_subsection']) && !empty($sub[2])) {
+																					$menu_context['current_subsection'] = $sa;
+										}
 									}
 
 									// Let's assume this is the last, for now.
 									$last_sa = $sa;
 								}
 								// Mark it as disabled...
-								else
-									$menu_context['sections'][$section_id]['areas'][$area_id]['subsections'][$sa]['disabled'] = true;
+								else {
+																	$menu_context['sections'][$section_id]['areas'][$area_id]['subsections'][$sa]['disabled'] = true;
+								}
 							}
 
 							// Set which one is first, last and selected in the group.
@@ -198,8 +214,9 @@ 
 								$menu_context['sections'][$section_id]['areas'][$area_id]['subsections'][$context['right_to_left'] ? $last_sa : $first_sa]['is_first'] = true;
 								$menu_context['sections'][$section_id]['areas'][$area_id]['subsections'][$context['right_to_left'] ? $first_sa : $last_sa]['is_last'] = true;
 
-								if ($menu_context['current_area'] == $area_id && !isset($menu_context['current_subsection']))
-									$menu_context['current_subsection'] = $first_sa;
+								if ($menu_context['current_area'] == $area_id && !isset($menu_context['current_subsection'])) {
+																	$menu_context['current_subsection'] = $first_sa;
+								}
 							}
 						}
 					}
@@ -233,23 +250,26 @@ 
 	$menu_context['base_url'] = isset($menuOptions['base_url']) ? $menuOptions['base_url'] : $scripturl . '?action=' . $menu_context['current_action'];
 
 	// If we didn't find the area we were looking for go to a default one.
-	if (isset($backup_area) && empty($found_section))
-		$menu_context['current_area'] = $backup_area;
+	if (isset($backup_area) && empty($found_section)) {
+			$menu_context['current_area'] = $backup_area;
+	}
 
 	// If there are sections quickly goes through all the sections to check if the base menu has an url
 	if (!empty($menu_context['current_section']))
 	{
 		$menu_context['sections'][$menu_context['current_section']]['selected'] = true;
 		$menu_context['sections'][$menu_context['current_section']]['areas'][$menu_context['current_area']]['selected'] = true;
-		if (!empty($menu_context['sections'][$menu_context['current_section']]['areas'][$menu_context['current_area']]['subsections'][$context['current_subaction']]))
-			$menu_context['sections'][$menu_context['current_section']]['areas'][$menu_context['current_area']]['subsections'][$context['current_subaction']]['selected'] = true;
+		if (!empty($menu_context['sections'][$menu_context['current_section']]['areas'][$menu_context['current_area']]['subsections'][$context['current_subaction']])) {
+					$menu_context['sections'][$menu_context['current_section']]['areas'][$menu_context['current_area']]['subsections'][$context['current_subaction']]['selected'] = true;
+		}
 
-		foreach ($menu_context['sections'] as $section_id => $section)
-			foreach ($section['areas'] as $area_id => $area)
+		foreach ($menu_context['sections'] as $section_id => $section) {
+					foreach ($section['areas'] as $area_id => $area)
 			{
 				if (!isset($menu_context['sections'][$section_id]['url']))
 				{
 					$menu_context['sections'][$section_id]['url'] = isset($area['url']) ? $area['url'] : $menu_context['base_url'] . ';area=' . $area_id;
+		}
 					break;
 				}
 			}
@@ -260,8 +280,9 @@ 
 	{
 		// Never happened!
 		$context['max_menu_id']--;
-		if ($context['max_menu_id'] == 0)
-			unset($context['max_menu_id']);
+		if ($context['max_menu_id'] == 0) {
+					unset($context['max_menu_id']);
+		}
 
 		return false;
 	}
@@ -272,8 +293,9 @@ 
 	$context['template_layers'][] = $menu_context['layer_name'];
 
 	// Check we had something - for sanity sake.
-	if (empty($include_data))
-		return false;
+	if (empty($include_data)) {
+			return false;
+	}
 
 	// Finally - return information on the selected item.
 	$include_data += array(
@@ -296,12 +318,14 @@ 
 	global $context;
 
 	$menu_name = $menu_id == 'last' && isset($context['max_menu_id']) && isset($context['menu_data_' . $context['max_menu_id']]) ? 'menu_data_' . $context['max_menu_id'] : 'menu_data_' . $menu_id;
-	if (!isset($context[$menu_name]))
-		return false;
+	if (!isset($context[$menu_name])) {
+			return false;
+	}
 
 	$layer_index = array_search($context[$menu_name]['layer_name'], $context['template_layers']);
-	if ($layer_index !== false)
-		unset($context['template_layers'][$layer_index]);
+	if ($layer_index !== false) {
+			unset($context['template_layers'][$layer_index]);
+	}
 
 	unset($context[$menu_name]);
 }

Themes/default/index.template.php

Braces +89 added lines, -61 removed lines

@@ -72,9 +72,10 @@ 
 
 	// Allow css/js files to be disable for this specific theme.
 	// 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.
-	if (!isset($settings['disable_files']))
-		$settings['disable_files'] = array();
-}
+	if (!isset($settings['disable_files'])) {
+			$settings['disable_files'] = array();
+	}
+	}
 
 /**
  * The main sub template above the content.
@@ -111,8 +112,9 @@ 
 		echo '
 	<meta';
 
-		foreach ($meta_tag as $meta_key => $meta_value)
-			echo ' ', $meta_key, '="', $meta_value, '"';
+		foreach ($meta_tag as $meta_key => $meta_value) {
+					echo ' ', $meta_key, '="', $meta_value, '"';
+		}
 
 		echo '>';
 	}
@@ -123,14 +125,16 @@ 
 	<meta name="theme-color" content="#557EA0">';
 
 	// Please don't index these Mr Robot.
-	if (!empty($context['robot_no_index']))
-		echo '
+	if (!empty($context['robot_no_index'])) {
+			echo '
 	<meta name="robots" content="noindex">';
+	}
 
 	// Present a canonical url for search engines to prevent duplicate content in their indices.
-	if (!empty($context['canonical_url']))
-		echo '
+	if (!empty($context['canonical_url'])) {
+			echo '
 	<link rel="canonical" href="', $context['canonical_url'], '">';
+	}
 
 	// Show all the relative links, such as help, search, contents, and the like.
 	echo '
@@ -139,10 +143,11 @@ 
 	<link rel="search" href="' . $scripturl . '?action=search">' : '');
 
 	// If RSS feeds are enabled, advertise the presence of one.
-	if (!empty($modSettings['xmlnews_enable']) && (!empty($modSettings['allow_guestAccess']) || $context['user']['is_logged']))
-		echo '
+	if (!empty($modSettings['xmlnews_enable']) && (!empty($modSettings['allow_guestAccess']) || $context['user']['is_logged'])) {
+			echo '
 	<link rel="alternate" type="application/rss+xml" title="', $context['forum_name_html_safe'], ' - ', $txt['rss'], '" href="', $scripturl, '?action=.xml;type=rss2', !empty($context['current_board']) ? ';board=' . $context['current_board'] : '', '">
 	<link rel="alternate" type="application/atom+xml" title="', $context['forum_name_html_safe'], ' - ', $txt['atom'], '" href="', $scripturl, '?action=.xml;type=atom', !empty($context['current_board']) ? ';board=' . $context['current_board'] : '', '">';
+	}
 
 	// If we're viewing a topic, these should be the previous and next topics, respectively.
 	if (!empty($context['links']['next']))
@@ -158,9 +163,10 @@ 
 	}
 
 	// If we're in a board, or a topic for that matter, the index will be the board's index.
-	if (!empty($context['current_board']))
-		echo '
+	if (!empty($context['current_board'])) {
+			echo '
 	<link rel="index" href="', $scripturl, '?board=', $context['current_board'], '.0">';
+	}
 
 	// Output any remaining HTML headers. (from mods, maybe?)
 	echo $context['html_headers'];
@@ -191,8 +197,9 @@ 
 		<ul class="floatleft" id="top_info">
 			<li>
 				<a href="', $scripturl, '?action=profile"', !empty($context['self_profile']) ? ' class="active"' : '', ' id="profile_menu_top" onclick="return false;">';
-					if (!empty($context['user']['avatar']))
-						echo $context['user']['avatar']['image'];
+					if (!empty($context['user']['avatar'])) {
+											echo $context['user']['avatar']['image'];
+					}
 					echo $context['user']['name'], '</a>
 				<div id="profile_menu" class="top_menu"></div>
 			</li>';
@@ -220,17 +227,18 @@ 
 	}
 	// Otherwise they're a guest. Ask them to either register or login.
 	else
-		if (empty($maintenance))
-			echo '
+		if (empty($maintenance)) {
+					echo '
 			<ul class="floatleft welcome">
 				<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>
 			</ul>';
-		else
-			//In maintenance mode, only login is allowed and don't show OverlayDiv
+		} else {
+					//In maintenance mode, only login is allowed and don't show OverlayDiv
 			echo '
 			<ul class="floatleft welcome">
 				<li>', sprintf($txt['welcome_guest'], $txt['guest_title'], '', $scripturl. '?action=login', 'return true;'), '</li>
 			</ul>';
+		}
 
 	if (!empty($modSettings['userLanguage']) && !empty($context['languages']) && count($context['languages']) > 1)
 	{
@@ -238,9 +246,10 @@ 
 		<form id="languages_form" method="get" class="floatright">
 			<select id="language_select" name="language" onchange="this.form.submit()">';
 
-		foreach ($context['languages'] as $language)
-			echo '
+		foreach ($context['languages'] as $language) {
+					echo '
 				<option value="', $language['filename'], '"', isset($context['user']['language']) && $context['user']['language'] == $language['filename'] ? ' selected="selected"' : '', '>', str_replace('-utf8', '', $language['name']), '</option>';
+		}
 
 		echo '
 			</select>
@@ -264,31 +273,36 @@ 
 				<option value="all"', ($selected == 'all' ? ' selected' : ''), '>', $txt['search_entireforum'], ' </option>';
 
 		// Can't limit it to a specific topic if we are not in one
-		if (!empty($context['current_topic']))
-			echo '
+		if (!empty($context['current_topic'])) {
+					echo '
 				<option value="topic"', ($selected == 'current_topic' ? ' selected' : ''), '>', $txt['search_thistopic'], '</option>';
+		}
 
 		// Can't limit it to a specific board if we are not in one
-		if (!empty($context['current_board']))
-			echo '
+		if (!empty($context['current_board'])) {
+					echo '
 				<option value="board"', ($selected == 'current_board' ? ' selected' : ''), '>', $txt['search_thisbrd'], '</option>';
+		}
 
 		// Can't search for members if we can't see the memberlist
-		if (!empty($context['allow_memberlist']))
-			echo '
+		if (!empty($context['allow_memberlist'])) {
+					echo '
 				<option value="members"', ($selected == 'members' ? ' selected' : ''), '>', $txt['search_members'], ' </option>';
+		}
 
 		echo '
 			</select>';
 
 		// Search within current topic?
-		if (!empty($context['current_topic']))
-			echo '
+		if (!empty($context['current_topic'])) {
+					echo '
 			<input type="hidden" name="sd_topic" value="', $context['current_topic'], '">';
+		}
 		// If we're on a certain board, limit it to this board ;).
-		elseif (!empty($context['current_board']))
-			echo '
+		elseif (!empty($context['current_board'])) {
+					echo '
 			<input type="hidden" name="sd_brd" value="', $context['current_board'], '">';
+		}
 
 		echo '
 			<input type="submit" name="search2" value="', $txt['search'], '" class="button_submit">
@@ -318,12 +332,13 @@ 
 						', $context['current_time'], '
 					</div>';
 	// Show a random news item? (or you could pick one from news_lines...)
-	if (!empty($settings['enable_news']) && !empty($context['random_news_line']))
-		echo '
+	if (!empty($settings['enable_news']) && !empty($context['random_news_line'])) {
+			echo '
 					<div class="news">
 						<h2>', $txt['news'], ': </h2>
 						<p>', $context['random_news_line'], '</p>
 					</div>';
+	}
 
 	echo '
 					<hr class="clear">
@@ -386,9 +401,10 @@ 
 		</ul>';
 
 	// Show the load time?
-	if ($context['show_load_time'])
-		echo '
+	if ($context['show_load_time']) {
+			echo '
 		<p>', sprintf($txt['page_created_full'], $context['load_time'], $context['load_queries']), '</p>';
+	}
 
 	echo '
 	</div>';
@@ -418,19 +434,21 @@ 
 	global $context, $shown_linktree, $scripturl, $txt;
 
 	// If linktree is empty, just return - also allow an override.
-	if (empty($context['linktree']) || (!empty($context['dont_default_linktree']) && !$force_show))
-		return;
+	if (empty($context['linktree']) || (!empty($context['dont_default_linktree']) && !$force_show)) {
+			return;
+	}
 
 	echo '
 				<div class="navigate_section">
 					<ul>';
 
-	if ($context['user']['is_logged'])
-	echo '
+	if ($context['user']['is_logged']) {
+		echo '
 						<li class="unread_links">
 							<a href="', $scripturl, '?action=unread" title="', $txt['unread_since_visit'], '">', $txt['view_unread_category'], '</a>
 							<a href="', $scripturl, '?action=unreadreplies" title="', $txt['show_unread_replies'], '">', $txt['unread_replies'], '</a>
 						</li>';
+	}
 
 	// Each tree item has a URL and name. Some may have extra_before and extra_after.
 	foreach ($context['linktree'] as $link_num => $tree)
@@ -441,25 +459,29 @@ 
 		// Don't show a separator for the first one.
 		// Better here. Always points to the next level when the linktree breaks to a second line.
 		// Picked a better looking HTML entity, and added support for RTL plus a span for styling.
-		if ($link_num != 0)
-			echo '
+		if ($link_num != 0) {
+					echo '
 							<span class="dividers">', $context['right_to_left'] ? ' &#9668; ' : ' &#9658; ', '</span>';
+		}
 
 		// Show something before the link?
-		if (isset($tree['extra_before']))
-			echo $tree['extra_before'], ' ';
+		if (isset($tree['extra_before'])) {
+					echo $tree['extra_before'], ' ';
+		}
 
 		// Show the link, including a URL if it should have one.
-		if (isset($tree['url']))
-			echo '
+		if (isset($tree['url'])) {
+					echo '
 					<a href="' . $tree['url'] . '"><span>' . $tree['name'] . '</span></a>';
-		else
-			echo '
+		} else {
+					echo '
 					<span>' . $tree['name'] . '</span>';
+		}
 
 		// Show something after the link...?
-		if (isset($tree['extra_after']))
-			echo ' ', $tree['extra_after'];
+		if (isset($tree['extra_after'])) {
+					echo ' ', $tree['extra_after'];
+		}
 
 		echo '
 						</li>';
@@ -509,13 +531,14 @@ 
 					echo '
 									<ul>';
 
-					foreach ($childbutton['sub_buttons'] as $grandchildbutton)
-						echo '
+					foreach ($childbutton['sub_buttons'] as $grandchildbutton) {
+											echo '
 										<li>
 											<a href="', $grandchildbutton['href'], '"', isset($grandchildbutton['target']) ? ' target="' . $grandchildbutton['target'] . '"' : '', '>
 												', $grandchildbutton['title'], '
 											</a>
 										</li>';
+					}
 
 					echo '
 									</ul>';
@@ -546,8 +569,9 @@ 
 {
 	global $context, $txt;
 
-	if (!is_array($strip_options))
-		$strip_options = array();
+	if (!is_array($strip_options)) {
+			$strip_options = array();
+	}
 
 	// Create the buttons...
 	$buttons = array();
@@ -556,8 +580,9 @@ 
 		// 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!)
 		if (!isset($value['test']) || !empty($context[$value['test']]))
 		{
-			if (!isset($value['id']))
-				$value['id'] = $key;
+			if (!isset($value['id'])) {
+							$value['id'] = $key;
+			}
 
 			$button = '
 				<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>';
@@ -570,13 +595,15 @@ 
 							<div class="overview">';
 				foreach ($value['sub_buttons'] as $element)
 				{
-					if (isset($element['test']) && empty($context[$element['test']]))
-						continue;
+					if (isset($element['test']) && empty($context[$element['test']])) {
+											continue;
+					}
 
 					$button .= '
 								<a href="' . $element['url'] . '"><strong>' . $txt[$element['text']] . '</strong>';
-					if (isset($txt[$element['text'] . '_desc']))
-						$button .= '<br><span>' . $txt[$element['text'] . '_desc'] . '</span>';
+					if (isset($txt[$element['text'] . '_desc'])) {
+											$button .= '<br><span>' . $txt[$element['text'] . '_desc'] . '</span>';
+					}
 					$button .= '</a>';
 				}
 				$button .= '
@@ -590,8 +617,9 @@ 
 	}
 
 	// No buttons? No button strip either.
-	if (empty($buttons))
-		return;
+	if (empty($buttons)) {
+			return;
+	}
 
 	echo '
 		<div class="buttonlist', !empty($direction) ? ' float' . $direction : '', '"', (empty($buttons) ? ' style="display: none;"' : ''), (!empty($strip_options['id']) ? ' id="' . $strip_options['id'] . '"' : ''), '>