SimpleMachines / SMF2.1

Sources/MessageIndex.php

Braces +264 added lines, -197 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Show the list of topics in this board, along with any child boards.
@@ -56,8 +57,9 @@ 
 
 	$context['name'] = $board_info['name'];
 	$context['description'] = $board_info['description'];
-	if (!empty($board_info['description']))
-		$context['meta_description'] = strip_tags($board_info['description']);
+	if (!empty($board_info['description'])) {
+			$context['meta_description'] = strip_tags($board_info['description']);
+	}
 
 	// How many topics do we have in total?
 	$board_info['total_topics'] = allowedTo('approve_posts') ? $board_info['num_topics'] + $board_info['unapproved_topics'] : $board_info['num_topics'] + $board_info['unapproved_user_topics'];
@@ -73,12 +75,14 @@ 
 		$session_name = session_name();
 		foreach ($_GET as $k => $v)
 		{
-			if (!in_array($k, array('board', 'start', $session_name)))
-				$context['robot_no_index'] = true;
+			if (!in_array($k, array('board', 'start', $session_name))) {
+							$context['robot_no_index'] = true;
+			}
 		}
 	}
-	if (!empty($_REQUEST['start']) && (!is_numeric($_REQUEST['start']) || $_REQUEST['start'] % $context['messages_per_page'] != 0))
-		$context['robot_no_index'] = true;
+	if (!empty($_REQUEST['start']) && (!is_numeric($_REQUEST['start']) || $_REQUEST['start'] % $context['messages_per_page'] != 0)) {
+			$context['robot_no_index'] = true;
+	}
 
 	// If we can view unapproved messages and there are some build up a list.
 	if (allowedTo('approve_posts') && ($board_info['unapproved_topics'] || $board_info['unapproved_posts']))
@@ -89,14 +93,16 @@ 
 	}
 
 	// We only know these.
-	if (isset($_REQUEST['sort']) && !in_array($_REQUEST['sort'], array('subject', 'starter', 'last_poster', 'replies', 'views', 'first_post', 'last_post')))
-		$_REQUEST['sort'] = 'last_post';
+	if (isset($_REQUEST['sort']) && !in_array($_REQUEST['sort'], array('subject', 'starter', 'last_poster', 'replies', 'views', 'first_post', 'last_post'))) {
+			$_REQUEST['sort'] = 'last_post';
+	}
 
 	// Make sure the starting place makes sense and construct the page index.
-	if (isset($_REQUEST['sort']))
-		$context['page_index'] = constructPageIndex($scripturl . '?board=' . $board . '.%1$d;sort=' . $_REQUEST['sort'] . (isset($_REQUEST['desc']) ? ';desc' : ''), $_REQUEST['start'], $board_info['total_topics'], $maxindex, true);
-	else
-		$context['page_index'] = constructPageIndex($scripturl . '?board=' . $board . '.%1$d', $_REQUEST['start'], $board_info['total_topics'], $maxindex, true);
+	if (isset($_REQUEST['sort'])) {
+			$context['page_index'] = constructPageIndex($scripturl . '?board=' . $board . '.%1$d;sort=' . $_REQUEST['sort'] . (isset($_REQUEST['desc']) ? ';desc' : ''), $_REQUEST['start'], $board_info['total_topics'], $maxindex, true);
+	} else {
+			$context['page_index'] = constructPageIndex($scripturl . '?board=' . $board . '.%1$d', $_REQUEST['start'], $board_info['total_topics'], $maxindex, true);
+	}
 	$context['start'] = &$_REQUEST['start'];
 
 	// Set a canonical URL for this page.
@@ -132,14 +138,16 @@ 
 	$context['link_moderators'] = array();
 	if (!empty($board_info['moderators']))
 	{
-		foreach ($board_info['moderators'] as $mod)
-			$context['link_moderators'][] = '<a href="' . $scripturl . '?action=profile;u=' . $mod['id'] . '" title="' . $txt['board_moderator'] . '">' . $mod['name'] . '</a>';
+		foreach ($board_info['moderators'] as $mod) {
+					$context['link_moderators'][] = '<a href="' . $scripturl . '?action=profile;u=' . $mod['id'] . '" title="' . $txt['board_moderator'] . '">' . $mod['name'] . '</a>';
+		}
 	}
 	if (!empty($board_info['moderator_groups']))
 	{
 		// By default just tack the moderator groups onto the end of the members
-		foreach ($board_info['moderator_groups'] as $mod_group)
-			$context['link_moderators'][] = '<a href="' . $scripturl . '?action=groups;sa=members;group=' . $mod_group['id'] . '" title="' . $txt['board_moderator'] . '">' . $mod_group['name'] . '</a>';
+		foreach ($board_info['moderator_groups'] as $mod_group) {
+					$context['link_moderators'][] = '<a href="' . $scripturl . '?action=groups;sa=members;group=' . $mod_group['id'] . '" title="' . $txt['board_moderator'] . '">' . $mod_group['name'] . '</a>';
+		}
 	}
 
 	// Now we tack the info onto the end of the linktree
@@ -191,20 +199,24 @@ 
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (empty($row['id_member']))
-				continue;
+			if (empty($row['id_member'])) {
+							continue;
+			}
 
-			if (!empty($row['online_color']))
-				$link = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '" style="color: ' . $row['online_color'] . ';">' . $row['real_name'] . '</a>';
-			else
-				$link = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
+			if (!empty($row['online_color'])) {
+							$link = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '" style="color: ' . $row['online_color'] . ';">' . $row['real_name'] . '</a>';
+			} else {
+							$link = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
+			}
 
 			$is_buddy = in_array($row['id_member'], $user_info['buddies']);
-			if ($is_buddy)
-				$link = '<strong>' . $link . '</strong>';
+			if ($is_buddy) {
+							$link = '<strong>' . $link . '</strong>';
+			}
 
-			if (!empty($row['show_online']) || allowedTo('moderate_forum'))
-				$context['view_members_list'][$row['log_time'] . $row['member_name']] = empty($row['show_online']) ? '<em>' . $link . '</em>' : $link;
+			if (!empty($row['show_online']) || allowedTo('moderate_forum')) {
+							$context['view_members_list'][$row['log_time'] . $row['member_name']] = empty($row['show_online']) ? '<em>' . $link . '</em>' : $link;
+			}
 			// @todo why are we filling this array of data that are just counted (twice) and discarded? ???
 			$context['view_members'][$row['log_time'] . $row['member_name']] = array(
 				'id' => $row['id_member'],
@@ -217,8 +229,9 @@ 
 				'hidden' => empty($row['show_online']),
 			);
 
-			if (empty($row['show_online']))
-				$context['view_num_hidden']++;
+			if (empty($row['show_online'])) {
+							$context['view_num_hidden']++;
+			}
 		}
 		$context['view_num_guests'] = $smcFunc['db_num_rows']($request) - count($context['view_members']);
 		$smcFunc['db_free_result']($request);
@@ -257,8 +270,9 @@ 
 	$context['sort_direction'] = $ascending ? 'up' : 'down';
 	$txt['starter'] = $txt['started_by'];
 
-	foreach ($sort_methods as $key => $val)
-		$context['topics_headers'][$key] = '<a href="' . $scripturl . '?board=' . $context['current_board'] . '.' . $context['start'] . ';sort=' . $key . ($context['sort_by'] == $key && $context['sort_direction'] == 'up' ? ';desc' : '') . '">' . $txt[$key] . ($context['sort_by'] == $key ? '<span class="sort sort_' . $context['sort_direction'] . '"></span>' : '') . '</a>';
+	foreach ($sort_methods as $key => $val) {
+			$context['topics_headers'][$key] = '<a href="' . $scripturl . '?board=' . $context['current_board'] . '.' . $context['start'] . ';sort=' . $key . ($context['sort_by'] == $key && $context['sort_direction'] == 'up' ? ';desc' : '') . '">' . $txt[$key] . ($context['sort_by'] == $key ? '<span class="sort sort_' . $context['sort_direction'] . '"></span>' : '') . '</a>';
+	}
 
 	// Calculate the fastest way to get the topics.
 	$start = (int) $_REQUEST['start'];
@@ -268,14 +282,15 @@ 
 		$fake_ascending = true;
 		$maxindex = $board_info['total_topics'] < $start + $maxindex + 1 ? $board_info['total_topics'] - $start : $maxindex;
 		$start = $board_info['total_topics'] < $start + $maxindex + 1 ? 0 : $board_info['total_topics'] - $start - $maxindex;
+	} else {
+			$fake_ascending = false;
 	}
-	else
-		$fake_ascending = false;
 
 	// Setup the default topic icons...
 	$context['icon_sources'] = array();
-	foreach ($context['stable_icons'] as $icon)
-		$context['icon_sources'][$icon] = 'images_url';
+	foreach ($context['stable_icons'] as $icon) {
+			$context['icon_sources'][$icon] = 'images_url';
+	}
 
 	$topic_ids = array();
 	$context['topics'] = array();
@@ -306,8 +321,9 @@ 
 			)
 		);
 		$topic_ids = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$topic_ids[] = $row['id_topic'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$topic_ids[] = $row['id_topic'];
+		}
 	}
 
 	// Grab the appropriate topic information...
@@ -363,11 +379,13 @@ 
 		// Begin 'printing' the message index for current board.
 		while ($row = $smcFunc['db_fetch_assoc']($result))
 		{
-			if ($row['id_poll'] > 0 && $modSettings['pollMode'] == '0')
-				continue;
+			if ($row['id_poll'] > 0 && $modSettings['pollMode'] == '0') {
+							continue;
+			}
 
-			if (!$pre_query)
-				$topic_ids[] = $row['id_topic'];
+			if (!$pre_query) {
+							$topic_ids[] = $row['id_topic'];
+			}
 
 			// Reference the main color class.
 			$colorClass = 'windowbg';
@@ -377,8 +395,9 @@ 
 			{
 				// Limit them to $modSettings['preview_characters'] characters
 				$row['first_body'] = strip_tags(strtr(parse_bbc($row['first_body'], $row['first_smileys'], $row['id_first_msg']), array('<br>' => '&#10;')));
-				if ($smcFunc['strlen']($row['first_body']) > $modSettings['preview_characters'])
-					$row['first_body'] = $smcFunc['substr']($row['first_body'], 0, $modSettings['preview_characters']) . '...';
+				if ($smcFunc['strlen']($row['first_body']) > $modSettings['preview_characters']) {
+									$row['first_body'] = $smcFunc['substr']($row['first_body'], 0, $modSettings['preview_characters']) . '...';
+				}
 
 				// Censor the subject and message preview.
 				censorText($row['first_subject']);
@@ -389,27 +408,27 @@ 
 				{
 					$row['last_subject'] = $row['first_subject'];
 					$row['last_body'] = $row['first_body'];
-				}
-				else
+				} else
 				{
 					$row['last_body'] = strip_tags(strtr(parse_bbc($row['last_body'], $row['last_smileys'], $row['id_last_msg']), array('<br>' => '&#10;')));
-					if ($smcFunc['strlen']($row['last_body']) > $modSettings['preview_characters'])
-						$row['last_body'] = $smcFunc['substr']($row['last_body'], 0, $modSettings['preview_characters']) . '...';
+					if ($smcFunc['strlen']($row['last_body']) > $modSettings['preview_characters']) {
+											$row['last_body'] = $smcFunc['substr']($row['last_body'], 0, $modSettings['preview_characters']) . '...';
+					}
 
 					censorText($row['last_subject']);
 					censorText($row['last_body']);
 				}
-			}
-			else
+			} else
 			{
 				$row['first_body'] = '';
 				$row['last_body'] = '';
 				censorText($row['first_subject']);
 
-				if ($row['id_first_msg'] == $row['id_last_msg'])
-					$row['last_subject'] = $row['first_subject'];
-				else
-					censorText($row['last_subject']);
+				if ($row['id_first_msg'] == $row['id_last_msg']) {
+									$row['last_subject'] = $row['first_subject'];
+				} else {
+									censorText($row['last_subject']);
+				}
 			}
 
 			// Decide how many pages the topic should have.
@@ -420,42 +439,50 @@ 
 				$pages = constructPageIndex($scripturl . '?topic=' . $row['id_topic'] . '.%1$d', $start, $row['num_replies'] + 1, $context['messages_per_page'], true, false);
 
 				// If we can use all, show all.
-				if (!empty($modSettings['enableAllMessages']) && $row['num_replies'] + 1 < $modSettings['enableAllMessages'])
-					$pages .= ' &nbsp;<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.0;all">' . $txt['all'] . '</a>';
+				if (!empty($modSettings['enableAllMessages']) && $row['num_replies'] + 1 < $modSettings['enableAllMessages']) {
+									$pages .= ' &nbsp;<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.0;all">' . $txt['all'] . '</a>';
+				}
+			} else {
+							$pages = '';
 			}
-			else
-				$pages = '';
 
 			// We need to check the topic icons exist...
 			if (!empty($modSettings['messageIconChecks_enable']))
 			{
-				if (!isset($context['icon_sources'][$row['first_icon']]))
-					$context['icon_sources'][$row['first_icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['first_icon'] . '.png') ? 'images_url' : 'default_images_url';
-				if (!isset($context['icon_sources'][$row['last_icon']]))
-					$context['icon_sources'][$row['last_icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['last_icon'] . '.png') ? 'images_url' : 'default_images_url';
-			}
-			else
+				if (!isset($context['icon_sources'][$row['first_icon']])) {
+									$context['icon_sources'][$row['first_icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['first_icon'] . '.png') ? 'images_url' : 'default_images_url';
+				}
+				if (!isset($context['icon_sources'][$row['last_icon']])) {
+									$context['icon_sources'][$row['last_icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['last_icon'] . '.png') ? 'images_url' : 'default_images_url';
+				}
+			} else
 			{
-				if (!isset($context['icon_sources'][$row['first_icon']]))
-					$context['icon_sources'][$row['first_icon']] = 'images_url';
-				if (!isset($context['icon_sources'][$row['last_icon']]))
-					$context['icon_sources'][$row['last_icon']] = 'images_url';
+				if (!isset($context['icon_sources'][$row['first_icon']])) {
+									$context['icon_sources'][$row['first_icon']] = 'images_url';
+				}
+				if (!isset($context['icon_sources'][$row['last_icon']])) {
+									$context['icon_sources'][$row['last_icon']] = 'images_url';
+				}
 			}
 
-			if (!empty($board_info['recycle']))
-				$row['first_icon'] = 'recycled';
+			if (!empty($board_info['recycle'])) {
+							$row['first_icon'] = 'recycled';
+			}
 
 			// Is this topic pending approval, or does it have any posts pending approval?
-			if ($context['can_approve_posts'] && $row['unapproved_posts'])
-				$colorClass .= (!$row['approved'] ? ' approvetopic' : ' approvepost');
+			if ($context['can_approve_posts'] && $row['unapproved_posts']) {
+							$colorClass .= (!$row['approved'] ? ' approvetopic' : ' approvepost');
+			}
 
 			// Sticky topics should get a different color, too.
-			if ($row['is_sticky'])
-				$colorClass .= ' sticky';
+			if ($row['is_sticky']) {
+							$colorClass .= ' sticky';
+			}
 
 			// Locked topics get special treatment as well.
-			if ($row['locked'])
-				$colorClass .= ' locked';
+			if ($row['locked']) {
+							$colorClass .= ' locked';
+			}
 
 			// 'Print' the topic info.
 			$context['topics'][$row['id_topic']] = array_merge($row, array(
@@ -536,8 +563,9 @@ 
 		$smcFunc['db_free_result']($result);
 
 		// Fix the sequence of topics if they were retrieved in the wrong order. (for speed reasons...)
-		if ($fake_ascending)
-			$context['topics'] = array_reverse($context['topics'], true);
+		if ($fake_ascending) {
+					$context['topics'] = array_reverse($context['topics'], true);
+		}
 
 		if (!empty($modSettings['enableParticipation']) && !$user_info['is_guest'] && !empty($topic_ids))
 		{
@@ -554,8 +582,9 @@ 
 					'limit' => count($topic_ids),
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($result))
-				$context['topics'][$row['id_topic']]['is_posted_in'] = true;
+			while ($row = $smcFunc['db_fetch_assoc']($result)) {
+							$context['topics'][$row['id_topic']]['is_posted_in'] = true;
+			}
 			$smcFunc['db_free_result']($result);
 		}
 	}
@@ -580,9 +609,9 @@ 
 		// Can we restore topics?
 		$context['can_restore'] = allowedTo('move_any') && !empty($board_info['recycle']);
 
-		if ($user_info['is_admin'] || $modSettings['topic_move_any'])
-			$context['can_move_any'] = true;
-		else
+		if ($user_info['is_admin'] || $modSettings['topic_move_any']) {
+					$context['can_move_any'] = true;
+		} else
 		{
 			// We'll use this in a minute
 			$boards_allowed = boardsAllowedTo('post_new');
@@ -609,11 +638,13 @@ 
 		}
 
 		// Can we use quick moderation checkboxes?
-		if ($options['display_quick_mod'] == 1)
-			$context['can_quick_mod'] = $context['user']['is_logged'] || $context['can_approve'] || $context['can_remove'] || $context['can_lock'] || $context['can_sticky'] || $context['can_move'] || $context['can_merge'] || $context['can_restore'];
+		if ($options['display_quick_mod'] == 1) {
+					$context['can_quick_mod'] = $context['user']['is_logged'] || $context['can_approve'] || $context['can_remove'] || $context['can_lock'] || $context['can_sticky'] || $context['can_move'] || $context['can_merge'] || $context['can_restore'];
+		}
 		// Or the icons?
-		else
-			$context['can_quick_mod'] = $context['can_remove'] || $context['can_lock'] || $context['can_sticky'] || $context['can_move'];
+		else {
+					$context['can_quick_mod'] = $context['can_remove'] || $context['can_lock'] || $context['can_sticky'] || $context['can_move'];
+		}
 	}
 
 	if (!empty($context['can_quick_mod']) && $options['display_quick_mod'] == 1)
@@ -647,13 +678,15 @@ 
 			);
 
 			// We've seen all these boards now!
-			foreach ($board_info['parent_boards'] as $k => $dummy)
-				if (isset($_SESSION['topicseen_cache'][$k]))
+			foreach ($board_info['parent_boards'] as $k => $dummy) {
+							if (isset($_SESSION['topicseen_cache'][$k]))
 					unset($_SESSION['topicseen_cache'][$k]);
+			}
 		}
 
-		if (isset($_SESSION['topicseen_cache'][$board]))
-			unset($_SESSION['topicseen_cache'][$board]);
+		if (isset($_SESSION['topicseen_cache'][$board])) {
+					unset($_SESSION['topicseen_cache'][$board]);
+		}
 
 		$request = $smcFunc['db_query']('', '
 			SELECT id_topic, id_board, sent
@@ -675,8 +708,9 @@ 
 				$context['is_marked_notify'] = true;
 				$board_sent = $row['sent'];
 			}
-			if (!empty($row['id_topic']))
-				$context['topics'][$row['id_topic']]['is_watched'] = true;
+			if (!empty($row['id_topic'])) {
+							$context['topics'][$row['id_topic']]['is_watched'] = true;
+			}
 		}
 		$smcFunc['db_free_result']($request);
 
@@ -700,8 +734,7 @@ 
 		$pref = !empty($pref[$user_info['id']]) ? $pref[$user_info['id']] : array();
 		$pref = isset($pref['board_notify_' . $board]) ? $pref['board_notify_' . $board] : (!empty($pref['board_notify']) ? $pref['board_notify'] : 0);
 		$context['board_notification_mode'] = !$context['is_marked_notify'] ? 1 : ($pref & 0x02 ? 3 : ($pref & 0x01 ? 2 : 1));
-	}
-	else
+	} else
 	{
 		$context['is_marked_notify'] = false;
 		$context['board_notification_mode'] = 1;
@@ -714,23 +747,27 @@ 
 	$context['becomesUnapproved'] = !empty($_SESSION['becomesUnapproved']) ? true : false;
 
 	// Don't want to show this forever...
-	if ($context['becomesUnapproved'])
-		unset($_SESSION['becomesUnapproved']);
+	if ($context['becomesUnapproved']) {
+			unset($_SESSION['becomesUnapproved']);
+	}
 
 	// Build the message index button array.
 	$context['normal_buttons'] = array();
 	
-	if ($context['can_post_new'])
-		$context['normal_buttons']['new_topic'] = array('text' => 'new_topic', 'image' => 'new_topic.png', 'lang' => true, 'url' => $scripturl . '?action=post;board=' . $context['current_board'] . '.0', 'active' => true);
+	if ($context['can_post_new']) {
+			$context['normal_buttons']['new_topic'] = array('text' => 'new_topic', 'image' => 'new_topic.png', 'lang' => true, 'url' => $scripturl . '?action=post;board=' . $context['current_board'] . '.0', 'active' => true);
+	}
 	
-	if ($context['can_post_poll'])
-		$context['normal_buttons']['post_poll'] = array('text' => 'new_poll', 'image' => 'new_poll.png', 'lang' => true, 'url' => $scripturl . '?action=post;board=' . $context['current_board'] . '.0;poll');
+	if ($context['can_post_poll']) {
+			$context['normal_buttons']['post_poll'] = array('text' => 'new_poll', 'image' => 'new_poll.png', 'lang' => true, 'url' => $scripturl . '?action=post;board=' . $context['current_board'] . '.0;poll');
+	}
 	
-	if (!$context['user']['is_logged'])
-		$context['normal_buttons']['markread'] = array('text' => 'mark_read_short', 'image' => 'markread.png', 'lang' => true, 'custom' => 'data-confirm="' . $txt['are_sure_mark_read'] . '"', 'class' => 'you_sure', 'url' => $scripturl . '?action=markasread;sa=board;board=' . $context['current_board'] . '.0;' . $context['session_var'] . '=' . $context['session_id']);
+	if (!$context['user']['is_logged']) {
+			$context['normal_buttons']['markread'] = array('text' => 'mark_read_short', 'image' => 'markread.png', 'lang' => true, 'custom' => 'data-confirm="' . $txt['are_sure_mark_read'] . '"', 'class' => 'you_sure', 'url' => $scripturl . '?action=markasread;sa=board;board=' . $context['current_board'] . '.0;' . $context['session_var'] . '=' . $context['session_id']);
+	}
 
-	if ($context['can_mark_notify'])
-		$context['normal_buttons']['notify'] = array(
+	if ($context['can_mark_notify']) {
+			$context['normal_buttons']['notify'] = array(
 			'lang' => true,
 			'text' => 'notify_board_' . $context['board_notification_mode'],
 			'sub_buttons' => array(
@@ -748,6 +785,7 @@ 
 				),
 			),
 		);
+	}
 
 	// Javascript for inline editing.
 	loadJavaScriptFile('topic.js', array('defer' => false), 'smf_topic');
@@ -769,18 +807,21 @@ 
 	checkSession('request');
 
 	// Lets go straight to the restore area.
-	if (isset($_REQUEST['qaction']) && $_REQUEST['qaction'] == 'restore' && !empty($_REQUEST['topics']))
-		redirectexit('action=restoretopic;topics=' . implode(',', $_REQUEST['topics']) . ';' . $context['session_var'] . '=' . $context['session_id']);
+	if (isset($_REQUEST['qaction']) && $_REQUEST['qaction'] == 'restore' && !empty($_REQUEST['topics'])) {
+			redirectexit('action=restoretopic;topics=' . implode(',', $_REQUEST['topics']) . ';' . $context['session_var'] . '=' . $context['session_id']);
+	}
 
-	if (isset($_SESSION['topicseen_cache']))
-		$_SESSION['topicseen_cache'] = array();
+	if (isset($_SESSION['topicseen_cache'])) {
+			$_SESSION['topicseen_cache'] = array();
+	}
 
 	// This is going to be needed to send off the notifications and for updateLastMessages().
 	require_once($sourcedir . '/Subs-Post.php');
 
 	// Remember the last board they moved things to.
-	if (isset($_REQUEST['move_to']))
-		$_SESSION['move_to_topic'] = $_REQUEST['move_to'];
+	if (isset($_REQUEST['move_to'])) {
+			$_SESSION['move_to_topic'] = $_REQUEST['move_to'];
+	}
 
 	// Only a few possible actions.
 	$possibleActions = array();
@@ -800,8 +841,7 @@ 
 		);
 
 		$redirect_url = 'board=' . $board . '.' . $_REQUEST['start'];
-	}
-	else
+	} else
 	{
 		/**
 		 * @todo Ugly. There's no getting around this, is there?
@@ -819,8 +859,7 @@ 
 		if (!empty($board))
 		{
 			$boards_can['post_new'] = array_diff(boardsAllowedTo('post_new'), array($board));
-		}
-		else
+		} else
 		{
 			$boards_can['post_new'] = boardsAllowedTo('post_new');
 		}
@@ -831,55 +870,67 @@ 
 		}
 	}
 
-	if (!$user_info['is_guest'])
-		$possibleActions[] = 'markread';
-	if (!empty($boards_can['make_sticky']))
-		$possibleActions[] = 'sticky';
-	if (!empty($boards_can['move_any']) || !empty($boards_can['move_own']))
-		$possibleActions[] = 'move';
-	if (!empty($boards_can['remove_any']) || !empty($boards_can['remove_own']))
-		$possibleActions[] = 'remove';
-	if (!empty($boards_can['lock_any']) || !empty($boards_can['lock_own']))
-		$possibleActions[] = 'lock';
-	if (!empty($boards_can['merge_any']))
-		$possibleActions[] = 'merge';
-	if (!empty($boards_can['approve_posts']))
-		$possibleActions[] = 'approve';
+	if (!$user_info['is_guest']) {
+			$possibleActions[] = 'markread';
+	}
+	if (!empty($boards_can['make_sticky'])) {
+			$possibleActions[] = 'sticky';
+	}
+	if (!empty($boards_can['move_any']) || !empty($boards_can['move_own'])) {
+			$possibleActions[] = 'move';
+	}
+	if (!empty($boards_can['remove_any']) || !empty($boards_can['remove_own'])) {
+			$possibleActions[] = 'remove';
+	}
+	if (!empty($boards_can['lock_any']) || !empty($boards_can['lock_own'])) {
+			$possibleActions[] = 'lock';
+	}
+	if (!empty($boards_can['merge_any'])) {
+			$possibleActions[] = 'merge';
+	}
+	if (!empty($boards_can['approve_posts'])) {
+			$possibleActions[] = 'approve';
+	}
 
 	// Two methods: $_REQUEST['actions'] (id_topic => action), and $_REQUEST['topics'] and $_REQUEST['qaction'].
 	// (if action is 'move', $_REQUEST['move_to'] or $_REQUEST['move_tos'][$topic] is used.)
 	if (!empty($_REQUEST['topics']))
 	{
 		// If the action isn't valid, just quit now.
-		if (empty($_REQUEST['qaction']) || !in_array($_REQUEST['qaction'], $possibleActions))
-			redirectexit($redirect_url);
+		if (empty($_REQUEST['qaction']) || !in_array($_REQUEST['qaction'], $possibleActions)) {
+					redirectexit($redirect_url);
+		}
 
 		// Merge requires all topics as one parameter and can be done at once.
 		if ($_REQUEST['qaction'] == 'merge')
 		{
 			// Merge requires at least two topics.
-			if (empty($_REQUEST['topics']) || count($_REQUEST['topics']) < 2)
-				redirectexit($redirect_url);
+			if (empty($_REQUEST['topics']) || count($_REQUEST['topics']) < 2) {
+							redirectexit($redirect_url);
+			}
 
 			require_once($sourcedir . '/SplitTopics.php');
 			return MergeExecute($_REQUEST['topics']);
 		}
 
 		// Just convert to the other method, to make it easier.
-		foreach ($_REQUEST['topics'] as $topic)
-			$_REQUEST['actions'][(int) $topic] = $_REQUEST['qaction'];
+		foreach ($_REQUEST['topics'] as $topic) {
+					$_REQUEST['actions'][(int) $topic] = $_REQUEST['qaction'];
+		}
 	}
 
 	// Weird... how'd you get here?
-	if (empty($_REQUEST['actions']))
-		redirectexit($redirect_url);
+	if (empty($_REQUEST['actions'])) {
+			redirectexit($redirect_url);
+	}
 
 	// Validate each action.
 	$temp = array();
 	foreach ($_REQUEST['actions'] as $topic => $action)
 	{
-		if (in_array($action, $possibleActions))
-			$temp[(int) $topic] = $action;
+		if (in_array($action, $possibleActions)) {
+					$temp[(int) $topic] = $action;
+		}
 	}
 	$_REQUEST['actions'] = $temp;
 
@@ -900,27 +951,31 @@ 
 		{
 			if (!empty($board))
 			{
-				if ($row['id_board'] != $board || ($modSettings['postmod_active'] && !$row['approved'] && !allowedTo('approve_posts')))
-					unset($_REQUEST['actions'][$row['id_topic']]);
-			}
-			else
+				if ($row['id_board'] != $board || ($modSettings['postmod_active'] && !$row['approved'] && !allowedTo('approve_posts'))) {
+									unset($_REQUEST['actions'][$row['id_topic']]);
+				}
+			} else
 			{
 				// Don't allow them to act on unapproved posts they can't see...
-				if ($modSettings['postmod_active'] && !$row['approved'] && !in_array(0, $boards_can['approve_posts']) && !in_array($row['id_board'], $boards_can['approve_posts']))
-					unset($_REQUEST['actions'][$row['id_topic']]);
+				if ($modSettings['postmod_active'] && !$row['approved'] && !in_array(0, $boards_can['approve_posts']) && !in_array($row['id_board'], $boards_can['approve_posts'])) {
+									unset($_REQUEST['actions'][$row['id_topic']]);
+				}
 				// Goodness, this is fun.  We need to validate the action.
-				elseif ($_REQUEST['actions'][$row['id_topic']] == 'sticky' && !in_array(0, $boards_can['make_sticky']) && !in_array($row['id_board'], $boards_can['make_sticky']))
-					unset($_REQUEST['actions'][$row['id_topic']]);
-				elseif ($_REQUEST['actions'][$row['id_topic']] == 'move' && !in_array(0, $boards_can['move_any']) && !in_array($row['id_board'], $boards_can['move_any']) && ($row['id_member_started'] != $user_info['id'] || (!in_array(0, $boards_can['move_own']) && !in_array($row['id_board'], $boards_can['move_own']))))
-					unset($_REQUEST['actions'][$row['id_topic']]);
-				elseif ($_REQUEST['actions'][$row['id_topic']] == 'remove' && !in_array(0, $boards_can['remove_any']) && !in_array($row['id_board'], $boards_can['remove_any']) && ($row['id_member_started'] != $user_info['id'] || (!in_array(0, $boards_can['remove_own']) && !in_array($row['id_board'], $boards_can['remove_own']))))
-					unset($_REQUEST['actions'][$row['id_topic']]);
+				elseif ($_REQUEST['actions'][$row['id_topic']] == 'sticky' && !in_array(0, $boards_can['make_sticky']) && !in_array($row['id_board'], $boards_can['make_sticky'])) {
+									unset($_REQUEST['actions'][$row['id_topic']]);
+				} elseif ($_REQUEST['actions'][$row['id_topic']] == 'move' && !in_array(0, $boards_can['move_any']) && !in_array($row['id_board'], $boards_can['move_any']) && ($row['id_member_started'] != $user_info['id'] || (!in_array(0, $boards_can['move_own']) && !in_array($row['id_board'], $boards_can['move_own'])))) {
+									unset($_REQUEST['actions'][$row['id_topic']]);
+				} elseif ($_REQUEST['actions'][$row['id_topic']] == 'remove' && !in_array(0, $boards_can['remove_any']) && !in_array($row['id_board'], $boards_can['remove_any']) && ($row['id_member_started'] != $user_info['id'] || (!in_array(0, $boards_can['remove_own']) && !in_array($row['id_board'], $boards_can['remove_own'])))) {
+									unset($_REQUEST['actions'][$row['id_topic']]);
+				}
 				// @todo $locked is not set, what are you trying to do? (taking the change it is supposed to be $row['locked'])
-				elseif ($_REQUEST['actions'][$row['id_topic']] == 'lock' && !in_array(0, $boards_can['lock_any']) && !in_array($row['id_board'], $boards_can['lock_any']) && ($row['id_member_started'] != $user_info['id'] || $row['locked'] == 1 || (!in_array(0, $boards_can['lock_own']) && !in_array($row['id_board'], $boards_can['lock_own']))))
-					unset($_REQUEST['actions'][$row['id_topic']]);
+				elseif ($_REQUEST['actions'][$row['id_topic']] == 'lock' && !in_array(0, $boards_can['lock_any']) && !in_array($row['id_board'], $boards_can['lock_any']) && ($row['id_member_started'] != $user_info['id'] || $row['locked'] == 1 || (!in_array(0, $boards_can['lock_own']) && !in_array($row['id_board'], $boards_can['lock_own'])))) {
+									unset($_REQUEST['actions'][$row['id_topic']]);
+				}
 				// If the topic is approved then you need permission to approve the posts within.
-				elseif ($_REQUEST['actions'][$row['id_topic']] == 'approve' && (!$row['unapproved_posts'] || (!in_array(0, $boards_can['approve_posts']) && !in_array($row['id_board'], $boards_can['approve_posts']))))
-					unset($_REQUEST['actions'][$row['id_topic']]);
+				elseif ($_REQUEST['actions'][$row['id_topic']] == 'approve' && (!$row['unapproved_posts'] || (!in_array(0, $boards_can['approve_posts']) && !in_array($row['id_board'], $boards_can['approve_posts'])))) {
+									unset($_REQUEST['actions'][$row['id_topic']]);
+				}
 			}
 		}
 		$smcFunc['db_free_result']($request);
@@ -938,11 +993,11 @@ 
 	{
 		$topic = (int) $topic;
 
-		if ($action == 'markread')
-			$markCache[] = $topic;
-		elseif ($action == 'sticky')
-			$stickyCache[] = $topic;
-		elseif ($action == 'move')
+		if ($action == 'markread') {
+					$markCache[] = $topic;
+		} elseif ($action == 'sticky') {
+					$stickyCache[] = $topic;
+		} elseif ($action == 'move')
 		{
 			require_once($sourcedir . '/MoveTopic.php');
 			moveTopicConcurrence();
@@ -950,23 +1005,25 @@ 
 			// $moveCache[0] is the topic, $moveCache[1] is the board to move to.
 			$moveCache[1][$topic] = (int) (isset($_REQUEST['move_tos'][$topic]) ? $_REQUEST['move_tos'][$topic] : $_REQUEST['move_to']);
 
-			if (empty($moveCache[1][$topic]))
-				continue;
+			if (empty($moveCache[1][$topic])) {
+							continue;
+			}
 
 			$moveCache[0][] = $topic;
+		} elseif ($action == 'remove') {
+					$removeCache[] = $topic;
+		} elseif ($action == 'lock') {
+					$lockCache[] = $topic;
+		} elseif ($action == 'approve') {
+					$approveCache[] = $topic;
 		}
-		elseif ($action == 'remove')
-			$removeCache[] = $topic;
-		elseif ($action == 'lock')
-			$lockCache[] = $topic;
-		elseif ($action == 'approve')
-			$approveCache[] = $topic;
 	}
 
-	if (empty($board))
-		$affectedBoards = array();
-	else
-		$affectedBoards = array($board => array(0, 0));
+	if (empty($board)) {
+			$affectedBoards = array();
+	} else {
+			$affectedBoards = array($board => array(0, 0));
+	}
 
 	// Do all the stickies...
 	if (!empty($stickyCache))
@@ -1026,14 +1083,16 @@ 
 		{
 			$to = $moveCache[1][$row['id_topic']];
 
-			if (empty($to))
-				continue;
+			if (empty($to)) {
+							continue;
+			}
 
 			// Does this topic's board count the posts or not?
 			$countPosts[$row['id_topic']] = empty($row['count_posts']);
 
-			if (!isset($moveTos[$to]))
-				$moveTos[$to] = array();
+			if (!isset($moveTos[$to])) {
+							$moveTos[$to] = array();
+			}
 
 			$moveTos[$to][] = $row['id_topic'];
 
@@ -1047,8 +1106,9 @@ 
 		require_once($sourcedir . '/MoveTopic.php');
 
 		// Do the actual moves...
-		foreach ($moveTos as $to => $topics)
-			moveTopics($topics, $to);
+		foreach ($moveTos as $to => $topics) {
+					moveTopics($topics, $to);
+		}
 
 		// Does the post counts need to be updated?
 		if (!empty($moveTos))
@@ -1097,20 +1157,23 @@ 
 
 				while ($row = $smcFunc['db_fetch_assoc']($request))
 				{
-					if (!isset($members[$row['id_member']]))
-						$members[$row['id_member']] = 0;
+					if (!isset($members[$row['id_member']])) {
+											$members[$row['id_member']] = 0;
+					}
 
-					if ($topicRecounts[$row['id_topic']] === '+')
-						$members[$row['id_member']] += 1;
-					else
-						$members[$row['id_member']] -= 1;
+					if ($topicRecounts[$row['id_topic']] === '+') {
+											$members[$row['id_member']] += 1;
+					} else {
+											$members[$row['id_member']] -= 1;
+					}
 				}
 
 				$smcFunc['db_free_result']($request);
 
 				// And now update them member's post counts
-				foreach ($members as $id_member => $post_adj)
-					updateMemberData($id_member, array('posts' => 'posts + ' . $post_adj));
+				foreach ($members as $id_member => $post_adj) {
+									updateMemberData($id_member, array('posts' => 'posts + ' . $post_adj));
+				}
 
 			}
 		}
@@ -1190,8 +1253,9 @@ 
 			approveTopics($approveCache);
 
 			// Time for some logging!
-			foreach ($approveCache as $topic)
-				logAction('approve_topic', array('topic' => $topic, 'member' => $approveCacheMembers[$topic]));
+			foreach ($approveCache as $topic) {
+							logAction('approve_topic', array('topic' => $topic, 'member' => $approveCacheMembers[$topic]));
+			}
 		}
 	}
 
@@ -1226,8 +1290,7 @@ 
 				$lockStatus[$row['id_topic']] = empty($row['locked']);
 			}
 			$smcFunc['db_free_result']($result);
-		}
-		else
+		} else
 		{
 			$result = $smcFunc['db_query']('', '
 				SELECT id_topic, locked, id_board
@@ -1277,13 +1340,15 @@ 
 			)
 		);
 		$logged_topics = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$logged_topics[$row['id_topic']] = $row['unwatched'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$logged_topics[$row['id_topic']] = $row['unwatched'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		$markArray = array();
-		foreach ($markCache as $topic)
-			$markArray[] = array($modSettings['maxMsgID'], $user_info['id'], $topic, (isset($logged_topics[$topic]) ? $logged_topics[$topic] : 0));
+		foreach ($markCache as $topic) {
+					$markArray[] = array($modSettings['maxMsgID'], $user_info['id'], $topic, (isset($logged_topics[$topic]) ? $logged_topics[$topic] : 0));
+		}
 
 		$smcFunc['db_insert']('replace',
 			'{db_prefix}log_topics',
@@ -1296,8 +1361,9 @@ 
 	foreach ($moveCache as $topic)
 	{
 		// Didn't actually move anything!
-		if (!isset($topic[0]))
-			break;
+		if (!isset($topic[0])) {
+					break;
+		}
 
 		logAction('move', array('topic' => $topic[0], 'board_from' => $topic[1], 'board_to' => $topic[2]));
 		sendNotifications($topic[0], 'move');
@@ -1319,8 +1385,9 @@ 
 		'calendar_updated' => time(),
 	));
 
-	if (!empty($affectedBoards))
-		updateLastMessages(array_keys($affectedBoards));
+	if (!empty($affectedBoards)) {
+			updateLastMessages(array_keys($affectedBoards));
+	}
 
 	redirectexit($redirect_url);
 }

Sources/MoveTopic.php

Braces +101 added lines, -72 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * This function allows to move a topic, making sure to ask the moderator
@@ -32,8 +33,9 @@ 
 {
 	global $txt, $board, $topic, $user_info, $context, $language, $scripturl, $smcFunc, $modSettings, $sourcedir;
 
-	if (empty($topic))
-		fatal_lang_error('no_access', false);
+	if (empty($topic)) {
+			fatal_lang_error('no_access', false);
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT t.id_member_started, ms.subject, t.approved
@@ -49,8 +51,9 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// Can they see it - if not approved?
-	if ($modSettings['postmod_active'] && !$context['is_approved'])
-		isAllowedTo('approve_posts');
+	if ($modSettings['postmod_active'] && !$context['is_approved']) {
+			isAllowedTo('approve_posts');
+	}
 
 	// Permission check!
 	// @todo
@@ -59,9 +62,9 @@ 
 		if ($id_member_started == $user_info['id'])
 		{
 			isAllowedTo('move_own');
+		} else {
+					isAllowedTo('move_any');
 		}
-		else
-			isAllowedTo('move_any');
 	}
 
 	$context['move_any'] = $user_info['is_admin'] || $modSettings['topic_move_any'];
@@ -83,11 +86,13 @@ 
 		'not_redirection' => true,
 	);
 
-	if (!empty($_SESSION['move_to_topic']) && $_SESSION['move_to_topic'] != $board)
-		$options['selected_board'] = $_SESSION['move_to_topic'];
+	if (!empty($_SESSION['move_to_topic']) && $_SESSION['move_to_topic'] != $board) {
+			$options['selected_board'] = $_SESSION['move_to_topic'];
+	}
 
-	if (!$context['move_any'])
-		$options['included_boards'] = $boards;
+	if (!$context['move_any']) {
+			$options['included_boards'] = $boards;
+	}
 
 	require_once($sourcedir . '/Subs-MessageIndex.php');
 	$context['categories'] = getBoardList($options);
@@ -138,12 +143,14 @@ 
 	global $txt, $board, $topic, $scripturl, $sourcedir, $modSettings, $context;
 	global $board, $language, $user_info, $smcFunc;
 
-	if (empty($topic))
-		fatal_lang_error('no_access', false);
+	if (empty($topic)) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// You can't choose to have a redirection topic and use an empty reason.
-	if (isset($_POST['postRedirect']) && (!isset($_POST['reason']) || trim($_POST['reason']) == ''))
-		fatal_lang_error('movetopic_no_reason', false);
+	if (isset($_POST['postRedirect']) && (!isset($_POST['reason']) || trim($_POST['reason']) == '')) {
+			fatal_lang_error('movetopic_no_reason', false);
+	}
 
 	moveTopicConcurrence();
 
@@ -163,16 +170,18 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// Can they see it?
-	if (!$context['is_approved'])
-		isAllowedTo('approve_posts');
+	if (!$context['is_approved']) {
+			isAllowedTo('approve_posts');
+	}
 
 	// Can they move topics on this board?
 	if (!allowedTo('move_any'))
 	{
-		if ($id_member_started == $user_info['id'])
-			isAllowedTo('move_own');
-		else
-			isAllowedTo('move_any');
+		if ($id_member_started == $user_info['id']) {
+					isAllowedTo('move_own');
+		} else {
+					isAllowedTo('move_any');
+		}
 	}
 
 	checkSession();
@@ -197,8 +206,9 @@ 
 			'blank_redirect' => '',
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('no_board');
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('no_board');
+	}
 	list ($pcounter, $board_name, $subject) = $smcFunc['db_fetch_row']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -210,8 +220,9 @@ 
 	{
 		$_POST['custom_subject'] = strtr($smcFunc['htmltrim']($smcFunc['htmlspecialchars']($_POST['custom_subject'])), array("\r" => '', "\n" => '', "\t" => ''));
 		// Keep checking the length.
-		if ($smcFunc['strlen']($_POST['custom_subject']) > 100)
-			$_POST['custom_subject'] = $smcFunc['substr']($_POST['custom_subject'], 0, 100);
+		if ($smcFunc['strlen']($_POST['custom_subject']) > 100) {
+					$_POST['custom_subject'] = $smcFunc['substr']($_POST['custom_subject'], 0, 100);
+		}
 
 		// If it's still valid move onwards and upwards.
 		if ($_POST['custom_subject'] != '')
@@ -221,9 +232,9 @@ 
 				// Get a response prefix, but in the forum's default language.
 				if (!isset($context['response_prefix']) && !($context['response_prefix'] = cache_get_data('response_prefix')))
 				{
-					if ($language === $user_info['language'])
-						$context['response_prefix'] = $txt['response_prefix'];
-					else
+					if ($language === $user_info['language']) {
+											$context['response_prefix'] = $txt['response_prefix'];
+					} else
 					{
 						loadLanguage('index', $language, false);
 						$context['response_prefix'] = $txt['response_prefix'];
@@ -263,8 +274,9 @@ 
 	if (isset($_POST['postRedirect']))
 	{
 		// Should be in the boardwide language.
-		if ($user_info['language'] != $language)
-			loadLanguage('index', $language);
+		if ($user_info['language'] != $language) {
+					loadLanguage('index', $language);
+		}
 
 		$_POST['reason'] = $smcFunc['htmlspecialchars']($_POST['reason'], ENT_QUOTES);
 		preparsecode($_POST['reason']);
@@ -328,8 +340,9 @@ 
 		$posters = array();
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (!isset($posters[$row['id_member']]))
-				$posters[$row['id_member']] = 0;
+			if (!isset($posters[$row['id_member']])) {
+							$posters[$row['id_member']] = 0;
+			}
 
 			$posters[$row['id_member']]++;
 		}
@@ -338,11 +351,13 @@ 
 		foreach ($posters as $id_member => $posts)
 		{
 			// The board we're moving from counted posts, but not to.
-			if (empty($pcounter_from))
-				updateMemberData($id_member, array('posts' => 'posts - ' . $posts));
+			if (empty($pcounter_from)) {
+							updateMemberData($id_member, array('posts' => 'posts - ' . $posts));
+			}
 			// The reverse: from didn't, to did.
-			else
-				updateMemberData($id_member, array('posts' => 'posts + ' . $posts));
+			else {
+							updateMemberData($id_member, array('posts' => 'posts + ' . $posts));
+			}
 		}
 	}
 
@@ -350,17 +365,19 @@ 
 	moveTopics($topic, $_POST['toboard']);
 
 	// Log that they moved this topic.
-	if (!allowedTo('move_own') || $id_member_started != $user_info['id'])
-		logAction('move', array('topic' => $topic, 'board_from' => $board, 'board_to' => $_POST['toboard']));
+	if (!allowedTo('move_own') || $id_member_started != $user_info['id']) {
+			logAction('move', array('topic' => $topic, 'board_from' => $board, 'board_to' => $_POST['toboard']));
+	}
 	// Notify people that this topic has been moved?
 	sendNotifications($topic, 'move');
 
 	// Why not go back to the original board in case they want to keep moving?
-	if (!isset($_REQUEST['goback']))
-		redirectexit('board=' . $board . '.0');
-	else
-		redirectexit('topic=' . $topic . '.0');
-}
+	if (!isset($_REQUEST['goback'])) {
+			redirectexit('board=' . $board . '.0');
+	} else {
+			redirectexit('topic=' . $topic . '.0');
+	}
+	}
 
 /**
  * Moves one or more topics to a specific board. (doesn't check permissions.)
@@ -376,18 +393,21 @@ 
 	global $sourcedir, $user_info, $modSettings, $smcFunc;
 
 	// Empty array?
-	if (empty($topics))
-		return;
+	if (empty($topics)) {
+			return;
+	}
 
 	// Only a single topic.
-	if (is_numeric($topics))
-		$topics = array($topics);
+	if (is_numeric($topics)) {
+			$topics = array($topics);
+	}
 
 	$fromBoards = array();
 
 	// Destination board empty or equal to 0?
-	if (empty($toBoard))
-		return;
+	if (empty($toBoard)) {
+			return;
+	}
 
 	// Are we moving to the recycle board?
 	$isRecycleDest = !empty($modSettings['recycle_enable']) && $modSettings['recycle_board'] == $toBoard;
@@ -395,8 +415,9 @@ 
 	// Callback for search APIs to do their thing
 	require_once($sourcedir . '/Search.php');
 	$searchAPI = findSearchAPI();
-	if ($searchAPI->supportsMethod('topicsMoved'))
-		$searchAPI->topicsMoved($topics, $toBoard);
+	if ($searchAPI->supportsMethod('topicsMoved')) {
+			$searchAPI->topicsMoved($topics, $toBoard);
+	}
 
 	// Determine the source boards...
 	$request = $smcFunc['db_query']('', '
@@ -410,8 +431,9 @@ 
 		)
 	);
 	// Num of rows = 0 -> no topics found. Num of rows > 1 -> topics are on multiple boards.
-	if ($smcFunc['db_num_rows']($request) == 0)
-		return;
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			return;
+	}
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		if (!isset($fromBoards[$row['id_board']]['num_posts']))
@@ -429,10 +451,11 @@ 
 		$fromBoards[$row['id_board']]['unapproved_posts'] += $row['unapproved_posts'];
 
 		// Add the topics to the right type.
-		if ($row['approved'])
-			$fromBoards[$row['id_board']]['num_topics'] += $row['num_topics'];
-		else
-			$fromBoards[$row['id_board']]['unapproved_topics'] += $row['num_topics'];
+		if ($row['approved']) {
+					$fromBoards[$row['id_board']]['num_topics'] += $row['num_topics'];
+		} else {
+					$fromBoards[$row['id_board']]['unapproved_topics'] += $row['num_topics'];
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -558,13 +581,14 @@ 
 			)
 		);
 		$approval_msgs = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$approval_msgs[] = $row['id_msg'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$approval_msgs[] = $row['id_msg'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Empty the approval queue for these, as we're going to approve them next.
-		if (!empty($approval_msgs))
-			$smcFunc['db_query']('', '
+		if (!empty($approval_msgs)) {
+					$smcFunc['db_query']('', '
 				DELETE FROM {db_prefix}approval_queue
 				WHERE id_msg IN ({array_int:message_list})
 					AND id_attach = {int:id_attach}',
@@ -573,6 +597,7 @@ 
 					'id_attach' => 0,
 				)
 			);
+		}
 
 		// Get all the current max and mins.
 		$request = $smcFunc['db_query']('', '
@@ -606,8 +631,8 @@ 
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
 			// If not, update.
-			if ($row['first_msg'] != $topicMaxMin[$row['id_topic']]['min'] || $row['last_msg'] != $topicMaxMin[$row['id_topic']]['max'])
-				$smcFunc['db_query']('', '
+			if ($row['first_msg'] != $topicMaxMin[$row['id_topic']]['min'] || $row['last_msg'] != $topicMaxMin[$row['id_topic']]['max']) {
+							$smcFunc['db_query']('', '
 					UPDATE {db_prefix}topics
 					SET id_first_msg = {int:first_msg}, id_last_msg = {int:last_msg}
 					WHERE id_topic = {int:selected_topic}',
@@ -617,6 +642,7 @@ 
 						'selected_topic' => $row['id_topic'],
 					)
 				);
+			}
 		}
 		$smcFunc['db_free_result']($request);
 	}
@@ -675,9 +701,10 @@ 
 	}
 
 	// Update the cache?
-	if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 3)
-		foreach ($topics as $topic_id)
+	if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 3) {
+			foreach ($topics as $topic_id)
 			cache_put_data('topic_board-' . $topic_id, null, 120);
+	}
 
 	require_once($sourcedir . '/Subs-Post.php');
 
@@ -701,15 +728,17 @@ 
 {
 	global $board, $topic, $smcFunc, $scripturl;
 
-	if (isset($_GET['current_board']))
-		$move_from = (int) $_GET['current_board'];
+	if (isset($_GET['current_board'])) {
+			$move_from = (int) $_GET['current_board'];
+	}
 
-	if (empty($move_from) || empty($board) || empty($topic))
-		return true;
+	if (empty($move_from) || empty($board) || empty($topic)) {
+			return true;
+	}
 
-	if ($move_from == $board)
-		return true;
-	else
+	if ($move_from == $board) {
+			return true;
+	} else
 	{
 		$request = $smcFunc['db_query']('', '
 			SELECT m.subject, b.name

Sources/Session.php

Braces +31 added lines, -21 removed lines

@@ -17,8 +17,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Attempt to start the session, unless it already has been.
@@ -38,8 +39,9 @@ 
 	{
 		$parsed_url = parse_url($boardurl);
 
-		if (preg_match('~^\d{1,3}(\.\d{1,3}){3}$~', $parsed_url['host']) == 0 && preg_match('~(?:[^\.]+\.)?([^\.]{2,}\..+)\z~i', $parsed_url['host'], $parts) == 1)
-			@ini_set('session.cookie_domain', '.' . $parts[1]);
+		if (preg_match('~^\d{1,3}(\.\d{1,3}){3}$~', $parsed_url['host']) == 0 && preg_match('~(?:[^\.]+\.)?([^\.]{2,}\..+)\z~i', $parsed_url['host'], $parts) == 1) {
+					@ini_set('session.cookie_domain', '.' . $parts[1]);
+		}
 	}
 	// @todo Set the session cookie path?
 
@@ -47,8 +49,9 @@ 
 	if ((ini_get('session.auto_start') == 1 && !empty($modSettings['databaseSession_enable'])) || session_id() == '')
 	{
 		// Attempt to end the already-started session.
-		if (ini_get('session.auto_start') == 1)
-			session_write_close();
+		if (ini_get('session.auto_start') == 1) {
+					session_write_close();
+		}
 
 		// This is here to stop people from using bad junky PHPSESSIDs.
 		if (isset($_REQUEST[session_name()]) && preg_match('~^[A-Za-z0-9,-]{16,64}$~', $_REQUEST[session_name()]) == 0 && !isset($_COOKIE[session_name()]))
@@ -65,19 +68,21 @@ 
 			@ini_set('session.serialize_handler', 'php');
 			session_set_save_handler('sessionOpen', 'sessionClose', 'sessionRead', 'sessionWrite', 'sessionDestroy', 'sessionGC');
 			@ini_set('session.gc_probability', '1');
+		} elseif (ini_get('session.gc_maxlifetime') <= 1440 && !empty($modSettings['databaseSession_lifetime'])) {
+					@ini_set('session.gc_maxlifetime', max($modSettings['databaseSession_lifetime'], 60));
 		}
-		elseif (ini_get('session.gc_maxlifetime') <= 1440 && !empty($modSettings['databaseSession_lifetime']))
-			@ini_set('session.gc_maxlifetime', max($modSettings['databaseSession_lifetime'], 60));
 
 		// Use cache setting sessions?
-		if (empty($modSettings['databaseSession_enable']) && !empty($modSettings['cache_enable']) && php_sapi_name() != 'cli')
-			call_integration_hook('integrate_session_handlers');
+		if (empty($modSettings['databaseSession_enable']) && !empty($modSettings['cache_enable']) && php_sapi_name() != 'cli') {
+					call_integration_hook('integrate_session_handlers');
+		}
 
 		session_start();
 
 		// Change it so the cache settings are a little looser than default.
-		if (!empty($modSettings['databaseSession_loose']))
-			header('Cache-Control: private');
+		if (!empty($modSettings['databaseSession_loose'])) {
+					header('Cache-Control: private');
+		}
 	}
 
 	// Set the randomly generated code.
@@ -123,8 +128,9 @@ 
 {
 	global $smcFunc;
 
-	if (preg_match('~^[A-Za-z0-9,-]{16,64}$~', $session_id) == 0)
-		return '';
+	if (preg_match('~^[A-Za-z0-9,-]{16,64}$~', $session_id) == 0) {
+			return '';
+	}
 
 	// Look for it in the database.
 	$result = $smcFunc['db_query']('', '
@@ -153,8 +159,9 @@ 
 {
 	global $smcFunc;
 
-	if (preg_match('~^[A-Za-z0-9,-]{16,64}$~', $session_id) == 0)
-		return false;
+	if (preg_match('~^[A-Za-z0-9,-]{16,64}$~', $session_id) == 0) {
+			return false;
+	}
 
 	// First try to update an existing row...
 	$smcFunc['db_query']('', '
@@ -169,13 +176,14 @@ 
 	);
 
 	// If that didn't work, try inserting a new one.
-	if ($smcFunc['db_affected_rows']() == 0)
-		$smcFunc['db_insert']('ignore',
+	if ($smcFunc['db_affected_rows']() == 0) {
+			$smcFunc['db_insert']('ignore',
 			'{db_prefix}sessions',
 			array('session_id' => 'string', 'data' => 'string', 'last_update' => 'int'),
 			array($session_id, $data, time()),
 			array('session_id')
 		);
+	}
 
 	return ($smcFunc['db_affected_rows']() == 0 ? false : true);
 }
@@ -190,8 +198,9 @@ 
 {
 	global $smcFunc;
 
-	if (preg_match('~^[A-Za-z0-9,-]{16,64}$~', $session_id) == 0)
-		return false;
+	if (preg_match('~^[A-Za-z0-9,-]{16,64}$~', $session_id) == 0) {
+			return false;
+	}
 
 	// Just delete the row...
 	$smcFunc['db_query']('', '
@@ -217,8 +226,9 @@ 
 	global $modSettings, $smcFunc;
 
 	// Just set to the default or lower?  Ignore it for a higher value. (hopefully)
-	if (!empty($modSettings['databaseSession_lifetime']) && ($max_lifetime <= 1440 || $modSettings['databaseSession_lifetime'] > $max_lifetime))
-		$max_lifetime = max($modSettings['databaseSession_lifetime'], 60);
+	if (!empty($modSettings['databaseSession_lifetime']) && ($max_lifetime <= 1440 || $modSettings['databaseSession_lifetime'] > $max_lifetime)) {
+			$max_lifetime = max($modSettings['databaseSession_lifetime'], 60);
+	}
 
 	// Clean up after yerself ;).
 	$smcFunc['db_query']('', '

Sources/ManageSmileys.php

Braces +297 added lines, -211 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * This is the dispatcher of smileys administration.
@@ -91,8 +92,9 @@ 
 	);
 
 	// Some settings may not be enabled, disallow these from the tabs as appropriate.
-	if (empty($modSettings['messageIcons_enable']))
-		$context[$context['admin_menu_name']]['tab_data']['tabs']['editicons']['disabled'] = true;
+	if (empty($modSettings['messageIcons_enable'])) {
+			$context[$context['admin_menu_name']]['tab_data']['tabs']['editicons']['disabled'] = true;
+	}
 	if (empty($modSettings['smiley_enable']))
 	{
 		$context[$context['admin_menu_name']]['tab_data']['tabs']['addsmiley']['disabled'] = true;
@@ -125,8 +127,9 @@ 
 	$set_names = explode("\n", $modSettings['smiley_sets_names']);
 
 	$smiley_context = array();
-	foreach ($smiley_sets as $i => $set)
-		$smiley_context[$set] = $set_names[$i];
+	foreach ($smiley_sets as $i => $set) {
+			$smiley_context[$set] = $set_names[$i];
+	}
 
 	// All the settings for the page...
 	$config_vars = array(
@@ -147,8 +150,9 @@ 
 
 	call_integration_hook('integrate_modify_smiley_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Setup the basics of the settings template.
 	require_once($sourcedir . '/ManageServer.php');
@@ -207,8 +211,9 @@ 
 			foreach ($_POST['smiley_set'] as $id => $val)
 			{
 				// If this is the set you've marked as default, or the only one remaining, you can't delete it
-				if ($modSettings['smiley_sets_default'] != $set_paths[$id] && count($set_paths) != 1 && isset($set_paths[$id], $set_names[$id]))
-					unset($set_paths[$id], $set_names[$id]);
+				if ($modSettings['smiley_sets_default'] != $set_paths[$id] && count($set_paths) != 1 && isset($set_paths[$id], $set_names[$id])) {
+									unset($set_paths[$id], $set_names[$id]);
+				}
 			}
 
 			// Shortcut... array_merge() on a single array resets the numeric keys
@@ -222,8 +227,9 @@ 
 			));
 		}
 		// Add a new smiley set.
-		elseif (!empty($_POST['add']))
-			$context['sub_action'] = 'modifyset';
+		elseif (!empty($_POST['add'])) {
+					$context['sub_action'] = 'modifyset';
+		}
 		// Create or modify a smiley set.
 		elseif (isset($_POST['set']))
 		{
@@ -233,8 +239,9 @@ 
 			// Create a new smiley set.
 			if ($_POST['set'] == -1 && isset($_POST['smiley_sets_path']))
 			{
-				if (in_array($_POST['smiley_sets_path'], $set_paths))
-					fatal_lang_error('smiley_set_already_exists');
+				if (in_array($_POST['smiley_sets_path'], $set_paths)) {
+									fatal_lang_error('smiley_set_already_exists');
+				}
 
 				updateSettings(array(
 					'smiley_sets_known' => $modSettings['smiley_sets_known'] . ',' . $_POST['smiley_sets_path'],
@@ -246,12 +253,14 @@ 
 			else
 			{
 				// Make sure the smiley set exists.
-				if (!isset($set_paths[$_POST['set']]) || !isset($set_names[$_POST['set']]))
-					fatal_lang_error('smiley_set_not_found');
+				if (!isset($set_paths[$_POST['set']]) || !isset($set_names[$_POST['set']])) {
+									fatal_lang_error('smiley_set_not_found');
+				}
 
 				// Make sure the path is not yet used by another smileyset.
-				if (in_array($_POST['smiley_sets_path'], $set_paths) && $_POST['smiley_sets_path'] != $set_paths[$_POST['set']])
-					fatal_lang_error('smiley_set_path_already_used');
+				if (in_array($_POST['smiley_sets_path'], $set_paths) && $_POST['smiley_sets_path'] != $set_paths[$_POST['set']]) {
+									fatal_lang_error('smiley_set_path_already_used');
+				}
 
 				$set_paths[$_POST['set']] = $_POST['smiley_sets_path'];
 				$set_names[$_POST['set']] = $_POST['smiley_sets_name'];
@@ -263,8 +272,9 @@ 
 			}
 
 			// The user might have checked to also import smileys.
-			if (!empty($_POST['smiley_sets_import']))
-				ImportSmileys($_POST['smiley_sets_path']);
+			if (!empty($_POST['smiley_sets_import'])) {
+							ImportSmileys($_POST['smiley_sets_path']);
+			}
 		}
 		cache_put_data('parsing_smileys', null, 480);
 		cache_put_data('posting_smileys', null, 480);
@@ -273,13 +283,14 @@ 
 	// Load all available smileysets...
 	$context['smiley_sets'] = explode(',', $modSettings['smiley_sets_known']);
 	$set_names = explode("\n", $modSettings['smiley_sets_names']);
-	foreach ($context['smiley_sets'] as $i => $set)
-		$context['smiley_sets'][$i] = array(
+	foreach ($context['smiley_sets'] as $i => $set) {
+			$context['smiley_sets'][$i] = array(
 			'id' => $i,
 			'path' => $smcFunc['htmlspecialchars']($set),
 			'name' => $smcFunc['htmlspecialchars']($set_names[$i]),
 			'selected' => $set == $modSettings['smiley_sets_default']
 		);
+	}
 
 	// Importing any smileys from an existing set?
 	if ($context['sub_action'] == 'import')
@@ -290,8 +301,9 @@ 
 		$_GET['set'] = (int) $_GET['set'];
 
 		// Sanity check - then import.
-		if (isset($context['smiley_sets'][$_GET['set']]))
-			ImportSmileys(un_htmlspecialchars($context['smiley_sets'][$_GET['set']]['path']));
+		if (isset($context['smiley_sets'][$_GET['set']])) {
+					ImportSmileys(un_htmlspecialchars($context['smiley_sets'][$_GET['set']]['path']));
+		}
 
 		// Force the process to continue.
 		$context['sub_action'] = 'modifyset';
@@ -301,15 +313,15 @@ 
 	if ($context['sub_action'] == 'modifyset')
 	{
 		$_GET['set'] = !isset($_GET['set']) ? -1 : (int) $_GET['set'];
-		if ($_GET['set'] == -1 || !isset($context['smiley_sets'][$_GET['set']]))
-			$context['current_set'] = array(
+		if ($_GET['set'] == -1 || !isset($context['smiley_sets'][$_GET['set']])) {
+					$context['current_set'] = array(
 				'id' => '-1',
 				'path' => '',
 				'name' => '',
 				'selected' => false,
 				'is_new' => true,
 			);
-		else
+		} else
 		{
 			$context['current_set'] = &$context['smiley_sets'][$_GET['set']];
 			$context['current_set']['is_new'] = false;
@@ -321,13 +333,15 @@ 
 				$dir = dir($modSettings['smileys_dir'] . '/' . $context['current_set']['path']);
 				while ($entry = $dir->read())
 				{
-					if (in_array(strrchr($entry, '.'), array('.jpg', '.gif', '.jpeg', '.png')))
-						$smileys[strtolower($entry)] = $entry;
+					if (in_array(strrchr($entry, '.'), array('.jpg', '.gif', '.jpeg', '.png'))) {
+											$smileys[strtolower($entry)] = $entry;
+					}
 				}
 				$dir->close();
 
-				if (empty($smileys))
-					fatal_lang_error('smiley_set_dir_not_found', false, array($context['current_set']['name']));
+				if (empty($smileys)) {
+									fatal_lang_error('smiley_set_dir_not_found', false, array($context['current_set']['name']));
+				}
 
 				// Exclude the smileys that are already in the database.
 				$request = $smcFunc['db_query']('', '
@@ -338,9 +352,10 @@ 
 						'smiley_list' => $smileys,
 					)
 				);
-				while ($row = $smcFunc['db_fetch_assoc']($request))
-					if (isset($smileys[strtolower($row['filename'])]))
+				while ($row = $smcFunc['db_fetch_assoc']($request)) {
+									if (isset($smileys[strtolower($row['filename'])]))
 						unset($smileys[strtolower($row['filename'])]);
+				}
 				$smcFunc['db_free_result']($request);
 
 				$context['current_set']['can_import'] = count($smileys);
@@ -355,13 +370,14 @@ 
 			$dir = dir($modSettings['smileys_dir']);
 			while ($entry = $dir->read())
 			{
-				if (!in_array($entry, array('.', '..')) && is_dir($modSettings['smileys_dir'] . '/' . $entry))
-					$context['smiley_set_dirs'][] = array(
+				if (!in_array($entry, array('.', '..')) && is_dir($modSettings['smileys_dir'] . '/' . $entry)) {
+									$context['smiley_set_dirs'][] = array(
 						'id' => $entry,
 						'path' => $modSettings['smileys_dir'] . '/' . $entry,
 						'selectable' => $entry == $context['current_set']['path'] || !in_array($entry, explode(',', $modSettings['smiley_sets_known'])),
 						'current' => $entry == $context['current_set']['path'],
 					);
+				}
 			}
 			$dir->close();
 		}
@@ -371,8 +387,9 @@ 
 	createToken('admin-mss', 'request');
 
 	// In case we need to import smileys, we need to add the token in now.
-	if (isset($context['current_set']['import_url']))
-		$context['current_set']['import_url'] .= ';' . $context['admin-mss_token_var'] . '=' . $context['admin-mss_token'];
+	if (isset($context['current_set']['import_url'])) {
+			$context['current_set']['import_url'] .= ';' . $context['admin-mss_token_var'] . '=' . $context['admin-mss_token'];
+	}
 
 	$listOptions = array(
 		'id' => 'smiley_set_list',
@@ -510,21 +527,23 @@ 
 		$cols['name'][] = $set_names[$i];
 	}
 	$sort_flag = strpos($sort, 'DESC') === false ? SORT_ASC : SORT_DESC;
-	if (substr($sort, 0, 4) === 'name')
-		array_multisort($cols['name'], $sort_flag, SORT_REGULAR, $cols['path'], $cols['selected'], $cols['id']);
-	elseif (substr($sort, 0, 4) === 'path')
-		array_multisort($cols['path'], $sort_flag, SORT_REGULAR, $cols['name'], $cols['selected'], $cols['id']);
-	else
-		array_multisort($cols['selected'], $sort_flag, SORT_REGULAR, $cols['path'], $cols['name'], $cols['id']);
+	if (substr($sort, 0, 4) === 'name') {
+			array_multisort($cols['name'], $sort_flag, SORT_REGULAR, $cols['path'], $cols['selected'], $cols['id']);
+	} elseif (substr($sort, 0, 4) === 'path') {
+			array_multisort($cols['path'], $sort_flag, SORT_REGULAR, $cols['name'], $cols['selected'], $cols['id']);
+	} else {
+			array_multisort($cols['selected'], $sort_flag, SORT_REGULAR, $cols['path'], $cols['name'], $cols['id']);
+	}
 
 	$smiley_sets = array();
-	foreach ($cols['id'] as $i => $id)
-		$smiley_sets[] = array(
+	foreach ($cols['id'] as $i => $id) {
+			$smiley_sets[] = array(
 			'id' => $id,
 			'path' => $cols['path'][$i],
 			'name' => $cols['name'][$i],
 			'selected' => $cols['path'][$i] == $modSettings['smiley_sets_default']
 		);
+	}
 
 	return $smiley_sets;
 }
@@ -553,13 +572,14 @@ 
 	$context['smileys_dir_found'] = is_dir($context['smileys_dir']);
 	$context['smiley_sets'] = explode(',', $modSettings['smiley_sets_known']);
 	$set_names = explode("\n", $modSettings['smiley_sets_names']);
-	foreach ($context['smiley_sets'] as $i => $set)
-		$context['smiley_sets'][$i] = array(
+	foreach ($context['smiley_sets'] as $i => $set) {
+			$context['smiley_sets'][$i] = array(
 			'id' => $i,
 			'path' => $smcFunc['htmlspecialchars']($set),
 			'name' => $smcFunc['htmlspecialchars']($set_names[$i]),
 			'selected' => $set == $modSettings['smiley_sets_default']
 		);
+	}
 
 	// Submitting a form?
 	if (isset($_POST[$context['session_var']], $_POST['smiley_code']))
@@ -575,8 +595,9 @@ 
 		$_POST['smiley_filename'] = htmltrim__recursive($_POST['smiley_filename']);
 
 		// Make sure some code was entered.
-		if (empty($_POST['smiley_code']))
-			fatal_lang_error('smiley_has_no_code');
+		if (empty($_POST['smiley_code'])) {
+					fatal_lang_error('smiley_has_no_code');
+		}
 
 		// Check whether the new code has duplicates. It should be unique.
 		$request = $smcFunc['db_query']('', '
@@ -588,8 +609,9 @@ 
 				'smiley_code' => $_POST['smiley_code'],
 			)
 		);
-		if ($smcFunc['db_num_rows']($request) > 0)
-			fatal_lang_error('smiley_not_unique');
+		if ($smcFunc['db_num_rows']($request) > 0) {
+					fatal_lang_error('smiley_not_unique');
+		}
 		$smcFunc['db_free_result']($request);
 
 		// If we are uploading - check all the smiley sets are writable!
@@ -598,38 +620,44 @@ 
 			$writeErrors = array();
 			foreach ($context['smiley_sets'] as $set)
 			{
-				if (!is_writable($context['smileys_dir'] . '/' . un_htmlspecialchars($set['path'])))
-					$writeErrors[] = $set['path'];
+				if (!is_writable($context['smileys_dir'] . '/' . un_htmlspecialchars($set['path']))) {
+									$writeErrors[] = $set['path'];
+				}
+			}
+			if (!empty($writeErrors)) {
+							fatal_lang_error('smileys_upload_error_notwritable', true, array(implode(', ', $writeErrors)));
 			}
-			if (!empty($writeErrors))
-				fatal_lang_error('smileys_upload_error_notwritable', true, array(implode(', ', $writeErrors)));
 		}
 
 		// Uploading just one smiley for all of them?
 		if (isset($_POST['sameall']) && isset($_FILES['uploadSmiley']['name']) && $_FILES['uploadSmiley']['name'] != '')
 		{
-			if (!is_uploaded_file($_FILES['uploadSmiley']['tmp_name']) || (ini_get('open_basedir') == '' && !file_exists($_FILES['uploadSmiley']['tmp_name'])))
-				fatal_lang_error('smileys_upload_error');
+			if (!is_uploaded_file($_FILES['uploadSmiley']['tmp_name']) || (ini_get('open_basedir') == '' && !file_exists($_FILES['uploadSmiley']['tmp_name']))) {
+							fatal_lang_error('smileys_upload_error');
+			}
 
 			// Sorry, no spaces, dots, or anything else but letters allowed.
 			$_FILES['uploadSmiley']['name'] = preg_replace(array('/\s/', '/\.[\.]+/', '/[^\w_\.\-]/'), array('_', '.', ''), $_FILES['uploadSmiley']['name']);
 
 			// We only allow image files - it's THAT simple - no messing around here...
-			if (!in_array(strtolower(substr(strrchr($_FILES['uploadSmiley']['name'], '.'), 1)), $allowedTypes))
-				fatal_lang_error('smileys_upload_error_types', false, array(implode(', ', $allowedTypes)));
+			if (!in_array(strtolower(substr(strrchr($_FILES['uploadSmiley']['name'], '.'), 1)), $allowedTypes)) {
+							fatal_lang_error('smileys_upload_error_types', false, array(implode(', ', $allowedTypes)));
+			}
 
 			// We only need the filename...
 			$destName = basename($_FILES['uploadSmiley']['name']);
 
 			// Make sure they aren't trying to upload a nasty file - for their own good here!
-			if (in_array(strtolower($destName), $disabledFiles))
-				fatal_lang_error('smileys_upload_error_illegal');
+			if (in_array(strtolower($destName), $disabledFiles)) {
+							fatal_lang_error('smileys_upload_error_illegal');
+			}
 
 			// Check if the file already exists... and if not move it to EVERY smiley set directory.
 			$i = 0;
 			// Keep going until we find a set the file doesn't exist in. (or maybe it exists in all of them?)
-			while (isset($context['smiley_sets'][$i]) && file_exists($context['smileys_dir'] . '/' . un_htmlspecialchars($context['smiley_sets'][$i]['path']) . '/' . $destName))
-				$i++;
+			while (isset($context['smiley_sets'][$i]) && file_exists($context['smileys_dir'] . '/' . un_htmlspecialchars($context['smiley_sets'][$i]['path']) . '/' . $destName)) {
+							$i++;
+			}
 
 			// Okay, we're going to put the smiley right here, since it's not there yet!
 			if (isset($context['smiley_sets'][$i]['path']))
@@ -644,8 +672,9 @@ 
 					$currentPath = $context['smileys_dir'] . '/' . un_htmlspecialchars($context['smiley_sets'][$i]['path']) . '/' . $destName;
 
 					// The file is already there!  Don't overwrite it!
-					if (file_exists($currentPath))
-						continue;
+					if (file_exists($currentPath)) {
+											continue;
+					}
 
 					// Okay, so copy the first one we made to here.
 					copy($smileyLocation, $currentPath);
@@ -662,13 +691,15 @@ 
 			$newName = '';
 			foreach ($_FILES as $name => $data)
 			{
-				if ($_FILES[$name]['name'] == '')
-					fatal_lang_error('smileys_upload_error_blank');
+				if ($_FILES[$name]['name'] == '') {
+									fatal_lang_error('smileys_upload_error_blank');
+				}
 
-				if (empty($newName))
-					$newName = basename($_FILES[$name]['name']);
-				elseif (basename($_FILES[$name]['name']) != $newName)
-					fatal_lang_error('smileys_upload_error_name');
+				if (empty($newName)) {
+									$newName = basename($_FILES[$name]['name']);
+				} elseif (basename($_FILES[$name]['name']) != $newName) {
+									fatal_lang_error('smileys_upload_error_name');
+				}
 			}
 
 			foreach ($context['smiley_sets'] as $i => $set)
@@ -676,31 +707,36 @@ 
 				$set['name'] = un_htmlspecialchars($set['name']);
 				$set['path'] = un_htmlspecialchars($set['path']);
 
-				if (!isset($_FILES['individual_' . $set['name']]['name']) || $_FILES['individual_' . $set['name']]['name'] == '')
-					continue;
+				if (!isset($_FILES['individual_' . $set['name']]['name']) || $_FILES['individual_' . $set['name']]['name'] == '') {
+									continue;
+				}
 
 				// Got one...
-				if (!is_uploaded_file($_FILES['individual_' . $set['name']]['tmp_name']) || (ini_get('open_basedir') == '' && !file_exists($_FILES['individual_' . $set['name']]['tmp_name'])))
-					fatal_lang_error('smileys_upload_error');
+				if (!is_uploaded_file($_FILES['individual_' . $set['name']]['tmp_name']) || (ini_get('open_basedir') == '' && !file_exists($_FILES['individual_' . $set['name']]['tmp_name']))) {
+									fatal_lang_error('smileys_upload_error');
+				}
 
 				// Sorry, no spaces, dots, or anything else but letters allowed.
 				$_FILES['individual_' . $set['name']]['name'] = preg_replace(array('/\s/', '/\.[\.]+/', '/[^\w_\.\-]/'), array('_', '.', ''), $_FILES['individual_' . $set['name']]['name']);
 
 				// We only allow image files - it's THAT simple - no messing around here...
-				if (!in_array(strtolower(substr(strrchr($_FILES['individual_' . $set['name']]['name'], '.'), 1)), $allowedTypes))
-					fatal_lang_error('smileys_upload_error_types', false, array(implode(', ', $allowedTypes)));
+				if (!in_array(strtolower(substr(strrchr($_FILES['individual_' . $set['name']]['name'], '.'), 1)), $allowedTypes)) {
+									fatal_lang_error('smileys_upload_error_types', false, array(implode(', ', $allowedTypes)));
+				}
 
 				// We only need the filename...
 				$destName = basename($_FILES['individual_' . $set['name']]['name']);
 
 				// Make sure they aren't trying to upload a nasty file - for their own good here!
-				if (in_array(strtolower($destName), $disabledFiles))
-					fatal_lang_error('smileys_upload_error_illegal');
+				if (in_array(strtolower($destName), $disabledFiles)) {
+									fatal_lang_error('smileys_upload_error_illegal');
+				}
 
 				// If the file exists - ignore it.
 				$smileyLocation = $context['smileys_dir'] . '/' . $set['path'] . '/' . $destName;
-				if (file_exists($smileyLocation))
-					continue;
+				if (file_exists($smileyLocation)) {
+									continue;
+				}
 
 				// Finally - move the image!
 				move_uploaded_file($_FILES['individual_' . $set['name']]['tmp_name'], $smileyLocation);
@@ -712,8 +748,9 @@ 
 		}
 
 		// Also make sure a filename was given.
-		if (empty($_POST['smiley_filename']))
-			fatal_lang_error('smiley_has_no_filename');
+		if (empty($_POST['smiley_filename'])) {
+					fatal_lang_error('smiley_has_no_filename');
+		}
 
 		// Find the position on the right.
 		$smiley_order = '0';
@@ -732,8 +769,9 @@ 
 			list ($smiley_order) = $smcFunc['db_fetch_row']($request);
 			$smcFunc['db_free_result']($request);
 
-			if (empty($smiley_order))
-				$smiley_order = '0';
+			if (empty($smiley_order)) {
+							$smiley_order = '0';
+			}
 		}
 		$smcFunc['db_insert']('',
 			'{db_prefix}smileys',
@@ -761,17 +799,19 @@ 
 	{
 		foreach ($context['smiley_sets'] as $smiley_set)
 		{
-			if (!file_exists($context['smileys_dir'] . '/' . un_htmlspecialchars($smiley_set['path'])))
-				continue;
+			if (!file_exists($context['smileys_dir'] . '/' . un_htmlspecialchars($smiley_set['path']))) {
+							continue;
+			}
 
 			$dir = dir($context['smileys_dir'] . '/' . un_htmlspecialchars($smiley_set['path']));
 			while ($entry = $dir->read())
 			{
-				if (!in_array($entry, $context['filenames']) && in_array(strrchr($entry, '.'), array('.jpg', '.gif', '.jpeg', '.png')))
-					$context['filenames'][strtolower($entry)] = array(
+				if (!in_array($entry, $context['filenames']) && in_array(strrchr($entry, '.'), array('.jpg', '.gif', '.jpeg', '.png'))) {
+									$context['filenames'][strtolower($entry)] = array(
 						'id' => $smcFunc['htmlspecialchars']($entry),
 						'selected' => false,
 					);
+				}
 			}
 			$dir->close();
 		}
@@ -809,17 +849,19 @@ 
 		// Changing the selected smileys?
 		if (isset($_POST['smiley_action']) && !empty($_POST['checked_smileys']))
 		{
-			foreach ($_POST['checked_smileys'] as $id => $smiley_id)
-				$_POST['checked_smileys'][$id] = (int) $smiley_id;
+			foreach ($_POST['checked_smileys'] as $id => $smiley_id) {
+							$_POST['checked_smileys'][$id] = (int) $smiley_id;
+			}
 
-			if ($_POST['smiley_action'] == 'delete')
-				$smcFunc['db_query']('', '
+			if ($_POST['smiley_action'] == 'delete') {
+							$smcFunc['db_query']('', '
 					DELETE FROM {db_prefix}smileys
 					WHERE id_smiley IN ({array_int:checked_smileys})',
 					array(
 						'checked_smileys' => $_POST['checked_smileys'],
 					)
 				);
+			}
 			// Changing the status of the smiley?
 			else
 			{
@@ -829,8 +871,8 @@ 
 					'hidden' => 1,
 					'popup' => 2
 				);
-				if (isset($displayTypes[$_POST['smiley_action']]))
-					$smcFunc['db_query']('', '
+				if (isset($displayTypes[$_POST['smiley_action']])) {
+									$smcFunc['db_query']('', '
 						UPDATE {db_prefix}smileys
 						SET hidden = {int:display_type}
 						WHERE id_smiley IN ({array_int:checked_smileys})',
@@ -839,6 +881,7 @@ 
 							'display_type' => $displayTypes[$_POST['smiley_action']],
 						)
 					);
+				}
 			}
 		}
 		// Create/modify a smiley.
@@ -864,12 +907,14 @@ 
 				$_POST['smiley_location'] = empty($_POST['smiley_location']) || $_POST['smiley_location'] > 2 || $_POST['smiley_location'] < 0 ? 0 : (int) $_POST['smiley_location'];
 
 				// Make sure some code was entered.
-				if (empty($_POST['smiley_code']))
-					fatal_lang_error('smiley_has_no_code');
+				if (empty($_POST['smiley_code'])) {
+									fatal_lang_error('smiley_has_no_code');
+				}
 
 				// Also make sure a filename was given.
-				if (empty($_POST['smiley_filename']))
-					fatal_lang_error('smiley_has_no_filename');
+				if (empty($_POST['smiley_filename'])) {
+									fatal_lang_error('smiley_has_no_filename');
+				}
 
 				// Check whether the new code has duplicates. It should be unique.
 				$request = $smcFunc['db_query']('', '
@@ -883,8 +928,9 @@ 
 						'smiley_code' => $_POST['smiley_code'],
 					)
 				);
-				if ($smcFunc['db_num_rows']($request) > 0)
-					fatal_lang_error('smiley_not_unique');
+				if ($smcFunc['db_num_rows']($request) > 0) {
+									fatal_lang_error('smiley_not_unique');
+				}
 				$smcFunc['db_free_result']($request);
 
 				$smcFunc['db_query']('', '
@@ -913,13 +959,14 @@ 
 	// Load all known smiley sets.
 	$context['smiley_sets'] = explode(',', $modSettings['smiley_sets_known']);
 	$set_names = explode("\n", $modSettings['smiley_sets_names']);
-	foreach ($context['smiley_sets'] as $i => $set)
-		$context['smiley_sets'][$i] = array(
+	foreach ($context['smiley_sets'] as $i => $set) {
+			$context['smiley_sets'][$i] = array(
 			'id' => $i,
 			'path' => $smcFunc['htmlspecialchars']($set),
 			'name' => $smcFunc['htmlspecialchars']($set_names[$i]),
 			'selected' => $set == $modSettings['smiley_sets_default']
 		);
+	}
 
 	// Prepare overview of all (custom) smileys.
 	if ($context['sub_action'] == 'editsmileys')
@@ -935,9 +982,10 @@ 
 		// Create a list of options for selecting smiley sets.
 		$smileyset_option_list = '
 			<select name="set" onchange="changeSet(this.options[this.selectedIndex].value);">';
-		foreach ($context['smiley_sets'] as $smiley_set)
-			$smileyset_option_list .= '
+		foreach ($context['smiley_sets'] as $smiley_set) {
+					$smileyset_option_list .= '
 				<option value="' . $smiley_set['path'] . '"' . ($modSettings['smiley_sets_default'] == $smiley_set['path'] ? ' selected' : '') . '>' . $smiley_set['name'] . '</option>';
+		}
 		$smileyset_option_list .= '
 			</select>';
 
@@ -999,12 +1047,13 @@ 
 					'data' => array(
 						'function' => function ($rowData) use ($txt)
 						{
-							if (empty($rowData['hidden']))
-								return $txt['smileys_location_form'];
-							elseif ($rowData['hidden'] == 1)
-								return $txt['smileys_location_hidden'];
-							else
-								return $txt['smileys_location_popup'];
+							if (empty($rowData['hidden'])) {
+															return $txt['smileys_location_form'];
+							} elseif ($rowData['hidden'] == 1) {
+															return $txt['smileys_location_hidden'];
+							} else {
+															return $txt['smileys_location_popup'];
+							}
 						},
 					),
 					'sort' => array(
@@ -1019,19 +1068,22 @@ 
 					'data' => array(
 						'function' => function ($rowData) use ($context, $txt, $modSettings, $smcFunc)
 						{
-							if (empty($modSettings['smileys_dir']) || !is_dir($modSettings['smileys_dir']))
-								return $smcFunc['htmlspecialchars']($rowData['description']);
+							if (empty($modSettings['smileys_dir']) || !is_dir($modSettings['smileys_dir'])) {
+															return $smcFunc['htmlspecialchars']($rowData['description']);
+							}
 
 							// Check if there are smileys missing in some sets.
 							$missing_sets = array();
-							foreach ($context['smiley_sets'] as $smiley_set)
-								if (!file_exists(sprintf('%1$s/%2$s/%3$s', $modSettings['smileys_dir'], $smiley_set['path'], $rowData['filename'])))
+							foreach ($context['smiley_sets'] as $smiley_set) {
+															if (!file_exists(sprintf('%1$s/%2$s/%3$s', $modSettings['smileys_dir'], $smiley_set['path'], $rowData['filename'])))
 									$missing_sets[] = $smiley_set['path'];
+							}
 
 							$description = $smcFunc['htmlspecialchars']($rowData['description']);
 
-							if (!empty($missing_sets))
-								$description .= sprintf('<br><span class="smalltext"><strong>%1$s:</strong> %2$s</span>', $txt['smileys_not_found_in_set'], implode(', ', $missing_sets));
+							if (!empty($missing_sets)) {
+															$description .= sprintf('<br><span class="smalltext"><strong>%1$s:</strong> %2$s</span>', $txt['smileys_not_found_in_set'], implode(', ', $missing_sets));
+							}
 
 							return $description;
 						},
@@ -1147,13 +1199,14 @@ 
 		$context['smileys_dir_found'] = is_dir($context['smileys_dir']);
 		$context['smiley_sets'] = explode(',', $modSettings['smiley_sets_known']);
 		$set_names = explode("\n", $modSettings['smiley_sets_names']);
-		foreach ($context['smiley_sets'] as $i => $set)
-			$context['smiley_sets'][$i] = array(
+		foreach ($context['smiley_sets'] as $i => $set) {
+					$context['smiley_sets'][$i] = array(
 				'id' => $i,
 				'path' => $smcFunc['htmlspecialchars']($set),
 				'name' => $smcFunc['htmlspecialchars']($set_names[$i]),
 				'selected' => $set == $modSettings['smiley_sets_default']
 			);
+		}
 
 		$context['selected_set'] = $modSettings['smiley_sets_default'];
 
@@ -1163,17 +1216,19 @@ 
 		{
 			foreach ($context['smiley_sets'] as $smiley_set)
 			{
-				if (!file_exists($context['smileys_dir'] . '/' . un_htmlspecialchars($smiley_set['path'])))
-					continue;
+				if (!file_exists($context['smileys_dir'] . '/' . un_htmlspecialchars($smiley_set['path']))) {
+									continue;
+				}
 
 				$dir = dir($context['smileys_dir'] . '/' . un_htmlspecialchars($smiley_set['path']));
 				while ($entry = $dir->read())
 				{
-					if (!in_array($entry, $context['filenames']) && in_array(strrchr($entry, '.'), array('.jpg', '.gif', '.jpeg', '.png')))
-						$context['filenames'][strtolower($entry)] = array(
+					if (!in_array($entry, $context['filenames']) && in_array(strrchr($entry, '.'), array('.jpg', '.gif', '.jpeg', '.png'))) {
+											$context['filenames'][strtolower($entry)] = array(
 							'id' => $smcFunc['htmlspecialchars']($entry),
 							'selected' => false,
 						);
+					}
 				}
 				$dir->close();
 			}
@@ -1188,8 +1243,9 @@ 
 				'current_smiley' => (int) $_REQUEST['smiley'],
 			)
 		);
-		if ($smcFunc['db_num_rows']($request) != 1)
-			fatal_lang_error('smiley_not_found');
+		if ($smcFunc['db_num_rows']($request) != 1) {
+					fatal_lang_error('smiley_not_found');
+		}
 		$context['current_smiley'] = $smcFunc['db_fetch_assoc']($request);
 		$smcFunc['db_free_result']($request);
 
@@ -1197,8 +1253,9 @@ 
 		$context['current_smiley']['filename'] = $smcFunc['htmlspecialchars']($context['current_smiley']['filename']);
 		$context['current_smiley']['description'] = $smcFunc['htmlspecialchars']($context['current_smiley']['description']);
 
-		if (isset($context['filenames'][strtolower($context['current_smiley']['filename'])]))
-			$context['filenames'][strtolower($context['current_smiley']['filename'])]['selected'] = true;
+		if (isset($context['filenames'][strtolower($context['current_smiley']['filename'])])) {
+					$context['filenames'][strtolower($context['current_smiley']['filename'])]['selected'] = true;
+		}
 	}
 }
 
@@ -1223,8 +1280,9 @@ 
 		)
 	);
 	$smileys = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$smileys[] = $row;
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$smileys[] = $row;
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $smileys;
@@ -1264,8 +1322,9 @@ 
 		$_GET['location'] = empty($_GET['location']) || $_GET['location'] != 'popup' ? 0 : 2;
 		$_GET['source'] = empty($_GET['source']) ? 0 : (int) $_GET['source'];
 
-		if (empty($_GET['source']))
-			fatal_lang_error('smiley_not_found');
+		if (empty($_GET['source'])) {
+					fatal_lang_error('smiley_not_found');
+		}
 
 		if (!empty($_GET['after']))
 		{
@@ -1281,12 +1340,12 @@ 
 					'after_smiley' => $_GET['after'],
 				)
 			);
-			if ($smcFunc['db_num_rows']($request) != 1)
-				fatal_lang_error('smiley_not_found');
+			if ($smcFunc['db_num_rows']($request) != 1) {
+							fatal_lang_error('smiley_not_found');
+			}
 			list ($smiley_row, $smiley_order, $smileyLocation) = $smcFunc['db_fetch_row']($request);
 			$smcFunc['db_free_result']($request);
-		}
-		else
+		} else
 		{
 			$smiley_row = (int) $_GET['row'];
 			$smiley_order = -1;
@@ -1360,14 +1419,15 @@ 
 	$context['move_smiley'] = empty($_REQUEST['move']) ? 0 : (int) $_REQUEST['move'];
 
 	// Make sure all rows are sequential.
-	foreach (array_keys($context['smileys']) as $location)
-		$context['smileys'][$location] = array(
+	foreach (array_keys($context['smileys']) as $location) {
+			$context['smileys'][$location] = array(
 			'id' => $location,
 			'title' => $location == 'postform' ? $txt['smileys_location_form'] : $txt['smileys_location_popup'],
 			'description' => $location == 'postform' ? $txt['smileys_location_form_description'] : $txt['smileys_location_popup_description'],
 			'last_row' => count($context['smileys'][$location]['rows']),
 			'rows' => array_values($context['smileys'][$location]['rows']),
 		);
+	}
 
 	// Check & fix smileys that are not ordered properly in the database.
 	foreach (array_keys($context['smileys']) as $location)
@@ -1392,8 +1452,8 @@ 
 				$context['smileys'][$location]['rows'][$id][0]['row'] = $id;
 			}
 			// Make sure the smiley order is always sequential.
-			foreach ($smiley_row as $order_id => $smiley)
-				if ($order_id != $smiley['order'])
+			foreach ($smiley_row as $order_id => $smiley) {
+							if ($order_id != $smiley['order'])
 					$smcFunc['db_query']('', '
 						UPDATE {db_prefix}smileys
 						SET smiley_order = {int:new_order}
@@ -1403,6 +1463,7 @@ 
 							'current_smiley' => $smiley['id'],
 						)
 					);
+			}
 		}
 	}
 
@@ -1435,19 +1496,20 @@ 
 		$context['filename'] = $base_name;
 
 		// Check that the smiley is from simplemachines.org, for now... maybe add mirroring later.
-		if (preg_match('~^http://[\w_\-]+\.simplemachines\.org/~', $_REQUEST['set_gz']) == 0 || strpos($_REQUEST['set_gz'], 'dlattach') !== false)
-			fatal_lang_error('not_on_simplemachines');
+		if (preg_match('~^http://[\w_\-]+\.simplemachines\.org/~', $_REQUEST['set_gz']) == 0 || strpos($_REQUEST['set_gz'], 'dlattach') !== false) {
+					fatal_lang_error('not_on_simplemachines');
+		}
 
 		$destination = $packagesdir . '/' . $base_name;
 
-		if (file_exists($destination))
-			fatal_lang_error('package_upload_error_exists');
+		if (file_exists($destination)) {
+					fatal_lang_error('package_upload_error_exists');
+		}
 
 		// Let's copy it to the Packages directory
 		file_put_contents($destination, fetch_web_data($_REQUEST['set_gz']));
 		$testing = true;
-	}
-	elseif (isset($_REQUEST['package']))
+	} elseif (isset($_REQUEST['package']))
 	{
 		$base_name = basename($_REQUEST['package']);
 		$name = $smcFunc['htmlspecialchars'](strtok(basename($_REQUEST['package']), '.'));
@@ -1456,12 +1518,14 @@ 
 		$destination = $packagesdir . '/' . basename($_REQUEST['package']);
 	}
 
-	if (empty($destination) || !file_exists($destination))
-		fatal_lang_error('package_no_file', false);
+	if (empty($destination) || !file_exists($destination)) {
+			fatal_lang_error('package_no_file', false);
+	}
 
 	// Make sure temp directory exists and is empty.
-	if (file_exists($packagesdir . '/temp'))
-		deltree($packagesdir . '/temp', false);
+	if (file_exists($packagesdir . '/temp')) {
+			deltree($packagesdir . '/temp', false);
+	}
 
 	if (!mktree($packagesdir . '/temp', 0755))
 	{
@@ -1473,31 +1537,37 @@ 
 			create_chmod_control(array($packagesdir . '/temp/delme.tmp'), array('destination_url' => $scripturl . '?action=admin;area=smileys;sa=install;set_gz=' . $_REQUEST['set_gz'], 'crash_on_error' => true));
 
 			deltree($packagesdir . '/temp', false);
-			if (!mktree($packagesdir . '/temp', 0777))
-				fatal_lang_error('package_cant_download', false);
+			if (!mktree($packagesdir . '/temp', 0777)) {
+							fatal_lang_error('package_cant_download', false);
+			}
 		}
 	}
 
 	$extracted = read_tgz_file($destination, $packagesdir . '/temp');
-	if (!$extracted)
-		fatal_lang_error('packageget_unable', false, array('http://custom.simplemachines.org/mods/index.php?action=search;type=12;basic_search=' . $name));
-	if ($extracted && !file_exists($packagesdir . '/temp/package-info.xml'))
-		foreach ($extracted as $file)
+	if (!$extracted) {
+			fatal_lang_error('packageget_unable', false, array('http://custom.simplemachines.org/mods/index.php?action=search;type=12;basic_search=' . $name));
+	}
+	if ($extracted && !file_exists($packagesdir . '/temp/package-info.xml')) {
+			foreach ($extracted as $file)
 			if (basename($file['filename']) == 'package-info.xml')
 			{
 				$base_path = dirname($file['filename']) . '/';
+	}
 				break;
 			}
 
-	if (!isset($base_path))
-		$base_path = '';
+	if (!isset($base_path)) {
+			$base_path = '';
+	}
 
-	if (!file_exists($packagesdir . '/temp/' . $base_path . 'package-info.xml'))
-		fatal_lang_error('package_get_error_missing_xml', false);
+	if (!file_exists($packagesdir . '/temp/' . $base_path . 'package-info.xml')) {
+			fatal_lang_error('package_get_error_missing_xml', false);
+	}
 
 	$smileyInfo = getPackageInfo($context['filename']);
-	if (!is_array($smileyInfo))
-		fatal_lang_error($smileyInfo);
+	if (!is_array($smileyInfo)) {
+			fatal_lang_error($smileyInfo);
+	}
 
 	// See if it is installed?
 	$request = $smcFunc['db_query']('', '
@@ -1513,8 +1583,9 @@ 
 		)
 	);
 
-	if ($smcFunc['db_num_rows']($request) > 0)
-		fata_lang_error('package_installed_warning1');
+	if ($smcFunc['db_num_rows']($request) > 0) {
+			fata_lang_error('package_installed_warning1');
+	}
 
 	// Everything is fine, now it's time to do something
 	$actions = parsePackageInfo($smileyInfo['xml'], true, 'install');
@@ -1531,23 +1602,23 @@ 
 		{
 			$has_readme = true;
 			$type = 'package_' . $action['type'];
-			if (file_exists($packagesdir . '/temp/' . $base_path . $action['filename']))
-				$context[$type] = $smcFunc['htmlspecialchars'](trim(file_get_contents($packagesdir . '/temp/' . $base_path . $action['filename']), "\n\r"));
-			elseif (file_exists($action['filename']))
-				$context[$type] = $smcFunc['htmlspecialchars'](trim(file_get_contents($action['filename']), "\n\r"));
+			if (file_exists($packagesdir . '/temp/' . $base_path . $action['filename'])) {
+							$context[$type] = $smcFunc['htmlspecialchars'](trim(file_get_contents($packagesdir . '/temp/' . $base_path . $action['filename']), "\n\r"));
+			} elseif (file_exists($action['filename'])) {
+							$context[$type] = $smcFunc['htmlspecialchars'](trim(file_get_contents($action['filename']), "\n\r"));
+			}
 
 			if (!empty($action['parse_bbc']))
 			{
 				require_once($sourcedir . '/Subs-Post.php');
 				preparsecode($context[$type]);
 				$context[$type] = parse_bbc($context[$type]);
+			} else {
+							$context[$type] = nl2br($context[$type]);
 			}
-			else
-				$context[$type] = nl2br($context[$type]);
 
 			continue;
-		}
-		elseif ($action['type'] == 'require-dir')
+		} elseif ($action['type'] == 'require-dir')
 		{
 			// Do this one...
 			$thisAction = array(
@@ -1566,12 +1637,12 @@ 
 				);
 			}
 			// @todo None given?
-			if (empty($thisAction['description']))
-				$thisAction['description'] = isset($action['description']) ? $action['description'] : '';
+			if (empty($thisAction['description'])) {
+							$thisAction['description'] = isset($action['description']) ? $action['description'] : '';
+			}
 
 			$context['actions'][] = $thisAction;
-		}
-		elseif ($action['type'] == 'credits')
+		} elseif ($action['type'] == 'credits')
 		{
 			// Time to build the billboard
 			$credits_tag = array(
@@ -1630,12 +1701,14 @@ 
 		cache_put_data('posting_smileys', null, 480);
 	}
 
-	if (file_exists($packagesdir . '/temp'))
-		deltree($packagesdir . '/temp');
+	if (file_exists($packagesdir . '/temp')) {
+			deltree($packagesdir . '/temp');
+	}
 
-	if (!$testing)
-		redirectexit('action=admin;area=smileys');
-}
+	if (!$testing) {
+			redirectexit('action=admin;area=smileys');
+	}
+	}
 
 /**
  * A function to import new smileys from an existing directory into the database.
@@ -1646,15 +1719,17 @@ 
 {
 	global $modSettings, $smcFunc;
 
-	if (empty($modSettings['smileys_dir']) || !is_dir($modSettings['smileys_dir'] . '/' . $smileyPath))
-		fatal_lang_error('smiley_set_unable_to_import');
+	if (empty($modSettings['smileys_dir']) || !is_dir($modSettings['smileys_dir'] . '/' . $smileyPath)) {
+			fatal_lang_error('smiley_set_unable_to_import');
+	}
 
 	$smileys = array();
 	$dir = dir($modSettings['smileys_dir'] . '/' . $smileyPath);
 	while ($entry = $dir->read())
 	{
-		if (in_array(strrchr($entry, '.'), array('.jpg', '.gif', '.jpeg', '.png')))
-			$smileys[strtolower($entry)] = $entry;
+		if (in_array(strrchr($entry, '.'), array('.jpg', '.gif', '.jpeg', '.png'))) {
+					$smileys[strtolower($entry)] = $entry;
+		}
 	}
 	$dir->close();
 
@@ -1667,9 +1742,10 @@ 
 			'smiley_list' => $smileys,
 		)
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		if (isset($smileys[strtolower($row['filename'])]))
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			if (isset($smileys[strtolower($row['filename'])]))
 			unset($smileys[strtolower($row['filename'])]);
+	}
 	$smcFunc['db_free_result']($request);
 
 	$request = $smcFunc['db_query']('', '
@@ -1686,9 +1762,10 @@ 
 	$smcFunc['db_free_result']($request);
 
 	$new_smileys = array();
-	foreach ($smileys as $smiley)
-		if (strlen($smiley) <= 48)
+	foreach ($smileys as $smiley) {
+			if (strlen($smiley) <= 48)
 			$new_smileys[] = array(':' . strtok($smiley, '.') . ':', $smiley, strtok($smiley, '.'), 0, ++$smiley_order);
+	}
 
 	if (!empty($new_smileys))
 	{
@@ -1753,8 +1830,9 @@ 
 		if (isset($_POST['delete']) && !empty($_POST['checked_icons']))
 		{
 			$deleteIcons = array();
-			foreach ($_POST['checked_icons'] as $icon)
-				$deleteIcons[] = (int) $icon;
+			foreach ($_POST['checked_icons'] as $icon) {
+							$deleteIcons[] = (int) $icon;
+			}
 
 			// Do the actual delete!
 			$smcFunc['db_query']('', '
@@ -1771,35 +1849,41 @@ 
 			$_GET['icon'] = (int) $_GET['icon'];
 
 			// Do some preperation with the data... like check the icon exists *somewhere*
-			if (strpos($_POST['icon_filename'], '.png') !== false)
-				$_POST['icon_filename'] = substr($_POST['icon_filename'], 0, -4);
-			if (!file_exists($settings['default_theme_dir'] . '/images/post/' . $_POST['icon_filename'] . '.png'))
-				fatal_lang_error('icon_not_found');
+			if (strpos($_POST['icon_filename'], '.png') !== false) {
+							$_POST['icon_filename'] = substr($_POST['icon_filename'], 0, -4);
+			}
+			if (!file_exists($settings['default_theme_dir'] . '/images/post/' . $_POST['icon_filename'] . '.png')) {
+							fatal_lang_error('icon_not_found');
+			}
 			// There is a 16 character limit on message icons...
-			elseif (strlen($_POST['icon_filename']) > 16)
-				fatal_lang_error('icon_name_too_long');
-			elseif ($_POST['icon_location'] == $_GET['icon'] && !empty($_GET['icon']))
-				fatal_lang_error('icon_after_itself');
+			elseif (strlen($_POST['icon_filename']) > 16) {
+							fatal_lang_error('icon_name_too_long');
+			} elseif ($_POST['icon_location'] == $_GET['icon'] && !empty($_GET['icon'])) {
+							fatal_lang_error('icon_after_itself');
+			}
 
 			// First do the sorting... if this is an edit reduce the order of everything after it by one ;)
 			if ($_GET['icon'] != 0)
 			{
 				$oldOrder = $context['icons'][$_GET['icon']]['true_order'];
-				foreach ($context['icons'] as $id => $data)
-					if ($data['true_order'] > $oldOrder)
+				foreach ($context['icons'] as $id => $data) {
+									if ($data['true_order'] > $oldOrder)
 						$context['icons'][$id]['true_order']--;
+				}
 			}
 
 			// If there are no existing icons and this is a new one, set the id to 1 (mainly for non-mysql)
-			if (empty($_GET['icon']) && empty($context['icons']))
-				$_GET['icon'] = 1;
+			if (empty($_GET['icon']) && empty($context['icons'])) {
+							$_GET['icon'] = 1;
+			}
 
 			// Get the new order.
 			$newOrder = $_POST['icon_location'] == 0 ? 0 : $context['icons'][$_POST['icon_location']]['true_order'] + 1;
 			// Do the same, but with the one that used to be after this icon, done to avoid conflict.
-			foreach ($context['icons'] as $id => $data)
-				if ($data['true_order'] >= $newOrder)
+			foreach ($context['icons'] as $id => $data) {
+							if ($data['true_order'] >= $newOrder)
 					$context['icons'][$id]['true_order']++;
+			}
 
 			// Finally set the current icon's position!
 			$context['icons'][$_GET['icon']]['true_order'] = $newOrder;
@@ -1817,8 +1901,7 @@ 
 				if ($id != 0)
 				{
 					$iconInsert[] = array($id, $icon['board_id'], $icon['title'], $icon['filename'], $icon['true_order']);
-				}
-				else
+				} else
 				{
 					$iconInsert_new[] = array($icon['board_id'], $icon['title'], $icon['filename'], $icon['true_order']);
 				}
@@ -1843,8 +1926,9 @@ 
 		}
 
 		// Unless we're adding a new thing, we'll escape
-		if (!isset($_POST['add']))
-			redirectexit('action=admin;area=smileys;sa=editicons');
+		if (!isset($_POST['add'])) {
+					redirectexit('action=admin;area=smileys;sa=editicons');
+		}
 	}
 
 	$context[$context['admin_menu_name']]['current_subsection'] = 'editicons';
@@ -1954,8 +2038,9 @@ 
 		$context['new_icon'] = !isset($_GET['icon']);
 
 		// Get the properties of the current icon from the icon list.
-		if (!$context['new_icon'])
-			$context['icon'] = $context['icons'][$_GET['icon']];
+		if (!$context['new_icon']) {
+					$context['icon'] = $context['icons'][$_GET['icon']];
+		}
 
 		// Get a list of boards needed for assigning this icon to a specific board.
 		$boardListOptions = array(
@@ -1989,8 +2074,9 @@ 
 	);
 
 	$message_icons = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$message_icons[] = $row;
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$message_icons[] = $row;
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $message_icons;

Sources/DbPackages-mysql.php

Braces +124 added lines, -99 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Add the file functions to the $smcFunc array.
@@ -52,8 +53,9 @@ 
 		'messages', 'moderators', 'package_servers', 'permission_profiles', 'permissions', 'personal_messages',
 		'pm_recipients', 'poll_choices', 'polls', 'scheduled_tasks', 'sessions', 'settings', 'smileys',
 		'themes', 'topics');
-	foreach ($reservedTables as $k => $table_name)
-		$reservedTables[$k] = strtolower($db_prefix . $table_name);
+	foreach ($reservedTables as $k => $table_name) {
+			$reservedTables[$k] = strtolower($db_prefix . $table_name);
+	}
 
 	// We in turn may need the extra stuff.
 	db_extend('extra');
@@ -105,8 +107,9 @@ 
 	$table_name = str_replace('{db_prefix}', $db_prefix, $table_name);
 
 	// First - no way do we touch SMF tables.
-	if (in_array(strtolower($table_name), $reservedTables))
-		return false;
+	if (in_array(strtolower($table_name), $reservedTables)) {
+			return false;
+	}
 
 	// Log that we'll want to remove this on uninstall.
 	$db_package_log[] = array('remove_table', $table_name);
@@ -116,16 +119,18 @@ 
 	if (in_array($full_table_name, $tables))
 	{
 		// This is a sad day... drop the table? If not, return false (error) by default.
-		if ($if_exists == 'overwrite')
-			$smcFunc['db_drop_table']($table_name);
-		else
-			return $if_exists == 'ignore';
+		if ($if_exists == 'overwrite') {
+					$smcFunc['db_drop_table']($table_name);
+		} else {
+					return $if_exists == 'ignore';
+		}
 	}
 
 	// Righty - let's do the damn thing!
 	$table_query = 'CREATE TABLE ' . $table_name . "\n" . '(';
-	foreach ($columns as $column)
-		$table_query .= "\n\t" . smf_db_create_query_column($column) . ',';
+	foreach ($columns as $column) {
+			$table_query .= "\n\t" . smf_db_create_query_column($column) . ',';
+	}
 
 	// Loop through the indexes next...
 	foreach ($indexes as $index)
@@ -133,19 +138,21 @@ 
 		$columns = implode(',', $index['columns']);
 
 		// Is it the primary?
-		if (isset($index['type']) && $index['type'] == 'primary')
-			$table_query .= "\n\t" . 'PRIMARY KEY (' . implode(',', $index['columns']) . '),';
-		else
+		if (isset($index['type']) && $index['type'] == 'primary') {
+					$table_query .= "\n\t" . 'PRIMARY KEY (' . implode(',', $index['columns']) . '),';
+		} else
 		{
-			if (empty($index['name']))
-				$index['name'] = implode('_', $index['columns']);
+			if (empty($index['name'])) {
+							$index['name'] = implode('_', $index['columns']);
+			}
 			$table_query .= "\n\t" . (isset($index['type']) && $index['type'] == 'unique' ? 'UNIQUE' : 'KEY') . ' ' . $index['name'] . ' (' . $columns . '),';
 		}
 	}
 
 	// No trailing commas!
-	if (substr($table_query, -1) == ',')
-		$table_query = substr($table_query, 0, -1);
+	if (substr($table_query, -1) == ',') {
+			$table_query = substr($table_query, 0, -1);
+	}
 
 	// Which engine do we want here?
 	if (empty($engines))
@@ -155,8 +162,9 @@ 
 
 		while ($row = $smcFunc['db_fetch_assoc']($get_engines))
 		{
-			if ($row['Support'] == 'YES' || $row['Support'] == 'DEFAULT')
-				$engines[] = $row['Engine'];
+			if ($row['Support'] == 'YES' || $row['Support'] == 'DEFAULT') {
+							$engines[] = $row['Engine'];
+			}
 		}
 
 		$smcFunc['db_free_result']($get_engines);
@@ -170,8 +178,9 @@ 
 	}
 
 	$table_query .= ') ENGINE=' . $parameters['engine'];
-	if (!empty($db_character_set) && $db_character_set == 'utf8')
-		$table_query .= ' DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci';
+	if (!empty($db_character_set) && $db_character_set == 'utf8') {
+			$table_query .= ' DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci';
+	}
 
 	// Create the table!
 	$smcFunc['db_query']('', $table_query,
@@ -203,8 +212,9 @@ 
 	$table_name = str_replace('{db_prefix}', $db_prefix, $table_name);
 
 	// God no - dropping one of these = bad.
-	if (in_array(strtolower($table_name), $reservedTables))
-		return false;
+	if (in_array(strtolower($table_name), $reservedTables)) {
+			return false;
+	}
 
 	// Does it exist?
 	if (in_array($full_table_name, $smcFunc['db_list_tables']()))
@@ -245,14 +255,16 @@ 
 
 	// Does it exist - if so don't add it again!
 	$columns = $smcFunc['db_list_columns']($table_name, false);
-	foreach ($columns as $column)
-		if ($column == $column_info['name'])
+	foreach ($columns as $column) {
+			if ($column == $column_info['name'])
 		{
 			// If we're going to overwrite then use change column.
 			if ($if_exists == 'update')
 				return $smcFunc['db_change_column']($table_name, $column_info['name'], $column_info);
-			else
-				return false;
+	}
+			else {
+							return false;
+			}
 		}
 
 	// Get the specifics...
@@ -288,8 +300,8 @@ 
 
 	// Does it exist?
 	$columns = $smcFunc['db_list_columns']($table_name, true);
-	foreach ($columns as $column)
-		if ($column['name'] == $column_name)
+	foreach ($columns as $column) {
+			if ($column['name'] == $column_name)
 		{
 			$smcFunc['db_query']('', '
 				ALTER TABLE ' . $table_name . '
@@ -298,6 +310,7 @@ 
 					'security_override' => true,
 				)
 			);
+	}
 
 			return true;
 		}
@@ -324,37 +337,47 @@ 
 	// Check it does exist!
 	$columns = $smcFunc['db_list_columns']($table_name, true);
 	$old_info = null;
-	foreach ($columns as $column)
-		if ($column['name'] == $old_column)
+	foreach ($columns as $column) {
+			if ($column['name'] == $old_column)
 			$old_info = $column;
+	}
 
 	// Nothing?
-	if ($old_info == null)
-		return false;
+	if ($old_info == null) {
+			return false;
+	}
 
 	// Get the right bits.
-	if (!isset($column_info['name']))
-		$column_info['name'] = $old_column;
-	if (!isset($column_info['default']))
-		$column_info['default'] = $old_info['default'];
-	if (!isset($column_info['null']))
-		$column_info['null'] = $old_info['null'];
-	if (!isset($column_info['auto']))
-		$column_info['auto'] = $old_info['auto'];
-	if (!isset($column_info['type']))
-		$column_info['type'] = $old_info['type'];
-	if (!isset($column_info['size']) || !is_numeric($column_info['size']))
-		$column_info['size'] = $old_info['size'];
-	if (!isset($column_info['unsigned']) || !in_array($column_info['type'], array('int', 'tinyint', 'smallint', 'mediumint', 'bigint')))
-		$column_info['unsigned'] = '';
+	if (!isset($column_info['name'])) {
+			$column_info['name'] = $old_column;
+	}
+	if (!isset($column_info['default'])) {
+			$column_info['default'] = $old_info['default'];
+	}
+	if (!isset($column_info['null'])) {
+			$column_info['null'] = $old_info['null'];
+	}
+	if (!isset($column_info['auto'])) {
+			$column_info['auto'] = $old_info['auto'];
+	}
+	if (!isset($column_info['type'])) {
+			$column_info['type'] = $old_info['type'];
+	}
+	if (!isset($column_info['size']) || !is_numeric($column_info['size'])) {
+			$column_info['size'] = $old_info['size'];
+	}
+	if (!isset($column_info['unsigned']) || !in_array($column_info['type'], array('int', 'tinyint', 'smallint', 'mediumint', 'bigint'))) {
+			$column_info['unsigned'] = '';
+	}
 
 	list ($type, $size) = $smcFunc['db_calculate_type']($column_info['type'], $column_info['size']);
 
 	// Allow for unsigned integers (mysql only)
 	$unsigned = in_array($type, array('int', 'tinyint', 'smallint', 'mediumint', 'bigint')) && !empty($column_info['unsigned']) ? 'unsigned ' : '';
 
-	if ($size !== null)
-		$type = $type . '(' . $size . ')';
+	if ($size !== null) {
+			$type = $type . '(' . $size . ')';
+	}
 
 	$smcFunc['db_query']('', '
 		ALTER TABLE ' . $table_name . '
@@ -384,21 +407,23 @@ 
 	$table_name = str_replace('{db_prefix}', $db_prefix, $table_name);
 
 	// No columns = no index.
-	if (empty($index_info['columns']))
-		return false;
+	if (empty($index_info['columns'])) {
+			return false;
+	}
 	$columns = implode(',', $index_info['columns']);
 
 	// No name - make it up!
 	if (empty($index_info['name']))
 	{
 		// No need for primary.
-		if (isset($index_info['type']) && $index_info['type'] == 'primary')
-			$index_info['name'] = '';
-		else
-			$index_info['name'] = implode('_', $index_info['columns']);
+		if (isset($index_info['type']) && $index_info['type'] == 'primary') {
+					$index_info['name'] = '';
+		} else {
+					$index_info['name'] = implode('_', $index_info['columns']);
+		}
+	} else {
+			$index_info['name'] = $index_info['name'];
 	}
-	else
-		$index_info['name'] = $index_info['name'];
 
 	// Log that we are going to want to remove this!
 	$db_package_log[] = array('remove_index', $table_name, $index_info['name']);
@@ -411,10 +436,11 @@ 
 		if ($index['name'] == $index_info['name'] || ($index['type'] == 'primary' && isset($index_info['type']) && $index_info['type'] == 'primary'))
 		{
 			// If we want to overwrite simply remove the current one then continue.
-			if ($if_exists != 'update' || $index['type'] == 'primary')
-				return false;
-			else
-				$smcFunc['db_remove_index']($table_name, $index_info['name']);
+			if ($if_exists != 'update' || $index['type'] == 'primary') {
+							return false;
+			} else {
+							$smcFunc['db_remove_index']($table_name, $index_info['name']);
+			}
 		}
 	}
 
@@ -428,8 +454,7 @@ 
 				'security_override' => true,
 			)
 		);
-	}
-	else
+	} else
 	{
 		$smcFunc['db_query']('', '
 			ALTER TABLE ' . $table_name . '
@@ -513,8 +538,7 @@ 
 		$types = array(
 			'inet' => 'varbinary',
 		);
-	}
-	else
+	} else
 	{
 		$types = array(
 			'varbinary' => 'inet',
@@ -528,16 +552,15 @@ 
 		{
 			$type_size = 16;
 			$type_name = 'varbinary';
-		}
-		elseif ($type_name == 'varbinary' && $reverse && $type_size == 16)
+		} elseif ($type_name == 'varbinary' && $reverse && $type_size == 16)
 		{
 			$type_name = 'inet';
 			$type_size = null;
+		} elseif ($type_name == 'varbinary') {
+					$type_name = 'varbinary';
+		} else {
+					$type_name = $types[$type_name];
 		}
-		elseif ($type_name == 'varbinary')
-			$type_name = 'varbinary';
-		else
-			$type_name = $types[$type_name];
 	}
 
 	return array($type_name, $type_size);
@@ -605,8 +628,7 @@ 
 		if (!$detail)
 		{
 			$columns[] = $row['Field'];
-		}
-		else
+		} else
 		{
 			// Is there an auto_increment?
 			$auto = strpos($row['Extra'], 'auto_increment') !== false ? true : false;
@@ -616,10 +638,10 @@ 
 			{
 				$type = $matches[1];
 				$size = $matches[2];
-				if (!empty($matches[3]) && $matches[3] == 'unsigned')
-					$unsigned = true;
-			}
-			else
+				if (!empty($matches[3]) && $matches[3] == 'unsigned') {
+									$unsigned = true;
+				}
+			} else
 			{
 				$type = $row['Type'];
 				$size = null;
@@ -670,19 +692,20 @@ 
 	$indexes = array();
 	while ($row = $smcFunc['db_fetch_assoc']($result))
 	{
-		if (!$detail)
-			$indexes[] = $row['Key_name'];
-		else
+		if (!$detail) {
+					$indexes[] = $row['Key_name'];
+		} else
 		{
 			// What is the type?
-			if ($row['Key_name'] == 'PRIMARY')
-				$type = 'primary';
-			elseif (empty($row['Non_unique']))
-				$type = 'unique';
-			elseif (isset($row['Index_type']) && $row['Index_type'] == 'FULLTEXT')
-				$type = 'fulltext';
-			else
-				$type = 'index';
+			if ($row['Key_name'] == 'PRIMARY') {
+							$type = 'primary';
+			} elseif (empty($row['Non_unique'])) {
+							$type = 'unique';
+			} elseif (isset($row['Index_type']) && $row['Index_type'] == 'FULLTEXT') {
+							$type = 'fulltext';
+			} else {
+							$type = 'index';
+			}
 
 			// This is the first column we've seen?
 			if (empty($indexes[$row['Key_name']]))
@@ -695,10 +718,11 @@ 
 			}
 
 			// Is it a partial index?
-			if (!empty($row['Sub_part']))
-				$indexes[$row['Key_name']]['columns'][] = $row['Column_name'] . '(' . $row['Sub_part'] . ')';
-			else
-				$indexes[$row['Key_name']]['columns'][] = $row['Column_name'];
+			if (!empty($row['Sub_part'])) {
+							$indexes[$row['Key_name']]['columns'][] = $row['Column_name'] . '(' . $row['Sub_part'] . ')';
+			} else {
+							$indexes[$row['Key_name']]['columns'][] = $row['Column_name'];
+			}
 		}
 	}
 	$smcFunc['db_free_result']($result);
@@ -720,11 +744,11 @@ 
 	if (!empty($column['auto']))
 	{
 		$default = 'auto_increment';
+	} elseif (isset($column['default']) && $column['default'] !== null) {
+			$default = 'default \'' . $smcFunc['db_escape_string']($column['default']) . '\'';
+	} else {
+			$default = '';
 	}
-	elseif (isset($column['default']) && $column['default'] !== null)
-		$default = 'default \'' . $smcFunc['db_escape_string']($column['default']) . '\'';
-	else
-		$default = '';
 
 	// Sort out the size... and stuff...
 	$column['size'] = isset($column['size']) && is_numeric($column['size']) ? $column['size'] : null;
@@ -733,8 +757,9 @@ 
 	// Allow unsigned integers (mysql only)
 	$unsigned = in_array($type, array('int', 'tinyint', 'smallint', 'mediumint', 'bigint')) && !empty($column['unsigned']) ? 'unsigned ' : '';
 
-	if ($size !== null)
-		$type = $type . '(' . $size . ')';
+	if ($size !== null) {
+			$type = $type . '(' . $size . ')';
+	}
 
 	// Now just put it together!
 	return '`' . $column['name'] . '` ' . $type . ' ' . (!empty($unsigned) ? $unsigned : '') . (!empty($column['null']) ? '' : 'NOT NULL') . ' ' . $default;

Sources/ManageMembergroups.php

Braces +128 added lines, -88 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 
 /**
@@ -44,8 +45,9 @@ 
 	$_REQUEST['sa'] = isset($_REQUEST['sa']) && isset($subActions[$_REQUEST['sa']]) ? $_REQUEST['sa'] : (allowedTo('manage_membergroups') ? 'index' : 'settings');
 
 	// Is it elsewhere?
-	if (isset($subActions[$_REQUEST['sa']][2]))
-		require_once($sourcedir . '/' . $subActions[$_REQUEST['sa']][2]);
+	if (isset($subActions[$_REQUEST['sa']][2])) {
+			require_once($sourcedir . '/' . $subActions[$_REQUEST['sa']][2]);
+	}
 
 	// Do the permission check, you might not be allowed her.
 	isAllowedTo($subActions[$_REQUEST['sa']][1]);
@@ -104,19 +106,20 @@ 
 					'function' => function($rowData) use ($scripturl)
 					{
 						// Since the moderator group has no explicit members, no link is needed.
-						if ($rowData['id_group'] == 3)
-							$group_name = $rowData['group_name'];
-						else
+						if ($rowData['id_group'] == 3) {
+													$group_name = $rowData['group_name'];
+						} else
 						{
 							$color_style = empty($rowData['online_color']) ? '' : sprintf(' style="color: %1$s;"', $rowData['online_color']);
 							$group_name = sprintf('<a href="%1$s?action=admin;area=membergroups;sa=members;group=%2$d"%3$s>%4$s</a>', $scripturl, $rowData['id_group'], $color_style, $rowData['group_name']);
 						}
 
 						// Add a help option for moderator and administrator.
-						if ($rowData['id_group'] == 1)
-							$group_name .= sprintf(' (<a href="%1$s?action=helpadmin;help=membergroup_administrator" onclick="return reqOverlayDiv(this.href);">?</a>)', $scripturl);
-						elseif ($rowData['id_group'] == 3)
-							$group_name .= sprintf(' (<a href="%1$s?action=helpadmin;help=membergroup_moderator" onclick="return reqOverlayDiv(this.href);">?</a>)', $scripturl);
+						if ($rowData['id_group'] == 1) {
+													$group_name .= sprintf(' (<a href="%1$s?action=helpadmin;help=membergroup_administrator" onclick="return reqOverlayDiv(this.href);">?</a>)', $scripturl);
+						} elseif ($rowData['id_group'] == 3) {
+													$group_name .= sprintf(' (<a href="%1$s?action=helpadmin;help=membergroup_moderator" onclick="return reqOverlayDiv(this.href);">?</a>)', $scripturl);
+						}
 
 						return $group_name;
 					},
@@ -330,12 +333,14 @@ 
 		call_integration_hook('integrate_add_membergroup', array($id_group, $postCountBasedGroup));
 
 		// Update the post groups now, if this is a post group!
-		if (isset($_POST['min_posts']))
-			updateStats('postgroups');
+		if (isset($_POST['min_posts'])) {
+					updateStats('postgroups');
+		}
 
 		// You cannot set permissions for post groups if they are disabled.
-		if ($postCountBasedGroup && empty($modSettings['permission_enable_postgroups']))
-			$_POST['perm_type'] = '';
+		if ($postCountBasedGroup && empty($modSettings['permission_enable_postgroups'])) {
+					$_POST['perm_type'] = '';
+		}
 
 		if ($_POST['perm_type'] == 'predefined')
 		{
@@ -365,8 +370,9 @@ 
 				$smcFunc['db_free_result']($request);
 
 				// Protected groups are... well, protected!
-				if ($copy_type == 1)
-					fatal_lang_error('membergroup_does_not_exist');
+				if ($copy_type == 1) {
+									fatal_lang_error('membergroup_does_not_exist');
+				}
 			}
 
 			// Don't allow copying of a real priviledged person!
@@ -384,18 +390,20 @@ 
 			$inserts = array();
 			while ($row = $smcFunc['db_fetch_assoc']($request))
 			{
-				if (empty($context['illegal_permissions']) || !in_array($row['permission'], $context['illegal_permissions']))
-					$inserts[] = array($id_group, $row['permission'], $row['add_deny']);
+				if (empty($context['illegal_permissions']) || !in_array($row['permission'], $context['illegal_permissions'])) {
+									$inserts[] = array($id_group, $row['permission'], $row['add_deny']);
+				}
 			}
 			$smcFunc['db_free_result']($request);
 
-			if (!empty($inserts))
-				$smcFunc['db_insert']('insert',
+			if (!empty($inserts)) {
+							$smcFunc['db_insert']('insert',
 					'{db_prefix}permissions',
 					array('id_group' => 'int', 'permission' => 'string', 'add_deny' => 'int'),
 					$inserts,
 					array('id_group', 'permission')
 				);
+			}
 
 			$request = $smcFunc['db_query']('', '
 				SELECT id_profile, permission, add_deny
@@ -406,17 +414,19 @@ 
 				)
 			);
 			$inserts = array();
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$inserts[] = array($id_group, $row['id_profile'], $row['permission'], $row['add_deny']);
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$inserts[] = array($id_group, $row['id_profile'], $row['permission'], $row['add_deny']);
+			}
 			$smcFunc['db_free_result']($request);
 
-			if (!empty($inserts))
-				$smcFunc['db_insert']('insert',
+			if (!empty($inserts)) {
+							$smcFunc['db_insert']('insert',
 					'{db_prefix}board_permissions',
 					array('id_group' => 'int', 'id_profile' => 'int', 'permission' => 'string', 'add_deny' => 'int'),
 					$inserts,
 					array('id_group', 'id_profile', 'permission')
 				);
+			}
 
 			// Also get some membergroup information if we're copying and not copying from guests...
 			if ($copy_id > 0 && $_POST['perm_type'] == 'copy')
@@ -469,14 +479,15 @@ 
 		$changed_boards['allow'] = array();
 		$changed_boards['deny'] = array();
 		$changed_boards['ignore'] = array();
-		foreach ($accesses as $group_id => $action)
-			$changed_boards[$action][] = (int) $group_id;
+		foreach ($accesses as $group_id => $action) {
+					$changed_boards[$action][] = (int) $group_id;
+		}
 
 		foreach (array('allow', 'deny') as $board_action)
 		{
 			// Only do this if they have special access requirements.
-			if (!empty($changed_boards[$board_action]))
-				$smcFunc['db_query']('', '
+			if (!empty($changed_boards[$board_action])) {
+							$smcFunc['db_query']('', '
 					UPDATE {db_prefix}boards
 					SET {raw:column} = CASE WHEN {raw:column} = {string:blank_string} THEN {string:group_id_string} ELSE CONCAT({raw:column}, {string:comma_group}) END
 					WHERE id_board IN ({array_int:board_list})',
@@ -488,11 +499,13 @@ 
 						'column' => $board_action == 'allow' ? 'member_groups' : 'deny_member_groups',
 					)
 				);
+			}
 		}
 
 		// If this is joinable then set it to show group membership in people's profiles.
-		if (empty($modSettings['show_group_membership']) && $_POST['group_type'] > 1)
-			updateSettings(array('show_group_membership' => 1));
+		if (empty($modSettings['show_group_membership']) && $_POST['group_type'] > 1) {
+					updateSettings(array('show_group_membership' => 1));
+		}
 
 		// Rebuild the group cache.
 		updateSettings(array(
@@ -513,8 +526,9 @@ 
 	$context['undefined_group'] = !isset($_REQUEST['postgroup']) && !isset($_REQUEST['generalgroup']);
 	$context['allow_protected'] = allowedTo('admin_forum');
 
-	if (!empty($modSettings['deny_boards_access']))
-		loadLanguage('ManagePermissions');
+	if (!empty($modSettings['deny_boards_access'])) {
+			loadLanguage('ManagePermissions');
+	}
 
 	$result = $smcFunc['db_query']('', '
 		SELECT id_group, group_name
@@ -531,11 +545,12 @@ 
 		)
 	);
 	$context['groups'] = array();
-	while ($row = $smcFunc['db_fetch_assoc']($result))
-		$context['groups'][] = array(
+	while ($row = $smcFunc['db_fetch_assoc']($result)) {
+			$context['groups'][] = array(
 			'id' => $row['id_group'],
 			'name' => $row['group_name']
 		);
+	}
 	$smcFunc['db_free_result']($result);
 
 	$request = $smcFunc['db_query']('', '
@@ -552,12 +567,13 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// This category hasn't been set up yet..
-		if (!isset($context['categories'][$row['id_cat']]))
-			$context['categories'][$row['id_cat']] = array(
+		if (!isset($context['categories'][$row['id_cat']])) {
+					$context['categories'][$row['id_cat']] = array(
 				'id' => $row['id_cat'],
 				'name' => $row['cat_name'],
 				'boards' => array()
 			);
+		}
 
 		// Set this board up, and let the template know when it's a child.  (indent them..)
 		$context['categories'][$row['id_cat']]['boards'][$row['id_board']] = array(
@@ -605,8 +621,9 @@ 
 	require_once($sourcedir . '/Subs-Membergroups.php');
 	$result = deleteMembergroups((int) $_REQUEST['group']);
 	// Need to throw a warning if it went wrong, but this is the only one we have a message for...
-	if ($result === 'group_cannot_delete_sub')
-		fatal_lang_error('membergroups_cannot_delete_paid', false);
+	if ($result === 'group_cannot_delete_sub') {
+			fatal_lang_error('membergroups_cannot_delete_paid', false);
+	}
 
 	// Go back to the membergroup index.
 	redirectexit('action=admin;area=membergroups;');
@@ -628,8 +645,9 @@ 
 
 	$_REQUEST['group'] = isset($_REQUEST['group']) && $_REQUEST['group'] > 0 ? (int) $_REQUEST['group'] : 0;
 
-	if (!empty($modSettings['deny_boards_access']))
-		loadLanguage('ManagePermissions');
+	if (!empty($modSettings['deny_boards_access'])) {
+			loadLanguage('ManagePermissions');
+	}
 
 	// Make sure this group is editable.
 	if (!empty($_REQUEST['group']))
@@ -651,8 +669,9 @@ 
 	}
 
 	// Now, do we have a valid id?
-	if (empty($_REQUEST['group']))
-		fatal_lang_error('membergroup_does_not_exist', false);
+	if (empty($_REQUEST['group'])) {
+			fatal_lang_error('membergroup_does_not_exist', false);
+	}
 
 	// People who can manage boards are a bit special.
 	require_once($sourcedir . '/Subs-Members.php');
@@ -683,8 +702,9 @@ 
 		require_once($sourcedir . '/Subs-Membergroups.php');
 		$result = deleteMembergroups($_REQUEST['group']);
 		// Need to throw a warning if it went wrong, but this is the only one we have a message for...
-		if ($result === 'group_cannot_delete_sub')
-			fatal_lang_error('membergroups_cannot_delete_paid', false);
+		if ($result === 'group_cannot_delete_sub') {
+					fatal_lang_error('membergroups_cannot_delete_paid', false);
+		}
 
 		redirectexit('action=admin;area=membergroups;');
 	}
@@ -761,16 +781,18 @@ 
 				$request = $smcFunc['db_query']('', '
 					SELECT id_board
 					FROM {db_prefix}boards');
-				while ($row = $smcFunc['db_fetch_assoc']($request))
-					$accesses[(int) $row['id_board']] = 'allow';
+				while ($row = $smcFunc['db_fetch_assoc']($request)) {
+									$accesses[(int) $row['id_board']] = 'allow';
+				}
 				$smcFunc['db_free_result']($request);
 			}
 
 			$changed_boards['allow'] = array();
 			$changed_boards['deny'] = array();
 			$changed_boards['ignore'] = array();
-			foreach ($accesses as $group_id => $action)
-				$changed_boards[$action][] = (int) $group_id;
+			foreach ($accesses as $group_id => $action) {
+							$changed_boards[$action][] = (int) $group_id;
+			}
 
 			foreach (array('allow', 'deny') as $board_action)
 			{
@@ -786,8 +808,8 @@ 
 						'column' => $board_action == 'allow' ? 'member_groups' : 'deny_member_groups',
 					)
 				);
-				while ($row = $smcFunc['db_fetch_assoc']($request))
-					$smcFunc['db_query']('', '
+				while ($row = $smcFunc['db_fetch_assoc']($request)) {
+									$smcFunc['db_query']('', '
 						UPDATE {db_prefix}boards
 						SET {raw:column} = {string:member_group_access}
 						WHERE id_board = {int:current_board}',
@@ -797,11 +819,12 @@ 
 							'column' => $board_action == 'allow' ? 'member_groups' : 'deny_member_groups',
 						)
 					);
+				}
 				$smcFunc['db_free_result']($request);
 
 				// Add the membergroup to all boards that hadn't been set yet.
-				if (!empty($changed_boards[$board_action]))
-					$smcFunc['db_query']('', '
+				if (!empty($changed_boards[$board_action])) {
+									$smcFunc['db_query']('', '
 						UPDATE {db_prefix}boards
 						SET {raw:column} = CASE WHEN {raw:column} = {string:blank_string} THEN {string:group_id_string} ELSE CONCAT({raw:column}, {string:comma_group}) END
 						WHERE id_board IN ({array_int:board_list})
@@ -815,6 +838,7 @@ 
 							'column' => $board_action == 'allow' ? 'member_groups' : 'deny_member_groups',
 						)
 					);
+				}
 			}
 		}
 
@@ -840,12 +864,14 @@ 
 				)
 			);
 			$updates = array();
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$updates[$row['additional_groups']][] = $row['id_member'];
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$updates[$row['additional_groups']][] = $row['id_member'];
+			}
 			$smcFunc['db_free_result']($request);
 
-			foreach ($updates as $additional_groups => $memberArray)
-				updateMemberData($memberArray, array('additional_groups' => implode(',', array_diff(explode(',', $additional_groups), array((int) $_REQUEST['group'])))));
+			foreach ($updates as $additional_groups => $memberArray) {
+							updateMemberData($memberArray, array('additional_groups' => implode(',', array_diff(explode(',', $additional_groups), array((int) $_REQUEST['group'])))));
+			}
 
 			// Sorry, but post groups can't moderate boards
 			$smcFunc['db_query']('', '
@@ -855,8 +881,7 @@ 
 					'current_group' => (int) $_REQUEST['group'],
 				)
 			);
-		}
-		elseif ($_REQUEST['group'] != 3)
+		} elseif ($_REQUEST['group'] != 3)
 		{
 			// Making it a hidden group? If so remove everyone with it as primary group (Actually, just make them additional).
 			if ($_POST['group_hidden'] == 2)
@@ -871,8 +896,9 @@ 
 					)
 				);
 				$updates = array();
-				while ($row = $smcFunc['db_fetch_assoc']($request))
-					$updates[$row['additional_groups']][] = $row['id_member'];
+				while ($row = $smcFunc['db_fetch_assoc']($request)) {
+									$updates[$row['additional_groups']][] = $row['id_member'];
+				}
 				$smcFunc['db_free_result']($request);
 
 				foreach ($updates as $additional_groups => $memberArray)
@@ -914,8 +940,9 @@ 
 			$smcFunc['db_free_result']($request);
 
 			// Do we need to update the setting?
-			if ((empty($modSettings['show_group_membership']) && $have_joinable) || (!empty($modSettings['show_group_membership']) && !$have_joinable))
-				updateSettings(array('show_group_membership' => $have_joinable ? 1 : 0));
+			if ((empty($modSettings['show_group_membership']) && $have_joinable) || (!empty($modSettings['show_group_membership']) && !$have_joinable)) {
+							updateSettings(array('show_group_membership' => $have_joinable ? 1 : 0));
+			}
 		}
 
 		// Do we need to set inherited permissions?
@@ -948,8 +975,9 @@ 
 				{
 					$moderators[$k] = trim($moderators[$k]);
 
-					if (strlen($moderators[$k]) == 0)
-						unset($moderators[$k]);
+					if (strlen($moderators[$k]) == 0) {
+											unset($moderators[$k]);
+					}
 				}
 
 				// Find all the id_member's for the member_name's in the list.
@@ -965,8 +993,9 @@ 
 							'count' => count($moderators),
 						)
 					);
-					while ($row = $smcFunc['db_fetch_assoc']($request))
-						$group_moderators[] = $row['id_member'];
+					while ($row = $smcFunc['db_fetch_assoc']($request)) {
+											$group_moderators[] = $row['id_member'];
+					}
 					$smcFunc['db_free_result']($request);
 				}
 			}
@@ -974,8 +1003,9 @@ 
 			if (!empty($_POST['moderator_list']))
 			{
 				$moderators = array();
-				foreach ($_POST['moderator_list'] as $moderator)
-					$moderators[] = (int) $moderator;
+				foreach ($_POST['moderator_list'] as $moderator) {
+									$moderators[] = (int) $moderator;
+				}
 
 				if (!empty($moderators))
 				{
@@ -989,8 +1019,9 @@ 
 							'num_moderators' => count($moderators),
 						)
 					);
-					while ($row = $smcFunc['db_fetch_assoc']($request))
-						$group_moderators[] = $row['id_member'];
+					while ($row = $smcFunc['db_fetch_assoc']($request)) {
+											$group_moderators[] = $row['id_member'];
+					}
 					$smcFunc['db_free_result']($request);
 				}
 			}
@@ -1002,8 +1033,9 @@ 
 			if (!empty($group_moderators))
 			{
 				$mod_insert = array();
-				foreach ($group_moderators as $moderator)
-					$mod_insert[] = array($_REQUEST['group'], $moderator);
+				foreach ($group_moderators as $moderator) {
+									$mod_insert[] = array($_REQUEST['group'], $moderator);
+				}
 
 				$smcFunc['db_insert']('insert',
 					'{db_prefix}group_moderators',
@@ -1037,8 +1069,9 @@ 
 			'current_group' => (int) $_REQUEST['group'],
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('membergroup_does_not_exist', false);
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('membergroup_does_not_exist', false);
+	}
 	$row = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -1075,14 +1108,16 @@ 
 		)
 	);
 	$context['group']['moderators'] = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$context['group']['moderators'][$row['id_member']] = $row['real_name'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$context['group']['moderators'][$row['id_member']] = $row['real_name'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	$context['group']['moderator_list'] = empty($context['group']['moderators']) ? '' : '&quot;' . implode('&quot;, &quot;', $context['group']['moderators']) . '&quot;';
 
-	if (!empty($context['group']['moderators']))
-		list ($context['group']['last_moderator_id']) = array_slice(array_keys($context['group']['moderators']), -1);
+	if (!empty($context['group']['moderators'])) {
+			list ($context['group']['last_moderator_id']) = array_slice(array_keys($context['group']['moderators']), -1);
+	}
 
 	// Get a list of boards this membergroup is allowed to see.
 	$context['boards'] = array();
@@ -1102,12 +1137,13 @@ 
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
 			// This category hasn't been set up yet..
-			if (!isset($context['categories'][$row['id_cat']]))
-				$context['categories'][$row['id_cat']] = array(
+			if (!isset($context['categories'][$row['id_cat']])) {
+							$context['categories'][$row['id_cat']] = array(
 					'id' => $row['id_cat'],
 					'name' => $row['cat_name'],
 					'boards' => array()
 				);
+			}
 
 			// Set this board up, and let the template know when it's a child.  (indent them..)
 			$context['categories'][$row['id_cat']]['boards'][$row['id_board']] = array(
@@ -1155,19 +1191,22 @@ 
 				$image_info = getimagesize($settings['default_theme_dir'] . '/images/membericons/' . $value);
 
 				// If this is bigger than 128 in width or 32 in height, skip this one.
-				if ($image_info == false || $image_info[0] > 128 || $image_info[1] > 32)
-					continue;
+				if ($image_info == false || $image_info[0] > 128 || $image_info[1] > 32) {
+									continue;
+				}
 
 				// Else it's valid. Add it in.
-				else
-					$context['possible_icons'][] = $value;
+				else {
+									$context['possible_icons'][] = $value;
+				}
 			}
 		}
 	}
 
 	// Insert our JS, if we have possible icons.
-	if (!empty($context['possible_icons']))
-		loadJavaScriptFile('icondropdown.js', array('validate' => true), 'smf_icondropdown');
+	if (!empty($context['possible_icons'])) {
+			loadJavaScriptFile('icondropdown.js', array('validate' => true), 'smf_icondropdown');
+	}
 
 		loadJavaScriptFile('suggest.js', array('defer' => false), 'smf_suggest');
 
@@ -1189,8 +1228,9 @@ 
 		)
 	);
 	$context['inheritable_groups'] = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$context['inheritable_groups'][$row['id_group']] = $row['group_name'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$context['inheritable_groups'][$row['id_group']] = $row['group_name'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	call_integration_hook('integrate_view_membergroup');

Sources/RemoveTopic.php

Braces +267 added lines, -200 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /*	The contents of this file handle the deletion of topics, posts, and related
 	paraphernalia.  It has the following functions:
@@ -37,8 +38,9 @@ 
 	require_once($sourcedir . '/Subs-Post.php');
 
 	// Trying to fool us around, are we?
-	if (empty($topic))
-		redirectexit();
+	if (empty($topic)) {
+			redirectexit();
+	}
 
 	removeDeleteConcurrence();
 
@@ -55,20 +57,23 @@ 
 	list ($starter, $subject, $approved, $locked) = $smcFunc['db_fetch_row']($request);
 	$smcFunc['db_free_result']($request);
 
-	if ($starter == $user_info['id'] && !allowedTo('remove_any'))
-		isAllowedTo('remove_own');
-	else
-		isAllowedTo('remove_any');
+	if ($starter == $user_info['id'] && !allowedTo('remove_any')) {
+			isAllowedTo('remove_own');
+	} else {
+			isAllowedTo('remove_any');
+	}
 
 	// Can they see the topic?
-	if ($modSettings['postmod_active'] && !$approved && $starter != $user_info['id'])
-		isAllowedTo('approve_posts');
+	if ($modSettings['postmod_active'] && !$approved && $starter != $user_info['id']) {
+			isAllowedTo('approve_posts');
+	}
 
 	// Ok, we got that far, but is it locked?
 	if ($locked)
 	{
-		if (!($locked == 1 && $starter == $user_info['id'] || allowedTo('lock_any')))
-			fatal_lang_error('cannot_remove_locked', 'user');
+		if (!($locked == 1 && $starter == $user_info['id'] || allowedTo('lock_any'))) {
+					fatal_lang_error('cannot_remove_locked', 'user');
+		}
 	}
 
 	// Notify people that this topic has been removed.
@@ -77,8 +82,9 @@ 
 	removeTopics($topic);
 
 	// Note, only log topic ID in native form if it's not gone forever.
-	if (allowedTo('remove_any') || (allowedTo('remove_own') && $starter == $user_info['id']))
-		logAction('remove', array((empty($modSettings['recycle_enable']) || $modSettings['recycle_board'] != $board ? 'topic' : 'old_topic_id') => $topic, 'subject' => $subject, 'member' => $starter, 'board' => $board));
+	if (allowedTo('remove_any') || (allowedTo('remove_own') && $starter == $user_info['id'])) {
+			logAction('remove', array((empty($modSettings['recycle_enable']) || $modSettings['recycle_board'] != $board ? 'topic' : 'old_topic_id') => $topic, 'subject' => $subject, 'member' => $starter, 'board' => $board));
+	}
 
 	redirectexit('board=' . $board . '.0');
 }
@@ -96,8 +102,9 @@ 
 	$_REQUEST['msg'] = (int) $_REQUEST['msg'];
 
 	// Is $topic set?
-	if (empty($topic) && isset($_REQUEST['topic']))
-		$topic = (int) $_REQUEST['topic'];
+	if (empty($topic) && isset($_REQUEST['topic'])) {
+			$topic = (int) $_REQUEST['topic'];
+	}
 
 	removeDeleteConcurrence();
 
@@ -116,44 +123,48 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// Verify they can see this!
-	if ($modSettings['postmod_active'] && !$approved && !empty($poster) && $poster != $user_info['id'])
-		isAllowedTo('approve_posts');
+	if ($modSettings['postmod_active'] && !$approved && !empty($poster) && $poster != $user_info['id']) {
+			isAllowedTo('approve_posts');
+	}
 
 	if ($poster == $user_info['id'])
 	{
 		if (!allowedTo('delete_own'))
 		{
-			if ($starter == $user_info['id'] && !allowedTo('delete_any'))
-				isAllowedTo('delete_replies');
-			elseif (!allowedTo('delete_any'))
-				isAllowedTo('delete_own');
+			if ($starter == $user_info['id'] && !allowedTo('delete_any')) {
+							isAllowedTo('delete_replies');
+			} elseif (!allowedTo('delete_any')) {
+							isAllowedTo('delete_own');
+			}
+		} elseif (!allowedTo('delete_any') && ($starter != $user_info['id'] || !allowedTo('delete_replies')) && !empty($modSettings['edit_disable_time']) && $post_time + $modSettings['edit_disable_time'] * 60 < time()) {
+					fatal_lang_error('modify_post_time_passed', false);
 		}
-		elseif (!allowedTo('delete_any') && ($starter != $user_info['id'] || !allowedTo('delete_replies')) && !empty($modSettings['edit_disable_time']) && $post_time + $modSettings['edit_disable_time'] * 60 < time())
-			fatal_lang_error('modify_post_time_passed', false);
+	} elseif ($starter == $user_info['id'] && !allowedTo('delete_any')) {
+			isAllowedTo('delete_replies');
+	} else {
+			isAllowedTo('delete_any');
 	}
-	elseif ($starter == $user_info['id'] && !allowedTo('delete_any'))
-		isAllowedTo('delete_replies');
-	else
-		isAllowedTo('delete_any');
 
 	// If the full topic was removed go back to the board.
 	$full_topic = removeMessage($_REQUEST['msg']);
 
-	if (allowedTo('delete_any') && (!allowedTo('delete_own') || $poster != $user_info['id']))
-		logAction('delete', array('topic' => $topic, 'subject' => $subject, 'member' => $poster, 'board' => $board));
+	if (allowedTo('delete_any') && (!allowedTo('delete_own') || $poster != $user_info['id'])) {
+			logAction('delete', array('topic' => $topic, 'subject' => $subject, 'member' => $poster, 'board' => $board));
+	}
 
 	// We want to redirect back to recent action.
-	if (isset($_REQUEST['modcenter']))
-		redirectexit('action=moderate;area=reportedposts;done');
-	elseif (isset($_REQUEST['recent']))
-		redirectexit('action=recent');
-	elseif (isset($_REQUEST['profile'], $_REQUEST['start'], $_REQUEST['u']))
-		redirectexit('action=profile;u=' . $_REQUEST['u'] . ';area=showposts;start=' . $_REQUEST['start']);
-	elseif ($full_topic)
-		redirectexit('board=' . $board . '.0');
-	else
-		redirectexit('topic=' . $topic . '.' . $_REQUEST['start']);
-}
+	if (isset($_REQUEST['modcenter'])) {
+			redirectexit('action=moderate;area=reportedposts;done');
+	} elseif (isset($_REQUEST['recent'])) {
+			redirectexit('action=recent');
+	} elseif (isset($_REQUEST['profile'], $_REQUEST['start'], $_REQUEST['u'])) {
+			redirectexit('action=profile;u=' . $_REQUEST['u'] . ';area=showposts;start=' . $_REQUEST['start']);
+	} elseif ($full_topic) {
+			redirectexit('board=' . $board . '.0');
+	} else {
+			redirectexit('topic=' . $topic . '.' . $_REQUEST['start']);
+	}
+	}
 
 /**
  * So long as you are sure... all old posts will be gone.
@@ -167,8 +178,9 @@ 
 	checkSession('post', 'admin');
 
 	// No boards at all?  Forget it then :/.
-	if (empty($_POST['boards']))
-		redirectexit('action=admin;area=maintain;sa=topics');
+	if (empty($_POST['boards'])) {
+			redirectexit('action=admin;area=maintain;sa=topics');
+	}
 
 	// This should exist, but we can make sure.
 	$_POST['delete_type'] = isset($_POST['delete_type']) ? $_POST['delete_type'] : 'nothing';
@@ -222,8 +234,9 @@ 
 		$condition_params
 	);
 	$topics = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$topics[] = $row['id_topic'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$topics[] = $row['id_topic'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	removeTopics($topics, false, true);
@@ -247,11 +260,13 @@ 
 	global $sourcedir, $modSettings, $smcFunc;
 
 	// Nothing to do?
-	if (empty($topics))
-		return;
+	if (empty($topics)) {
+			return;
+	}
 	// Only a single topic.
-	if (is_numeric($topics))
-		$topics = array($topics);
+	if (is_numeric($topics)) {
+			$topics = array($topics);
+	}
 
 	$recycle_board = !empty($modSettings['recycle_enable']) && !empty($modSettings['recycle_board']) ? (int) $modSettings['recycle_board'] : 0;
 
@@ -276,8 +291,9 @@ 
 		);
 		if ($smcFunc['db_num_rows']($requestMembers) > 0)
 		{
-			while ($rowMembers = $smcFunc['db_fetch_assoc']($requestMembers))
-				updateMemberData($rowMembers['id_member'], array('posts' => 'posts - ' . $rowMembers['posts']));
+			while ($rowMembers = $smcFunc['db_fetch_assoc']($requestMembers)) {
+							updateMemberData($rowMembers['id_member'], array('posts' => 'posts - ' . $rowMembers['posts']));
+			}
 		}
 		$smcFunc['db_free_result']($requestMembers);
 	}
@@ -303,8 +319,9 @@ 
 			$recycleTopics = array();
 			while ($row = $smcFunc['db_fetch_assoc']($request))
 			{
-				if (function_exists('apache_reset_timeout'))
-					@apache_reset_timeout();
+				if (function_exists('apache_reset_timeout')) {
+									@apache_reset_timeout();
+				}
 
 				$recycleTopics[] = $row['id_topic'];
 
@@ -346,20 +363,22 @@ 
 
 			// Topics that were recycled don't need to be deleted, so subtract them.
 			$topics = array_diff($topics, $recycleTopics);
+		} else {
+					$smcFunc['db_free_result']($request);
 		}
-		else
-			$smcFunc['db_free_result']($request);
 	}
 
 	// Still topics left to delete?
-	if (empty($topics))
-		return;
+	if (empty($topics)) {
+			return;
+	}
 
 	// Callback for search APIs to do their thing
 	require_once($sourcedir . '/Search.php');
 	$searchAPI = findSearchAPI();
-	if ($searchAPI->supportsMethod('topicsRemoved'))
-		$searchAPI->topicsRemoved($topics);
+	if ($searchAPI->supportsMethod('topicsRemoved')) {
+			$searchAPI->topicsRemoved($topics);
+	}
 
 	$adjustBoards = array();
 
@@ -391,10 +410,11 @@ 
 		$adjustBoards[$row['id_board']]['unapproved_posts'] += $row['unapproved_posts'];
 
 		// Add the topics to the right type.
-		if ($row['approved'])
-			$adjustBoards[$row['id_board']]['num_topics'] += $row['num_topics'];
-		else
-			$adjustBoards[$row['id_board']]['unapproved_topics'] += $row['num_topics'];
+		if ($row['approved']) {
+					$adjustBoards[$row['id_board']]['num_topics'] += $row['num_topics'];
+		} else {
+					$adjustBoards[$row['id_board']]['unapproved_topics'] += $row['num_topics'];
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -403,8 +423,9 @@ 
 		// Decrease the posts/topics...
 		foreach ($adjustBoards as $stats)
 		{
-			if (function_exists('apache_reset_timeout'))
-				@apache_reset_timeout();
+			if (function_exists('apache_reset_timeout')) {
+							@apache_reset_timeout();
+			}
 
 			$smcFunc['db_query']('', '
 				UPDATE {db_prefix}boards
@@ -438,8 +459,9 @@ 
 		)
 	);
 	$polls = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$polls[] = $row['id_poll'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$polls[] = $row['id_poll'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	if (!empty($polls))
@@ -492,8 +514,9 @@ 
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (function_exists('apache_reset_timeout'))
-				@apache_reset_timeout();
+			if (function_exists('apache_reset_timeout')) {
+							@apache_reset_timeout();
+			}
 
 			$words = array_merge($words, text2words($row['body'], $customIndexSettings['bytes_per_word'], true));
 			$messages[] = $row['id_msg'];
@@ -501,8 +524,8 @@ 
 		$smcFunc['db_free_result']($request);
 		$words = array_unique($words);
 
-		if (!empty($words) && !empty($messages))
-			$smcFunc['db_query']('', '
+		if (!empty($words) && !empty($messages)) {
+					$smcFunc['db_query']('', '
 				DELETE FROM {db_prefix}log_search_words
 				WHERE id_word IN ({array_int:word_list})
 					AND id_msg IN ({array_int:message_list})',
@@ -511,6 +534,7 @@ 
 					'message_list' => $messages,
 				)
 			);
+		}
 	}
 
 	// Delete anything related to the topic.
@@ -569,8 +593,9 @@ 
 
 	require_once($sourcedir . '/Subs-Post.php');
 	$updates = array();
-	foreach ($adjustBoards as $stats)
-		$updates[] = $stats['id_board'];
+	foreach ($adjustBoards as $stats) {
+			$updates[] = $stats['id_board'];
+	}
 	updateLastMessages($updates);
 }
 
@@ -587,8 +612,9 @@ 
 {
 	global $board, $sourcedir, $modSettings, $user_info, $smcFunc;
 
-	if (empty($message) || !is_numeric($message))
-		return false;
+	if (empty($message) || !is_numeric($message)) {
+			return false;
+	}
 
 	$recycle_board = !empty($modSettings['recycle_enable']) && !empty($modSettings['recycle_board']) ? (int) $modSettings['recycle_board'] : 0;
 
@@ -607,8 +633,9 @@ 
 			'id_msg' => $message,
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) == 0)
-		return false;
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			return false;
+	}
 	$row = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -629,54 +656,57 @@ 
 				{
 					if ($row['id_member_poster'] == $user_info['id'])
 					{
-						if (!$delete_replies)
-							fatal_lang_error('cannot_delete_replies', 'permission');
+						if (!$delete_replies) {
+													fatal_lang_error('cannot_delete_replies', 'permission');
+						}
+					} else {
+											fatal_lang_error('cannot_delete_own', 'permission');
 					}
-					else
-						fatal_lang_error('cannot_delete_own', 'permission');
+				} elseif (($row['id_member_poster'] != $user_info['id'] || !$delete_replies) && !empty($modSettings['edit_disable_time']) && $row['poster_time'] + $modSettings['edit_disable_time'] * 60 < time()) {
+									fatal_lang_error('modify_post_time_passed', false);
 				}
-				elseif (($row['id_member_poster'] != $user_info['id'] || !$delete_replies) && !empty($modSettings['edit_disable_time']) && $row['poster_time'] + $modSettings['edit_disable_time'] * 60 < time())
-					fatal_lang_error('modify_post_time_passed', false);
-			}
-			elseif ($row['id_member_poster'] == $user_info['id'])
+			} elseif ($row['id_member_poster'] == $user_info['id'])
 			{
-				if (!$delete_replies)
-					fatal_lang_error('cannot_delete_replies', 'permission');
+				if (!$delete_replies) {
+									fatal_lang_error('cannot_delete_replies', 'permission');
+				}
+			} else {
+							fatal_lang_error('cannot_delete_any', 'permission');
 			}
-			else
-				fatal_lang_error('cannot_delete_any', 'permission');
 		}
 
 		// Can't delete an unapproved message, if you can't see it!
 		if ($modSettings['postmod_active'] && !$row['approved'] && $row['id_member'] != $user_info['id'] && !(in_array(0, $delete_any) || in_array($row['id_board'], $delete_any)))
 		{
 			$approve_posts = boardsAllowedTo('approve_posts');
-			if (!in_array(0, $approve_posts) && !in_array($row['id_board'], $approve_posts))
-				return false;
+			if (!in_array(0, $approve_posts) && !in_array($row['id_board'], $approve_posts)) {
+							return false;
+			}
 		}
-	}
-	else
+	} else
 	{
 		// Check permissions to delete this message.
 		if ($row['id_member'] == $user_info['id'])
 		{
 			if (!allowedTo('delete_own'))
 			{
-				if ($row['id_member_poster'] == $user_info['id'] && !allowedTo('delete_any'))
-					isAllowedTo('delete_replies');
-				elseif (!allowedTo('delete_any'))
-					isAllowedTo('delete_own');
+				if ($row['id_member_poster'] == $user_info['id'] && !allowedTo('delete_any')) {
+									isAllowedTo('delete_replies');
+				} elseif (!allowedTo('delete_any')) {
+									isAllowedTo('delete_own');
+				}
+			} elseif (!allowedTo('delete_any') && ($row['id_member_poster'] != $user_info['id'] || !allowedTo('delete_replies')) && !empty($modSettings['edit_disable_time']) && $row['poster_time'] + $modSettings['edit_disable_time'] * 60 < time()) {
+							fatal_lang_error('modify_post_time_passed', false);
 			}
-			elseif (!allowedTo('delete_any') && ($row['id_member_poster'] != $user_info['id'] || !allowedTo('delete_replies')) && !empty($modSettings['edit_disable_time']) && $row['poster_time'] + $modSettings['edit_disable_time'] * 60 < time())
-				fatal_lang_error('modify_post_time_passed', false);
+		} elseif ($row['id_member_poster'] == $user_info['id'] && !allowedTo('delete_any')) {
+					isAllowedTo('delete_replies');
+		} else {
+					isAllowedTo('delete_any');
 		}
-		elseif ($row['id_member_poster'] == $user_info['id'] && !allowedTo('delete_any'))
-			isAllowedTo('delete_replies');
-		else
-			isAllowedTo('delete_any');
 
-		if ($modSettings['postmod_active'] && !$row['approved'] && $row['id_member'] != $user_info['id'] && !allowedTo('delete_own'))
-			isAllowedTo('approve_posts');
+		if ($modSettings['postmod_active'] && !$row['approved'] && $row['id_member'] != $user_info['id'] && !allowedTo('delete_own')) {
+					isAllowedTo('approve_posts');
+		}
 	}
 
 	// Delete the *whole* topic, but only if the topic consists of one message.
@@ -692,31 +722,34 @@ 
 				$remove_own = in_array(0, $remove_own) || in_array($row['id_board'], $remove_own);
 			}
 
-			if ($row['id_member'] != $user_info['id'] && !$remove_any)
-				fatal_lang_error('cannot_remove_any', 'permission');
-			elseif (!$remove_any && !$remove_own)
-				fatal_lang_error('cannot_remove_own', 'permission');
-		}
-		else
+			if ($row['id_member'] != $user_info['id'] && !$remove_any) {
+							fatal_lang_error('cannot_remove_any', 'permission');
+			} elseif (!$remove_any && !$remove_own) {
+							fatal_lang_error('cannot_remove_own', 'permission');
+			}
+		} else
 		{
 			// Check permissions to delete a whole topic.
-			if ($row['id_member'] != $user_info['id'])
-				isAllowedTo('remove_any');
-			elseif (!allowedTo('remove_any'))
-				isAllowedTo('remove_own');
+			if ($row['id_member'] != $user_info['id']) {
+							isAllowedTo('remove_any');
+			} elseif (!allowedTo('remove_any')) {
+							isAllowedTo('remove_own');
+			}
 		}
 
 		// ...if there is only one post.
-		if (!empty($row['num_replies']))
-			fatal_lang_error('delFirstPost', false);
+		if (!empty($row['num_replies'])) {
+					fatal_lang_error('delFirstPost', false);
+		}
 
 		removeTopics($row['id_topic']);
 		return true;
 	}
 
 	// Deleting a recycled message can not lower anyone's post count.
-	if (!empty($recycle_board) && $row['id_board'] == $recycle_board)
-		$decreasePostCount = false;
+	if (!empty($recycle_board) && $row['id_board'] == $recycle_board) {
+			$decreasePostCount = false;
+	}
 
 	// This is the last post, update the last post on the board.
 	if ($row['id_last_msg'] == $message)
@@ -755,8 +788,8 @@ 
 		);
 	}
 	// Only decrease post counts.
-	else
-		$smcFunc['db_query']('', '
+	else {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}topics
 			SET ' . ($row['approved'] ? '
 				num_replies = CASE WHEN num_replies = {int:no_replies} THEN 0 ELSE num_replies - 1 END' : '
@@ -768,6 +801,7 @@ 
 				'id_topic' => $row['id_topic'],
 			)
 		);
+	}
 
 	// Default recycle to false.
 	$recycle = false;
@@ -787,8 +821,9 @@ 
 				'recycle_board' => $modSettings['recycle_board'],
 			)
 		);
-		if ($smcFunc['db_num_rows']($request) == 0)
-			fatal_lang_error('recycle_no_valid_board');
+		if ($smcFunc['db_num_rows']($request) == 0) {
+					fatal_lang_error('recycle_no_valid_board');
+		}
 		list ($isRead, $last_board_msg) = $smcFunc['db_fetch_row']($request);
 		$smcFunc['db_free_result']($request);
 
@@ -807,8 +842,8 @@ 
 		$smcFunc['db_free_result']($request);
 
 		// Insert a new topic in the recycle board if $id_recycle_topic is empty.
-		if (empty($id_recycle_topic))
-			$id_topic = $smcFunc['db_insert']('',
+		if (empty($id_recycle_topic)) {
+					$id_topic = $smcFunc['db_insert']('',
 				'{db_prefix}topics',
 				array(
 					'id_board' => 'int', 'id_member_started' => 'int', 'id_member_updated' => 'int', 'id_first_msg' => 'int',
@@ -821,6 +856,7 @@ 
 				array('id_topic'),
 				1
 			);
+		}
 
 		// Capture the ID of the new topic...
 		$topicID = empty($id_recycle_topic) ? $id_topic : $id_recycle_topic;
@@ -858,22 +894,24 @@ 
 			);
 
 			// Mark recycled topic as read.
-			if (!$user_info['is_guest'])
-				$smcFunc['db_insert']('replace',
+			if (!$user_info['is_guest']) {
+							$smcFunc['db_insert']('replace',
 					'{db_prefix}log_topics',
 					array('id_topic' => 'int', 'id_member' => 'int', 'id_msg' => 'int', 'unwatched' => 'int'),
 					array($topicID, $user_info['id'], $modSettings['maxMsgID'], 0),
 					array('id_topic', 'id_member')
 				);
+			}
 
 			// Mark recycle board as seen, if it was marked as seen before.
-			if (!empty($isRead) && !$user_info['is_guest'])
-				$smcFunc['db_insert']('replace',
+			if (!empty($isRead) && !$user_info['is_guest']) {
+							$smcFunc['db_insert']('replace',
 					'{db_prefix}log_boards',
 					array('id_board' => 'int', 'id_member' => 'int', 'id_msg' => 'int'),
 					array($modSettings['recycle_board'], $user_info['id'], $modSettings['maxMsgID']),
 					array('id_board', 'id_member')
 				);
+			}
 
 			// Add one topic and post to the recycle bin board.
 			$smcFunc['db_query']('', '
@@ -891,8 +929,8 @@ 
 			);
 
 			// Lets increase the num_replies, and the first/last message ID as appropriate.
-			if (!empty($id_recycle_topic))
-				$smcFunc['db_query']('', '
+			if (!empty($id_recycle_topic)) {
+							$smcFunc['db_query']('', '
 					UPDATE {db_prefix}topics
 					SET num_replies = num_replies + 1' .
 						($message > $last_topic_msg ? ', id_last_msg = {int:id_merged_msg}' : '') .
@@ -903,6 +941,7 @@ 
 						'id_merged_msg' => $message,
 					)
 				);
+			}
 
 			// Make sure this message isn't getting deleted later on.
 			$recycle = true;
@@ -912,8 +951,8 @@ 
 		}
 
 		// If it wasn't approved don't keep it in the queue.
-		if (!$row['approved'])
-			$smcFunc['db_query']('', '
+		if (!$row['approved']) {
+					$smcFunc['db_query']('', '
 				DELETE FROM {db_prefix}approval_queue
 				WHERE id_msg = {int:id_msg}
 					AND id_attach = {int:id_attach}',
@@ -922,6 +961,7 @@ 
 					'id_attach' => 0,
 				)
 			);
+		}
 	}
 
 	$smcFunc['db_query']('', '
@@ -939,8 +979,9 @@ 
 
 	// If the poster was registered and the board this message was on incremented
 	// the member's posts when it was posted, decrease his or her post count.
-	if (!empty($row['id_member']) && $decreasePostCount && empty($row['count_posts']) && $row['approved'])
-		updateMemberData($row['id_member'], array('posts' => '-'));
+	if (!empty($row['id_member']) && $decreasePostCount && empty($row['count_posts']) && $row['approved']) {
+			updateMemberData($row['id_member'], array('posts' => '-'));
+	}
 
 	// Only remove posts if they're not recycled.
 	if (!$recycle)
@@ -948,8 +989,9 @@ 
 		// Callback for search APIs to do their thing
 		require_once($sourcedir . '/Search.php');
 		$searchAPI = findSearchAPI();
-		if ($searchAPI->supportsMethod('postRemoved'))
-			$searchAPI->postRemoved($message);
+		if ($searchAPI->supportsMethod('postRemoved')) {
+					$searchAPI->postRemoved($message);
+		}
 
 		// Remove the message!
 		$smcFunc['db_query']('', '
@@ -964,8 +1006,8 @@ 
 		{
 			$customIndexSettings = smf_json_decode($modSettings['search_custom_index_config'], true);
 			$words = text2words($row['body'], $customIndexSettings['bytes_per_word'], true);
-			if (!empty($words))
-				$smcFunc['db_query']('', '
+			if (!empty($words)) {
+							$smcFunc['db_query']('', '
 					DELETE FROM {db_prefix}log_search_words
 					WHERE id_word IN ({array_int:word_list})
 						AND id_msg = {int:id_msg}',
@@ -974,6 +1016,7 @@ 
 						'id_msg' => $message,
 					)
 				);
+			}
 		}
 
 		// Delete attachment(s) if they exist.
@@ -997,10 +1040,11 @@ 
 
 	// And now to update the last message of each board we messed with.
 	require_once($sourcedir . '/Subs-Post.php');
-	if ($recycle)
-		updateLastMessages(array($row['id_board'], $modSettings['recycle_board']));
-	else
-		updateLastMessages($row['id_board']);
+	if ($recycle) {
+			updateLastMessages(array($row['id_board'], $modSettings['recycle_board']));
+	} else {
+			updateLastMessages($row['id_board']);
+	}
 
 	// Close any moderation reports for this message.
 	$smcFunc['db_query']('', '
@@ -1033,8 +1077,9 @@ 
 	checkSession('get');
 
 	// Is recycled board enabled?
-	if (empty($modSettings['recycle_enable']))
-		fatal_lang_error('restored_disabled', 'critical');
+	if (empty($modSettings['recycle_enable'])) {
+			fatal_lang_error('restored_disabled', 'critical');
+	}
 
 	// Can we be in here?
 	isAllowedTo('move_any', $modSettings['recycle_board']);
@@ -1049,8 +1094,9 @@ 
 	if (!empty($_REQUEST['msgs']))
 	{
 		$msgs = explode(',', $_REQUEST['msgs']);
-		foreach ($msgs as $k => $msg)
-			$msgs[$k] = (int) $msg;
+		foreach ($msgs as $k => $msg) {
+					$msgs[$k] = (int) $msg;
+		}
 
 		// Get the id_previous_board and id_previous_topic.
 		$request = $smcFunc['db_query']('', '
@@ -1084,8 +1130,8 @@ 
 			}
 
 			$previous_topics[] = $row['id_previous_topic'];
-			if (empty($actioned_messages[$row['id_previous_topic']]))
-				$actioned_messages[$row['id_previous_topic']] = array(
+			if (empty($actioned_messages[$row['id_previous_topic']])) {
+							$actioned_messages[$row['id_previous_topic']] = array(
 					'msgs' => array(),
 					'count_posts' => $row['count_posts'],
 					'subject' => $row['subject'],
@@ -1095,17 +1141,20 @@ 
 					'current_board' => $row['id_board'],
 					'members' => array(),
 				);
+			}
 
 			$actioned_messages[$row['id_previous_topic']]['msgs'][$row['id_msg']] = $row['subject'];
-			if ($row['id_member'])
-				$actioned_messages[$row['id_previous_topic']]['members'][] = $row['id_member'];
+			if ($row['id_member']) {
+							$actioned_messages[$row['id_previous_topic']]['members'][] = $row['id_member'];
+			}
 		}
 		$smcFunc['db_free_result']($request);
 
 		// Check for topics we are going to fully restore.
-		foreach ($actioned_messages as $topic => $data)
-			if (in_array($topic, $topics_to_restore))
+		foreach ($actioned_messages as $topic => $data) {
+					if (in_array($topic, $topics_to_restore))
 				unset($actioned_messages[$topic]);
+		}
 
 		// Load any previous topics to check they exist.
 		if (!empty($previous_topics))
@@ -1120,11 +1169,12 @@ 
 				)
 			);
 			$previous_topics = array();
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$previous_topics[$row['id_topic']] = array(
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$previous_topics[$row['id_topic']] = array(
 					'board' => $row['id_board'],
 					'subject' => $row['subject'],
 				);
+			}
 			$smcFunc['db_free_result']($request);
 		}
 
@@ -1146,11 +1196,11 @@ 
 				// Log em.
 				logAction('restore_posts', array('topic' => $topic, 'subject' => $previous_topics[$topic]['subject'], 'board' => empty($data['previous_board']) ? $data['possible_prev_board'] : $data['previous_board']));
 				$messages = array_merge(array_keys($data['msgs']), $messages);
-			}
-			else
+			} else
 			{
-				foreach ($data['msgs'] as $msg)
-					$unfound_messages[$msg['id']] = $msg['subject'];
+				foreach ($data['msgs'] as $msg) {
+									$unfound_messages[$msg['id']] = $msg['subject'];
+				}
 			}
 		}
 	}
@@ -1159,8 +1209,9 @@ 
 	if (!empty($_REQUEST['topics']))
 	{
 		$topics = explode(',', $_REQUEST['topics']);
-		foreach ($topics as $id)
-			$topics_to_restore[] = (int) $id;
+		foreach ($topics as $id) {
+					$topics_to_restore[] = (int) $id;
+		}
 	}
 
 	if (!empty($topics_to_restore))
@@ -1214,8 +1265,9 @@ 
 					)
 				);
 
-				while ($member = $smcFunc['db_fetch_assoc']($request2))
-					updateMemberData($member['id_member'], array('posts' => 'posts + ' . $member['post_count']));
+				while ($member = $smcFunc['db_fetch_assoc']($request2)) {
+									updateMemberData($member['id_member'], array('posts' => 'posts + ' . $member['post_count']));
+				}
 				$smcFunc['db_free_result']($request2);
 			}
 
@@ -1226,8 +1278,9 @@ 
 	}
 
 	// Didn't find some things?
-	if (!empty($unfound_messages))
-		fatal_lang_error('restore_not_found', false, array(implode('<br>', $unfound_messages)));
+	if (!empty($unfound_messages)) {
+			fatal_lang_error('restore_not_found', false, array(implode('<br>', $unfound_messages)));
+	}
 
 	// Just send them to the index if they get here.
 	redirectexit();
@@ -1247,12 +1300,14 @@ 
 	//!!! This really needs to be rewritten to take a load of messages from ANY topic, it's also inefficient.
 
 	// Is it an array?
-	if (!is_array($msgs))
-		$msgs = array($msgs);
+	if (!is_array($msgs)) {
+			$msgs = array($msgs);
+	}
 
 	// Lets make sure they are int.
-	foreach ($msgs as $key => $msg)
-		$msgs[$key] = (int) $msg;
+	foreach ($msgs as $key => $msg) {
+			$msgs[$key] = (int) $msg;
+	}
 
 	// Get the source information.
 	$request = $smcFunc['db_query']('', '
@@ -1295,8 +1350,9 @@ 
 			)
 		);
 
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			updateMemberData($row['id_member'], array('posts' => '+'));
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					updateMemberData($row['id_member'], array('posts' => '+'));
+		}
 	}
 
 	// Time to move the messages.
@@ -1332,13 +1388,15 @@ 
 	);
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if ($row['id_first_msg'] < $target_topic_data['id_first_msg'])
-			$target_topic_data['id_first_msg'] = $row['id_first_msg'];
+		if ($row['id_first_msg'] < $target_topic_data['id_first_msg']) {
+					$target_topic_data['id_first_msg'] = $row['id_first_msg'];
+		}
 		$target_topic_data['id_last_msg'] = $row['id_last_msg'];
-		if (!$row['approved'])
-			$target_topic_data['unapproved_posts'] = $row['message_count'];
-		else
-			$target_topic_data['num_replies'] = max(0, $row['message_count'] - 1);
+		if (!$row['approved']) {
+					$target_topic_data['unapproved_posts'] = $row['message_count'];
+		} else {
+					$target_topic_data['num_replies'] = max(0, $row['message_count'] - 1);
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -1397,13 +1455,15 @@ 
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if ($row['id_first_msg'] < $source_topic_data['id_first_msg'])
-				$source_topic_data['id_first_msg'] = $row['id_first_msg'];
+			if ($row['id_first_msg'] < $source_topic_data['id_first_msg']) {
+							$source_topic_data['id_first_msg'] = $row['id_first_msg'];
+			}
 			$source_topic_data['id_last_msg'] = $row['id_last_msg'];
-			if (!$row['approved'])
-				$source_topic_data['unapproved_posts'] = $row['message_count'];
-			else
-				$source_topic_data['num_replies'] = max(0, $row['message_count'] - 1);
+			if (!$row['approved']) {
+							$source_topic_data['unapproved_posts'] = $row['message_count'];
+			} else {
+							$source_topic_data['num_replies'] = max(0, $row['message_count'] - 1);
+			}
 		}
 		$smcFunc['db_free_result']($request);
 
@@ -1467,10 +1527,12 @@ 
 
 	// Subject cache?
 	$cache_updates = array();
-	if ($target_first_msg != $target_topic_data['id_first_msg'])
-		$cache_updates[] = $target_topic_data['id_first_msg'];
-	if (!empty($source_topic_data['id_first_msg']) && $from_first_msg != $source_topic_data['id_first_msg'])
-		$cache_updates[] = $source_topic_data['id_first_msg'];
+	if ($target_first_msg != $target_topic_data['id_first_msg']) {
+			$cache_updates[] = $target_topic_data['id_first_msg'];
+	}
+	if (!empty($source_topic_data['id_first_msg']) && $from_first_msg != $source_topic_data['id_first_msg']) {
+			$cache_updates[] = $source_topic_data['id_first_msg'];
+	}
 
 	if (!empty($cache_updates))
 	{
@@ -1482,8 +1544,9 @@ 
 				'first_messages' => $cache_updates,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			updateStats('subject', $row['id_topic'], $row['subject']);
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					updateStats('subject', $row['id_topic'], $row['subject']);
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
@@ -1499,22 +1562,26 @@ 
 	global $modSettings, $board, $scripturl, $context;
 
 	// No recycle no need to go further
-	if (empty($modSettings['recycle_enable']) || empty($modSettings['recycle_board']))
-		return false;
+	if (empty($modSettings['recycle_enable']) || empty($modSettings['recycle_board'])) {
+			return false;
+	}
 
 	// If it's confirmed go on and delete (from recycle)
-	if (isset($_GET['confirm_delete']))
-		return true;
+	if (isset($_GET['confirm_delete'])) {
+			return true;
+	}
 
-	if (empty($board))
-		return false;
+	if (empty($board)) {
+			return false;
+	}
 
-	if ($modSettings['recycle_board'] != $board)
-		return true;
-	elseif (isset($_REQUEST['msg']))
-		$confirm_url = $scripturl . '?action=deletemsg;confirm_delete;topic=' . $context['current_topic'] . '.0;msg=' . $_REQUEST['msg'] . ';' . $context['session_var'] . '=' . $context['session_id'];
-	else
-		$confirm_url = $scripturl . '?action=removetopic2;confirm_delete;topic=' . $context['current_topic'] . '.0;' . $context['session_var'] . '=' . $context['session_id'];
+	if ($modSettings['recycle_board'] != $board) {
+			return true;
+	} elseif (isset($_REQUEST['msg'])) {
+			$confirm_url = $scripturl . '?action=deletemsg;confirm_delete;topic=' . $context['current_topic'] . '.0;msg=' . $_REQUEST['msg'] . ';' . $context['session_var'] . '=' . $context['session_id'];
+	} else {
+			$confirm_url = $scripturl . '?action=removetopic2;confirm_delete;topic=' . $context['current_topic'] . '.0;' . $context['session_var'] . '=' . $context['session_id'];
+	}
 
 	fatal_lang_error('post_already_deleted', false, array($confirm_url));
 }

Sources/CacheAPI-sqlite.php

Braces +3 added lines, -3 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('Hacking attempt...');
+}
 
 /**
  * SQLite Cache API class
@@ -153,8 +154,7 @@ 
 		if (is_null($dir) || !is_writable($dir))
 		{
 			$this->cachedir = $cachedir_sqlite;
-		}
-		else
+		} else
 		{
 			$this->cachedir = $dir;
 		}

Sources/Calendar.php

Braces +125 added lines, -99 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Show the calendar.
@@ -47,12 +48,14 @@ 
 		'post' => 'CalendarPost',
 	);
 
-	if (isset($_GET['sa']) && isset($subActions[$_GET['sa']]))
-		return call_helper($subActions[$_GET['sa']]);
+	if (isset($_GET['sa']) && isset($subActions[$_GET['sa']])) {
+			return call_helper($subActions[$_GET['sa']]);
+	}
 
 	// You can't do anything if the calendar is off.
-	if (empty($modSettings['cal_enabled']))
-		fatal_lang_error('calendar_off', false);
+	if (empty($modSettings['cal_enabled'])) {
+			fatal_lang_error('calendar_off', false);
+	}
 
 	// This is gonna be needed...
 	loadTemplate('Calendar');
@@ -80,8 +83,9 @@ 
 				$_REQUEST['month'] = (int) $_REQUEST['month'];
 
 				// We want month view.
-				if (empty($_GET['viewmonth']))
-					$_GET['viewmonth'] = true;
+				if (empty($_GET['viewmonth'])) {
+									$_GET['viewmonth'] = true;
+				}
 
 				// And we definitely don't want weekly view.
 				unset ($_GET['viewweek']);
@@ -98,22 +102,25 @@ 
 	$context['page_title'] = $txt['calendar'];
 
 	// Ensure a default view is defined
-	if (empty($modSettings['calendar_default_view']))
-		$modSettings['calendar_default_view'] = 'view_list';
+	if (empty($modSettings['calendar_default_view'])) {
+			$modSettings['calendar_default_view'] = 'view_list';
+	}
 
 	// What view do we want?
-	if (isset($_GET['viewweek']))
-		$context['calendar_view'] = 'view_week';
-	elseif (isset($_GET['viewmonth']))
-		$context['calendar_view'] = 'view_month';
-	elseif (isset($_GET['viewlist']))
-		$context['calendar_view'] = 'view_list';
-	else
-		$context['calendar_view'] = $modSettings['calendar_default_view'];
+	if (isset($_GET['viewweek'])) {
+			$context['calendar_view'] = 'view_week';
+	} elseif (isset($_GET['viewmonth'])) {
+			$context['calendar_view'] = 'view_month';
+	} elseif (isset($_GET['viewlist'])) {
+			$context['calendar_view'] = 'view_list';
+	} else {
+			$context['calendar_view'] = $modSettings['calendar_default_view'];
+	}
 
 	// Don't let search engines index the non-default calendar pages
-	if ($context['calendar_view'] !== $modSettings['calendar_default_view'])
-		$context['robot_no_index'] = true;
+	if ($context['calendar_view'] !== $modSettings['calendar_default_view']) {
+			$context['robot_no_index'] = true;
+	}
 
 	// Get the current day of month...
 	require_once($sourcedir . '/Subs-Calendar.php');
@@ -174,16 +181,19 @@ 
 	);
 
 	// Make sure the year and month are in valid ranges.
-	if ($curPage['month'] < 1 || $curPage['month'] > 12)
-		fatal_lang_error('invalid_month', false);
-	if ($curPage['year'] < $modSettings['cal_minyear'] || $curPage['year'] > $modSettings['cal_maxyear'])
-		fatal_lang_error('invalid_year', false);
+	if ($curPage['month'] < 1 || $curPage['month'] > 12) {
+			fatal_lang_error('invalid_month', false);
+	}
+	if ($curPage['year'] < $modSettings['cal_minyear'] || $curPage['year'] > $modSettings['cal_maxyear']) {
+			fatal_lang_error('invalid_year', false);
+	}
 	// If we have a day clean that too.
 	if ($context['calendar_view'] != 'view_month')
 	{
 		$isValid = checkdate($curPage['month'], $curPage['day'], $curPage['year']);
-		if (!$isValid)
-			fatal_lang_error('invalid_day', false);
+		if (!$isValid) {
+					fatal_lang_error('invalid_day', false);
+		}
 	}
 
 	// Load all the context information needed to show the calendar grid.
@@ -205,23 +215,26 @@ 
 	);
 
 	// Load up the main view.
-	if ($context['calendar_view'] == 'view_list')
-		$context['calendar_grid_main'] = getCalendarList($curPage['start_date'], $curPage['end_date'], $calendarOptions);
-	elseif ($context['calendar_view'] == 'view_week')
-		$context['calendar_grid_main'] = getCalendarWeek($curPage['month'], $curPage['year'], $curPage['day'], $calendarOptions);
-	else
-		$context['calendar_grid_main'] = getCalendarGrid($curPage['month'], $curPage['year'], $calendarOptions);
+	if ($context['calendar_view'] == 'view_list') {
+			$context['calendar_grid_main'] = getCalendarList($curPage['start_date'], $curPage['end_date'], $calendarOptions);
+	} elseif ($context['calendar_view'] == 'view_week') {
+			$context['calendar_grid_main'] = getCalendarWeek($curPage['month'], $curPage['year'], $curPage['day'], $calendarOptions);
+	} else {
+			$context['calendar_grid_main'] = getCalendarGrid($curPage['month'], $curPage['year'], $calendarOptions);
+	}
 
 	// Load up the previous and next months.
 	$context['calendar_grid_current'] = getCalendarGrid($curPage['month'], $curPage['year'], $calendarOptions);
 
 	// Only show previous month if it isn't pre-January of the min-year
-	if ($context['calendar_grid_current']['previous_calendar']['year'] > $modSettings['cal_minyear'] || $curPage['month'] != 1)
-		$context['calendar_grid_prev'] = getCalendarGrid($context['calendar_grid_current']['previous_calendar']['month'], $context['calendar_grid_current']['previous_calendar']['year'], $calendarOptions, true);
+	if ($context['calendar_grid_current']['previous_calendar']['year'] > $modSettings['cal_minyear'] || $curPage['month'] != 1) {
+			$context['calendar_grid_prev'] = getCalendarGrid($context['calendar_grid_current']['previous_calendar']['month'], $context['calendar_grid_current']['previous_calendar']['year'], $calendarOptions, true);
+	}
 
 	// Only show next month if it isn't post-December of the max-year
-	if ($context['calendar_grid_current']['next_calendar']['year'] < $modSettings['cal_maxyear'] || $curPage['month'] != 12)
-		$context['calendar_grid_next'] = getCalendarGrid($context['calendar_grid_current']['next_calendar']['month'], $context['calendar_grid_current']['next_calendar']['year'], $calendarOptions);
+	if ($context['calendar_grid_current']['next_calendar']['year'] < $modSettings['cal_maxyear'] || $curPage['month'] != 12) {
+			$context['calendar_grid_next'] = getCalendarGrid($context['calendar_grid_current']['next_calendar']['month'], $context['calendar_grid_current']['next_calendar']['year'], $calendarOptions);
+	}
 
 	// Basic template stuff.
 	$context['allow_calendar_event'] = allowedTo('calendar_post');
@@ -241,8 +254,9 @@ 
 	$context['blocks_disabled'] = !empty($modSettings['cal_disable_prev_next']) ? 1 : 0;
 
 	// Set the page title to mention the month or week, too
-	if ($context['calendar_view'] != 'view_list')
-		$context['page_title'] .= ' - ' . ($context['calendar_view'] == 'view_week' ? $context['calendar_grid_main']['week_title'] : $txt['months'][$context['current_month']] . ' ' . $context['current_year']);
+	if ($context['calendar_view'] != 'view_list') {
+			$context['page_title'] .= ' - ' . ($context['calendar_view'] == 'view_week' ? $context['calendar_grid_main']['week_title'] : $txt['months'][$context['current_month']] . ' ' . $context['current_year']);
+	}
 
 	// Load up the linktree!
 	$context['linktree'][] = array(
@@ -255,17 +269,19 @@ 
 		'name' => $txt['months'][$context['current_month']] . ' ' . $context['current_year']
 	);
 	// If applicable, add the current week to the linktree.
-	if ($context['calendar_view'] == 'view_week')
-		$context['linktree'][] = array(
+	if ($context['calendar_view'] == 'view_week') {
+			$context['linktree'][] = array(
 			'url' => $scripturl . '?action=calendar;viewweek;year=' . $context['current_year'] . ';month=' . $context['current_month'] . ';day=' . $context['current_day'],
 			'name' => $context['calendar_grid_main']['week_title'],
 		);
+	}
 
 	// Build the calendar button array.
 	$context['calendar_buttons'] = array();
 
-	if ($context['can_post'])
-		$context['calendar_buttons']['post_event'] = array('text' => 'calendar_post_event', 'image' => 'calendarpe.png', 'url' => $scripturl . '?action=calendar;sa=post;month=' . $context['current_month'] . ';year=' . $context['current_year'] . ';' . $context['session_var'] . '=' . $context['session_id']);
+	if ($context['can_post']) {
+			$context['calendar_buttons']['post_event'] = array('text' => 'calendar_post_event', 'image' => 'calendarpe.png', 'url' => $scripturl . '?action=calendar;sa=post;month=' . $context['current_month'] . ';year=' . $context['current_year'] . ';' . $context['session_var'] . '=' . $context['session_id']);
+	}
 
 	// Allow mods to add additional buttons here
 	call_integration_hook('integrate_calendar_buttons');
@@ -294,14 +310,16 @@ 
 	require_once($sourcedir . '/Subs.php');
 
 	// Cast this for safety...
-	if (isset($_REQUEST['eventid']))
-		$_REQUEST['eventid'] = (int) $_REQUEST['eventid'];
+	if (isset($_REQUEST['eventid'])) {
+			$_REQUEST['eventid'] = (int) $_REQUEST['eventid'];
+	}
 
 	// We want a fairly compact version of the time, but as close as possible to the user's settings.
-	if (preg_match('~%[HkIlMpPrRSTX](?:[^%]*%[HkIlMpPrRSTX])*~', $user_info['time_format'], $matches) == 0 || empty($matches[0]))
-		$time_string = '%k:%M';
-	else
-		$time_string = str_replace(array('%I', '%H', '%S', '%r', '%R', '%T'), array('%l', '%k', '', '%l:%M %p', '%k:%M', '%l:%M'), $matches[0]);
+	if (preg_match('~%[HkIlMpPrRSTX](?:[^%]*%[HkIlMpPrRSTX])*~', $user_info['time_format'], $matches) == 0 || empty($matches[0])) {
+			$time_string = '%k:%M';
+	} else {
+			$time_string = str_replace(array('%I', '%H', '%S', '%r', '%R', '%T'), array('%l', '%k', '', '%l:%M %p', '%k:%M', '%l:%M'), $matches[0]);
+	}
 
 	$js_time_string = str_replace(
 		array('%H', '%k', '%I', '%l', '%M', '%p', '%P', '%r',      '%R',  '%S', '%T',    '%X'),
@@ -315,12 +333,14 @@ 
 		checkSession();
 
 		// Validate the post...
-		if (!isset($_POST['link_to_board']))
-			validateEventPost();
+		if (!isset($_POST['link_to_board'])) {
+					validateEventPost();
+		}
 
 		// If you're not allowed to edit any events, you have to be the poster.
-		if ($_REQUEST['eventid'] > 0 && !allowedTo('calendar_edit_any'))
-			isAllowedTo('calendar_edit_' . (!empty($user_info['id']) && getEventPoster($_REQUEST['eventid']) == $user_info['id'] ? 'own' : 'any'));
+		if ($_REQUEST['eventid'] > 0 && !allowedTo('calendar_edit_any')) {
+					isAllowedTo('calendar_edit_' . (!empty($user_info['id']) && getEventPoster($_REQUEST['eventid']) == $user_info['id'] ? 'own' : 'any'));
+		}
 
 		// New - and directing?
 		if (isset($_POST['link_to_board']) || empty($modSettings['cal_allow_unlinked']))
@@ -343,8 +363,9 @@ 
 		}
 
 		// Deleting...
-		elseif (isset($_REQUEST['deleteevent']))
-			removeEvent($_REQUEST['eventid']);
+		elseif (isset($_REQUEST['deleteevent'])) {
+					removeEvent($_REQUEST['eventid']);
+		}
 
 		// ... or just update it?
 		else
@@ -366,14 +387,12 @@ 
 			$d = date_parse($_POST['start_date']);
 			$year = $d['year'];
 			$month = $d['month'];
-		}
-		elseif (isset($_POST['start_datetime']))
+		} elseif (isset($_POST['start_datetime']))
 		{
 			$d = date_parse($_POST['start_datetime']);
 			$year = $d['year'];
 			$month = $d['month'];
-		}
-		else
+		} else
 		{
 			$today = getdate();
 			$year = isset($_POST['year']) ? $_POST['year'] : $today['year'];
@@ -406,13 +425,13 @@ 
 		$context['event'] = array_merge($context['event'], $eventDatetimes);
 
 		$context['event']['last_day'] = (int) strftime('%d', mktime(0, 0, 0, $context['event']['month'] == 12 ? 1 : $context['event']['month'] + 1, 0, $context['event']['month'] == 12 ? $context['event']['year'] + 1 : $context['event']['year']));
-	}
-	else
+	} else
 	{
 		$context['event'] = getEventProperties($_REQUEST['eventid']);
 
-		if ($context['event'] === false)
-			fatal_lang_error('no_access', false);
+		if ($context['event'] === false) {
+					fatal_lang_error('no_access', false);
+		}
 
 		// If it has a board, then they should be editing it within the topic.
 		if (!empty($context['event']['topic']['id']) && !empty($context['event']['topic']['first_msg']))
@@ -423,10 +442,11 @@ 
 		}
 
 		// Make sure the user is allowed to edit this event.
-		if ($context['event']['member'] != $user_info['id'])
-			isAllowedTo('calendar_edit_any');
-		elseif (!allowedTo('calendar_edit_any'))
-			isAllowedTo('calendar_edit_own');
+		if ($context['event']['member'] != $user_info['id']) {
+					isAllowedTo('calendar_edit_any');
+		} elseif (!allowedTo('calendar_edit_any')) {
+					isAllowedTo('calendar_edit_own');
+		}
 	}
 
 	// An all day event? Set up some nice defaults in case the user wants to change that
@@ -460,8 +480,7 @@ 
 	{
 		// You can post new events but can't link them to anything...
 		$context['event']['categories'] = array();
-	}
-	else
+	} else
 	{
 		// Load the list of boards and categories in the context.
 		require_once($sourcedir . '/Subs-MessageIndex.php');
@@ -548,12 +567,14 @@ 
 	global $smcFunc, $sourcedir, $forum_version, $modSettings, $webmaster_email, $mbname;
 
 	// You can't export if the calendar export feature is off.
-	if (empty($modSettings['cal_export']))
-		fatal_lang_error('calendar_export_off', false);
+	if (empty($modSettings['cal_export'])) {
+			fatal_lang_error('calendar_export_off', false);
+	}
 
 	// Goes without saying that this is required.
-	if (!isset($_REQUEST['eventid']))
-		fatal_lang_error('no_access', false);
+	if (!isset($_REQUEST['eventid'])) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// This is kinda wanted.
 	require_once($sourcedir . '/Subs-Calendar.php');
@@ -561,15 +582,17 @@ 
 	// Load up the event in question and check it exists.
 	$event = getEventProperties($_REQUEST['eventid']);
 
-	if ($event === false)
-		fatal_lang_error('no_access', false);
+	if ($event === false) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Check the title isn't too long - iCal requires some formatting if so.
 	$title = str_split($event['title'], 30);
 	foreach ($title as $id => $line)
 	{
-		if ($id != 0)
-			$title[$id] = ' ' . $title[$id];
+		if ($id != 0) {
+					$title[$id] = ' ' . $title[$id];
+		}
 		$title[$id] .= "\n";
 	}
 
@@ -582,8 +605,7 @@ 
 	{
 		$datestart = date_format($start_date, 'Ymd\THis');
 		$dateend = date_format($end_date, 'Ymd\THis');
-	}
-	else
+	} else
 	{
 		$datestart = date_format($start_date, 'Ymd');
 
@@ -604,15 +626,18 @@ 
 	$filecontents .= 'DTSTART' . (!empty($event['start_time']) ? ';TZID=' . $event['tz'] : ';VALUE=DATE') . ':' . $datestart . "\n";
 
 	// event has a duration
-	if ($event['start_iso_gmdate'] != $event['end_iso_gmdate'])
-		$filecontents .= 'DTEND' . (!empty($event['end_time']) ? ';TZID=' . $event['tz'] : ';VALUE=DATE') . ':' . $dateend . "\n";
+	if ($event['start_iso_gmdate'] != $event['end_iso_gmdate']) {
+			$filecontents .= 'DTEND' . (!empty($event['end_time']) ? ';TZID=' . $event['tz'] : ';VALUE=DATE') . ':' . $dateend . "\n";
+	}
 
 	// event has changed? advance the sequence for this UID
-	if ($event['sequence'] > 0)
-		$filecontents .= 'SEQUENCE:' . $event['sequence'] . "\n";
+	if ($event['sequence'] > 0) {
+			$filecontents .= 'SEQUENCE:' . $event['sequence'] . "\n";
+	}
 
-	if (!empty($event['location']))
-		$filecontents .= 'LOCATION:' . str_replace(',', '\,', $event['location']) . "\n";
+	if (!empty($event['location'])) {
+			$filecontents .= 'LOCATION:' . str_replace(',', '\,', $event['location']) . "\n";
+	}
 
 	$filecontents .= 'SUMMARY:' . implode('', $title);
 	$filecontents .= 'UID:' . $event['eventid'] . '@' . str_replace(' ', '-', $mbname) . "\n";
@@ -621,23 +646,26 @@ 
 
 	// Send some standard headers.
 	ob_end_clean();
-	if (!empty($modSettings['enableCompressedOutput']))
-		@ob_start('ob_gzhandler');
-	else
-		ob_start();
+	if (!empty($modSettings['enableCompressedOutput'])) {
+			@ob_start('ob_gzhandler');
+	} else {
+			ob_start();
+	}
 
 	// Send the file headers
 	header('Pragma: ');
 	header('Cache-Control: no-cache');
-	if (!isBrowser('gecko'))
-		header('Content-Transfer-Encoding: binary');
+	if (!isBrowser('gecko')) {
+			header('Content-Transfer-Encoding: binary');
+	}
 	header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 525600 * 60) . ' GMT');
 	header('Last-Modified: ' . gmdate('D, d M Y H:i:s', time()) . 'GMT');
 	header('Accept-Ranges: bytes');
 	header('Connection: close');
 	header('Content-Disposition: attachment; filename="' . $event['title'] . '.ics"');
-	if (empty($modSettings['enableCompressedOutput']))
-		header('Content-Length: ' . $smcFunc['strlen']($filecontents));
+	if (empty($modSettings['enableCompressedOutput'])) {
+			header('Content-Length: ' . $smcFunc['strlen']($filecontents));
+	}
 
 	// This is a calendar item!
 	header('Content-Type: text/calendar');
@@ -676,20 +704,17 @@ 
 		$context['sub_template'] = 'bcd';
 		$context['linktree'][] = array('url' => $scripturl . '?action=clock;bcd', 'name' => 'BCD');
 		$context['clockicons'] = safe_unserialize(base64_decode('YTo2OntzOjI6ImgxIjthOjI6e2k6MDtpOjI7aToxO2k6MTt9czoyOiJoMiI7YTo0OntpOjA7aTo4O2k6MTtpOjQ7aToyO2k6MjtpOjM7aToxO31zOjI6Im0xIjthOjM6e2k6MDtpOjQ7aToxO2k6MjtpOjI7aToxO31zOjI6Im0yIjthOjQ6e2k6MDtpOjg7aToxO2k6NDtpOjI7aToyO2k6MztpOjE7fXM6MjoiczEiO2E6Mzp7aTowO2k6NDtpOjE7aToyO2k6MjtpOjE7fXM6MjoiczIiO2E6NDp7aTowO2k6ODtpOjE7aTo0O2k6MjtpOjI7aTozO2k6MTt9fQ=='));
-	}
-	elseif (!$omfg && !isset($_REQUEST['time']))
+	} elseif (!$omfg && !isset($_REQUEST['time']))
 	{
 		$context['sub_template'] = 'hms';
 		$context['linktree'][] = array('url' => $scripturl . '?action=clock', 'name' => 'Binary');
 		$context['clockicons'] = safe_unserialize(base64_decode('YTozOntzOjE6ImgiO2E6NTp7aTowO2k6MTY7aToxO2k6ODtpOjI7aTo0O2k6MztpOjI7aTo0O2k6MTt9czoxOiJtIjthOjY6e2k6MDtpOjMyO2k6MTtpOjE2O2k6MjtpOjg7aTozO2k6NDtpOjQ7aToyO2k6NTtpOjE7fXM6MToicyI7YTo2OntpOjA7aTozMjtpOjE7aToxNjtpOjI7aTo4O2k6MztpOjQ7aTo0O2k6MjtpOjU7aToxO319'));
-	}
-	elseif ($omfg)
+	} elseif ($omfg)
 	{
 		$context['sub_template'] = 'omfg';
 		$context['linktree'][] = array('url' => $scripturl . '?action=clock;omfg', 'name' => 'OMFG');
 		$context['clockicons'] = safe_unserialize(base64_decode('YTo2OntzOjQ6InllYXIiO2E6Nzp7aTowO2k6NjQ7aToxO2k6MzI7aToyO2k6MTY7aTozO2k6ODtpOjQ7aTo0O2k6NTtpOjI7aTo2O2k6MTt9czo1OiJtb250aCI7YTo0OntpOjA7aTo4O2k6MTtpOjQ7aToyO2k6MjtpOjM7aToxO31zOjM6ImRheSI7YTo1OntpOjA7aToxNjtpOjE7aTo4O2k6MjtpOjQ7aTozO2k6MjtpOjQ7aToxO31zOjQ6ImhvdXIiO2E6NTp7aTowO2k6MTY7aToxO2k6ODtpOjI7aTo0O2k6MztpOjI7aTo0O2k6MTt9czozOiJtaW4iO2E6Njp7aTowO2k6MzI7aToxO2k6MTY7aToyO2k6ODtpOjM7aTo0O2k6NDtpOjI7aTo1O2k6MTt9czozOiJzZWMiO2E6Njp7aTowO2k6MzI7aToxO2k6MTY7aToyO2k6ODtpOjM7aTo0O2k6NDtpOjI7aTo1O2k6MTt9fQ=='));
-	}
-	elseif (isset($_REQUEST['time']))
+	} elseif (isset($_REQUEST['time']))
 	{
 		$context['sub_template'] = 'thetime';
 		$time = getdate($_REQUEST['time'] == 'now' ? time() : (int) $_REQUEST['time']);
@@ -749,12 +774,13 @@ 
 			),
 		);
 
-		foreach ($context['clockicons'] as $t => $vs)
-			foreach ($vs as $v => $dumb)
+		foreach ($context['clockicons'] as $t => $vs) {
+					foreach ($vs as $v => $dumb)
 			{
 				if ($$t >= $v)
 				{
 					$$t -= $v;
+		}
 					$context['clockicons'][$t][$v] = true;
 				}
 			}