elkarte / Elkarte

sources/controllers/News.controller.php

Braces +132 added lines, -46 removed lines

@@ -88,7 +88,9 @@ 
 
 		// If it's not enabled, die.
 		if (empty($modSettings['xmlnews_enable']))
-			obExit(false);
+		{
+					obExit(false);
+		}
 
 		loadLanguage('Stats');
 		$txt['xml_rss_desc'] = replaceBasicActionUrl($txt['xml_rss_desc']);
@@ -121,11 +123,15 @@ 
 			$boards = array_keys($boards_posts);
 
 			if (!empty($boards))
-				$this->_query_this_board = 'b.id_board IN (' . implode(', ', $boards) . ')';
+			{
+							$this->_query_this_board = 'b.id_board IN (' . implode(', ', $boards) . ')';
+			}
 
 			// Try to limit the number of messages we look through.
 			if ($total_cat_posts > 100 && $total_cat_posts > $modSettings['totalMessages'] / 15)
-				$context['optimize_msg']['lowest'] = 'm.id_msg >= ' . max(0, $modSettings['maxMsgID'] - 400 - $this->_limit * 5);
+			{
+							$context['optimize_msg']['lowest'] = 'm.id_msg >= ' . max(0, $modSettings['maxMsgID'] - 400 - $this->_limit * 5);
+			}
 		}
 		// Maybe they only want to see feeds form some certain boards?
 		elseif (!empty($this->_req->query->boards))
@@ -138,14 +144,18 @@ 
 			// Either the board specified doesn't exist or you have no access.
 			$num_boards = count($boards_data);
 			if ($num_boards == 0)
-				throw new Elk_Exception('no_board');
+			{
+							throw new Elk_Exception('no_board');
+			}
 
 			$total_posts = 0;
 			$boards = array_keys($boards_data);
 			foreach ($boards_data as $row)
 			{
 				if ($num_boards == 1)
-					$feed_title = ' - ' . strip_tags($row['name']);
+				{
+									$feed_title = ' - ' . strip_tags($row['name']);
+				}
 
 				$total_posts += $row['num_posts'];
 			}
@@ -154,7 +164,9 @@ 
 
 			// The more boards, the more we're going to look through...
 			if ($total_posts > 100 && $total_posts > $modSettings['totalMessages'] / 12)
-				$context['optimize_msg']['lowest'] = 'm.id_msg >= ' . max(0, $modSettings['maxMsgID'] - 500 - $this->_limit * 5);
+			{
+							$context['optimize_msg']['lowest'] = 'm.id_msg >= ' . max(0, $modSettings['maxMsgID'] - 500 - $this->_limit * 5);
+			}
 		}
 		// Just a single board
 		elseif (!empty($board))
@@ -168,7 +180,9 @@ 
 
 			// Try to look through just a few messages, if at all possible.
 			if ($boards_data[(int) $board]['num_posts'] > 80 && $boards_data[(int) $board]['num_posts'] > $modSettings['totalMessages'] / 10)
-				$context['optimize_msg']['lowest'] = 'm.id_msg >= ' . max(0, $modSettings['maxMsgID'] - 600 - $this->_limit * 5);
+			{
+							$context['optimize_msg']['lowest'] = 'm.id_msg >= ' . max(0, $modSettings['maxMsgID'] - 600 - $this->_limit * 5);
+			}
 		}
 		else
 		{
@@ -180,7 +194,9 @@ 
 		// If format isn't set, or is wrong, rss2 is default
 		$xml_format = $this->_req->getQuery('type', 'trim', 'rss2');
 		if (!in_array($xml_format, array('rss', 'rss2', 'atom', 'rdf')))
-			$xml_format = 'rss2';
+		{
+					$xml_format = 'rss2';
+		}
 
 		// List all the different types of data they can pull.
 		$subActions = array(
@@ -201,7 +217,9 @@ 
 		foreach (array('board', 'boards', 'c') as $var)
 		{
 			if (isset($this->_req->query->{$var}))
-				$cachekey[] = $this->_req->query->{$var};
+			{
+							$cachekey[] = $this->_req->query->{$var};
+			}
 		}
 
 		$cachekey = md5(serialize($cachekey) . (!empty($this->_query_this_board) ? $this->_query_this_board : ''));
@@ -210,14 +228,18 @@ 
 
 		// Get the associative array representing the xml.
 		if (!$user_info['is_guest'] || $cache->levelHigherThan(2))
-			$xml = $cache->get('xmlfeed-' . $xml_format . ':' . ($user_info['is_guest'] ? '' : $user_info['id'] . '-') . $cachekey, 240);
+		{
+					$xml = $cache->get('xmlfeed-' . $xml_format . ':' . ($user_info['is_guest'] ? '' : $user_info['id'] . '-') . $cachekey, 240);
+		}
 
 		if (empty($xml))
 		{
 			$xml = $this->{$subActions[$subAction][0]}($xml_format);
 
 			if ($cache->isEnabled() && (($user_info['is_guest'] && $cache->levelHigherThan(2)) || (!$user_info['is_guest'] && (microtime(true) - $cache_t > 0.2))))
-				$cache->put('xmlfeed-' . $xml_format . ':' . ($user_info['is_guest'] ? '' : $user_info['id'] . '-') . $cachekey, $xml, 240);
+			{
+							$cache->put('xmlfeed-' . $xml_format . ':' . ($user_info['is_guest'] ? '' : $user_info['id'] . '-') . $cachekey, $xml, 240);
+			}
 		}
 
 		$context['feed_title'] = encode_special(strip_tags(un_htmlspecialchars($context['forum_name']) . (isset($feed_title) ? $feed_title : '')));
@@ -230,13 +252,21 @@ 
 
 		// This is an xml file....
 		if (isset($this->_req->query->debug))
-			header('Content-Type: text/xml; charset=UTF-8');
+		{
+					header('Content-Type: text/xml; charset=UTF-8');
+		}
 		elseif ($xml_format === 'rss' || $xml_format === 'rss2')
-			header('Content-Type: application/rss+xml; charset=UTF-8');
+		{
+					header('Content-Type: application/rss+xml; charset=UTF-8');
+		}
 		elseif ($xml_format === 'atom')
-			header('Content-Type: application/atom+xml; charset=UTF-8');
+		{
+					header('Content-Type: application/atom+xml; charset=UTF-8');
+		}
 		elseif ($xml_format === 'rdf')
-			header('Content-Type: ' . (isBrowser('ie') ? 'text/xml' : 'application/rdf+xml') . '; charset=UTF-8');
+		{
+					header('Content-Type: ' . (isBrowser('ie') ? 'text/xml' : 'application/rdf+xml') . '; charset=UTF-8');
+		}
 
 		loadTemplate('Xml');
 		Template_Layers::instance()->removeAll();
@@ -280,7 +310,9 @@ 
 
 		// Not allowed, then you get nothing
 		if (!allowedTo('view_mlist'))
-			return array();
+		{
+					return array();
+		}
 
 		// Find the most recent members.
 		require_once(SUBSDIR . '/Members.subs.php');
@@ -293,34 +325,41 @@ 
 		{
 			// Make the data look rss-ish.
 			if ($xml_format === 'rss' || $xml_format === 'rss2')
-				$data[] = array(
+			{
+							$data[] = array(
 					'title' => cdata_parse($member['real_name']),
 					'link' => $scripturl . '?action=profile;u=' . $member['id_member'],
 					'comments' => $scripturl . '?action=pm;sa=send;u=' . $member['id_member'],
 					'pubDate' => gmdate('D, d M Y H:i:s \G\M\T', $member['date_registered']),
 					'guid' => $scripturl . '?action=profile;u=' . $member['id_member'],
 				);
+			}
 			elseif ($xml_format === 'rdf')
-				$data[] = array(
+			{
+							$data[] = array(
 					'title' => cdata_parse($member['real_name']),
 					'link' => $scripturl . '?action=profile;u=' . $member['id_member'],
 				);
+			}
 			elseif ($xml_format === 'atom')
-				$data[] = array(
+			{
+							$data[] = array(
 					'title' => cdata_parse($member['real_name']),
 					'link' => $scripturl . '?action=profile;u=' . $member['id_member'],
 					'published' => Util::gmstrftime('%Y-%m-%dT%H:%M:%SZ', $member['date_registered']),
 					'updated' => Util::gmstrftime('%Y-%m-%dT%H:%M:%SZ', $member['last_login']),
 					'id' => $scripturl . '?action=profile;u=' . $member['id_member'],
 				);
+			}
 			// More logical format for the data, but harder to apply.
-			else
-				$data[] = array(
+			else {
+							$data[] = array(
 					'name' => cdata_parse($member['real_name']),
 					'time' => htmlspecialchars(strip_tags(standardTime($member['date_registered'])), ENT_COMPAT, 'UTF-8'),
 					'id' => $member['id_member'],
 					'link' => $scripturl . '?action=profile;u=' . $member['id_member']
 				);
+			}
 		}
 
 		return $data;
@@ -349,7 +388,9 @@ 
 		{
 			// Limit the length of the message, if the option is set.
 			if (!empty($modSettings['xmlnews_maxlen']) && Util::strlen(str_replace('<br />', "\n", $row['body'])) > $modSettings['xmlnews_maxlen'])
-				$row['body'] = strtr(Util::shorten_text(str_replace('<br />', "\n", $row['body']), $modSettings['xmlnews_maxlen'], true), array("\n" => '<br />'));
+			{
+							$row['body'] = strtr(Util::shorten_text(str_replace('<br />', "\n", $row['body']), $modSettings['xmlnews_maxlen'], true), array("\n" => '<br />'));
+			}
 
 			$row['body'] = $bbc_parser->parseMessage($row['body'], $row['smileys_enabled']);
 
@@ -455,7 +496,9 @@ 
 		{
 			// Limit the length of the message, if the option is set.
 			if (!empty($modSettings['xmlnews_maxlen']) && Util::strlen(str_replace('<br />', "\n", $row['body'])) > $modSettings['xmlnews_maxlen'])
-				$row['body'] = strtr(Util::shorten_text(str_replace('<br />', "\n", $row['body']), $modSettings['xmlnews_maxlen'], true), array("\n" => '<br />'));
+			{
+							$row['body'] = strtr(Util::shorten_text(str_replace('<br />', "\n", $row['body']), $modSettings['xmlnews_maxlen'], true), array("\n" => '<br />'));
+			}
 
 			$row['body'] = $bbc_parser->parseMessage($row['body'], $row['smileys_enabled']);
 
@@ -558,14 +601,18 @@ 
 
 		// You must input a valid user....
 		if (empty($this->_req->query->u) || loadMemberData((int) $this->_req->query->u) === false)
-			return array();
+		{
+					return array();
+		}
 
 		// Make sure the id is a number and not "I like trying to hack the database".
 		$uid = (int) $this->_req->query->u;
 
 		// Load the member's contextual information!
 		if (!loadMemberContext($uid) || !allowedTo('profile_view_any'))
-			return array();
+		{
+					return array();
+		}
 
 		$profile = &$memberContext[$uid];
 
@@ -623,35 +670,51 @@ 
 
 			// Everything below here might not be set, and thus maybe shouldn't be displayed.
 			if ($profile['avatar']['name'] != '')
-				$data['avatar'] = $profile['avatar']['url'];
+			{
+							$data['avatar'] = $profile['avatar']['url'];
+			}
 
 			// If they are online, show an empty tag... no reason to put anything inside it.
 			if ($profile['online']['is_online'])
-				$data['online'] = '';
+			{
+							$data['online'] = '';
+			}
 
 			if ($profile['signature'] != '')
-				$data['signature'] = cdata_parse($profile['signature']);
+			{
+							$data['signature'] = cdata_parse($profile['signature']);
+			}
 
 			if ($profile['title'] != '')
-				$data['title'] = cdata_parse($profile['title']);
+			{
+							$data['title'] = cdata_parse($profile['title']);
+			}
 
 			if ($profile['website']['title'] != '')
-				$data['website'] = array(
+			{
+							$data['website'] = array(
 					'title' => cdata_parse($profile['website']['title']),
 					'link' => $profile['website']['url']
 				);
+			}
 
 			if ($profile['group'] != '')
-				$data['position'] = cdata_parse($profile['group']);
+			{
+							$data['position'] = cdata_parse($profile['group']);
+			}
 
 			if (!empty($modSettings['karmaMode']))
-				$data['karma'] = array(
+			{
+							$data['karma'] = array(
 					'good' => $profile['karma']['good'],
 					'bad' => $profile['karma']['bad']
 				);
+			}
 
 			if (in_array($profile['show_email'], array('yes', 'yes_permission_override')))
-				$data['email'] = $profile['email'];
+			{
+							$data['email'] = $profile['email'];
+			}
 
 			if (!empty($profile['birth_date']) && substr($profile['birth_date'], 0, 4) != '0000')
 			{
@@ -679,7 +742,9 @@ 
 	global $modSettings, $scripturl;
 
 	if (substr($val, 0, strlen($scripturl)) != $scripturl)
-		return $val;
+	{
+			return $val;
+	}
 
 	call_integration_hook('integrate_fix_url', array(&$val));
 
@@ -730,7 +795,9 @@ 
 
 	// Are we not doing it?
 	if (!empty($cdata_override))
-		return $data;
+	{
+			return $data;
+	}
 
 	$cdata = '<![CDATA[';
 
@@ -742,33 +809,46 @@ 
 		);
 
 		if ($ns != '')
-			$positions[] = Util::strpos($data, '<', $pos);
+		{
+					$positions[] = Util::strpos($data, '<', $pos);
+		}
 
 		foreach ($positions as $k => $dummy)
 		{
 			if ($dummy === false)
-				unset($positions[$k]);
+			{
+							unset($positions[$k]);
+			}
 		}
 
 		$old = $pos;
 		$pos = empty($positions) ? $n : min($positions);
 
 		if ($pos - $old > 0)
-			$cdata .= Util::substr($data, $old, $pos - $old);
+		{
+					$cdata .= Util::substr($data, $old, $pos - $old);
+		}
 
 		if ($pos >= $n)
-			break;
+		{
+					break;
+		}
 
 		if (Util::substr($data, $pos, 1) === '<')
 		{
 			$pos2 = Util::strpos($data, '>', $pos);
 			if ($pos2 === false)
-				$pos2 = $n;
+			{
+							$pos2 = $n;
+			}
 
 			if (Util::substr($data, $pos + 1, 1) === '/')
-				$cdata .= ']]></' . $ns . ':' . Util::substr($data, $pos + 2, $pos2 - $pos - 1) . '<![CDATA[';
-			else
-				$cdata .= ']]><' . $ns . ':' . Util::substr($data, $pos + 1, $pos2 - $pos) . '<![CDATA[';
+			{
+							$cdata .= ']]></' . $ns . ':' . Util::substr($data, $pos + 2, $pos2 - $pos - 1) . '<![CDATA[';
+			}
+			else {
+							$cdata .= ']]><' . $ns . ':' . Util::substr($data, $pos + 1, $pos2 - $pos) . '<![CDATA[';
+			}
 
 			$pos = $pos2 + 1;
 		}
@@ -782,14 +862,20 @@ 
 			$pos2 = Util::strpos($data, ';', $pos);
 
 			if ($pos2 === false)
-				$pos2 = $n;
+			{
+							$pos2 = $n;
+			}
 
 			$ent = Util::substr($data, $pos + 1, $pos2 - $pos - 1);
 
 			if (Util::substr($data, $pos + 1, 1) === '#')
-				$cdata .= ']]>' . Util::substr($data, $pos, $pos2 - $pos + 1) . '<![CDATA[';
+			{
+							$cdata .= ']]>' . Util::substr($data, $pos, $pos2 - $pos + 1) . '<![CDATA[';
+			}
 			elseif (in_array($ent, array('amp', 'lt', 'gt', 'quot')))
-				$cdata .= ']]>' . Util::substr($data, $pos, $pos2 - $pos + 1) . '<![CDATA[';
+			{
+							$cdata .= ']]>' . Util::substr($data, $pos, $pos2 - $pos + 1) . '<![CDATA[';
+			}
 
 			$pos = $pos2 + 1;
 		}

sources/controllers/ModerateAttachments.controller.php

Braces +12 added lines, -5 removed lines

@@ -59,10 +59,14 @@ 
 			$attachments = attachmentsOfMessage($id_msg);
 		}
 		elseif (!empty($this->_req->query->aid))
-			$attachments[] = (int) $this->_req->query->aid;
+		{
+					$attachments[] = (int) $this->_req->query->aid;
+		}
 
 		if (empty($attachments))
-			throw new Elk_Exception('no_access', false);
+		{
+					throw new Elk_Exception('no_access', false);
+		}
 
 		// @todo nb: this requires permission to approve posts, not manage attachments
 		// Now we have some ID's cleaned and ready to approve, but first - let's check we have permission!
@@ -89,7 +93,9 @@ 
 		$redirect = 'topic=' . $attach_home['id_topic'] . '.msg' . $attach_home['id_msg'] . '#msg' . $attach_home['id_msg'];
 
 		if (empty($attachments))
-			throw new Elk_Exception('no_access', false);
+		{
+					throw new Elk_Exception('no_access', false);
+		}
 
 		// Finally, we are there. Follow through!
 		if ($is_approve)
@@ -97,8 +103,9 @@ 
 			// Checked and deemed worthy.
 			approveAttachments($attachments);
 		}
-		else
-			removeAttachments(array('id_attach' => $attachments, 'do_logging' => true));
+		else {
+					removeAttachments(array('id_attach' => $attachments, 'do_logging' => true));
+		}
 
 		// We approved or removed, either way we reset those numbers
 		Cache::instance()->remove('num_menu_errors');

sources/controllers/Stats.controller.php

Braces +27 added lines, -9 removed lines

@@ -55,7 +55,9 @@ 
 
 		// Page disabled - redirect them out
 		if (empty($modSettings['trackStats']))
-			throw new Elk_Exception('feature_disabled', true);
+		{
+					throw new Elk_Exception('feature_disabled', true);
+		}
 
 		// Expanding out the history summary
 		list($year, $month) = $this->_expandedStats();
@@ -73,7 +75,9 @@ 
 
 			// Collapsing stats only needs adjustments of the session variables.
 			if (!empty($this->_req->query->collapse))
-				obExit(false);
+			{
+							obExit(false);
+			}
 
 			$context['sub_template'] = 'stats';
 			getDailyStats('YEAR(date) = {int:year} AND MONTH(date) = {int:month}', array('year' => $year, 'month' => $month));
@@ -148,9 +152,11 @@ 
 		);
 
 		if (!empty($modSettings['hitStats']))
-			$context['general_statistics']['left'] += array(
+		{
+					$context['general_statistics']['left'] += array(
 				'num_hits' => comma_format($averages['hits'], 0)
 			);
+		}
 
 		$context['general_statistics']['right'] = array(
 			'average_members' => comma_format(round($averages['registers'] / $total_days_up, 2)),
@@ -164,9 +170,11 @@ 
 		);
 
 		if (!empty($modSettings['hitStats']))
-			$context['general_statistics']['right'] += array(
+		{
+					$context['general_statistics']['right'] += array(
 				'average_hits' => comma_format(round($averages['hits'] / $total_days_up, 2)),
 			);
+		}
 	}
 
 	/**
@@ -226,12 +234,16 @@ 
 
 			// Keep a list of collapsed years.
 			if (!$data['expanded'] && !$data['current_year'])
-				$context['collapsed_years'][] = $year;
+			{
+							$context['collapsed_years'][] = $year;
+			}
 		}
 
 		// Want to expand out the yearly stats
 		if (empty($_SESSION['expanded_stats']))
-			return false;
+		{
+					return false;
+		}
 
 		$condition_text = array();
 		$condition_params = array();
@@ -247,7 +259,9 @@ 
 
 		// No daily stats to even look at?
 		if (empty($condition_text))
-			return false;
+		{
+					return false;
+		}
 
 		getDailyStats(implode(' OR ', $condition_text), $condition_params);
 
@@ -273,7 +287,9 @@ 
 			$month = (int) substr($this->_req->query->expand, 4);
 			$year = (int) substr($this->_req->query->expand, 0, 4);
 			if ($year > 1900 && $year < 2200 && $month >= 1 && $month <= 12)
-				$_SESSION['expanded_stats'][$year][] = $month;
+			{
+							$_SESSION['expanded_stats'][$year][] = $month;
+			}
 		}
 		// Done looking at the details and want to fold it back up
 		elseif (!empty($this->_req->query->collapse))
@@ -283,7 +299,9 @@ 
 			$month = (int) substr($this->_req->query->collapse, 4);
 			$year = (int) substr($this->_req->query->collapse, 0, 4);
 			if (!empty($_SESSION['expanded_stats'][$year]))
-				$_SESSION['expanded_stats'][$year] = array_diff($_SESSION['expanded_stats'][$year], array($month));
+			{
+							$_SESSION['expanded_stats'][$year] = array_diff($_SESSION['expanded_stats'][$year], array($month));
+			}
 		}
 
 		return array($year, $month);

sources/controllers/Suggest.controller.php

Braces +6 added lines, -2 removed lines

@@ -82,7 +82,9 @@ 
 
 			// Do we have a file to include?
 			if (!empty($currentSearch['file']) && file_exists($currentSearch['file']))
-				require_once($currentSearch['file']);
+			{
+							require_once($currentSearch['file']);
+			}
 
 			// If it is a class, let's instantiate it
 			if (!empty($currentSearch['class']) && class_exists($currentSearch['class']))
@@ -101,7 +103,9 @@ 
 
 			// If we have data, return it
 			if (!empty($context['xml_data']))
-				$context['sub_template'] = 'generic_xml';
+			{
+							$context['sub_template'] = 'generic_xml';
+			}
 		}
 	}
 }

sources/controllers/Calendar.controller.php

Braces +48 added lines, -17 removed lines

@@ -57,7 +57,9 @@ 
 
 		// You can't do anything if the calendar is off.
 		if (empty($modSettings['cal_enabled']))
-			throw new Elk_Exception('calendar_off', false);
+		{
+					throw new Elk_Exception('calendar_off', false);
+		}
 
 		// Set the page title to mention the calendar ;).
 		$context['page_title'] = $txt['calendar'];
@@ -70,7 +72,9 @@ 
 
 		// Don't let search engines index weekly calendar pages.
 		if ($context['view_week'])
-			$context['robot_no_index'] = true;
+		{
+					$context['robot_no_index'] = true;
+		}
 
 		// Get the current day of month...
 		require_once(SUBSDIR . '/Calendar.subs.php');
@@ -85,16 +89,22 @@ 
 
 		// Make sure the year and month are in valid ranges.
 		if ($curPage['month'] < 1 || $curPage['month'] > 12)
-			throw new Elk_Exception('invalid_month', false);
+		{
+					throw new Elk_Exception('invalid_month', false);
+		}
 
 		if ($curPage['year'] < $context['cal_minyear'] || $curPage['year'] > $context['cal_maxyear'])
-			throw new Elk_Exception('invalid_year', false);
+		{
+					throw new Elk_Exception('invalid_year', false);
+		}
 
 		// If we have a day clean that too.
 		if ($context['view_week'])
 		{
 			if ($curPage['day'] > 31 || !mktime(0, 0, 0, $curPage['month'], $curPage['day'], $curPage['year']))
-				throw new Elk_Exception('invalid_day', false);
+			{
+							throw new Elk_Exception('invalid_day', false);
+			}
 		}
 
 		// Load all the context information needed to show the calendar grid.
@@ -112,9 +122,12 @@ 
 
 		// Load up the main view.
 		if ($context['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);
+		{
+					$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.
 		$calendarOptions['show_birthdays'] = $calendarOptions['show_events'] = $calendarOptions['show_holidays'] = false;
@@ -126,11 +139,15 @@ 
 
 		// Only show previous month if it isn't pre-January of the min-year
 		if ($context['calendar_grid_current']['previous_calendar']['year'] > $context['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);
+		{
+					$context['calendar_grid_prev'] = getCalendarGrid($context['calendar_grid_current']['previous_calendar']['month'], $context['calendar_grid_current']['previous_calendar']['year'], $calendarOptions);
+		}
 
 		// Only show next month if it isn't post-December of the max-year
 		if ($context['calendar_grid_current']['next_calendar']['year'] < $context['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);
+		{
+					$context['calendar_grid_next'] = getCalendarGrid($context['calendar_grid_current']['next_calendar']['month'], $context['calendar_grid_current']['next_calendar']['year'], $calendarOptions);
+		}
 
 		// Basic template stuff.
 		$context['can_post'] = allowedTo('calendar_post');
@@ -156,10 +173,12 @@ 
 
 		// If applicable, add the current week to the linktree.
 		if ($context['view_week'])
-			$context['linktree'][] = array(
+		{
+					$context['linktree'][] = array(
 				'url' => $scripturl . '?action=calendar;viewweek;year=' . $context['current_year'] . ';month=' . $context['current_month'] . ';day=' . $context['current_day'],
 				'name' => $txt['calendar_week'] . ' ' . $context['calendar_grid_main']['week_number']
 			);
+		}
 
 		// Build the calendar button array.
 		$context['calendar_buttons'] = array(
@@ -220,7 +239,9 @@ 
 			// Get list of boards that can be posted in.
 			$boards = boardsAllowedTo('post_new');
 			if (empty($boards))
-				throw new Elk_Exception('cannot_post_new', 'permission');
+			{
+							throw new Elk_Exception('cannot_post_new', 'permission');
+			}
 
 			// Load the list of boards and categories in the context.
 			require_once(SUBSDIR . '/Boards.subs.php');
@@ -275,7 +296,9 @@ 
 
 		// If you're not allowed to edit any events, you have to be the poster.
 		if (!$event->isNew() && !allowedTo('calendar_edit_any'))
-			isAllowedTo('calendar_edit_' . ($event->isStarter($user_info['id']) ? 'own' : 'any'));
+		{
+					isAllowedTo('calendar_edit_' . ($event->isStarter($user_info['id']) ? 'own' : 'any'));
+		}
 
 		// New - and directing?
 		if ($event->isNew() && isset($_POST['link_to_board']))
@@ -351,11 +374,15 @@ 
 
 		// You can't export if the calendar export feature is off.
 		if (empty($modSettings['cal_export']))
-			throw new Elk_Exception('calendar_export_off', false);
+		{
+					throw new Elk_Exception('calendar_export_off', false);
+		}
 
 		// Goes without saying that this is required.
 		if (!isset($_REQUEST['eventid']))
-			throw new Elk_Exception('no_access', false);
+		{
+					throw new Elk_Exception('no_access', false);
+		}
 
 		// This is kinda wanted.
 		require_once(SUBSDIR . '/Calendar.subs.php');
@@ -364,7 +391,9 @@ 
 		$event = getEventProperties($_REQUEST['eventid']);
 
 		if ($event === false)
-			throw new Elk_Exception('no_access', false);
+		{
+					throw new Elk_Exception('no_access', false);
+		}
 
 		$filecontents = build_ical_content($event);
 
@@ -380,7 +409,9 @@ 
 		header('Connection: close');
 		header('Content-Disposition: attachment; filename="' . $event['title'] . '.ics"');
 		if (empty($modSettings['enableCompressedOutput']))
-			header('Content-Length: ' . Util::strlen($filecontents));
+		{
+					header('Content-Length: ' . Util::strlen($filecontents));
+		}
 
 		// This is a calendar item!
 		header('Content-Type: text/calendar');

sources/controllers/Search.controller.php

Braces +156 added lines, -58 removed lines

@@ -121,7 +121,9 @@ 
 
 		// Is the load average too high to allow searching just now?
 		if (!empty($modSettings['loadavg_search']) && $modSettings['current_load'] >= $modSettings['loadavg_search'])
-			throw new Elk_Exception('loadavg_search_disabled', false);
+		{
+					throw new Elk_Exception('loadavg_search_disabled', false);
+		}
 
 		loadLanguage('Search');
 
@@ -169,17 +171,29 @@ 
 		}
 
 		if (isset($_REQUEST['search']))
-			$context['search_params']['search'] = un_htmlspecialchars($_REQUEST['search']);
+		{
+					$context['search_params']['search'] = un_htmlspecialchars($_REQUEST['search']);
+		}
 		if (isset($context['search_params']['search']))
-			$context['search_params']['search'] = Util::htmlspecialchars($context['search_params']['search']);
+		{
+					$context['search_params']['search'] = Util::htmlspecialchars($context['search_params']['search']);
+		}
 		if (isset($context['search_params']['userspec']))
-			$context['search_params']['userspec'] = htmlspecialchars($context['search_params']['userspec'], ENT_COMPAT, 'UTF-8');
+		{
+					$context['search_params']['userspec'] = htmlspecialchars($context['search_params']['userspec'], ENT_COMPAT, 'UTF-8');
+		}
 		if (!empty($context['search_params']['searchtype']))
-			$context['search_params']['searchtype'] = 2;
+		{
+					$context['search_params']['searchtype'] = 2;
+		}
 		if (!empty($context['search_params']['minage']))
-			$context['search_params']['minage'] = (int) $context['search_params']['minage'];
+		{
+					$context['search_params']['minage'] = (int) $context['search_params']['minage'];
+		}
 		if (!empty($context['search_params']['maxage']))
-			$context['search_params']['maxage'] = (int) $context['search_params']['maxage'];
+		{
+					$context['search_params']['maxage'] = (int) $context['search_params']['maxage'];
+		}
 
 		$context['search_params']['show_complete'] = !empty($context['search_params']['show_complete']);
 		$context['search_params']['subject_only'] = !empty($context['search_params']['subject_only']);
@@ -192,10 +206,14 @@ 
 			foreach ($context['search_errors'] as $search_error => $dummy)
 			{
 				if ($search_error === 'messages')
-					continue;
+				{
+									continue;
+				}
 
 				if ($search_error === 'string_too_long')
-					$txt['error_string_too_long'] = sprintf($txt['error_string_too_long'], $context['search_string_limit']);
+				{
+									$txt['error_string_too_long'] = sprintf($txt['error_string_too_long'], $context['search_string_limit']);
+				}
 
 				$context['search_errors']['messages'][] = $txt['error_' . $search_error];
 			}
@@ -210,7 +228,9 @@ 
 			$context['boards_in_category'][$cat] = count($category['boards']);
 			$category['child_ids'] = array_keys($category['boards']);
 			foreach ($category['boards'] as &$board)
-				$board['selected'] = (empty($context['search_params']['brd']) && (empty($modSettings['recycle_enable']) || $board['id'] != $modSettings['recycle_board']) && !in_array($board['id'], $user_info['ignoreboards'])) || (!empty($context['search_params']['brd']) && in_array($board['id'], $context['search_params']['brd']));
+			{
+							$board['selected'] = (empty($context['search_params']['brd']) && (empty($modSettings['recycle_enable']) || $board['id'] != $modSettings['recycle_board']) && !in_array($board['id'], $user_info['ignoreboards'])) || (!empty($context['search_params']['brd']) && in_array($board['id'], $context['search_params']['brd']));
+			}
 		}
 
 		if (!empty($_REQUEST['topic']))
@@ -238,7 +258,9 @@ 
 
 		// Start guest off collapsed
 		if ($context['user']['is_guest'] && !isset($context['minmax_preferences']['asearch']))
-			$context['minmax_preferences']['asearch'] = 1;
+		{
+					$context['minmax_preferences']['asearch'] = 1;
+		}
 
 		call_integration_hook('integrate_search');
 	}
@@ -284,10 +306,13 @@ 
 
 		loadLanguage('Search');
 		if (!isset($_REQUEST['xml']))
-			loadTemplate('Search');
+		{
+					loadTemplate('Search');
+		}
 		// If we're doing XML we need to use the results template regardless really.
-		else
-			$context['sub_template'] = 'results';
+		else {
+					$context['sub_template'] = 'results';
+		}
 
 		// Are you allowed?
 		isAllowedTo('search_posts');
@@ -299,17 +324,23 @@ 
 		$searchAPI = $this->_search->findSearchAPI();
 
 		if (isset($_REQUEST['params']))
-			$this->_search->searchParamsFromString($_REQUEST['params']);
+		{
+					$this->_search->searchParamsFromString($_REQUEST['params']);
+		}
 
 		$this->_search->mergeSearchParams($_REQUEST, $recentPercentage, $maxMembersToSearch);
 		$context['compact'] = $this->_search->isCompact();
 
 		// Nothing??
 		if ($this->_search->param('search') === false || $this->_search->param('search') === '')
-			$context['search_errors']['invalid_search_string'] = true;
+		{
+					$context['search_errors']['invalid_search_string'] = true;
+		}
 		// Too long?
 		elseif (Util::strlen($this->_search->param('search')) > $context['search_string_limit'])
-			$context['search_errors']['string_too_long'] = true;
+		{
+					$context['search_errors']['string_too_long'] = true;
+		}
 
 		// Build the search array
 		// $modSettings ['search_simple_fulltext'] is an hidden setting that will
@@ -323,13 +354,18 @@ 
 		if (empty($searchArray))
 		{
 			if (!empty($context['search_ignored']))
-				$context['search_errors']['search_string_small_words'] = true;
-			else
-				$context['search_errors']['invalid_search_string' . ($this->_search->foundBlackListedWords() ? '_blacklist' : '')] = true;
+			{
+							$context['search_errors']['search_string_small_words'] = true;
+			}
+			else {
+							$context['search_errors']['invalid_search_string' . ($this->_search->foundBlackListedWords() ? '_blacklist' : '')] = true;
+			}
 
 			// Don't allow duplicate error messages if one string is too short.
 			if (isset($context['search_errors']['search_string_small_words'], $context['search_errors']['invalid_search_string']))
-				unset($context['search_errors']['invalid_search_string']);
+			{
+							unset($context['search_errors']['invalid_search_string']);
+			}
 		}
 
 		$searchWords = $this->_search->searchWords();
@@ -346,13 +382,21 @@ 
 		// Let the user adjust the search query, should they wish?
 		$context['search_params'] = $this->_search->getParams();
 		if (isset($context['search_params']['search']))
-			$context['search_params']['search'] = Util::htmlspecialchars($context['search_params']['search']);
+		{
+					$context['search_params']['search'] = Util::htmlspecialchars($context['search_params']['search']);
+		}
 		if (isset($context['search_params']['userspec']))
-			$context['search_params']['userspec'] = Util::htmlspecialchars($context['search_params']['userspec']);
+		{
+					$context['search_params']['userspec'] = Util::htmlspecialchars($context['search_params']['userspec']);
+		}
 		if (empty($context['search_params']['minage']))
-			$context['search_params']['minage'] = 0;
+		{
+					$context['search_params']['minage'] = 0;
+		}
 		if (empty($context['search_params']['maxage']))
-			$context['search_params']['maxage'] = 9999;
+		{
+					$context['search_params']['maxage'] = 9999;
+		}
 
 		$context['search_params'] = $this->_fill_default_search_params($context['search_params']);
 
@@ -361,7 +405,9 @@ 
 		{
 			// If we come from another search box tone down the error...
 			if (!isset($_REQUEST['search_vv']))
-				$context['search_errors']['need_verification_code'] = true;
+			{
+							$context['search_errors']['need_verification_code'] = true;
+			}
 			else
 			{
 				require_once(SUBSDIR . '/VerificationControls.class.php');
@@ -373,11 +419,14 @@ 
 				if (is_array($context['require_verification']))
 				{
 					foreach ($context['require_verification'] as $error)
-						$context['search_errors'][$error] = true;
+					{
+											$context['search_errors'][$error] = true;
+					}
 				}
 				// Don't keep asking for it - they've proven themselves worthy.
-				else
-					$_SESSION['ss_vv_passed'] = true;
+				else {
+									$_SESSION['ss_vv_passed'] = true;
+				}
 			}
 		}
 
@@ -396,18 +445,24 @@ 
 
 		// Start guest off collapsed
 		if ($context['user']['is_guest'] && !isset($context['minmax_preferences']['asearch']))
-			$context['minmax_preferences']['asearch'] = 1;
+		{
+					$context['minmax_preferences']['asearch'] = 1;
+		}
 
 		// *** A last error check
 		call_integration_hook('integrate_search_errors');
 
 		// One or more search errors? Go back to the first search screen.
 		if (!empty($context['search_errors']))
-			return $this->action_search();
+		{
+					return $this->action_search();
+		}
 
 		// Spam me not, Spam-a-lot?
 		if (empty($_SESSION['last_ss']) || $_SESSION['last_ss'] != $this->_search->param('search'))
-			spamProtection('search');
+		{
+					spamProtection('search');
+		}
 
 		// Store the last search string to allow pages of results to be browsed.
 		$_SESSION['last_ss'] = $this->_search->param('search');
@@ -434,7 +489,9 @@ 
 				$this->_search->clearCacheResults($_SESSION['search_cache']['id_search']);
 
 				if ($this->_search->param('subject_only'))
-					$_SESSION['search_cache']['num_results'] = $this->_search->getSubjectResults($_SESSION['search_cache']['id_search'], $humungousTopicPosts, $maxMessageResults);
+				{
+									$_SESSION['search_cache']['num_results'] = $this->_search->getSubjectResults($_SESSION['search_cache']['id_search'], $humungousTopicPosts, $maxMessageResults);
+				}
 				else
 				{
 					$num_res = $this->_search->getResults($_SESSION['search_cache']['id_search'], $humungousTopicPosts, $maxMessageResults);
@@ -478,14 +535,18 @@ 
 			call_integration_hook('integrate_search_message_list', array(&$msg_list, &$posters));
 
 			if (!empty($posters))
-				loadMemberData(array_unique($posters));
+			{
+							loadMemberData(array_unique($posters));
+			}
 
 			// Get the messages out for the callback - select enough that it can be made to look just like Display.
 			$messages_request = $this->_search->loadMessagesRequest($msg_list, count($context['topics']));
 
 			// If there are no results that means the things in the cache got deleted, so pretend we have no topics anymore.
 			if ($this->_search->noMessages($messages_request))
-				$context['topics'] = array();
+			{
+							$context['topics'] = array();
+			}
 
 			// If we want to know who participated in what then load this now.
 			if (!empty($modSettings['enableParticipation']) && !$user_info['is_guest'])
@@ -494,7 +555,9 @@ 
 				$topics_participated_in = topicsParticipation($user_info['id'], array_keys($participants));
 
 				foreach ($topics_participated_in as $topic)
-					$participants[$topic['id_topic']] = true;
+				{
+									$participants[$topic['id_topic']] = true;
+				}
 			}
 		}
 
@@ -541,16 +604,22 @@ 
 		// Remember which message this is.  (ie. reply #83)
 		static $counter = null;
 		if ($counter === null || $reset)
-			$counter = $_REQUEST['start'] + 1;
+		{
+					$counter = $_REQUEST['start'] + 1;
+		}
 
 		// Start from the beginning...
 		if ($reset)
-			return currentContext($messages_request, $reset);
+		{
+					return currentContext($messages_request, $reset);
+		}
 
 		// Attempt to get the next in line
 		$message = currentContext($messages_request);
 		if (!$message)
-			return false;
+		{
+					return false;
+		}
 
 		// Can't have an empty subject can we?
 		$message['subject'] = $message['subject'] != '' ? $message['subject'] : $txt['no_subject'];
@@ -590,7 +659,9 @@ 
 			if (Util::strlen($message['body']) > $charLimit)
 			{
 				if (empty($context['key_words']))
-					$message['body'] = Util::substr($message['body'], 0, $charLimit) . '<strong>...</strong>';
+				{
+									$message['body'] = Util::substr($message['body'], 0, $charLimit) . '<strong>...</strong>';
+				}
 				else
 				{
 					$matchString = '';
@@ -600,7 +671,9 @@ 
 						$keyword = un_htmlspecialchars($keyword);
 						$keyword = preg_replace_callback('~(&amp;#(\d{1,7}|x[0-9a-fA-F]{1,6});)~', 'entity_fix__callback', strtr($keyword, array('\\\'' => '\'', '&' => '&amp;')));
 						if (preg_match('~[\'\.,/@%&;:(){}\[\]_\-+\\\\]$~', $keyword) != 0 || preg_match('~^[\'\.,/@%&;:(){}\[\]_\-+\\\\]~', $keyword) != 0)
-							$force_partial_word = true;
+						{
+													$force_partial_word = true;
+						}
 						$matchString .= strtr(preg_quote($keyword, '/'), array('\*' => '.+?')) . '|';
 					}
 					$matchString = un_htmlspecialchars(substr($matchString, 0, -1));
@@ -608,9 +681,12 @@ 
 					$message['body'] = un_htmlspecialchars(strtr($message['body'], array('&nbsp;' => ' ', '<br />' => "\n", '&#91;' => '[', '&#93;' => ']', '&#58;' => ':', '&#64;' => '@')));
 
 					if (empty($modSettings['search_method']) || $force_partial_word)
-						preg_match_all('/([^\s\W]{' . $charLimit . '}[\s\W]|[\s\W].{0,' . $charLimit . '}?|^)(' . $matchString . ')(.{0,' . $charLimit . '}[\s\W]|[^\s\W]{0,' . $charLimit . '})/isu', $message['body'], $matches);
-					else
-						preg_match_all('/([^\s\W]{' . $charLimit . '}[\s\W]|[\s\W].{0,' . $charLimit . '}?[\s\W]|^)(' . $matchString . ')([\s\W].{0,' . $charLimit . '}[\s\W]|[\s\W][^\s\W]{0,' . $charLimit . '})/isu', $message['body'], $matches);
+					{
+											preg_match_all('/([^\s\W]{' . $charLimit . '}[\s\W]|[\s\W].{0,' . $charLimit . '}?|^)(' . $matchString . ')(.{0,' . $charLimit . '}[\s\W]|[^\s\W]{0,' . $charLimit . '})/isu', $message['body'], $matches);
+					}
+					else {
+											preg_match_all('/([^\s\W]{' . $charLimit . '}[\s\W]|[\s\W].{0,' . $charLimit . '}?[\s\W]|^)(' . $matchString . ')([\s\W].{0,' . $charLimit . '}[\s\W]|[\s\W][^\s\W]{0,' . $charLimit . '})/isu', $message['body'], $matches);
+					}
 
 					$message['body'] = '';
 					foreach ($matches[0] as $match)
@@ -703,7 +779,9 @@ 
 		determineTopicClass($output);
 
 		if ($output['posted_in'])
-			$output['class'] = 'my_' . $output['class'];
+		{
+					$output['class'] = 'my_' . $output['class'];
+		}
 
 		$body_highlighted = $message['body'];
 		$subject_highlighted = $message['subject'];
@@ -878,7 +956,9 @@ 
 		{
 			// Admins can be bothered with a failure
 			if ($user_info['is_admin'])
-				throw new Elk_Exception('search_invalid_weights');
+			{
+							throw new Elk_Exception('search_invalid_weights');
+			}
 
 			// Even if users will get an answer, the admin should know something is broken
 			Errors::instance()->log_lang_error('search_invalid_weights');
@@ -917,28 +997,46 @@ 
 	private function _fill_default_search_params($array)
 	{
 		if (empty($array['search']))
-			$array['search'] = '';
+		{
+					$array['search'] = '';
+		}
 		if (empty($array['userspec']))
-			$array['userspec'] = '*';
+		{
+					$array['userspec'] = '*';
+		}
 		if (empty($array['searchtype']))
-			$array['searchtype'] = 0;
+		{
+					$array['searchtype'] = 0;
+		}
 
 		if (!isset($array['show_complete']))
-			$array['show_complete'] = 0;
-		else
-			$array['show_complete'] = (int) $array['show_complete'];
+		{
+					$array['show_complete'] = 0;
+		}
+		else {
+					$array['show_complete'] = (int) $array['show_complete'];
+		}
 
 		if (!isset($array['subject_only']))
-			$array['subject_only'] = 0;
-		else
-			$array['subject_only'] = (int) $array['subject_only'];
+		{
+					$array['subject_only'] = 0;
+		}
+		else {
+					$array['subject_only'] = (int) $array['subject_only'];
+		}
 
 		if (empty($array['minage']))
-			$array['minage'] = 0;
+		{
+					$array['minage'] = 0;
+		}
 		if (empty($array['maxage']))
-			$array['maxage'] = 9999;
+		{
+					$array['maxage'] = 9999;
+		}
 		if (empty($array['sort']))
-			$array['sort'] = 'relevance';
+		{
+					$array['sort'] = 'relevance';
+		}
 
 		return $array;
 	}

Spacing +1 added lines, -1 removed lines

@@ -738,7 +738,7 @@
 			$query = strtr(Util::htmlspecialchars($query), array('\\\'' => '\''));
 
 			$search_highlight = preg_quote(strtr($query, array('\'' => ''')), '/');
-			$body_highlighted = preg_replace_callback('/((<[^>]*)|(\b' . $search_highlight . '\b)|'. $search_highlight . ')/iu', array($this, '_highlighted_callback'), $body_highlighted);
+			$body_highlighted = preg_replace_callback('/((<[^>]*)|(\b' . $search_highlight . '\b)|' . $search_highlight . ')/iu', array($this, '_highlighted_callback'), $body_highlighted);
 			$subject_highlighted = preg_replace('/(' . preg_quote($query, '/') . ')/iu', '<strong class="highlight">$1</strong>', $subject_highlighted);
 		}
 

sources/controllers/Topic.controller.php

Braces +45 added lines, -18 removed lines

@@ -42,9 +42,12 @@ 
 
 		// Without anything it throws an error, so redirect somewhere
 		if (!empty($topic))
-			redirectexit('topic=' . $topic . '.0');
-		else
-			redirectexit();
+		{
+					redirectexit('topic=' . $topic . '.0');
+		}
+		else {
+					redirectexit();
+		}
 	}
 
 	/**
@@ -64,7 +67,9 @@ 
 
 		// Just quit if there's no topic to lock.
 		if (empty($topic))
-			throw new Elk_Exception('not_a_topic', false);
+		{
+					throw new Elk_Exception('not_a_topic', false);
+		}
 
 		checkSession('get');
 
@@ -79,29 +84,41 @@ 
 		$user_lock = !allowedTo('lock_any');
 
 		if ($user_lock && $starter == $user_info['id'])
-			isAllowedTo('lock_own');
-		else
-			isAllowedTo('lock_any');
+		{
+					isAllowedTo('lock_own');
+		}
+		else {
+					isAllowedTo('lock_any');
+		}
 
 		// Locking with high privileges.
 		if ($locked == '0' && !$user_lock)
-			$locked = '1';
+		{
+					$locked = '1';
+		}
 		// Locking with low privileges.
 		elseif ($locked == '0')
-			$locked = '2';
+		{
+					$locked = '2';
+		}
 		// Unlocking - make sure you don't unlock what you can't.
 		elseif ($locked == '2' || ($locked == '1' && !$user_lock))
-			$locked = '0';
+		{
+					$locked = '0';
+		}
 		// You cannot unlock this!
-		else
-			throw new Elk_Exception('locked_by_admin', 'user');
+		else {
+					throw new Elk_Exception('locked_by_admin', 'user');
+		}
 
 		// Lock the topic!
 		setTopicAttribute($topic, array('locked' => $locked));
 
 		// If they are allowed a "moderator" permission, log it in the moderator log.
 		if (!$user_lock)
-			logAction($locked ? 'lock' : 'unlock', array('topic' => $topic, 'board' => $board));
+		{
+					logAction($locked ? 'lock' : 'unlock', array('topic' => $topic, 'board' => $board));
+		}
 
 		// Notify people that this topic has been locked?
 		sendNotifications($topic, empty($locked) ? 'unlock' : 'lock');
@@ -131,7 +148,9 @@ 
 
 		// You can't sticky a board or something!
 		if (empty($topic))
-			throw new Elk_Exception('not_a_topic', false);
+		{
+					throw new Elk_Exception('not_a_topic', false);
+		}
 
 		checkSession('get');
 
@@ -153,7 +172,9 @@ 
 
 		// Notify people that this topic has been stickied?
 		if (empty($is_sticky))
-			sendNotifications($topic, 'sticky');
+		{
+					sendNotifications($topic, 'sticky');
+		}
 
 		// Take them back to the now stickied topic.
 		redirectexit('topic=' . $topic . '.' . $this->_req->post->start);
@@ -176,7 +197,9 @@ 
 
 		// Redirect to the boardindex if no valid topic id is provided.
 		if (empty($topic))
-			redirectexit();
+		{
+					redirectexit();
+		}
 
 		// Its not enabled, give them the boot
 		if (!empty($modSettings['disable_print_topic']))
@@ -196,7 +219,9 @@ 
 
 		// Redirect to the boardindex if no valid topic id is provided.
 		if (empty($topicinfo))
-			redirectexit();
+		{
+					redirectexit();
+		}
 
 		$context['user']['started'] = $user_info['id'] == $topicinfo['id_member'] && !$user_info['is_guest'];
 
@@ -233,7 +258,9 @@ 
 		$posts_id = array_keys($context['posts']);
 
 		if (!isset($context['topic_subject']))
-			$context['topic_subject'] = $context['posts'][min($posts_id)]['subject'];
+		{
+					$context['topic_subject'] = $context['posts'][min($posts_id)]['subject'];
+		}
 
 		// Fetch attachments so we can print them if asked, enabled and allowed
 		if (isset($this->_req->query->images) && !empty($modSettings['attachmentEnable']) && allowedTo('view_attachments'))

sources/controllers/Post.controller.php

Braces +357 added lines, -145 removed lines

@@ -171,7 +171,9 @@ 
 
 		// You must be posting to *some* board.
 		if (empty($board) && !$context['make_event'])
-			throw new Elk_Exception('no_board', false);
+		{
+					throw new Elk_Exception('no_board', false);
+		}
 
 		// All those wonderful modifiers and attachments
 		$this->_template_layers->add('additional_options', 200);
@@ -190,7 +192,9 @@ 
 		{
 			$topic = associatedTopic((int) $_REQUEST['msg']);
 			if (empty($topic))
-				unset($_REQUEST['msg'], $_POST['msg'], $_GET['msg']);
+			{
+							unset($_REQUEST['msg'], $_POST['msg'], $_GET['msg']);
+			}
 		}
 
 		// Check if it's locked. It isn't locked if no topic is specified.
@@ -203,35 +207,47 @@ 
 			if (empty($_REQUEST['msg']))
 			{
 				if ($user_info['is_guest'] && !allowedTo('post_reply_any') && (!$modSettings['postmod_active'] || !allowedTo('post_unapproved_replies_any')))
-					is_not_guest();
+				{
+									is_not_guest();
+				}
 
 				// By default the reply will be approved...
 				$context['becomes_approved'] = true;
 				if ($this->_topic_attributes['id_member'] != $user_info['id'])
 				{
 					if ($modSettings['postmod_active'] && allowedTo('post_unapproved_replies_any') && !allowedTo('post_reply_any'))
-						$context['becomes_approved'] = false;
-					else
-						isAllowedTo('post_reply_any');
+					{
+											$context['becomes_approved'] = false;
+					}
+					else {
+											isAllowedTo('post_reply_any');
+					}
 				}
 				elseif (!allowedTo('post_reply_any'))
 				{
 					if ($modSettings['postmod_active'])
 					{
 						if (allowedTo('post_unapproved_replies_own') && !allowedTo('post_reply_own'))
-							$context['becomes_approved'] = false;
+						{
+													$context['becomes_approved'] = false;
+						}
 						// Guests do not have post_unapproved_replies_own permission, so it's always post_unapproved_replies_any
 						elseif ($user_info['is_guest'] && allowedTo('post_unapproved_replies_any'))
-							$context['becomes_approved'] = false;
-						else
-							isAllowedTo('post_reply_own');
+						{
+													$context['becomes_approved'] = false;
+						}
+						else {
+													isAllowedTo('post_reply_own');
+						}
+					}
+					else {
+											isAllowedTo('post_reply_own');
 					}
-					else
-						isAllowedTo('post_reply_own');
 				}
 			}
-			else
-				$context['becomes_approved'] = true;
+			else {
+							$context['becomes_approved'] = true;
+			}
 
 			$context['can_lock'] = allowedTo('lock_any') || ($user_info['id'] == $this->_topic_attributes['id_member'] && allowedTo('lock_own'));
 			$context['can_sticky'] = allowedTo('make_sticky');
@@ -245,9 +261,12 @@ 
 			if (empty($context['make_event']) || !empty($board))
 			{
 				if ($modSettings['postmod_active'] && !allowedTo('post_new') && allowedTo('post_unapproved_topics'))
-					$context['becomes_approved'] = false;
-				else
-					isAllowedTo('post_new');
+				{
+									$context['becomes_approved'] = false;
+				}
+				else {
+									isAllowedTo('post_new');
+				}
 			}
 
 			$this->_topic_attributes['locked'] = 0;
@@ -277,7 +296,9 @@ 
 
 		// Don't allow a post if it's locked and you aren't all powerful.
 		if ($this->_topic_attributes['locked'] && !allowedTo('moderate_board'))
-			throw new Elk_Exception('topic_locked', false);
+		{
+					throw new Elk_Exception('topic_locked', false);
+		}
 	}
 
 	protected function _generating_message()
@@ -294,9 +315,12 @@ 
 				if (!empty($context['new_replies']))
 				{
 					if ($context['new_replies'] == 1)
-						$txt['error_new_replies'] = isset($_GET['last_msg']) ? $txt['error_new_reply_reading'] : $txt['error_new_reply'];
-					else
-						$txt['error_new_replies'] = sprintf(isset($_GET['last_msg']) ? $txt['error_new_replies_reading'] : $txt['error_new_replies'], $context['new_replies']);
+					{
+											$txt['error_new_replies'] = isset($_GET['last_msg']) ? $txt['error_new_reply_reading'] : $txt['error_new_reply'];
+					}
+					else {
+											$txt['error_new_replies'] = sprintf(isset($_GET['last_msg']) ? $txt['error_new_replies_reading'] : $txt['error_new_replies'], $context['new_replies']);
+					}
 
 					$this->_post_errors->addError('new_replies', 0);
 
@@ -322,13 +346,19 @@ 
 			else
 			{
 				if (!isset($_REQUEST['subject']))
-					$_REQUEST['subject'] = '';
+				{
+									$_REQUEST['subject'] = '';
+				}
 
 				if (!isset($_REQUEST['message']))
-					$_REQUEST['message'] = '';
+				{
+									$_REQUEST['message'] = '';
+				}
 
 				if (!isset($_REQUEST['icon']))
-					$_REQUEST['icon'] = 'xx';
+				{
+									$_REQUEST['icon'] = 'xx';
+				}
 
 				// They are previewing if they asked to preview (i.e. came from quick reply).
 				$really_previewing = !empty($_REQUEST['preview']) || isset($_REQUEST['xml']);
@@ -348,7 +378,9 @@ 
 
 			// Make sure the subject isn't too long - taking into account special characters.
 			if (Util::strlen($this->_form_subject) > 100)
-				$this->_form_subject = Util::substr($this->_form_subject, 0, 100);
+			{
+							$this->_form_subject = Util::substr($this->_form_subject, 0, 100);
+			}
 
 			// Are you... a guest?
 			if ($user_info['is_guest'])
@@ -382,13 +414,19 @@ 
 				}
 
 				if ($context['preview_message'] === '')
-					$this->_post_errors->addError('no_message');
+				{
+									$this->_post_errors->addError('no_message');
+				}
 				elseif (!empty($modSettings['max_messageLength']) && Util::strlen($this->_form_message) > $modSettings['max_messageLength'])
-					$this->_post_errors->addError(array('long_message', array($modSettings['max_messageLength'])));
+				{
+									$this->_post_errors->addError(array('long_message', array($modSettings['max_messageLength'])));
+				}
 
 				// Protect any CDATA blocks.
 				if (isset($_REQUEST['xml']))
-					$context['preview_message'] = strtr($context['preview_message'], array(']]>' => ']]]]><![CDATA[>'));
+				{
+									$context['preview_message'] = strtr($context['preview_message'], array(']]>' => ']]]]><![CDATA[>'));
+				}
 			}
 
 			// Set up the checkboxes.
@@ -411,12 +449,16 @@ 
 				// The message they were trying to edit was most likely deleted.
 				// @todo Change this error message?
 				if ($message === false)
-					throw new Elk_Exception('no_board', false);
+				{
+									throw new Elk_Exception('no_board', false);
+				}
 
 				$errors = checkMessagePermissions($message['message']);
 				if (!empty($errors))
-					foreach ($errors as $error)
+				{
+									foreach ($errors as $error)
 						$this->_post_errors->addError($error);
+				}
 
 				prepareMessageContext($message);
 			}
@@ -425,12 +467,17 @@ 
 				// @todo: sort out what kind of combinations are actually possible
 				// Posting a quoted reply?
 				if ((!empty($topic) && !empty($_REQUEST['quote'])) || (!empty($modSettings['enableFollowup']) && !empty($_REQUEST['followup'])))
-					$case = 2;
+				{
+									$case = 2;
+				}
 				// Posting a reply without a quote?
 				elseif (!empty($topic) && empty($_REQUEST['quote']))
-					$case = 3;
-				else
-					$case = 4;
+				{
+									$case = 3;
+				}
+				else {
+									$case = 4;
+				}
 
 				list ($this->_form_subject,) = getFormMsgSubject($case, $topic, $this->_topic_attributes['subject']);
 			}
@@ -447,14 +494,18 @@ 
 
 			// The message they were trying to edit was most likely deleted.
 			if ($message === false)
-				throw new Elk_Exception('no_message', false);
+			{
+							throw new Elk_Exception('no_message', false);
+			}
 
 			// Trigger the prepare_editing event
 			$this->_events->trigger('prepare_editing', array('topic' => $topic, 'message' => &$message));
 
 			if (!empty($message['errors']))
-				foreach ($message['errors'] as $error)
+			{
+							foreach ($message['errors'] as $error)
 					$this->_post_errors->addError($error);
+			}
 
 			// Get the stuff ready for the form.
 			$this->_form_subject = $message['message']['subject'];
@@ -492,19 +543,26 @@ 
 			// @todo: sort out what kind of combinations are actually possible
 			// Posting a quoted reply?
 			if ((!empty($topic) && !empty($_REQUEST['quote'])) || (!empty($modSettings['enableFollowup']) && !empty($_REQUEST['followup'])))
-				$case = 2;
+			{
+							$case = 2;
+			}
 			// Posting a reply without a quote?
 			elseif (!empty($topic) && empty($_REQUEST['quote']))
-				$case = 3;
-			else
-				$case = 4;
+			{
+							$case = 3;
+			}
+			else {
+							$case = 4;
+			}
 
 			list ($this->_form_subject, $this->_form_message) = getFormMsgSubject($case, $topic, $this->_topic_attributes['subject']);
 		}
 
 		// Check whether this is a really old post being bumped...
 		if (!empty($topic) && !empty($modSettings['oldTopicDays']) && $this->_topic_attributes['last_post_time'] + $modSettings['oldTopicDays'] * 86400 < time() && empty($this->_topic_attributes['is_sticky']) && !isset($_REQUEST['subject']))
-			$this->_post_errors->addError(array('old_topic', array($modSettings['oldTopicDays'])), 0);
+		{
+					$this->_post_errors->addError(array('old_topic', array($modSettings['oldTopicDays'])), 0);
+		}
 	}
 
 	protected function _preparing_page()
@@ -522,13 +580,20 @@ 
 		if (empty($context['page_title']))
 		{
 			if (isset($_REQUEST['msg']))
-				$context['page_title'] = $txt['modify_msg'];
+			{
+							$context['page_title'] = $txt['modify_msg'];
+			}
 			elseif (isset($_REQUEST['subject'], $context['preview_subject']))
-				$context['page_title'] = $txt['post_reply'];
+			{
+							$context['page_title'] = $txt['post_reply'];
+			}
 			elseif (empty($topic))
-				$context['page_title'] = $txt['start_new_topic'];
-			else
-				$context['page_title'] = $txt['post_reply'];
+			{
+							$context['page_title'] = $txt['start_new_topic'];
+			}
+			else {
+							$context['page_title'] = $txt['post_reply'];
+			}
 		}
 
 		// Update the topic summary, needed to show new posts in a preview
@@ -537,9 +602,12 @@ 
 			$only_approved = $modSettings['postmod_active'] && !allowedTo('approve_posts');
 
 			if (isset($_REQUEST['xml']))
-				$limit = empty($context['new_replies']) ? 0 : (int) $context['new_replies'];
-			else
-				$limit = $modSettings['topicSummaryPosts'];
+			{
+							$limit = empty($context['new_replies']) ? 0 : (int) $context['new_replies'];
+			}
+			else {
+							$limit = $modSettings['topicSummaryPosts'];
+			}
 
 			$before = isset($_REQUEST['msg']) ? array('before' => (int) $_REQUEST['msg']) : array();
 
@@ -552,13 +620,17 @@ 
 				$post['is_ignored'] = !empty($modSettings['enable_buddylist']) && in_array($post['id_poster'], $user_info['ignoreusers']);
 
 				if (!empty($context['new_replies']))
-					$context['new_replies']--;
+				{
+									$context['new_replies']--;
+				}
 			}
 		}
 
 		// Just ajax previewing then lets stop now
 		if (isset($_REQUEST['xml']))
-			obExit();
+		{
+					obExit();
+		}
 
 		$context['subject'] = addcslashes($this->_form_subject, '"');
 		$context['message'] = str_replace(array('"', '<', '>', '&nbsp;'), array('&quot;', '&lt;', '&gt;', ' '), $this->_form_message);
@@ -576,7 +648,9 @@ 
 
 			// $context['icon'] is set when editing a message
 			if (!isset($context['icon']))
-				$context['icon'] = $context['icons'][0]['value'];
+			{
+							$context['icon'] = $context['icons'][0]['value'];
+			}
 			$found = false;
 			foreach ($context['icons'] as $icon)
 			{
@@ -658,12 +732,17 @@ 
 		if (empty($_POST) && empty($topic))
 		{
 			if (empty($_SERVER['CONTENT_LENGTH']))
-				redirectexit('action=post;board=' . $board . '.0');
-			else
-				throw new Elk_Exception('post_upload_error', false);
+			{
+							redirectexit('action=post;board=' . $board . '.0');
+			}
+			else {
+							throw new Elk_Exception('post_upload_error', false);
+			}
 		}
 		elseif (empty($_POST) && !empty($topic))
-			redirectexit('action=post;topic=' . $topic . '.0');
+		{
+					redirectexit('action=post;topic=' . $topic . '.0');
+		}
 
 		// No need!
 		$context['robot_no_index'] = true;
@@ -686,7 +765,9 @@ 
 
 		// Previewing? Go back to start.
 		if (isset($_REQUEST['preview']))
-			return $this->action_post();
+		{
+					return $this->action_post();
+		}
 
 		require_once(SUBSDIR . '/Boards.subs.php');
 		loadLanguage('Post');
@@ -704,11 +785,15 @@ 
 
 			// Though the topic should be there, it might have vanished.
 			if (empty($topic_info))
-				throw new Elk_Exception('topic_doesnt_exist');
+			{
+							throw new Elk_Exception('topic_doesnt_exist');
+			}
 
 			// Did this topic suddenly move? Just checking...
 			if ($topic_info['id_board'] != $board)
-				throw new Elk_Exception('not_a_topic');
+			{
+							throw new Elk_Exception('not_a_topic');
+			}
 		}
 
 		// Replying to a topic?
@@ -716,28 +801,38 @@ 
 		{
 			// Don't allow a post if it's locked.
 			if ($topic_info['locked'] != 0 && !allowedTo('moderate_board'))
-				throw new Elk_Exception('topic_locked', false);
+			{
+							throw new Elk_Exception('topic_locked', false);
+			}
 
 			// Do the permissions and approval stuff...
 			$becomesApproved = true;
 			if ($topic_info['id_member_started'] != $user_info['id'])
 			{
 				if ($modSettings['postmod_active'] && allowedTo('post_unapproved_replies_any') && !allowedTo('post_reply_any'))
-					$becomesApproved = false;
-				else
-					isAllowedTo('post_reply_any');
+				{
+									$becomesApproved = false;
+				}
+				else {
+									isAllowedTo('post_reply_any');
+				}
 			}
 			elseif (!allowedTo('post_reply_any'))
 			{
 				if ($modSettings['postmod_active'])
 				{
 					if (allowedTo('post_unapproved_replies_own') && !allowedTo('post_reply_own'))
-						$becomesApproved = false;
+					{
+											$becomesApproved = false;
+					}
 					// Guests do not have post_unapproved_replies_own permission, so it's always post_unapproved_replies_any
 					elseif ($user_info['is_guest'] && allowedTo('post_unapproved_replies_any'))
-						$becomesApproved = false;
-					else
-						isAllowedTo('post_reply_own');
+					{
+											$becomesApproved = false;
+					}
+					else {
+											isAllowedTo('post_reply_own');
+					}
 				}
 			}
 
@@ -748,7 +843,9 @@ 
 
 			// So you wanna (un)sticky this...let's see.
 			if (isset($_POST['sticky']) && ($_POST['sticky'] == $topic_info['is_sticky'] || !allowedTo('make_sticky')))
-				unset($_POST['sticky']);
+			{
+							unset($_POST['sticky']);
+			}
 
 			// Trigger the save_replying event
 			$this->_events->trigger('save_replying', array('topic_info' => &$topic_info));
@@ -776,9 +873,12 @@ 
 			// Do like, the permissions, for safety and stuff...
 			$becomesApproved = true;
 			if ($modSettings['postmod_active'] && !allowedTo('post_new') && allowedTo('post_unapproved_topics'))
-				$becomesApproved = false;
-			else
-				isAllowedTo('post_new');
+			{
+							$becomesApproved = false;
+			}
+			else {
+							isAllowedTo('post_new');
+			}
 
 			// Trigger teh save new topic event
 			$this->_events->trigger('save_new_topic', array('becomesApproved' => &$becomesApproved));
@@ -789,7 +889,9 @@ 
 			}
 
 			if (isset($_POST['sticky']) && (empty($_POST['sticky']) || !allowedTo('make_sticky')))
-				unset($_POST['sticky']);
+			{
+							unset($_POST['sticky']);
+			}
 
 			$posterIsGuest = $user_info['is_guest'];
 		}
@@ -801,13 +903,17 @@ 
 			$msgInfo = basicMessageInfo($_REQUEST['msg'], true);
 
 			if (empty($msgInfo))
-				throw new Elk_Exception('cant_find_messages', false);
+			{
+							throw new Elk_Exception('cant_find_messages', false);
+			}
 
 			// Trigger teh save_modify event
 			$this->_events->trigger('save_modify', array('msgInfo' => &$msgInfo));
 
 			if (!empty($topic_info['locked']) && !allowedTo('moderate_board'))
-				throw new Elk_Exception('topic_locked', false);
+			{
+							throw new Elk_Exception('topic_locked', false);
+			}
 
 			if (isset($_POST['lock']))
 			{
@@ -816,16 +922,23 @@ 
 
 			// Change the sticky status of this topic?
 			if (isset($_POST['sticky']) && (!allowedTo('make_sticky') || $_POST['sticky'] == $topic_info['is_sticky']))
-				unset($_POST['sticky']);
+			{
+							unset($_POST['sticky']);
+			}
 
 			if ($msgInfo['id_member'] == $user_info['id'] && !allowedTo('modify_any'))
 			{
 				if ((!$modSettings['postmod_active'] || $msgInfo['approved']) && !empty($modSettings['edit_disable_time']) && $msgInfo['poster_time'] + ($modSettings['edit_disable_time'] + 5) * 60 < time())
-					throw new Elk_Exception('modify_post_time_passed', false);
+				{
+									throw new Elk_Exception('modify_post_time_passed', false);
+				}
 				elseif ($topic_info['id_member_started'] == $user_info['id'] && !allowedTo('modify_own'))
-					isAllowedTo('modify_replies');
-				else
-					isAllowedTo('modify_own');
+				{
+									isAllowedTo('modify_replies');
+				}
+				else {
+									isAllowedTo('modify_own');
+				}
 			}
 			elseif ($topic_info['id_member_started'] == $user_info['id'] && !allowedTo('modify_any'))
 			{
@@ -840,7 +953,9 @@ 
 
 				// Log it, assuming you're not modifying your own post.
 				if ($msgInfo['id_member'] != $user_info['id'])
-					$moderationAction = true;
+				{
+									$moderationAction = true;
+				}
 			}
 
 			$posterIsGuest = empty($msgInfo['id_member']);
@@ -871,10 +986,14 @@ 
 			$_POST['email'] = !isset($_POST['email']) ? '' : Util::htmlspecialchars(trim($_POST['email']));
 
 			if ($_POST['guestname'] == '' || $_POST['guestname'] == '_')
-				$this->_post_errors->addError('no_name');
+			{
+							$this->_post_errors->addError('no_name');
+			}
 
 			if (Util::strlen($_POST['guestname']) > 25)
-				$this->_post_errors->addError('long_name');
+			{
+							$this->_post_errors->addError('long_name');
+			}
 
 			if (empty($modSettings['guest_post_no_email']))
 			{
@@ -882,7 +1001,9 @@ 
 				if (!isset($msgInfo) || $msgInfo['poster_email'] != $_POST['email'])
 				{
 					if (!allowedTo('moderate_forum') && !Data_Validator::is_valid($_POST, array('email' => 'valid_email|required'), array('email' => 'trim')))
-						empty($_POST['email']) ? $this->_post_errors->addError('no_email') : $this->_post_errors->addError('bad_email');
+					{
+											empty($_POST['email']) ? $this->_post_errors->addError('no_email') : $this->_post_errors->addError('bad_email');
+					}
 				}
 
 				// Now make sure this email address is not banned from posting.
@@ -909,12 +1030,18 @@ 
 
 		// Check the subject and message.
 		if (!isset($_POST['subject']) || Util::htmltrim(Util::htmlspecialchars($_POST['subject'])) === '')
-			$this->_post_errors->addError('no_subject');
+		{
+					$this->_post_errors->addError('no_subject');
+		}
 
 		if (!isset($_POST['message']) || Util::htmltrim(Util::htmlspecialchars($_POST['message'], ENT_QUOTES)) === '')
-			$this->_post_errors->addError('no_message');
+		{
+					$this->_post_errors->addError('no_message');
+		}
 		elseif (!empty($modSettings['max_messageLength']) && Util::strlen($_POST['message']) > $modSettings['max_messageLength'])
-			$this->_post_errors->addError(array('long_message', array($modSettings['max_messageLength'])));
+		{
+					$this->_post_errors->addError(array('long_message', array($modSettings['max_messageLength'])));
+		}
 		else
 		{
 			// Prepare the message a bit for some additional testing.
@@ -922,7 +1049,9 @@ 
 
 			// Preparse code. (Zef)
 			if ($user_info['is_guest'])
-				$user_info['name'] = $_POST['guestname'];
+			{
+							$user_info['name'] = $_POST['guestname'];
+			}
 
 			$this->preparse->preparsecode($_POST['message']);
 
@@ -930,7 +1059,9 @@ 
 
 			// Let's see if there's still some content left without the tags.
 			if (Util::htmltrim(strip_tags($bbc_parser->parseMessage($_POST['message'], false), '<img>')) === '' && (!allowedTo('admin_forum') || strpos($_POST['message'], '[html]') === false))
-				$this->_post_errors->addError('no_message');
+			{
+							$this->_post_errors->addError('no_message');
+			}
 		}
 
 		if ($posterIsGuest)
@@ -938,7 +1069,9 @@ 
 			// If user is a guest, make sure the chosen name isn't taken.
 			require_once(SUBSDIR . '/Members.subs.php');
 			if (isReservedName($_POST['guestname'], 0, true, false) && (!isset($msgInfo['poster_name']) || $_POST['guestname'] != $msgInfo['poster_name']))
-				$this->_post_errors->addError('bad_name');
+			{
+							$this->_post_errors->addError('bad_name');
+			}
 		}
 		// If the user isn't a guest, get his or her name and email.
 		elseif (!isset($_REQUEST['msg']))
@@ -956,9 +1089,12 @@ 
 				$post_in_board = boardInfo($new_board);
 
 				if (!empty($post_in_board))
-					$this->_post_errors->addError(array('post_new_board', array($post_in_board['name'])));
-				else
-					$this->_post_errors->addError('post_new');
+				{
+									$this->_post_errors->addError(array('post_new_board', array($post_in_board['name'])));
+				}
+				else {
+									$this->_post_errors->addError('post_new');
+				}
 			}
 		}
 
@@ -977,7 +1113,9 @@ 
 
 		// Make sure the user isn't spamming the board.
 		if (!isset($_REQUEST['msg']))
-			spamProtection('post');
+		{
+					spamProtection('post');
+		}
 
 		// At about this point, we're posting and that's that.
 		ignore_user_abort(true);
@@ -990,7 +1128,9 @@ 
 
 		// At this point, we want to make sure the subject isn't too long.
 		if (Util::strlen($_POST['subject']) > 100)
-			$_POST['subject'] = Util::substr($_POST['subject'], 0, 100);
+		{
+					$_POST['subject'] = Util::substr($_POST['subject'], 0, 100);
+		}
 
 		// Creating a new topic?
 		$newTopic = empty($_REQUEST['msg']) && empty($topic);
@@ -1038,7 +1178,9 @@ 
 
 			// This will save some time...
 			if (empty($approve_has_changed))
-				unset($msgOptions['approved']);
+			{
+							unset($msgOptions['approved']);
+			}
 
 			modifyPost($msgOptions, $topicOptions, $posterOptions);
 		}
@@ -1061,7 +1203,9 @@ 
 			createPost($msgOptions, $topicOptions, $posterOptions);
 
 			if (isset($topicOptions['id']))
-				$topic = $topicOptions['id'];
+			{
+							$topic = $topicOptions['id'];
+			}
 		}
 
 		// Trigger the after_save_post event
@@ -1075,27 +1219,41 @@ 
 
 			// Returning to the topic?
 			if (!empty($_REQUEST['goback']))
-				$board_list[] = $board;
+			{
+							$board_list[] = $board;
+			}
 
 			if (!empty($board_list))
-				markBoardsRead($board_list, false, false);
+			{
+							markBoardsRead($board_list, false, false);
+			}
 		}
 
 		// Turn notification on or off.
 		if (!empty($_POST['notify']) && allowedTo('mark_any_notify'))
-			setTopicNotification($user_info['id'], $topic, true);
+		{
+					setTopicNotification($user_info['id'], $topic, true);
+		}
 		elseif (!$newTopic)
-			setTopicNotification($user_info['id'], $topic, false);
+		{
+					setTopicNotification($user_info['id'], $topic, false);
+		}
 
 		// Log an act of moderation - modifying.
 		if (!empty($moderationAction))
-			logAction('modify', array('topic' => $topic, 'message' => (int) $_REQUEST['msg'], 'member' => $msgInfo['id_member'], 'board' => $board));
+		{
+					logAction('modify', array('topic' => $topic, 'message' => (int) $_REQUEST['msg'], 'member' => $msgInfo['id_member'], 'board' => $board));
+		}
 
 		if (isset($_POST['lock']) && $_POST['lock'] != 2)
-			logAction(empty($_POST['lock']) ? 'unlock' : 'lock', array('topic' => $topicOptions['id'], 'board' => $topicOptions['board']));
+		{
+					logAction(empty($_POST['lock']) ? 'unlock' : 'lock', array('topic' => $topicOptions['id'], 'board' => $topicOptions['board']));
+		}
 
 		if (isset($_POST['sticky']))
-			logAction(empty($_POST['sticky']) ? 'unsticky' : 'sticky', array('topic' => $topicOptions['id'], 'board' => $topicOptions['board']));
+		{
+					logAction(empty($_POST['sticky']) ? 'unsticky' : 'sticky', array('topic' => $topicOptions['id'], 'board' => $topicOptions['board']));
+		}
 
 		// Notify any members who have notification turned on for this topic/board - only do this if it's going to be approved(!)
 		if ($becomesApproved)
@@ -1119,29 +1277,43 @@ 
 			{
 				// Only send it to everyone if the topic is approved, otherwise just to the topic starter if they want it.
 				if ($topic_info['approved'])
-					sendNotifications($topic, 'reply');
-				else
-					sendNotifications($topic, 'reply', array(), $topic_info['id_member_started']);
+				{
+									sendNotifications($topic, 'reply');
+				}
+				else {
+									sendNotifications($topic, 'reply', array(), $topic_info['id_member_started']);
+				}
 			}
 		}
 
 		if ($board_info['num_topics'] == 0)
-			Cache::instance()->remove('board-' . $board);
+		{
+					Cache::instance()->remove('board-' . $board);
+		}
 
 		if (!empty($_POST['announce_topic']))
-			redirectexit('action=announce;sa=selectgroup;topic=' . $topic . (!empty($_POST['move']) && allowedTo('move_any') ? ';move' : '') . (empty($_REQUEST['goback']) ? '' : ';goback'));
+		{
+					redirectexit('action=announce;sa=selectgroup;topic=' . $topic . (!empty($_POST['move']) && allowedTo('move_any') ? ';move' : '') . (empty($_REQUEST['goback']) ? '' : ';goback'));
+		}
 
 		if (!empty($_POST['move']) && allowedTo('move_any'))
-			redirectexit('action=movetopic;topic=' . $topic . '.0' . (empty($_REQUEST['goback']) ? '' : ';goback'));
+		{
+					redirectexit('action=movetopic;topic=' . $topic . '.0' . (empty($_REQUEST['goback']) ? '' : ';goback'));
+		}
 
 		// Return to post if the mod is on.
 		if (isset($_REQUEST['msg']) && !empty($_REQUEST['goback']))
-			redirectexit('topic=' . $topic . '.msg' . $_REQUEST['msg'] . '#msg' . $_REQUEST['msg'], isBrowser('ie'));
+		{
+					redirectexit('topic=' . $topic . '.msg' . $_REQUEST['msg'] . '#msg' . $_REQUEST['msg'], isBrowser('ie'));
+		}
 		elseif (!empty($_REQUEST['goback']))
-			redirectexit('topic=' . $topic . '.new#new', isBrowser('ie'));
+		{
+					redirectexit('topic=' . $topic . '.new#new', isBrowser('ie'));
+		}
 		// Dut-dut-duh-duh-DUH-duh-dut-duh-duh!  *dances to the Final Fantasy Fanfare...*
-		else
-			redirectexit('board=' . $board . '.0');
+		else {
+					redirectexit('board=' . $board . '.0');
+		}
 	}
 
 	/**
@@ -1166,7 +1338,9 @@ 
 
 		$context['sub_template'] = 'quotefast';
 		if (!empty($row))
-			$can_view_post = $row['approved'] || ($row['id_member'] != 0 && $row['id_member'] == $user_info['id']) || allowedTo('approve_posts', $row['id_board']);
+		{
+					$can_view_post = $row['approved'] || ($row['id_member'] != 0 && $row['id_member'] == $user_info['id']) || allowedTo('approve_posts', $row['id_board']);
+		}
 
 		if (!empty($can_view_post))
 		{
@@ -1214,12 +1388,13 @@ 
 				'subject' => '',
 			);
 		}
-		else
-			$context['quote'] = array(
+		else {
+					$context['quote'] = array(
 				'xml' => '',
 				'mozilla' => '',
 				'text' => '',
 			);
+		}
 	}
 
 	/**
@@ -1233,35 +1408,49 @@ 
 
 		// We have to have a topic!
 		if (empty($topic))
-			obExit(false);
+		{
+					obExit(false);
+		}
 
 		checkSession('get');
 
 		$row = getTopicInfoByMsg($topic, empty($_REQUEST['msg']) ? 0 : (int) $_REQUEST['msg']);
 
 		if (empty($row))
-			throw new Elk_Exception('no_board', false);
+		{
+					throw new Elk_Exception('no_board', false);
+		}
 
 		// Change either body or subject requires permissions to modify messages.
 		if (isset($_POST['message']) || isset($_POST['subject']) || isset($_REQUEST['icon']))
 		{
 			if (!empty($row['locked']))
-				isAllowedTo('moderate_board');
+			{
+							isAllowedTo('moderate_board');
+			}
 
 			if ($row['id_member'] == $user_info['id'] && !allowedTo('modify_any'))
 			{
 				if ((!$modSettings['postmod_active'] || $row['approved']) && !empty($modSettings['edit_disable_time']) && $row['poster_time'] + ($modSettings['edit_disable_time'] + 5) * 60 < time())
-					throw new Elk_Exception('modify_post_time_passed', false);
+				{
+									throw new Elk_Exception('modify_post_time_passed', false);
+				}
 				elseif ($row['id_member_started'] == $user_info['id'] && !allowedTo('modify_own'))
-					isAllowedTo('modify_replies');
-				else
-					isAllowedTo('modify_own');
+				{
+									isAllowedTo('modify_replies');
+				}
+				else {
+									isAllowedTo('modify_own');
+				}
 			}
 			// Otherwise, they're locked out; someone who can modify the replies is needed.
 			elseif ($row['id_member_started'] == $user_info['id'] && !allowedTo('modify_any'))
-				isAllowedTo('modify_replies');
-			else
-				isAllowedTo('modify_any');
+			{
+							isAllowedTo('modify_replies');
+			}
+			else {
+							isAllowedTo('modify_any');
+			}
 
 			// Only log this action if it wasn't your message.
 			$moderationAction = $row['id_member'] != $user_info['id'];
@@ -1273,7 +1462,9 @@ 
 
 			// Maximum number of characters.
 			if (Util::strlen($_POST['subject']) > 100)
-				$_POST['subject'] = Util::substr($_POST['subject'], 0, 100);
+			{
+							$_POST['subject'] = Util::substr($_POST['subject'], 0, 100);
+			}
 		}
 		elseif (isset($_POST['subject']))
 		{
@@ -1314,7 +1505,9 @@ 
 		}
 
 		if (isset($_POST['sticky']) && !allowedTo('make_sticky'))
-			unset($_POST['sticky']);
+		{
+					unset($_POST['sticky']);
+		}
 
 		if (!$this->_post_errors->hasErrors())
 		{
@@ -1332,7 +1525,9 @@ 
 					{
 						$_POST['message'] = str_replace('@' . $member['real_name'], '[member=' . $member['id_member'] . ']' . $member['real_name'] . '[/member]', $_POST['message'], $replacements);
 						if ($replacements > 0)
-							$actually_mentioned[] = $member['id_member'];
+						{
+													$actually_mentioned[] = $member['id_member'];
+						}
 					}
 				}
 
@@ -1376,8 +1571,9 @@ 
 				}
 			}
 			// If nothing was changed there's no need to add an entry to the moderation log.
-			else
-				$moderationAction = false;
+			else {
+							$moderationAction = false;
+			}
 
 			modifyPost($msgOptions, $topicOptions, $posterOptions);
 
@@ -1398,7 +1594,9 @@ 
 			}
 
 			if (!empty($moderationAction))
-				logAction('modify', array('topic' => $topic, 'message' => $row['id_msg'], 'member' => $row['id_member'], 'board' => $board));
+			{
+							logAction('modify', array('topic' => $topic, 'message' => $row['id_msg'], 'member' => $row['id_member'], 'board' => $board));
+			}
 		}
 
 		if (isset($_REQUEST['xml']))
@@ -1454,8 +1652,9 @@ 
 				$context['message']['errors'] = $this->_post_errors->prepareErrors();
 			}
 		}
-		else
-			obExit(false);
+		else {
+					obExit(false);
+		}
 	}
 
 	/**
@@ -1475,34 +1674,47 @@ 
 		{
 			// New topics are by default not locked.
 			if (empty($lock))
-				return null;
+			{
+							return null;
+			}
 			// Besides, you need permission.
 			elseif (!allowedTo(array('lock_any', 'lock_own')))
-				return null;
+			{
+							return null;
+			}
 			// A moderator-lock (1) can override a user-lock (2).
-			else
-				return allowedTo('lock_any') ? 1 : 2;
+			else {
+							return allowedTo('lock_any') ? 1 : 2;
+			}
 		}
 
 		// Nothing changes to the lock status.
 		if ((empty($lock) && empty($topic_info['locked'])) || (!empty($lock) && !empty($topic_info['locked'])))
-			return null;
+		{
+					return null;
+		}
 		// You're simply not allowed to (un)lock this.
 		elseif (!allowedTo(array('lock_any', 'lock_own')) || (!allowedTo('lock_any') && $user_info['id'] != $topic_info['id_member_started']))
-			return null;
+		{
+					return null;
+		}
 		// You're only allowed to lock your own topics.
 		elseif (!allowedTo('lock_any'))
 		{
 			// You're not allowed to break a moderator's lock.
 			if ($topic_info['locked'] == 1)
-				return null;
+			{
+							return null;
+			}
 			// Lock it with a soft lock or unlock it.
-			else
-				$lock = empty($lock) ? 0 : 2;
+			else {
+							$lock = empty($lock) ? 0 : 2;
+			}
 		}
 		// You must be the moderator.
-		else
-			$lock = empty($lock) ? 0 : 1;
+		else {
+					$lock = empty($lock) ? 0 : 1;
+		}
 
 		return $lock;
 	}

sources/database/DbSearch-postgresql.php

Braces +9 added lines, -4 removed lines

@@ -79,7 +79,9 @@ 
 		);
 
 		if (isset($replacements[$identifier]))
-			$db_string = preg_replace(array_keys($replacements[$identifier]), array_values($replacements[$identifier]), $db_string);
+		{
+					$db_string = preg_replace(array_keys($replacements[$identifier]), array_values($replacements[$identifier]), $db_string);
+		}
 		elseif (preg_match('~^\s*INSERT\sIGNORE~i', $db_string) != 0)
 		{
 			$db_string = preg_replace('~^\s*INSERT\sIGNORE~i', 'INSERT', $db_string);
@@ -116,7 +118,9 @@ 
 		// In order to report the sizes correctly we need to perform vacuum (optimize) on the tables we will be using.
 		$db_table->optimize('{db_prefix}messages');
 		if ($db_table->table_exists('{db_prefix}log_search_words'))
-			$db_table->optimize('{db_prefix}log_search_words');
+		{
+					$db_table->optimize('{db_prefix}log_search_words');
+		}
 
 		// PostGreSql has some hidden sizes.
 		$request = $db->query('', '
@@ -149,14 +153,15 @@ 
 			}
 			$db->free_result($request);
 		}
-		else
-			// Didn't work for some reason...
+		else {
+					// Didn't work for some reason...
 			$table_info = array(
 				'data_length' => $txt['not_applicable'],
 				'index_length' => $txt['not_applicable'],
 				'fulltext_length' => $txt['not_applicable'],
 				'custom_index_length' => $txt['not_applicable'],
 			);
+		}
 
 		return $table_info;
 	}