SimpleMachines / SMF2.1

Sources/Subs-BoardIndex.php

Spacing +3 added lines, -3 removed lines

@@ -134,7 +134,7 @@ 
 	$smcFunc['db_free_result']($result_boards);
 
 	// Run through the categories and boards (or only boards)....
-	for (reset($row_boards); key($row_boards)!==null; next($row_boards))
+	for (reset($row_boards); key($row_boards) !== null; next($row_boards))
 	{
 		$row_board = current($row_boards);
 
@@ -352,8 +352,8 @@ 
 
 		// Set the last post in the root board 
 		if (!$isChild && !empty($row_board['poster_time'])
-			&& ( empty($this_category[$row_board['id_board']]['last_post']['poster_time'])
-				|| forum_time(true,$this_category[$row_board['id_board']]['last_post']['poster_time']) < forum_time(true, $row_board['poster_time'])
+			&& (empty($this_category[$row_board['id_board']]['last_post']['poster_time'])
+				|| forum_time(true, $this_category[$row_board['id_board']]['last_post']['poster_time']) < forum_time(true, $row_board['poster_time'])
 				)
 			)
 			$this_category[$row_board['id_board']]['last_post'] = $this_last_post;

Braces +74 added lines, -57 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Fetches a list of boards and (optional) categories including
@@ -37,19 +38,21 @@ 
 	require_once($sourcedir . '/Subs-Boards.php');
 
 	// For performance, track the latest post while going through the boards.
-	if (!empty($boardIndexOptions['set_latest_post']))
-		$latest_post = array(
+	if (!empty($boardIndexOptions['set_latest_post'])) {
+			$latest_post = array(
 			'timestamp' => 0,
 			'ref' => 0,
 		);
+	}
 
 	// This setting is not allowed to be empty
-	if (empty($modSettings['boardindex_max_depth']))
-		$modSettings['boardindex_max_depth'] = 1;
+	if (empty($modSettings['boardindex_max_depth'])) {
+			$modSettings['boardindex_max_depth'] = 1;
+	}
 
 	// Find all boards and categories, as well as related information.  This will be sorted by the natural order of boards and categories, which we control.
-	if ($boardIndexOptions['parent_id'] != 0 && $smcFunc['db_cte_support']())
-		$result_boards = $smcFunc['db_query']('', '
+	if ($boardIndexOptions['parent_id'] != 0 && $smcFunc['db_cte_support']()) {
+			$result_boards = $smcFunc['db_query']('', '
 			WITH RECURSIVE 
 				boards_cte (child_level, id_board, name , description, redirect, num_posts, num_topics, unapproved_posts, unapproved_topics, id_parent, id_msg_updated, id_cat, id_last_msg, board_order)
 			as
@@ -90,8 +93,8 @@ 
 				'id_parent' => $boardIndexOptions['parent_id'],
 			)
 		);
-	else
-		$result_boards = $smcFunc['db_query']('', '
+	} else {
+			$result_boards = $smcFunc['db_query']('', '
 			SELECT' . ($boardIndexOptions['include_categories'] ? '
 				c.id_cat, c.name AS cat_name, c.description AS cat_desc,' : '') . '
 				b.id_board, b.name AS board_name, b.description,
@@ -119,18 +122,21 @@ 
 				'blank_string' => '',
 			)
 		);
+	}
 
 	// Start with an empty array.
-	if ($boardIndexOptions['include_categories'])
-		$categories = array();
-	else
-		$this_category = array();
+	if ($boardIndexOptions['include_categories']) {
+			$categories = array();
+	} else {
+			$this_category = array();
+	}
 	$boards = array();
 
 	// Children can affect parents, so we need to gather all the boards first and then process them after.
 	$row_boards = array();
-	while ($row_board = $smcFunc['db_fetch_assoc']($result_boards))
-		$row_boards[$row_board['id_board']] = $row_board;
+	while ($row_board = $smcFunc['db_fetch_assoc']($result_boards)) {
+			$row_boards[$row_board['id_board']] = $row_board;
+	}
 	$smcFunc['db_free_result']($result_boards);
 
 	// Run through the categories and boards (or only boards)....
@@ -143,8 +149,9 @@ 
 		$row_board['is_read'] = !empty($row_board['is_read']) || $ignoreThisBoard ? '1' : '0';
 
 		// Add parent boards to the $boards list later used to fetch moderators
-		if ($row_board['id_parent'] == $boardIndexOptions['parent_id'])
-			$boards[] = $row_board['id_board'];
+		if ($row_board['id_parent'] == $boardIndexOptions['parent_id']) {
+					$boards[] = $row_board['id_board'];
+		}
 
 		if ($boardIndexOptions['include_categories'])
 		{
@@ -166,8 +173,9 @@ 
 			}
 
 			// If this board has new posts in it (and isn't the recycle bin!) then the category is new.
-			if (empty($modSettings['recycle_enable']) || $modSettings['recycle_board'] != $row_board['id_board'])
-				$categories[$row_board['id_cat']]['new'] |= empty($row_board['is_read']);
+			if (empty($modSettings['recycle_enable']) || $modSettings['recycle_board'] != $row_board['id_board']) {
+							$categories[$row_board['id_cat']]['new'] |= empty($row_board['is_read']);
+			}
 
 			// Avoid showing category unread link where it only has redirection boards.
 			$categories[$row_board['id_cat']]['show_unread'] = !empty($categories[$row_board['id_cat']]['show_unread']) ? 1 : !$row_board['is_redirect'];
@@ -186,8 +194,9 @@ 
 				$isChild = false;
 
 				// We might or might not have already added this board, so...
-				if (!isset($this_category[$row_board['id_board']]))
-					$this_category[$row_board['id_board']] = array();
+				if (!isset($this_category[$row_board['id_board']])) {
+									$this_category[$row_board['id_board']] = array();
+				}
 
 				$this_category[$row_board['id_board']] += array(
 					'new' => empty($row_board['is_read']),
@@ -220,14 +229,12 @@ 
 				{
 					$this_category[$row_board['id_board']]['board_class'] = 'redirect';
 					$this_category[$row_board['id_board']]['board_tooltip'] = $txt['redirect_board'];
-				}
-				elseif ($this_category[$row_board['id_board']]['new'] || $context['user']['is_guest'])
+				} elseif ($this_category[$row_board['id_board']]['new'] || $context['user']['is_guest'])
 				{
 					// If we're showing to guests, we want to give them the idea that something interesting is going on!
 					$this_category[$row_board['id_board']]['board_class'] = 'on';
 					$this_category[$row_board['id_board']]['board_tooltip'] = $txt['new_posts'];
-				}
-				else
+				} else
 				{
 					$this_category[$row_board['id_board']]['board_tooltip'] = $txt['old_posts'];
 				}
@@ -239,12 +246,13 @@ 
 			$isChild = true;
 
 			// Ensure the parent has at least the most important info defined
-			if (!isset($this_category[$row_board['id_parent']]))
-				$this_category[$row_board['id_parent']] = array(
+			if (!isset($this_category[$row_board['id_parent']])) {
+							$this_category[$row_board['id_parent']] = array(
 					'children' => array(),
 					'children_new' => false,
 					'board_class' => 'off',
 				);
+			}
 
 			$this_category[$row_board['id_parent']]['children'][$row_board['id_board']] = array(
 				'id' => $row_board['id_board'],
@@ -288,8 +296,9 @@ 
 			// Propagate some values to the parent board
 			if (isset($row_boards[$row_board['id_parent']]))
 			{
-				if (empty($row_board['is_read']))
-					$row_boards[$row_board['id_parent']]['is_read'] = $row_board['is_read'];
+				if (empty($row_board['is_read'])) {
+									$row_boards[$row_board['id_parent']]['is_read'] = $row_board['is_read'];
+				}
 
 				if (!empty($boardIndexOptions['countChildPosts']) && !$row_board['is_redirect'])
 				{
@@ -320,12 +329,13 @@ 
 			'topic' => $row_board['id_topic']
 		);
 
-		if (!empty($settings['avatars_on_boardIndex']))
-			$this_last_post['member']['avatar'] = set_avatar_data(array(
+		if (!empty($settings['avatars_on_boardIndex'])) {
+					$this_last_post['member']['avatar'] = set_avatar_data(array(
 				'avatar' => $row_board['avatar'],
 				'email' => $row_board['email_address'],
 				'filename' => !empty($row_board['member_filename']) ? $row_board['member_filename'] : '',
 			));
+		}
 
 		// Provide the href and link.
 		if ($row_board['subject'] != '')
@@ -337,8 +347,7 @@ 
 			link, href, subject, start (where they should go for the first unread post.),
 			and member. (which has id, name, link, href, username in it.) */
 			$this_last_post['last_post_message'] = sprintf($txt['last_post_message'], $this_last_post['member']['link'], $this_last_post['link'], $this_last_post['time']);
-		}
-		else
+		} else
 		{
 			$this_last_post['href'] = '';
 			$this_last_post['link'] = $txt['not_applicable'];
@@ -347,27 +356,31 @@ 
 
 		// Set the last post in the parent board.
 		if ($isChild && !empty($row_board['poster_time']) 
-				&& forum_time(true, $row_boards[$row_board['id_parent']]['poster_time']) < forum_time(true, $row_board['poster_time']))
-			$this_category[$isChild ? $row_board['id_parent'] : $row_board['id_board']]['last_post'] = $this_last_post;
+				&& forum_time(true, $row_boards[$row_board['id_parent']]['poster_time']) < forum_time(true, $row_board['poster_time'])) {
+					$this_category[$isChild ? $row_board['id_parent'] : $row_board['id_board']]['last_post'] = $this_last_post;
+		}
 
 		// Set the last post in the root board 
 		if (!$isChild && !empty($row_board['poster_time'])
 			&& ( empty($this_category[$row_board['id_board']]['last_post']['poster_time'])
 				|| forum_time(true,$this_category[$row_board['id_board']]['last_post']['poster_time']) < forum_time(true, $row_board['poster_time'])
 				)
-			)
-			$this_category[$row_board['id_board']]['last_post'] = $this_last_post;
+			) {
+					$this_category[$row_board['id_board']]['last_post'] = $this_last_post;
+		}
 
 		// Just in the child...?
-		if ($isChild)
-			$this_category[$row_board['id_parent']]['children'][$row_board['id_board']]['last_post'] = $this_last_post;
+		if ($isChild) {
+					$this_category[$row_board['id_parent']]['children'][$row_board['id_board']]['last_post'] = $this_last_post;
+		}
 
 		// Determine a global most recent topic.
-		if (!empty($boardIndexOptions['set_latest_post']) && !empty($row_board['poster_time']) && $row_board['poster_time'] > $latest_post['timestamp'] && !$ignoreThisBoard)
-			$latest_post = array(
+		if (!empty($boardIndexOptions['set_latest_post']) && !empty($row_board['poster_time']) && $row_board['poster_time'] > $latest_post['timestamp'] && !$ignoreThisBoard) {
+					$latest_post = array(
 				'timestamp' => $row_board['poster_time'],
 				'ref' => &$this_category[$isChild ? $row_board['id_parent'] : $row_board['id_board']]['last_post'],
 			);
+		}
 	}
 
 	// Fetch the board's moderators and moderator groups
@@ -383,8 +396,9 @@ 
 				if (!empty($moderators[$board['id']]))
 				{
 					$categories[$k]['boards'][$j]['moderators'] = $moderators[$board['id']];
-					foreach ($moderators[$board['id']] as $moderator)
-						$categories[$k]['boards'][$j]['link_moderators'][] = $moderator['link'];
+					foreach ($moderators[$board['id']] as $moderator) {
+											$categories[$k]['boards'][$j]['link_moderators'][] = $moderator['link'];
+					}
 				}
 				if (!empty($groups[$board['id']]))
 				{
@@ -397,16 +411,16 @@ 
 				}
 			}
 		}
-	}
-	else
+	} else
 	{
 		foreach ($this_category as $k => $board)
 		{
 			if (!empty($moderators[$board['id']]))
 			{
 				$this_category[$k]['moderators'] = $moderators[$board['id']];
-				foreach ($moderators[$board['id']] as $moderator)
-					$this_category[$k]['link_moderators'][] = $moderator['link'];
+				foreach ($moderators[$board['id']] as $moderator) {
+									$this_category[$k]['link_moderators'][] = $moderator['link'];
+				}
 			}
 			if (!empty($groups[$board['id']]))
 			{
@@ -420,20 +434,23 @@ 
 		}
 	}
 
-	if ($boardIndexOptions['include_categories'])
-		sortCategories($categories);
-	else
-		sortBoards($this_category);
+	if ($boardIndexOptions['include_categories']) {
+			sortCategories($categories);
+	} else {
+			sortBoards($this_category);
+	}
 
 	// By now we should know the most recent post...if we wanna know it that is.
-	if (!empty($boardIndexOptions['set_latest_post']) && !empty($latest_post['ref']))
-		$context['latest_post'] = $latest_post['ref'];
+	if (!empty($boardIndexOptions['set_latest_post']) && !empty($latest_post['ref'])) {
+			$context['latest_post'] = $latest_post['ref'];
+	}
 
 	// I can't remember why but trying to make a ternary to get this all in one line is actually a Very Bad Idea.
-	if ($boardIndexOptions['include_categories'])
-		call_integration_hook('integrate_getboardtree', array($boardIndexOptions, &$categories));
-	else
-		call_integration_hook('integrate_getboardtree', array($boardIndexOptions, &$this_category));
+	if ($boardIndexOptions['include_categories']) {
+			call_integration_hook('integrate_getboardtree', array($boardIndexOptions, &$categories));
+	} else {
+			call_integration_hook('integrate_getboardtree', array($boardIndexOptions, &$this_category));
+	}
 
 	return $boardIndexOptions['include_categories'] ? $categories : $this_category;
 }