SimpleMachines / SMF2.1

index.php

Spacing +1 added lines, -1 removed lines

@@ -104,7 +104,7 @@
  *
  * @param string $class The fully-qualified class name.
  */
-spl_autoload_register(function ($class) use ($sourcedir)
+spl_autoload_register(function($class) use ($sourcedir)
 {
 	$classMap = array(
 		'ReCaptcha\\' => 'ReCaptcha/',

Braces +38 added lines, -26 removed lines

@@ -32,16 +32,18 @@ 
 ob_start();
 
 // Do some cleaning, just in case.
-foreach (array('db_character_set', 'cachedir') as $variable)
+foreach (array('db_character_set', 'cachedir') as $variable) {
 	if (isset($GLOBALS[$variable]))
 		unset($GLOBALS[$variable], $GLOBALS[$variable]);
+}
 
 // Load the settings...
 require_once(dirname(__FILE__) . '/Settings.php');
 
 // Make absolutely sure the cache directory is defined.
-if ((empty($cachedir) || !file_exists($cachedir)) && file_exists($boarddir . '/cache'))
+if ((empty($cachedir) || !file_exists($cachedir)) && file_exists($boarddir . '/cache')) {
 	$cachedir = $boarddir . '/cache';
+}
 
 // Without those we can't go anywhere
 require_once($sourcedir . '/QueryString.php');
@@ -51,8 +53,9 @@ 
 require_once($sourcedir . '/Load.php');
 
 // If $maintenance is set specifically to 2, then we're upgrading or something.
-if (!empty($maintenance) && $maintenance == 2)
+if (!empty($maintenance) && $maintenance == 2) {
 	display_maintenance_message();
+}
 
 // Create a variable to store some SMF specific functions in.
 $smcFunc = array();
@@ -67,8 +70,9 @@ 
 cleanRequest();
 
 // Seed the random generator.
-if (empty($modSettings['rand_seed']) || mt_rand(1, 250) == 69)
+if (empty($modSettings['rand_seed']) || mt_rand(1, 250) == 69) {
 	smf_seed_generator();
+}
 
 // Before we get carried away, are we doing a scheduled task? If so save CPU cycles by jumping out!
 if (isset($_GET['scheduled']))
@@ -88,9 +92,9 @@ 
 if (!empty($modSettings['enableCompressedOutput']) && !headers_sent())
 {
 	// If zlib is being used, turn off output compression.
-	if (ini_get('zlib.output_compression') >= 1 || ini_get('output_handler') == 'ob_gzhandler')
-		$modSettings['enableCompressedOutput'] = '0';
-	else
+	if (ini_get('zlib.output_compression') >= 1 || ini_get('output_handler') == 'ob_gzhandler') {
+			$modSettings['enableCompressedOutput'] = '0';
+	} else
 	{
 		ob_end_clean();
 		ob_start('ob_gzhandler');
@@ -182,18 +186,21 @@ 
 	loadPermissions();
 
 	// Attachments don't require the entire theme to be loaded.
-	if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'dlattach')
-		detectBrowser();
+	if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'dlattach') {
+			detectBrowser();
+	}
 	// Load the current theme.  (note that ?theme=1 will also work, may be used for guest theming.)
-	else
-		loadTheme();
+	else {
+			loadTheme();
+	}
 
 	// Check if the user should be disallowed access.
 	is_not_banned();
 
 	// If we are in a topic and don't have permission to approve it then duck out now.
-	if (!empty($topic) && empty($board_info['cur_topic_approved']) && !allowedTo('approve_posts') && ($user_info['id'] != $board_info['cur_topic_starter'] || $user_info['is_guest']))
-		fatal_lang_error('not_a_topic', false);
+	if (!empty($topic) && empty($board_info['cur_topic_approved']) && !allowedTo('approve_posts') && ($user_info['id'] != $board_info['cur_topic_starter'] || $user_info['is_guest'])) {
+			fatal_lang_error('not_a_topic', false);
+	}
 
 	$no_stat_actions = array('clock', 'dlattach', 'findmember', 'jsoption', 'likes', 'loadeditorlocale', 'modifycat', 'requestmembers', 'smstats', 'suggest', 'about:unknown', '.xml', 'xmlhttp', 'verificationcode', 'viewquery', 'viewsmfile');
 	call_integration_hook('integrate_pre_log_stats', array(&$no_stat_actions));
@@ -204,8 +211,9 @@ 
 		writeLog();
 
 		// Track forum statistics and hits...?
-		if (!empty($modSettings['hitStats']))
-			trackStats(array('hits' => '+'));
+		if (!empty($modSettings['hitStats'])) {
+					trackStats(array('hits' => '+'));
+		}
 	}
 	unset($no_stat_actions);
 
@@ -219,13 +227,14 @@ 
 			return ($_REQUEST['action'] == 'login2' ? 'Login2' : ($_REQUEST['action'] == 'logintfa' ? 'LoginTFA' : 'Logout'));
 		}
 		// Don't even try it, sonny.
-		else
-			return 'InMaintenance';
+		else {
+					return 'InMaintenance';
+		}
 	}
 	// If guest access is off, a guest can only do one of the very few following actions.
-	elseif (empty($modSettings['allow_guestAccess']) && $user_info['is_guest'] && (!isset($_REQUEST['action']) || !in_array($_REQUEST['action'], array('coppa', 'login', 'login2', 'logintfa', 'reminder', 'activate', 'help', 'helpadmin', 'smstats', 'verificationcode', 'signup', 'signup2'))))
-		return 'KickGuest';
-	elseif (empty($_REQUEST['action']))
+	elseif (empty($modSettings['allow_guestAccess']) && $user_info['is_guest'] && (!isset($_REQUEST['action']) || !in_array($_REQUEST['action'], array('coppa', 'login', 'login2', 'logintfa', 'reminder', 'activate', 'help', 'helpadmin', 'smstats', 'verificationcode', 'signup', 'signup2')))) {
+			return 'KickGuest';
+	} elseif (empty($_REQUEST['action']))
 	{
 		// Action and board are both empty... BoardIndex! Unless someone else wants to do something different.
 		if (empty($board) && empty($topic))
@@ -239,8 +248,9 @@ 
 
 				$call = call_helper($defaultAction, true);
 
-				if (!empty($call))
-					return $call;
+				if (!empty($call)) {
+									return $call;
+				}
 			}
 
 			// No default action huh? then go to our good old BoardIndex.
@@ -370,8 +380,9 @@ 
 
 			$call = call_helper($fallbackAction, true);
 
-			if (!empty($call))
-				return $call;
+			if (!empty($call)) {
+							return $call;
+			}
 		}
 
 		// No fallback action, huh?
@@ -382,8 +393,9 @@ 
 	}
 
 	// Otherwise, it was set - so let's go to that action.
-	if (!empty($actionArray[$_REQUEST['action']][0]))
-		require_once($sourcedir . '/' . $actionArray[$_REQUEST['action']][0]);
+	if (!empty($actionArray[$_REQUEST['action']][0])) {
+			require_once($sourcedir . '/' . $actionArray[$_REQUEST['action']][0]);
+	}
 
 	// Do the right thing.
 	return call_helper($actionArray[$_REQUEST['action']][1], true);

Themes/default/Calendar.template.php

Doc Comments +3 added lines, -3 removed lines

@@ -68,7 +68,7 @@ 
  * Display a list of upcoming events, birthdays, and holidays.
  *
  * @param string $grid_name The grid name
- * @return void|bool Returns false if the grid doesn't exist.
+ * @return false|null Returns false if the grid doesn't exist.
  */
 function template_show_upcoming_list($grid_name)
 {
@@ -238,7 +238,7 @@ 
  *
  * @param string $grid_name The grid name
  * @param bool $is_mini Is this a mini grid?
- * @return void|bool Returns false if the grid doesn't exist.
+ * @return false|null Returns false if the grid doesn't exist.
  */
 function template_show_month_grid($grid_name, $is_mini = false)
 {
@@ -523,7 +523,7 @@ 
  * Shows a weekly grid
  *
  * @param string $grid_name The name of the grid
- * @return void|bool Returns false if the grid doesn't exist
+ * @return false|null Returns false if the grid doesn't exist
  */
 function template_show_week_grid($grid_name)
 {

Braces +222 added lines, -162 removed lines

@@ -22,30 +22,32 @@ 
 		<div id="calendar">';
 
 	// Show the mini-blocks if they're enabled.
-	if (empty($context['blocks_disabled']))
-		echo '
+	if (empty($context['blocks_disabled'])) {
+			echo '
 			<div id="month_grid">
 				', template_show_month_grid('prev', true), '
 				', template_show_month_grid('current', true), '
 				', template_show_month_grid('next', true), '
 			</div>';
+	}
 
 	// What view are we showing?
-	if ($context['calendar_view'] == 'viewlist')
-		echo '
+	if ($context['calendar_view'] == 'viewlist') {
+			echo '
 			<div id="main_grid">
 				', template_show_upcoming_list('main'), '
 			</div>';
-	elseif ($context['calendar_view'] == 'viewweek')
-		echo '
+	} elseif ($context['calendar_view'] == 'viewweek') {
+			echo '
 			<div id="main_grid">
 				', template_show_week_grid('main'), '
 			</div>';
-	else
-		echo '
+	} else {
+			echo '
 			<div id="main_grid">
 				', template_show_month_grid('main'), '
 			</div>';
+	}
 
 	// Close our wrapper.
 	echo '
@@ -64,20 +66,22 @@ 
 	global $context, $scripturl, $txt;
 
 	// Bail out if we have nothing to work with
-	if (!isset($context['calendar_grid_' . $grid_name]))
-		return false;
+	if (!isset($context['calendar_grid_' . $grid_name])) {
+			return false;
+	}
 
 	// Protect programmer sanity
 	$calendar_data = &$context['calendar_grid_' . $grid_name];
 
 	// Do we want a title?
-	if (empty($calendar_data['disable_title']))
-		echo '
+	if (empty($calendar_data['disable_title'])) {
+			echo '
 			<div class="cat_bar">
 				<h3 class="catbg centertext largetext">
 					<a href="', $scripturl, '?action=calendar;viewlist;year=', $calendar_data['start_year'], ';month=', $calendar_data['start_month'], ';day=', $calendar_data['start_day'], '">', $txt['calendar_upcoming'], '</a>
 				</h3>
 			</div>';
+	}
 
 	// Give the user some controls to work with
 	template_calendar_top($calendar_data);
@@ -100,11 +104,13 @@ 
 					<li class="windowbg">
 						<strong class="event_title">', $event['link'], '</strong>';
 
-				if ($event['can_edit'])
-					echo ' <a href="' . $event['modify_href'] . '"><span class="generic_icons calendar_modify" title="', $txt['calendar_edit'], '"></span></a>';
+				if ($event['can_edit']) {
+									echo ' <a href="' . $event['modify_href'] . '"><span class="generic_icons calendar_modify" title="', $txt['calendar_edit'], '"></span></a>';
+				}
 
-				if ($event['can_export'])
-					echo ' <a href="' . $event['export_href'] . '"><span class="generic_icons calendar_export" title="', $txt['calendar_export'], '"></span></a>';
+				if ($event['can_export']) {
+									echo ' <a href="' . $event['export_href'] . '"><span class="generic_icons calendar_export" title="', $txt['calendar_export'], '"></span></a>';
+				}
 
 				echo '
 						<br>';
@@ -112,14 +118,14 @@ 
 				if (!empty($event['allday']))
 				{
 					echo '<time datetime="' . $event['start_iso_gmdate'] . '">', trim($event['start_date_local']), '</time>', ($event['start_date'] != $event['end_date']) ? ' &ndash; <time datetime="' . $event['end_iso_gmdate'] . '">' . trim($event['end_date_local']) . '</time>' : '';
-				}
-				else
+				} else
 				{
 					// Display event info relative to user's local timezone
 					echo '<time datetime="' . $event['start_iso_gmdate'] . '">', trim($event['start_date_local']), ', ', trim($event['start_time_local']), '</time> &ndash; <time datetime="' . $event['end_iso_gmdate'] . '">';
 
-					if ($event['start_date_local'] != $event['end_date_local'])
-						echo trim($event['end_date_local']) . ', ';
+					if ($event['start_date_local'] != $event['end_date_local']) {
+											echo trim($event['end_date_local']) . ', ';
+					}
 
 					echo trim($event['end_time_local']);
 
@@ -128,23 +134,27 @@ 
 					{
 						echo '</time> (<time datetime="' . $event['start_iso_gmdate'] . '">';
 
-						if ($event['start_date_orig'] != $event['start_date_local'] || $event['end_date_orig'] != $event['end_date_local'] || $event['start_date_orig'] != $event['end_date_orig'])
-							echo trim($event['start_date_orig']), ', ';
+						if ($event['start_date_orig'] != $event['start_date_local'] || $event['end_date_orig'] != $event['end_date_local'] || $event['start_date_orig'] != $event['end_date_orig']) {
+													echo trim($event['start_date_orig']), ', ';
+						}
 
 						echo trim($event['start_time_orig']), '</time> &ndash; <time datetime="' . $event['end_iso_gmdate'] . '">';
 
-						if ($event['start_date_orig'] != $event['end_date_orig'])
-							echo trim($event['end_date_orig']) . ', ';
+						if ($event['start_date_orig'] != $event['end_date_orig']) {
+													echo trim($event['end_date_orig']) . ', ';
+						}
 
 						echo trim($event['end_time_orig']), ' ', $event['tz_abbrev'], '</time>)';
 					}
 					// Event is scheduled in the user's own timezone? Let 'em know, just to avoid confusion
-					else
-						echo ' ', $event['tz_abbrev'], '</time>';
+					else {
+											echo ' ', $event['tz_abbrev'], '</time>';
+					}
 				}
 
-				if (!empty($event['location']))
-					echo '<br>', $event['location'];
+				if (!empty($event['location'])) {
+									echo '<br>', $event['location'];
+				}
 
 				echo '
 					</li>';
@@ -176,8 +186,9 @@ 
 
 			$birthdays = array();
 
-			foreach ($date as $member)
-				$birthdays[] = '<a href="' . $scripturl . '?action=profile;u=' . $member['id'] . '">' . $member['name'] . (isset($member['age']) ? ' (' . $member['age'] . ')' : '') . '</a>';
+			foreach ($date as $member) {
+							$birthdays[] = '<a href="' . $scripturl . '?action=profile;u=' . $member['id'] . '">' . $member['name'] . (isset($member['age']) ? ' (' . $member['age'] . ')' : '') . '</a>';
+			}
 
 			echo implode(', ', $birthdays);
 
@@ -208,8 +219,9 @@ 
 			$date_local = $date['date_local'];
 			unset($date['date_local']);
 
-			foreach ($date as $holiday)
-				$holidays[] = $holiday . ' (' . $date_local . ')';
+			foreach ($date as $holiday) {
+							$holidays[] = $holiday . ' (' . $date_local . ')';
+			}
 		}
 
 		echo implode(', ', $holidays);
@@ -233,17 +245,19 @@ 
 	global $context, $txt, $scripturl, $modSettings;
 
 	// If the grid doesn't exist, no point in proceeding.
-	if (!isset($context['calendar_grid_' . $grid_name]))
-		return false;
+	if (!isset($context['calendar_grid_' . $grid_name])) {
+			return false;
+	}
 
 	// A handy little pointer variable.
 	$calendar_data = &$context['calendar_grid_' . $grid_name];
 
 	// Some conditions for whether or not we should show the week links *here*.
-	if (isset($calendar_data['show_week_links']) && ($calendar_data['show_week_links'] == 3 || (($calendar_data['show_week_links'] == 1 && $is_mini === true) || $calendar_data['show_week_links'] == 2 && $is_mini === false)))
-		$show_week_links = true;
-	else
-		$show_week_links = false;
+	if (isset($calendar_data['show_week_links']) && ($calendar_data['show_week_links'] == 3 || (($calendar_data['show_week_links'] == 1 && $is_mini === true) || $calendar_data['show_week_links'] == 2 && $is_mini === false))) {
+			$show_week_links = true;
+	} else {
+			$show_week_links = false;
+	}
 
 	// Assuming that we've not disabled it, show the title block!
 	if (empty($calendar_data['disable_title']))
@@ -253,18 +267,20 @@ 
 				<h3 class="catbg centertext largetext">';
 
 		// Previous Link: If we're showing prev / next and it's not a mini-calendar.
-		if (empty($calendar_data['previous_calendar']['disabled']) && $calendar_data['show_next_prev'] && $is_mini === false)
-			echo '
+		if (empty($calendar_data['previous_calendar']['disabled']) && $calendar_data['show_next_prev'] && $is_mini === false) {
+					echo '
 					<span class="floatleft">
 						<a href="', $calendar_data['previous_calendar']['href'], '">&#171;</a>
 					</span>';
+		}
 
 		// Next Link: if we're showing prev / next and it's not a mini-calendar.
-		if (empty($calendar_data['next_calendar']['disabled']) && $calendar_data['show_next_prev'] && $is_mini === false)
-			echo '
+		if (empty($calendar_data['next_calendar']['disabled']) && $calendar_data['show_next_prev'] && $is_mini === false) {
+					echo '
 					<span class="floatright">
 						<a href="', $calendar_data['next_calendar']['href'], '">&#187;</a>
 					</span>';
+		}
 
 		// Arguably the most exciting part, the title!
 		echo '
@@ -274,8 +290,9 @@ 
 	}
 
 	// Show the controls on main grids
-	if ($is_mini === false)
-		template_calendar_top($calendar_data);
+	if ($is_mini === false) {
+			template_calendar_top($calendar_data);
+	}
 
 	// Finally, the main calendar table.
 	echo '
@@ -288,14 +305,16 @@ 
 				<tr>';
 
 		// If we're showing week links, there's an extra column ahead of the week links, so let's think ahead and be prepared!
-		if ($show_week_links === true)
-			echo '
+		if ($show_week_links === true) {
+					echo '
 					<th></th>';
+		}
 
 		// Now, loop through each actual day of the week.
-		foreach ($calendar_data['week_days'] as $day)
-			echo '
+		foreach ($calendar_data['week_days'] as $day) {
+					echo '
 					<th class="days" scope="col">', !empty($calendar_data['short_day_titles']) || $is_mini === true ? $txt['days_short'][$day] : $txt['days'][$day], '</th>';
+		}
 
 		echo '
 				</tr>';
@@ -313,11 +332,12 @@ 
 				<tr class="days_wrapper">';
 
 		// This is where we add the actual week link, if enabled on this location.
-		if ($show_week_links === true)
-			echo '
+		if ($show_week_links === true) {
+					echo '
 					<td class="windowbg weeks">
 						<a href="', $scripturl, '?action=calendar;viewweek;year=', $calendar_data['current_year'], ';month=', $calendar_data['current_month'], ';day=', $week['days'][0]['day'], '" title="', $txt['calendar_view_week'], '">&#187;</a>
 					</td>';
+		}
 
 		// Now loop through each day in the week we're on.
 		foreach ($week['days'] as $day)
@@ -333,27 +353,29 @@ 
 				// Additional classes are given for events, holidays, and birthdays.
 				if (!empty($day['events']) && !empty($calendar_data['highlight']['events']))
 				{
-					if ($is_mini === true && in_array($calendar_data['highlight']['events'], array(1, 3)))
-						$classes[] = 'events';
-					elseif ($is_mini === false && in_array($calendar_data['highlight']['events'], array(2, 3)))
-						$classes[] = 'events';
+					if ($is_mini === true && in_array($calendar_data['highlight']['events'], array(1, 3))) {
+											$classes[] = 'events';
+					} elseif ($is_mini === false && in_array($calendar_data['highlight']['events'], array(2, 3))) {
+											$classes[] = 'events';
+					}
 				}
 				if (!empty($day['holidays']) && !empty($calendar_data['highlight']['holidays']))
 				{
-					if ($is_mini === true && in_array($calendar_data['highlight']['holidays'], array(1, 3)))
-						$classes[] = 'holidays';
-					elseif ($is_mini === false && in_array($calendar_data['highlight']['holidays'], array(2, 3)))
-						$classes[] = 'holidays';
+					if ($is_mini === true && in_array($calendar_data['highlight']['holidays'], array(1, 3))) {
+											$classes[] = 'holidays';
+					} elseif ($is_mini === false && in_array($calendar_data['highlight']['holidays'], array(2, 3))) {
+											$classes[] = 'holidays';
+					}
 				}
 				if (!empty($day['birthdays']) && !empty($calendar_data['highlight']['birthdays']))
 				{
-					if ($is_mini === true && in_array($calendar_data['highlight']['birthdays'], array(1, 3)))
-						$classes[] = 'birthdays';
-					elseif ($is_mini === false && in_array($calendar_data['highlight']['birthdays'], array(2, 3)))
-						$classes[] = 'birthdays';
+					if ($is_mini === true && in_array($calendar_data['highlight']['birthdays'], array(1, 3))) {
+											$classes[] = 'birthdays';
+					} elseif ($is_mini === false && in_array($calendar_data['highlight']['birthdays'], array(2, 3))) {
+											$classes[] = 'birthdays';
+					}
 				}
-			}
-			else
+			} else
 			{
 				// Default Classes (either compact or comfortable and disabled).
 				$classes[] = !empty($calendar_data['size']) && $calendar_data['size'] == 'small' ? 'compact' : 'comfortable';
@@ -371,25 +393,27 @@ 
 				$title_prefix = !empty($day['is_first_of_month']) && $context['current_month'] == $calendar_data['current_month'] && $is_mini === false ? (!empty($calendar_data['short_month_titles']) ? $txt['months_short'][$calendar_data['current_month']] . ' ' : $txt['months_titles'][$calendar_data['current_month']] . ' ') : '';
 
 				// The actual day number - be it a link, or just plain old text!
-				if (!empty($modSettings['cal_daysaslink']) && $context['can_post'])
-					echo '
+				if (!empty($modSettings['cal_daysaslink']) && $context['can_post']) {
+									echo '
 						<a href="', $scripturl, '?action=calendar;sa=post;year=', $calendar_data['current_year'], ';month=', $calendar_data['current_month'], ';day=', $day['day'], ';', $context['session_var'], '=', $context['session_id'], '"><span class="day_text">', $title_prefix, $day['day'], '</span></a>';
-				elseif ($is_mini)
-					echo '
+				} elseif ($is_mini) {
+									echo '
 						<a href="', $scripturl, '?action=calendar;', $context['calendar_view'], ';year=', $calendar_data['current_year'], ';month=', $calendar_data['current_month'], ';day=', $day['day'], '"><span class="day_text">', $title_prefix, $day['day'], '</span></a>';
-				else
-					echo '
+				} else {
+									echo '
 						<span class="day_text">', $title_prefix, $day['day'], '</span>';
+				}
 
 				// A lot of stuff, we're not showing on mini-calendars to conserve space.
 				if ($is_mini === false)
 				{
 					// Holidays are always fun, let's show them!
-					if (!empty($day['holidays']))
-						echo '
+					if (!empty($day['holidays'])) {
+											echo '
 						<div class="smalltext holiday">
 							<span>', $txt['calendar_prompt'], '</span> ', implode(', ', $day['holidays']), '
 						</div>';
+					}
 
 					// Happy Birthday Dear Member!
 					if (!empty($day['birthdays']))
@@ -407,15 +431,17 @@ 
 							echo '<a href="', $scripturl, '?action=profile;u=', $member['id'], '"><span class="fix_rtl_names">', $member['name'], '</span>', isset($member['age']) ? ' (' . $member['age'] . ')' : '', '</a>', $member['is_last'] || ($count == 10 && $use_js_hide) ? '' : ', ';
 
 							// 9...10! Let's stop there.
-							if ($birthday_count == 10 && $use_js_hide)
-								// !!TODO - Inline CSS and JavaScript should be moved.
+							if ($birthday_count == 10 && $use_js_hide) {
+															// !!TODO - Inline CSS and JavaScript should be moved.
 								echo '<span class="hidelink" id="bdhidelink_', $day['day'], '">...<br><a href="', $scripturl, '?action=calendar;month=', $calendar_data['current_month'], ';year=', $calendar_data['current_year'], ';showbd" onclick="document.getElementById(\'bdhide_', $day['day'], '\').classList.remove(\'hidden\'); document.getElementById(\'bdhidelink_', $day['day'], '\').classList.add(\'hidden\'); return false;">(', sprintf($txt['calendar_click_all'], count($day['birthdays'])), ')</a></span><span id="bdhide_', $day['day'], '" class="hidden">, ';
+							}
 
 							++$birthday_count;
 						}
-						if ($use_js_hide)
-							echo '
+						if ($use_js_hide) {
+													echo '
 							</span>';
+						}
 
 						echo '
 						</div><!-- .smalltext -->';
@@ -426,8 +452,9 @@ 
 					{
 						// Sort events by start time (all day events will be listed first)
 						uasort($day['events'], function($a, $b) {
-							if ($a['start_timestamp'] == $b['start_timestamp'])
-								return 0;
+							if ($a['start_timestamp'] == $b['start_timestamp']) {
+															return 0;
+							}
 
 							return ($a['start_timestamp'] < $b['start_timestamp']) ? -1 : 1;
 						});
@@ -447,20 +474,22 @@ 
 								', $event['link'], '<br>
 								<span class="event_time', empty($event_icons_needed) ? ' floatright' : '', '">';
 
-							if (!empty($event['start_time_local']) && $event['starts_today'] == true)
-								echo trim(str_replace(':00 ', ' ', $event['start_time_local']));
-							elseif (!empty($event['end_time_local']) && $event['ends_today'] == true)
-								echo strtolower($txt['ends']), ' ', trim(str_replace(':00 ', ' ', $event['end_time_local']));
-							elseif (!empty($event['allday']))
-								echo $txt['calendar_allday'];
+							if (!empty($event['start_time_local']) && $event['starts_today'] == true) {
+															echo trim(str_replace(':00 ', ' ', $event['start_time_local']));
+							} elseif (!empty($event['end_time_local']) && $event['ends_today'] == true) {
+															echo strtolower($txt['ends']), ' ', trim(str_replace(':00 ', ' ', $event['end_time_local']));
+							} elseif (!empty($event['allday'])) {
+															echo $txt['calendar_allday'];
+							}
 
 							echo '
 								</span>';
 
-							if (!empty($event['location']))
-								echo '
+							if (!empty($event['location'])) {
+															echo '
 								<br>
 								<span class="event_location', empty($event_icons_needed) ? ' floatright' : '', '">' . $event['location'] . '</span>';
+							}
 
 							if ($event['can_edit'] || $event['can_export'])
 							{
@@ -468,18 +497,20 @@ 
 								<span class="modify_event_links">';
 
 								// If they can edit the event, show an icon they can click on....
-								if ($event['can_edit'])
-									echo '
+								if ($event['can_edit']) {
+																	echo '
 									<a class="modify_event" href="', $event['modify_href'], '">
 										<span class="generic_icons calendar_modify" title="', $txt['calendar_edit'], '"></span>
 									</a>';
+								}
 
 								// Exporting!
-								if ($event['can_export'])
-									echo '
+								if ($event['can_export']) {
+																	echo '
 									<a class="modify_event" href="', $event['export_href'], '">
 										<span class="generic_icons calendar_export" title="', $txt['calendar_export'], '"></span>
 									</a>';
+								}
 
 								echo '
 								</span><br class="clear">';
@@ -498,10 +529,11 @@ 
 			// Otherwise, assuming it's not a mini-calendar, we can show previous / next month days!
 			elseif ($is_mini === false)
 			{
-				if (empty($current_month_started) && !empty($context['calendar_grid_prev']))
-					echo '<a href="', $scripturl, '?action=calendar;year=', $context['calendar_grid_prev']['current_year'], ';month=', $context['calendar_grid_prev']['current_month'], '">', $context['calendar_grid_prev']['last_of_month'] - $calendar_data['shift']-- +1, '</a>';
-				elseif (!empty($current_month_started) && !empty($context['calendar_grid_next']))
-					echo '<a href="', $scripturl, '?action=calendar;year=', $context['calendar_grid_next']['current_year'], ';month=', $context['calendar_grid_next']['current_month'], '">', $current_month_started + 1 == $count ? (!empty($calendar_data['short_month_titles']) ? $txt['months_short'][$context['calendar_grid_next']['current_month']] . ' ' : $txt['months_titles'][$context['calendar_grid_next']['current_month']] . ' ') : '', $final_count++, '</a>';
+				if (empty($current_month_started) && !empty($context['calendar_grid_prev'])) {
+									echo '<a href="', $scripturl, '?action=calendar;year=', $context['calendar_grid_prev']['current_year'], ';month=', $context['calendar_grid_prev']['current_month'], '">', $context['calendar_grid_prev']['last_of_month'] - $calendar_data['shift']-- +1, '</a>';
+				} elseif (!empty($current_month_started) && !empty($context['calendar_grid_next'])) {
+									echo '<a href="', $scripturl, '?action=calendar;year=', $context['calendar_grid_next']['current_year'], ';month=', $context['calendar_grid_next']['current_month'], '">', $current_month_started + 1 == $count ? (!empty($calendar_data['short_month_titles']) ? $txt['months_short'][$context['calendar_grid_next']['current_month']] . ' ' : $txt['months_titles'][$context['calendar_grid_next']['current_month']] . ' ') : '', $final_count++, '</a>';
+				}
 			}
 
 			// Close this day and increase var count.
@@ -531,8 +563,9 @@ 
 	global $context, $txt, $scripturl, $modSettings;
 
 	// We might have no reason to proceed, if the variable isn't there.
-	if (!isset($context['calendar_grid_' . $grid_name]))
-		return false;
+	if (!isset($context['calendar_grid_' . $grid_name])) {
+			return false;
+	}
 
 	// Handy pointer.
 	$calendar_data = &$context['calendar_grid_' . $grid_name];
@@ -549,22 +582,25 @@ 
 					<h3 class="catbg centertext largetext">';
 
 			// Previous Week Link...
-			if (empty($calendar_data['previous_calendar']['disabled']) && !empty($calendar_data['show_next_prev']))
-				echo '
+			if (empty($calendar_data['previous_calendar']['disabled']) && !empty($calendar_data['show_next_prev'])) {
+							echo '
 						<span class="floatleft">
 							<a href="', $calendar_data['previous_week']['href'], '">&#171;</a>
 						</span>';
+			}
 
 			// Next Week Link...
-			if (empty($calendar_data['next_calendar']['disabled']) && !empty($calendar_data['show_next_prev']))
-				echo '
+			if (empty($calendar_data['next_calendar']['disabled']) && !empty($calendar_data['show_next_prev'])) {
+							echo '
 						<span class="floatright">
 							<a href="', $calendar_data['next_week']['href'], '">&#187;</a>
 						</span>';
+			}
 
 			// The Month Title + Week Number...
-			if (!empty($calendar_data['week_title']))
-				echo $calendar_data['week_title'];
+			if (!empty($calendar_data['week_title'])) {
+							echo $calendar_data['week_title'];
+			}
 
 			echo '
 					</h3>
@@ -605,11 +641,12 @@ 
 						<td class="', implode(' ', $classes), ' act_day">';
 
 			// Should the day number be a link?
-			if (!empty($modSettings['cal_daysaslink']) && $context['can_post'])
-				echo '
+			if (!empty($modSettings['cal_daysaslink']) && $context['can_post']) {
+							echo '
 							<a href="', $scripturl, '?action=calendar;sa=post;month=', $month_data['current_month'], ';year=', $month_data['current_year'], ';day=', $day['day'], ';', $context['session_var'], '=', $context['session_id'], '">', $txt['days'][$day['day_of_week']], ' - ', $day['day'], '</a>';
-			else
-				echo $txt['days'][$day['day_of_week']], ' - ', $day['day'];
+			} else {
+							echo $txt['days'][$day['day_of_week']], ' - ', $day['day'];
+			}
 
 			echo '
 						</td>
@@ -620,8 +657,9 @@ 
 			{
 				// Sort events by start time (all day events will be listed first)
 				uasort($day['events'], function($a, $b) {
-					if ($a['start_timestamp'] == $b['start_timestamp'])
-						return 0;
+					if ($a['start_timestamp'] == $b['start_timestamp']) {
+											return 0;
+					}
 					return ($a['start_timestamp'] < $b['start_timestamp']) ? -1 : 1;
 				});
 
@@ -635,35 +673,39 @@ 
 					echo $event['link'], '<br>
 								<span class="event_time', empty($event_icons_needed) ? ' floatright' : '', '">';
 
-					if (!empty($event['start_time_local']))
-						echo trim($event['start_time_local']), !empty($event['end_time_local']) ? ' &ndash; ' . trim($event['end_time_local']) : '';
-					else
-						echo $txt['calendar_allday'];
+					if (!empty($event['start_time_local'])) {
+											echo trim($event['start_time_local']), !empty($event['end_time_local']) ? ' &ndash; ' . trim($event['end_time_local']) : '';
+					} else {
+											echo $txt['calendar_allday'];
+					}
 
 					echo '
 								</span>';
 
-					if (!empty($event['location']))
-						echo '<br>
+					if (!empty($event['location'])) {
+											echo '<br>
 								<span class="event_location', empty($event_icons_needed) ? ' floatright' : '', '">' . $event['location'] . '</span>';
+					}
 
 					if (!empty($event_icons_needed))
 					{
 						echo ' <span class="modify_event_links">';
 
 						// If they can edit the event, show a star they can click on....
-						if (!empty($event['can_edit']))
-							echo '
+						if (!empty($event['can_edit'])) {
+													echo '
 									<a class="modify_event" href="', $event['modify_href'], '">
 										<span class="generic_icons calendar_modify" title="', $txt['calendar_edit'], '"></span>
 									</a>';
+						}
 
 						// Can we export? Sweet.
-						if (!empty($event['can_export']))
-							echo '
+						if (!empty($event['can_export'])) {
+													echo '
 									<a class="modify_event" href="', $event['export_href'], '">
 										<span class="generic_icons calendar_export" title="', $txt['calendar_export'], '"></span>
 									</a>';
+						}
 
 						echo '
 								</span><br class="clear">';
@@ -681,22 +723,23 @@ 
 							</div>
 							<br class="clear">';
 				}
-			}
-			else
+			} else
 			{
-				if (!empty($context['can_post']))
-					echo '
+				if (!empty($context['can_post'])) {
+									echo '
 							<div class="week_add_event">
 								<a href="', $scripturl, '?action=calendar;sa=post;month=', $month_data['current_month'], ';year=', $month_data['current_year'], ';day=', $day['day'], ';', $context['session_var'], '=', $context['session_id'], '">', $txt['calendar_post_event'], '</a>
 							</div>';
+				}
 			}
 			echo '
 						</td>
 						<td class="', implode(' ', $classes), !empty($day['holidays']) ? ' holidays' : ' disabled', ' holiday_col" data-css-prefix="' . $txt['calendar_prompt'] . ' ">';
 
 			// Show any holidays!
-			if (!empty($day['holidays']))
-				echo implode('<br>', $day['holidays']);
+			if (!empty($day['holidays'])) {
+							echo implode('<br>', $day['holidays']);
+			}
 
 			echo '
 						</td>
@@ -705,11 +748,12 @@ 
 			// Show any birthdays...
 			if (!empty($day['birthdays']))
 			{
-				foreach ($day['birthdays'] as $member)
-					echo '
+				foreach ($day['birthdays'] as $member) {
+									echo '
 							<a href="', $scripturl, '?action=profile;u=', $member['id'], '">', $member['name'], '</a>
 							', isset($member['age']) ? ' (' . $member['age'] . ')' : '', '
 							', $member['is_last'] ? '' : '<br>';
+				}
 			}
 			echo '
 						</td>
@@ -755,26 +799,27 @@ 
 				<input type="text" name="end_date" id="end_date" maxlength="10" value="', $calendar_data['end_date'], '" tabindex="', $context['tabindex']++, '" class="date_input end" data-type="date">
 				<input type="submit" class="button" style="float:none" id="view_button" value="', $txt['view'], '">
 			</form>';
-	}
-	else
+	} else
 	{
 		echo'
 			<form action="', $scripturl, '?action=calendar" id="calendar_navigation" method="post" accept-charset="', $context['character_set'], '">
 				<select name="month" id="input_month">';
 
 		// Show a select box with all the months.
-		foreach ($txt['months_short'] as $number => $month)
-			echo '
+		foreach ($txt['months_short'] as $number => $month) {
+					echo '
 					<option value="', $number, '"', $number == $context['current_month'] ? ' selected' : '', '>', $month, '</option>';
+		}
 
 		echo '
 				</select>
 				<select name="year">';
 
 		// Show a link for every year...
-		for ($year = $context['calendar_resources']['min_year']; $year <= $context['calendar_resources']['max_year']; $year++)
-			echo '
+		for ($year = $context['calendar_resources']['min_year']; $year <= $context['calendar_resources']['max_year']; $year++) {
+					echo '
 					<option value="', $year, '"', $year == $context['current_year'] ? ' selected' : '', '>', $year, '</option>';
+		}
 
 		echo '
 				</select>
@@ -796,9 +841,10 @@ 
 	echo '
 		<form action="', $scripturl, '?action=calendar;sa=post" method="post" name="postevent" accept-charset="', $context['character_set'], '" onsubmit="submitonce(this);">';
 
-	if (!empty($context['event']['new']))
-		echo '
+	if (!empty($context['event']['new'])) {
+			echo '
 			<input type="hidden" name="eventid" value="', $context['event']['eventid'], '">';
+	}
 
 	// Start the main table.
 	echo '
@@ -809,8 +855,8 @@ 
 					</h3>
 				</div>';
 
-	if (!empty($context['post_error']['messages']))
-		echo '
+	if (!empty($context['post_error']['messages'])) {
+			echo '
 				<div class="errorbox">
 					<dl class="event_error">
 						<dt>
@@ -821,6 +867,7 @@ 
 						</dt>
 					</dl>
 				</div>';
+	}
 
 	echo '
 				<div class="roundframe noup">
@@ -848,9 +895,10 @@ 
 			echo '
 									<optgroup label="', $category['name'], '">';
 
-			foreach ($category['boards'] as $board)
-				echo '
+			foreach ($category['boards'] as $board) {
+							echo '
 										<option value="', $board['id'], '"', $board['selected'] ? ' selected' : '', '>', $board['child_level'] > 0 ? str_repeat('==', $board['child_level'] - 1) . '=&gt;' : '', ' ', $board['name'], '</option>';
+			}
 			echo '
 									</optgroup>';
 		}
@@ -886,9 +934,10 @@ 
 								<span class="label">', $txt['calendar_timezone'], '</span>
 								<select name="tz" id="tz"', !empty($context['event']['allday']) ? ' disabled' : '', '>';
 
-	foreach ($context['all_timezones'] as $tz => $tzname)
-		echo '
+	foreach ($context['all_timezones'] as $tz => $tzname) {
+			echo '
 									<option', is_numeric($tz) ? ' value="" disabled' : ' value="' . $tz . '"', $tz === $context['event']['tz'] ? ' selected' : '', '>', $tzname, '</option>';
+	}
 
 	echo '
 								</select>
@@ -904,9 +953,10 @@ 
 					<input type="submit" value="', empty($context['event']['new']) ? $txt['save'] : $txt['post'], '" class="button">';
 
 	// Delete button?
-	if (empty($context['event']['new']))
-		echo '
+	if (empty($context['event']['new'])) {
+			echo '
 					<input type="submit" name="deleteevent" value="', $txt['event_delete'], '" data-confirm="', $txt['calendar_confirm_delete'], '" class="button you_sure">';
+	}
 
 	echo '
 					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -934,9 +984,10 @@ 
 		echo '
 				<td style="padding-', $alt ? 'right' : 'left', ': 1.5em;">';
 
-		foreach ($v as $i)
-			echo '
+		foreach ($v as $i) {
+					echo '
 					<img src="', $context['offimg'], '" alt="" id="', $t, '_', $i, '"><br>';
+		}
 
 		echo '
 				</td>';
@@ -957,9 +1008,10 @@ 
 
 	foreach ($context['clockicons'] as $t => $v)
 	{
-		foreach ($v as $i)
-			echo '
+		foreach ($v as $i) {
+					echo '
 			icons[\'', $t, '_', $i, '\'] = document.getElementById(\'', $t, '_', $i, '\');';
+		}
 	}
 
 	echo '
@@ -984,13 +1036,14 @@ 
 
 	foreach ($context['clockicons'] as $t => $v)
 	{
-		foreach ($v as $i)
-			echo '
+		foreach ($v as $i) {
+					echo '
 				if (', $t, ' >= ', $i, ')
 				{
 					turnon.push("', $t, '_', $i, '");
 					', $t, ' -= ', $i, ';
 				}';
+		}
 	}
 
 	echo '
@@ -1034,9 +1087,10 @@ 
 			<tr class="windowbg">
 				<td>';
 
-		foreach ($v as $i)
-			echo '
+		foreach ($v as $i) {
+					echo '
 					<img src="', $context['offimg'], '" alt="" id="', $t, '_', $i, '" style="padding: 2px;">';
+		}
 
 		echo '
 				</td>
@@ -1058,9 +1112,10 @@ 
 
 	foreach ($context['clockicons'] as $t => $v)
 	{
-		foreach ($v as $i)
-			echo '
+		foreach ($v as $i) {
+					echo '
 			icons[\'', $t, '_', $i, '\'] = document.getElementById(\'', $t, '_', $i, '\');';
+		}
 	}
 
 	echo '
@@ -1077,13 +1132,14 @@ 
 
 	foreach ($context['clockicons'] as $t => $v)
 	{
-		foreach ($v as $i)
-			echo '
+		foreach ($v as $i) {
+					echo '
 				if (', $t, ' >= ', $i, ')
 				{
 					turnon.push("', $t, '_', $i, '");
 					', $t, ' -= ', $i, ';
 				}';
+		}
 	}
 
 	echo '
@@ -1127,9 +1183,10 @@ 
 			<tr class="windowbg">
 				<td>';
 
-		foreach ($v as $i)
-			echo '
+		foreach ($v as $i) {
+					echo '
 					<img src="', $context['offimg'], '" alt="" id="', $t, '_', $i, '" style="padding: 2px;">';
+		}
 
 		echo '
 				</td>
@@ -1145,9 +1202,10 @@ 
 
 	foreach ($context['clockicons'] as $t => $v)
 	{
-		foreach ($v as $i)
-			echo '
+		foreach ($v as $i) {
+					echo '
 			icons[\'', $t, '_', $i, '\'] = document.getElementById(\'', $t, '_', $i, '\');';
+		}
 	}
 
 	echo '
@@ -1168,13 +1226,14 @@ 
 
 	foreach ($context['clockicons'] as $t => $v)
 	{
-		foreach ($v as $i)
-		echo '
+		foreach ($v as $i) {
+				echo '
 				if (', $t, ' >= ', $i, ')
 				{
 					turnon.push("', $t, '_', $i, '");
 					', $t, ' -= ', $i, ';
 				}';
+		}
 	}
 
 	echo '
@@ -1218,9 +1277,10 @@ 
 			<tr class="windowbg">
 				<td>';
 
-		foreach ($v as $i)
-			echo '
+		foreach ($v as $i) {
+					echo '
 					<img src="', $i ? $context['onimg'] : $context['offimg'], '" alt="" style="padding: 2px;">';
+		}
 
 		echo '
 				</td>

Sources/Class-CurlFetchWeb.php

Indentation +69 added lines, -69 removed lines

@@ -94,12 +94,12 @@ 
 	public $headers;
 
 	/**
-	* Start the curl object
-	* - allow for user override values
-	*
-	* @param array $options An array of cURL options
-	* @param int $max_redirect Maximum number of redirects
-	*/
+	 * Start the curl object
+	 * - allow for user override values
+	 *
+	 * @param array $options An array of cURL options
+	 * @param int $max_redirect Maximum number of redirects
+	 */
 	public function __construct($options = array(), $max_redirect = 3)
 	{
 		// Initialize class variables
@@ -108,16 +108,16 @@ 
 	}
 
 	/**
-	* Main calling function,
-	*  - will request the page data from a given $url
-	*  - optionally will post data to the page form if post data is supplied
-	*  - passed arrays will be converted to a post string joined with &'s
-	*  - calls set_options to set the curl opts array values based on the defaults and user input
-	*
-	* @param string $url the site we are going to fetch
-	* @param array $post_data any post data as form name => value
-	* @return object An instance of the curl_fetch_web_data class
-	*/
+	 * Main calling function,
+	 *  - will request the page data from a given $url
+	 *  - optionally will post data to the page form if post data is supplied
+	 *  - passed arrays will be converted to a post string joined with &'s
+	 *  - calls set_options to set the curl opts array values based on the defaults and user input
+	 *
+	 * @param string $url the site we are going to fetch
+	 * @param array $post_data any post data as form name => value
+	 * @return object An instance of the curl_fetch_web_data class
+	 */
 	public function get_url_data($url, $post_data = array())
 	{
 		// POSTing some data perhaps?
@@ -134,14 +134,14 @@ 
 	}
 
 	/**
-	* Makes the actual cURL call
-	*  - stores responses (url, code, error, headers, body) in the response array
-	*  - detects 301, 302, 307 codes and will redirect to the given response header location
-	*
-	* @param string $url The site to fetch
-	* @param bool $redirect Whether or not this was a redirect request
-	* @return void|bool Sets various properties of the class or returns false if the URL isn't specified
-	*/
+	 * Makes the actual cURL call
+	 *  - stores responses (url, code, error, headers, body) in the response array
+	 *  - detects 301, 302, 307 codes and will redirect to the given response header location
+	 *
+	 * @param string $url The site to fetch
+	 * @param bool $redirect Whether or not this was a redirect request
+	 * @return void|bool Sets various properties of the class or returns false if the URL isn't specified
+	 */
 	private function curl_request($url, $redirect = false)
 	{
 		// we do have a url I hope
@@ -193,12 +193,12 @@ 
 	}
 
 	/**
-	* Used if being redirected to ensure we have a fully qualified address
-	*
-	* @param string $last_url The URL we went to
-	* @param string $new_url The URL we were redirected to
-	* @return string The new URL that was in the HTTP header
-	*/
+	 * Used if being redirected to ensure we have a fully qualified address
+	 *
+	 * @param string $last_url The URL we went to
+	 * @param string $new_url The URL we were redirected to
+	 * @return string The new URL that was in the HTTP header
+	 */
 	private function get_redirect_url($last_url = '', $new_url = '')
 	{
 		// Get the elements for these urls
@@ -216,13 +216,13 @@ 
 	}
 
 	/**
-	* Used to return the results to the calling program
-	*  - called as ->result() will return the full final array
-	*  - called as ->result('body') to just return the page source of the result
-	*
-	* @param string $area Used to return an area such as body, header, error
-	* @return string The response
-	*/
+	 * Used to return the results to the calling program
+	 *  - called as ->result() will return the full final array
+	 *  - called as ->result('body') to just return the page source of the result
+	 *
+	 * @param string $area Used to return an area such as body, header, error
+	 * @return string The response
+	 */
 	public function result($area = '')
 	{
 		$max_result = count($this->response) - 1;
@@ -235,13 +235,13 @@ 
 	}
 
 	/**
-	* Will return all results from all loops (redirects)
-	*  - Can be called as ->result_raw(x) where x is a specific loop results.
-	*  - Call as ->result_raw() for everything.
-	*
-	* @param string $response_number Which response we want to get
-	* @return array|string The entire response array or just the specified response
-	*/
+	 * Will return all results from all loops (redirects)
+	 *  - Can be called as ->result_raw(x) where x is a specific loop results.
+	 *  - Call as ->result_raw() for everything.
+	 *
+	 * @param string $response_number Which response we want to get
+	 * @return array|string The entire response array or just the specified response
+	 */
 	public function result_raw($response_number = '')
 	{
 		if (!is_numeric($response_number))
@@ -254,13 +254,13 @@ 
 	}
 
 	/**
-	* Takes supplied POST data and url encodes it
-	*  - forms the date (for post) in to a string var=xyz&var2=abc&var3=123
-	*  - drops vars with @ since we don't support sending files (uploading)
-	*
-	* @param array|string $post_data The raw POST data
-	* @return string A string of post data
-	*/
+	 * Takes supplied POST data and url encodes it
+	 *  - forms the date (for post) in to a string var=xyz&var2=abc&var3=123
+	 *  - drops vars with @ since we don't support sending files (uploading)
+	 *
+	 * @param array|string $post_data The raw POST data
+	 * @return string A string of post data
+	 */
 	private function build_post_data($post_data)
 	{
 		if (is_array($post_data))
@@ -279,11 +279,11 @@ 
 	}
 
 	/**
-	* Sets the final cURL options for the current call
-	*  - overwrites our default values with user supplied ones or appends new user ones to what we have
-	*  - sets the callback function now that $this is existing
-	* @return void
-	*/
+	 * Sets the final cURL options for the current call
+	 *  - overwrites our default values with user supplied ones or appends new user ones to what we have
+	 *  - sets the callback function now that $this is existing
+	 * @return void
+	 */
 	private function set_options()
 	{
 		// Callback to parse the returned headers, if any
@@ -308,12 +308,12 @@ 
 	}
 
 	/**
-	* Called to initiate a redirect from a 301, 302 or 307 header
-	*  - resets the cURL options for the loop, sets the referrer flag
-	*
-	* @param string $target_url The URL we want to redirect to
-	* @param string $referer_url The URL that we're redirecting from
-	*/
+	 * Called to initiate a redirect from a 301, 302 or 307 header
+	 *  - resets the cURL options for the loop, sets the referrer flag
+	 *
+	 * @param string $target_url The URL we want to redirect to
+	 * @param string $referer_url The URL that we're redirecting from
+	 */
 	private function redirect($target_url, $referer_url)
 	{
 		// no no I last saw that over there ... really, 301, 302, 307
@@ -323,13 +323,13 @@ 
 	}
 
 	/**
-	* Callback function to parse returned headers
-	*  - lowercases everything to make it consistent
-	*
-	* @param type $cr Not sure what this is used for?
-	* @param string $header The header
-	* @return int The length of the header
-	*/
+	 * Callback function to parse returned headers
+	 *  - lowercases everything to make it consistent
+	 *
+	 * @param type $cr Not sure what this is used for?
+	 * @param string $header The header
+	 * @return int The length of the header
+	 */
 	private function header_callback($cr, $header)
 	{
 		$_header = trim($header);

Doc Comments +3 added lines, -3 removed lines

@@ -115,8 +115,8 @@ 
 	*  - calls set_options to set the curl opts array values based on the defaults and user input
 	*
 	* @param string $url the site we are going to fetch
-	* @param array $post_data any post data as form name => value
-	* @return object An instance of the curl_fetch_web_data class
+	* @param string $post_data any post data as form name => value
+	* @return curl_fetch_web_data An instance of the curl_fetch_web_data class
 	*/
 	public function get_url_data($url, $post_data = array())
 	{
@@ -140,7 +140,7 @@ 
 	*
 	* @param string $url The site to fetch
 	* @param bool $redirect Whether or not this was a redirect request
-	* @return void|bool Sets various properties of the class or returns false if the URL isn't specified
+	* @return false|null Sets various properties of the class or returns false if the URL isn't specified
 	*/
 	private function curl_request($url, $redirect = false)
 	{

Braces +30 added lines, -24 removed lines

@@ -10,8 +10,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Class curl_fetch_web_data
@@ -121,10 +122,11 @@ 
 	public function get_url_data($url, $post_data = array())
 	{
 		// POSTing some data perhaps?
-		if (!empty($post_data) && is_array($post_data))
-			$this->post_data = $this->build_post_data($post_data);
-		elseif (!empty($post_data))
-			$this->post_data = trim($post_data);
+		if (!empty($post_data) && is_array($post_data)) {
+					$this->post_data = $this->build_post_data($post_data);
+		} elseif (!empty($post_data)) {
+					$this->post_data = trim($post_data);
+		}
 
 		// set the options and get it
 		$this->set_options();
@@ -145,10 +147,11 @@ 
 	private function curl_request($url, $redirect = false)
 	{
 		// we do have a url I hope
-		if ($url == '')
-			return false;
-		else
-			$this->options[CURLOPT_URL] = $url;
+		if ($url == '') {
+					return false;
+		} else {
+					$this->options[CURLOPT_URL] = $url;
+		}
 
 		// if we have not already been redirected, set it up so we can if needed
 		if (!$redirect)
@@ -228,10 +231,11 @@ 
 		$max_result = count($this->response) - 1;
 
 		// just return a specifed area or the entire result?
-		if ($area == '')
-			return $this->response[$max_result];
-		else
-			return isset($this->response[$max_result][$area]) ? $this->response[$max_result][$area] : $this->response[$max_result];
+		if ($area == '') {
+					return $this->response[$max_result];
+		} else {
+					return isset($this->response[$max_result][$area]) ? $this->response[$max_result][$area] : $this->response[$max_result];
+		}
 	}
 
 	/**
@@ -244,9 +248,9 @@ 
 	*/
 	public function result_raw($response_number = '')
 	{
-		if (!is_numeric($response_number))
-			return $this->response;
-		else
+		if (!is_numeric($response_number)) {
+					return $this->response;
+		} else
 		{
 			$response_number = min($response_number, count($this->response) - 1);
 			return $this->response[$response_number];
@@ -268,13 +272,14 @@ 
 			$postvars = array();
 
 			// build the post data, drop ones with leading @'s since those can be used to send files, we don't support that.
-			foreach ($post_data as $name => $value)
-				$postvars[] = $name . '=' . urlencode($value[0] == '@' ? '' : $value);
+			foreach ($post_data as $name => $value) {
+							$postvars[] = $name . '=' . urlencode($value[0] == '@' ? '' : $value);
+			}
 
 			return implode('&', $postvars);
+		} else {
+					return $post_data;
 		}
-		else
-			return $post_data;
 	}
 
 	/**
@@ -294,9 +299,9 @@ 
 			$keys = array_merge(array_keys($this->default_options), array_keys($this->user_options));
 			$vals = array_merge($this->default_options, $this->user_options);
 			$this->options = array_combine($keys, $vals);
+		} else {
+					$this->options = $this->default_options;
 		}
-		else
-			$this->options = $this->default_options;
 
 		// POST data options, here we don't allow any overide
 		if (isset($this->post_data))
@@ -335,8 +340,9 @@ 
 		$temp = explode(': ', $_header, 2);
 
 		// set proper headers only
-		if (isset($temp[0]) && isset($temp[1]))
-			$this->headers[strtolower($temp[0])] = strtolower(trim($temp[1]));
+		if (isset($temp[0]) && isset($temp[1])) {
+					$this->headers[strtolower($temp[0])] = strtolower(trim($temp[1]));
+		}
 
 		// return the length of what was passed unless you want a Failed writing header error ;)
 		return strlen($header);

Sources/News.php

Indentation +2 added lines, -2 removed lines

@@ -837,7 +837,7 @@ 
 			{
 				uasort($loaded_attachments, function($a, $b) {
 					if ($a['filesize'] == $b['filesize'])
-					        return 0;
+							return 0;
 					return ($a['filesize'] < $b['filesize']) ? -1 : 1;
 				});
 			}
@@ -1242,7 +1242,7 @@ 
 			{
 				uasort($loaded_attachments, function($a, $b) {
 					if ($a['filesize'] == $b['filesize'])
-					        return 0;
+							return 0;
 					return ($a['filesize'] < $b['filesize']) ? -1 : 1;
 				});
 			}

Spacing +2 added lines, -2 removed lines

@@ -165,7 +165,7 @@ 
 		$smcFunc['db_free_result']($request);
 
 		$feed_meta['title'] = ' - ' . strip_tags($board_info['name']);
-		$feed_meta['source'] .= '?board=' . $board . '.0' ;
+		$feed_meta['source'] .= '?board=' . $board . '.0';
 
 		$query_this_board = 'b.id_board = ' . $board;
 
@@ -389,7 +389,7 @@ 
 
 		foreach ($xml_data as $item)
 		{
-			$link = array_filter($item['content'], function ($e) { return ($e['tag'] == 'link'); });
+			$link = array_filter($item['content'], function($e) { return ($e['tag'] == 'link'); });
 			$link = array_pop($link);
 
 			echo '

Braces +226 added lines, -185 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Outputs xml data representing recent information or a profile.
@@ -37,8 +38,9 @@ 
 	global $query_this_board, $smcFunc, $forum_version, $settings;
 
 	// If it's not enabled, die.
-	if (empty($modSettings['xmlnews_enable']))
-		obExit(false);
+	if (empty($modSettings['xmlnews_enable'])) {
+			obExit(false);
+	}
 
 	loadLanguage('Stats');
 
@@ -64,8 +66,9 @@ 
 	if (!empty($_REQUEST['c']) && empty($board))
 	{
 		$_REQUEST['c'] = explode(',', $_REQUEST['c']);
-		foreach ($_REQUEST['c'] as $i => $c)
-			$_REQUEST['c'][$i] = (int) $c;
+		foreach ($_REQUEST['c'] as $i => $c) {
+					$_REQUEST['c'][$i] = (int) $c;
+		}
 
 		if (count($_REQUEST['c']) == 1)
 		{
@@ -101,18 +104,20 @@ 
 		}
 		$smcFunc['db_free_result']($request);
 
-		if (!empty($boards))
-			$query_this_board = 'b.id_board IN (' . implode(', ', $boards) . ')';
+		if (!empty($boards)) {
+					$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 - $_GET['limit'] * 5);
-	}
-	elseif (!empty($_REQUEST['boards']))
+		if ($total_cat_posts > 100 && $total_cat_posts > $modSettings['totalMessages'] / 15) {
+					$context['optimize_msg']['lowest'] = 'm.id_msg >= ' . max(0, $modSettings['maxMsgID'] - 400 - $_GET['limit'] * 5);
+		}
+	} elseif (!empty($_REQUEST['boards']))
 	{
 		$_REQUEST['boards'] = explode(',', $_REQUEST['boards']);
-		foreach ($_REQUEST['boards'] as $i => $b)
-			$_REQUEST['boards'][$i] = (int) $b;
+		foreach ($_REQUEST['boards'] as $i => $b) {
+					$_REQUEST['boards'][$i] = (int) $b;
+		}
 
 		$request = $smcFunc['db_query']('', '
 			SELECT b.id_board, b.num_posts, b.name
@@ -128,29 +133,32 @@ 
 
 		// Either the board specified doesn't exist or you have no access.
 		$num_boards = $smcFunc['db_num_rows']($request);
-		if ($num_boards == 0)
-			fatal_lang_error('no_board');
+		if ($num_boards == 0) {
+					fatal_lang_error('no_board');
+		}
 
 		$total_posts = 0;
 		$boards = array();
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if ($num_boards == 1)
-				$feed_meta['title'] = ' - ' . strip_tags($row['name']);
+			if ($num_boards == 1) {
+							$feed_meta['title'] = ' - ' . strip_tags($row['name']);
+			}
 
 			$boards[] = $row['id_board'];
 			$total_posts += $row['num_posts'];
 		}
 		$smcFunc['db_free_result']($request);
 
-		if (!empty($boards))
-			$query_this_board = 'b.id_board IN (' . implode(', ', $boards) . ')';
+		if (!empty($boards)) {
+					$query_this_board = 'b.id_board IN (' . implode(', ', $boards) . ')';
+		}
 
 		// 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 - $_GET['limit'] * 5);
-	}
-	elseif (!empty($board))
+		if ($total_posts > 100 && $total_posts > $modSettings['totalMessages'] / 12) {
+					$context['optimize_msg']['lowest'] = 'm.id_msg >= ' . max(0, $modSettings['maxMsgID'] - 500 - $_GET['limit'] * 5);
+		}
+	} elseif (!empty($board))
 	{
 		$request = $smcFunc['db_query']('', '
 			SELECT num_posts
@@ -170,10 +178,10 @@ 
 		$query_this_board = 'b.id_board = ' . $board;
 
 		// Try to look through just a few messages, if at all possible.
-		if ($total_posts > 80 && $total_posts > $modSettings['totalMessages'] / 10)
-			$context['optimize_msg']['lowest'] = 'm.id_msg >= ' . max(0, $modSettings['maxMsgID'] - 600 - $_GET['limit'] * 5);
-	}
-	else
+		if ($total_posts > 80 && $total_posts > $modSettings['totalMessages'] / 10) {
+					$context['optimize_msg']['lowest'] = 'm.id_msg >= ' . max(0, $modSettings['maxMsgID'] - 600 - $_GET['limit'] * 5);
+		}
+	} else
 	{
 		$query_this_board = '{query_see_board}' . (!empty($modSettings['recycle_enable']) && $modSettings['recycle_board'] > 0 ? '
 			AND b.id_board != ' . $modSettings['recycle_board'] : '');
@@ -196,30 +204,35 @@ 
 	// Easy adding of sub actions
  	call_integration_hook('integrate_xmlfeeds', array(&$subActions));
 
-	if (empty($_GET['sa']) || !isset($subActions[$_GET['sa']]))
-		$_GET['sa'] = 'recent';
+	if (empty($_GET['sa']) || !isset($subActions[$_GET['sa']])) {
+			$_GET['sa'] = 'recent';
+	}
 
 	// We only want some information, not all of it.
 	$cachekey = array($xml_format, $_GET['action'], $_GET['limit'], $_GET['sa']);
-	foreach (array('board', 'boards', 'c') as $var)
-		if (isset($_REQUEST[$var]))
+	foreach (array('board', 'boards', 'c') as $var) {
+			if (isset($_REQUEST[$var]))
 			$cachekey[] = $_REQUEST[$var];
+	}
 	$cachekey = md5($smcFunc['json_encode']($cachekey) . (!empty($query_this_board) ? $query_this_board : ''));
 	$cache_t = microtime();
 
 	// Get the associative array representing the xml.
-	if (!empty($modSettings['cache_enable']) && (!$user_info['is_guest'] || $modSettings['cache_enable'] >= 3))
-		$xml_data = cache_get_data('xmlfeed-' . $xml_format . ':' . ($user_info['is_guest'] ? '' : $user_info['id'] . '-') . $cachekey, 240);
+	if (!empty($modSettings['cache_enable']) && (!$user_info['is_guest'] || $modSettings['cache_enable'] >= 3)) {
+			$xml_data = cache_get_data('xmlfeed-' . $xml_format . ':' . ($user_info['is_guest'] ? '' : $user_info['id'] . '-') . $cachekey, 240);
+	}
 	if (empty($xml_data))
 	{
 		$call = call_helper($subActions[$_GET['sa']][0], true);
 
-		if (!empty($call))
-			$xml_data = call_user_func($call, $xml_format);
+		if (!empty($call)) {
+					$xml_data = call_user_func($call, $xml_format);
+		}
 
 		if (!empty($modSettings['cache_enable']) && (($user_info['is_guest'] && $modSettings['cache_enable'] >= 3)
-		|| (!$user_info['is_guest'] && (array_sum(explode(' ', microtime())) - array_sum(explode(' ', $cache_t)) > 0.2))))
-			cache_put_data('xmlfeed-' . $xml_format . ':' . ($user_info['is_guest'] ? '' : $user_info['id'] . '-') . $cachekey, $xml_data, 240);
+		|| (!$user_info['is_guest'] && (array_sum(explode(' ', microtime())) - array_sum(explode(' ', $cache_t)) > 0.2)))) {
+					cache_put_data('xmlfeed-' . $xml_format . ':' . ($user_info['is_guest'] ? '' : $user_info['id'] . '-') . $cachekey, $xml_data, 240);
+		}
 	}
 
 	$feed_meta['title'] = $smcFunc['htmlspecialchars'](strip_tags($context['forum_name'])) . (isset($feed_meta['title']) ? $feed_meta['title'] : '');
@@ -259,43 +272,49 @@ 
 	call_integration_hook('integrate_xml_data', array(&$xml_data, &$feed_meta, &$namespaces, &$extraFeedTags, &$forceCdataKeys, &$nsKeys, $xml_format, $_GET['sa']));
 
 	// These can't be empty
-	foreach (array('title', 'desc', 'source') as $mkey)
-		$feed_meta[$mkey] = !empty($feed_meta[$mkey]) ? $feed_meta[$mkey] : $orig_feed_meta[$mkey];
+	foreach (array('title', 'desc', 'source') as $mkey) {
+			$feed_meta[$mkey] = !empty($feed_meta[$mkey]) ? $feed_meta[$mkey] : $orig_feed_meta[$mkey];
+	}
 
 	// Sanitize basic feed metadata values
-	foreach ($feed_meta as $mkey => $mvalue)
-		$feed_meta[$mkey] = cdata_parse(strip_tags(fix_possible_url($feed_meta[$mkey])));
+	foreach ($feed_meta as $mkey => $mvalue) {
+			$feed_meta[$mkey] = cdata_parse(strip_tags(fix_possible_url($feed_meta[$mkey])));
+	}
 
 	$ns_string = '';
 	if (!empty($namespaces[$xml_format]))
 	{
-		foreach ($namespaces[$xml_format] as $nsprefix => $nsurl)
-			$ns_string .= ' xmlns' . ($nsprefix !== '' ? ':' : '') . $nsprefix . '="' . $nsurl . '"';
+		foreach ($namespaces[$xml_format] as $nsprefix => $nsurl) {
+					$ns_string .= ' xmlns' . ($nsprefix !== '' ? ':' : '') . $nsprefix . '="' . $nsurl . '"';
+		}
 	}
 
 	$extraFeedTags_string = '';
 	if (!empty($extraFeedTags[$xml_format]))
 	{
 		$indent = "\t" . ($xml_format !== 'atom' ? "\t" : '');
-		foreach ($extraFeedTags[$xml_format] as $extraTag)
-			$extraFeedTags_string .= "\n" . $indent . $extraTag;
+		foreach ($extraFeedTags[$xml_format] as $extraTag) {
+					$extraFeedTags_string .= "\n" . $indent . $extraTag;
+		}
 	}
 
 	// This is an xml file....
 	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();
+	}
 
-	if ($xml_format == 'smf' || isset($_REQUEST['debug']))
-		header('content-type: text/xml; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
-	elseif ($xml_format == 'rss' || $xml_format == 'rss2')
-		header('content-type: application/rss+xml; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
-	elseif ($xml_format == 'atom')
-		header('content-type: application/atom+xml; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
-	elseif ($xml_format == 'rdf')
-		header('content-type: ' . (isBrowser('ie') ? 'text/xml' : 'application/rdf+xml') . '; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
+	if ($xml_format == 'smf' || isset($_REQUEST['debug'])) {
+			header('content-type: text/xml; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
+	} elseif ($xml_format == 'rss' || $xml_format == 'rss2') {
+			header('content-type: application/rss+xml; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
+	} elseif ($xml_format == 'atom') {
+			header('content-type: application/atom+xml; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
+	} elseif ($xml_format == 'rdf') {
+			header('content-type: ' . (isBrowser('ie') ? 'text/xml' : 'application/rdf+xml') . '; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
+	}
 
 	// First, output the xml header.
 	echo '<?xml version="1.0" encoding="', $context['character_set'], '"?' . '>';
@@ -303,10 +322,11 @@ 
 	// Are we outputting an rss feed or one with more information?
 	if ($xml_format == 'rss' || $xml_format == 'rss2')
 	{
-		if ($xml_format == 'rss2')
-			foreach ($_REQUEST as $var => $val)
+		if ($xml_format == 'rss2') {
+					foreach ($_REQUEST as $var => $val)
 				if (in_array($var, array('action', 'sa', 'type', 'board', 'boards', 'c', 'u', 'limit')))
 					$url_parts[] = $var . '=' . (is_array($val) ? implode(',', $val) : $val);
+		}
 
 		// Start with an RSS 2.0 header.
 		echo '
@@ -327,9 +347,10 @@ 
 		<language>' . $feed_meta['language'] . '</language>' : '';
 
 		// RSS2 calls for this.
-		if ($xml_format == 'rss2')
-			echo '
+		if ($xml_format == 'rss2') {
+					echo '
 		<atom:link rel="self" type="application/rss+xml" href="', $scripturl, !empty($url_parts) ? '?' . implode(';', $url_parts) : '', '" />';
+		}
 
 		echo $extraFeedTags_string;
 
@@ -340,12 +361,12 @@ 
 		echo '
 	</channel>
 </rss>';
-	}
-	elseif ($xml_format == 'atom')
+	} elseif ($xml_format == 'atom')
 	{
-		foreach ($_REQUEST as $var => $val)
-			if (in_array($var, array('action', 'sa', 'type', 'board', 'boards', 'c', 'u', 'limit')))
+		foreach ($_REQUEST as $var => $val) {
+					if (in_array($var, array('action', 'sa', 'type', 'board', 'boards', 'c', 'u', 'limit')))
 				$url_parts[] = $var . '=' . (is_array($val) ? implode(',', $val) : $val);
+		}
 
 		echo '
 <feed', $ns_string, !empty($feed_meta['language']) ? ' xml:lang="' . $feed_meta['language'] . '"' : '', '>
@@ -371,8 +392,7 @@ 
 
 		echo '
 </feed>';
-	}
-	elseif ($xml_format == 'rdf')
+	} elseif ($xml_format == 'rdf')
 	{
 		echo '
 <rdf:RDF', $ns_string, '>
@@ -437,13 +457,15 @@ 
 {
 	global $modSettings, $context, $scripturl;
 
-	if (substr($val, 0, strlen($scripturl)) != $scripturl)
-		return $val;
+	if (substr($val, 0, strlen($scripturl)) != $scripturl) {
+			return $val;
+	}
 
 	call_integration_hook('integrate_fix_url', array(&$val));
 
-	if (empty($modSettings['queryless_urls']) || ($context['server']['is_cgi'] && ini_get('cgi.fix_pathinfo') == 0 && @get_cfg_var('cgi.fix_pathinfo') == 0) || (!$context['server']['is_apache'] && !$context['server']['is_lighttpd']))
-		return $val;
+	if (empty($modSettings['queryless_urls']) || ($context['server']['is_cgi'] && ini_get('cgi.fix_pathinfo') == 0 && @get_cfg_var('cgi.fix_pathinfo') == 0) || (!$context['server']['is_apache'] && !$context['server']['is_lighttpd'])) {
+			return $val;
+	}
 
 	$val = preg_replace_callback('~\b' . preg_quote($scripturl, '~') . '\?((?:board|topic)=[^#"]+)(#[^"]*)?$~', function($m) use ($scripturl)
 		{
@@ -466,8 +488,9 @@ 
 	global $smcFunc;
 
 	// Do we even need to do this?
-	if (strpbrk($data, '<>&') == false && $force !== true)
-		return $data;
+	if (strpbrk($data, '<>&') == false && $force !== true) {
+			return $data;
+	}
 
 	$cdata = '<![CDATA[';
 
@@ -477,49 +500,55 @@ 
 			$smcFunc['strpos']($data, '&', $pos),
 			$smcFunc['strpos']($data, ']', $pos),
 		);
-		if ($ns != '')
-			$positions[] = $smcFunc['strpos']($data, '<', $pos);
+		if ($ns != '') {
+					$positions[] = $smcFunc['strpos']($data, '<', $pos);
+		}
 		foreach ($positions as $k => $dummy)
 		{
-			if ($dummy === false)
-				unset($positions[$k]);
+			if ($dummy === false) {
+							unset($positions[$k]);
+			}
 		}
 
 		$old = $pos;
 		$pos = empty($positions) ? $n : min($positions);
 
-		if ($pos - $old > 0)
-			$cdata .= $smcFunc['substr']($data, $old, $pos - $old);
-		if ($pos >= $n)
-			break;
+		if ($pos - $old > 0) {
+					$cdata .= $smcFunc['substr']($data, $old, $pos - $old);
+		}
+		if ($pos >= $n) {
+					break;
+		}
 
 		if ($smcFunc['substr']($data, $pos, 1) == '<')
 		{
 			$pos2 = $smcFunc['strpos']($data, '>', $pos);
-			if ($pos2 === false)
-				$pos2 = $n;
-			if ($smcFunc['substr']($data, $pos + 1, 1) == '/')
-				$cdata .= ']]></' . $ns . ':' . $smcFunc['substr']($data, $pos + 2, $pos2 - $pos - 1) . '<![CDATA[';
-			else
-				$cdata .= ']]><' . $ns . ':' . $smcFunc['substr']($data, $pos + 1, $pos2 - $pos) . '<![CDATA[';
+			if ($pos2 === false) {
+							$pos2 = $n;
+			}
+			if ($smcFunc['substr']($data, $pos + 1, 1) == '/') {
+							$cdata .= ']]></' . $ns . ':' . $smcFunc['substr']($data, $pos + 2, $pos2 - $pos - 1) . '<![CDATA[';
+			} else {
+							$cdata .= ']]><' . $ns . ':' . $smcFunc['substr']($data, $pos + 1, $pos2 - $pos) . '<![CDATA[';
+			}
 			$pos = $pos2 + 1;
-		}
-		elseif ($smcFunc['substr']($data, $pos, 1) == ']')
+		} elseif ($smcFunc['substr']($data, $pos, 1) == ']')
 		{
 			$cdata .= ']]>&#093;<![CDATA[';
 			$pos++;
-		}
-		elseif ($smcFunc['substr']($data, $pos, 1) == '&')
+		} elseif ($smcFunc['substr']($data, $pos, 1) == '&')
 		{
 			$pos2 = $smcFunc['strpos']($data, ';', $pos);
-			if ($pos2 === false)
-				$pos2 = $n;
+			if ($pos2 === false) {
+							$pos2 = $n;
+			}
 			$ent = $smcFunc['substr']($data, $pos + 1, $pos2 - $pos - 1);
 
-			if ($smcFunc['substr']($data, $pos + 1, 1) == '#')
-				$cdata .= ']]>' . $smcFunc['substr']($data, $pos, $pos2 - $pos + 1) . '<![CDATA[';
-			elseif (in_array($ent, array('amp', 'lt', 'gt', 'quot')))
-				$cdata .= ']]>' . $smcFunc['substr']($data, $pos, $pos2 - $pos + 1) . '<![CDATA[';
+			if ($smcFunc['substr']($data, $pos + 1, 1) == '#') {
+							$cdata .= ']]>' . $smcFunc['substr']($data, $pos, $pos2 - $pos + 1) . '<![CDATA[';
+			} elseif (in_array($ent, array('amp', 'lt', 'gt', 'quot'))) {
+							$cdata .= ']]>' . $smcFunc['substr']($data, $pos, $pos2 - $pos + 1) . '<![CDATA[';
+			}
 
 			$pos = $pos2 + 1;
 		}
@@ -559,8 +588,9 @@ 
 		'gender',
 		'blurb',
 	);
-	if ($xml_format != 'atom')
-		$keysToCdata[] = 'category';
+	if ($xml_format != 'atom') {
+			$keysToCdata[] = 'category';
+	}
 
 	if (!empty($forceCdataKeys))
 	{
@@ -577,8 +607,9 @@ 
 		$attrs = isset($element['attributes']) ? $element['attributes'] : null;
 
 		// Skip it, it's been set to null.
-		if ($key === null || ($val === null && $attrs === null))
-			continue;
+		if ($key === null || ($val === null && $attrs === null)) {
+					continue;
+		}
 
 		$forceCdata = in_array($key, $forceCdataKeys);
 		$ns = !empty($nsKeys[$key]) ? $nsKeys[$key] : '';
@@ -591,16 +622,16 @@ 
 
 		if (!empty($attrs))
 		{
-			foreach ($attrs as $attr_key => $attr_value)
-				echo ' ', $attr_key, '="', fix_possible_url($attr_value), '"';
+			foreach ($attrs as $attr_key => $attr_value) {
+							echo ' ', $attr_key, '="', fix_possible_url($attr_value), '"';
+			}
 		}
 
 		// If it's empty, simply output an empty element.
 		if (empty($val))
 		{
 			echo ' />';
-		}
-		else
+		} else
 		{
 			echo '>';
 
@@ -612,11 +643,13 @@ 
 				echo "\n", str_repeat("\t", $i);
 			}
 			// A string with returns in it.... show this as a multiline element.
-			elseif (strpos($val, "\n") !== false)
-				echo "\n", in_array($key, $keysToCdata) ? cdata_parse(fix_possible_url($val), $ns, $forceCdata) : fix_possible_url($val), "\n", str_repeat("\t", $i);
+			elseif (strpos($val, "\n") !== false) {
+							echo "\n", in_array($key, $keysToCdata) ? cdata_parse(fix_possible_url($val), $ns, $forceCdata) : fix_possible_url($val), "\n", str_repeat("\t", $i);
+			}
 			// A simple string.
-			else
-				echo in_array($key, $keysToCdata) ? cdata_parse(fix_possible_url($val), $ns, $forceCdata) : fix_possible_url($val);
+			else {
+							echo in_array($key, $keysToCdata) ? cdata_parse(fix_possible_url($val), $ns, $forceCdata) : fix_possible_url($val);
+			}
 
 			// Ending tag.
 			echo '</', $key, '>';
@@ -636,8 +669,9 @@ 
 {
 	global $scripturl, $smcFunc;
 
-	if (!allowedTo('view_mlist'))
-		return array();
+	if (!allowedTo('view_mlist')) {
+			return array();
+	}
 
 	// Find the most recent members.
 	$request = $smcFunc['db_query']('', '
@@ -656,8 +690,8 @@ 
 		$guid = 'tag:' . parse_url($scripturl, PHP_URL_HOST) . ',' . gmdate('Y-m-d', $row['date_registered']) . ':member=' . $row['id_member'];
 
 		// Make the data look rss-ish.
-		if ($xml_format == 'rss' || $xml_format == 'rss2')
-			$data[] = array(
+		if ($xml_format == 'rss' || $xml_format == 'rss2') {
+					$data[] = array(
 				'tag' => 'item',
 				'content' => array(
 					array(
@@ -685,8 +719,8 @@ 
 					),
 				),
 			);
-		elseif ($xml_format == 'rdf')
-			$data[] = array(
+		} elseif ($xml_format == 'rdf') {
+					$data[] = array(
 				'tag' => 'item',
 				'attributes' => array('rdf:about' => $scripturl . '?action=profile;u=' . $row['id_member']),
 				'content' => array(
@@ -704,8 +738,8 @@ 
 					),
 				),
 			);
-		elseif ($xml_format == 'atom')
-			$data[] = array(
+		} elseif ($xml_format == 'atom') {
+					$data[] = array(
 				'tag' => 'entry',
 				'content' => array(
 					array(
@@ -734,9 +768,10 @@ 
 					),
 				),
 			);
+		}
 		// More logical format for the data, but harder to apply.
-		else
-			$data[] = array(
+		else {
+					$data[] = array(
 				'tag' => 'member',
 				'content' => array(
 					array(
@@ -757,6 +792,7 @@ 
 					),
 				),
 			);
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -817,22 +853,24 @@ 
 		if ($loops < 2 && $smcFunc['db_num_rows']($request) < $_GET['limit'])
 		{
 			$smcFunc['db_free_result']($request);
-			if (empty($_REQUEST['boards']) && empty($board))
-				unset($context['optimize_msg']['lowest']);
-			else
-				$context['optimize_msg']['lowest'] = 'm.id_msg >= t.id_first_msg';
+			if (empty($_REQUEST['boards']) && empty($board)) {
+							unset($context['optimize_msg']['lowest']);
+			} else {
+							$context['optimize_msg']['lowest'] = 'm.id_msg >= t.id_first_msg';
+			}
 			$context['optimize_msg']['highest'] = 'm.id_msg <= t.id_last_msg';
 			$loops++;
+		} else {
+					$done = true;
 		}
-		else
-			$done = true;
 	}
 	$data = array();
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Limit the length of the message, if the option is set.
-		if (!empty($modSettings['xmlnews_maxlen']) && $smcFunc['strlen'](str_replace('<br>', "\n", $row['body'])) > $modSettings['xmlnews_maxlen'])
-			$row['body'] = strtr($smcFunc['substr'](str_replace('<br>', "\n", $row['body']), 0, $modSettings['xmlnews_maxlen'] - 3), array("\n" => '<br>')) . '...';
+		if (!empty($modSettings['xmlnews_maxlen']) && $smcFunc['strlen'](str_replace('<br>', "\n", $row['body'])) > $modSettings['xmlnews_maxlen']) {
+					$row['body'] = strtr($smcFunc['substr'](str_replace('<br>', "\n", $row['body']), 0, $modSettings['xmlnews_maxlen'] - 3), array("\n" => '<br>')) . '...';
+		}
 
 		$row['body'] = parse_bbc($row['body'], $row['smileys_enabled'], $row['id_msg']);
 
@@ -859,8 +897,9 @@ 
 			while ($attach = $smcFunc['db_fetch_assoc']($attach_request))
 			{
 				// Include approved attachments only
-				if ($attach['approved'])
-					$loaded_attachments['attachment_' . $attach['id_attach']] = $attach;
+				if ($attach['approved']) {
+									$loaded_attachments['attachment_' . $attach['id_attach']] = $attach;
+				}
 			}
 			$smcFunc['db_free_result']($attach_request);
 
@@ -868,16 +907,17 @@ 
 			if (!empty($loaded_attachments))
 			{
 				uasort($loaded_attachments, function($a, $b) {
-					if ($a['filesize'] == $b['filesize'])
-					        return 0;
+					if ($a['filesize'] == $b['filesize']) {
+										        return 0;
+					}
 					return ($a['filesize'] < $b['filesize']) ? -1 : 1;
 				});
+			} else {
+							$loaded_attachments = null;
 			}
-			else
-				$loaded_attachments = null;
+		} else {
+					$loaded_attachments = null;
 		}
-		else
-			$loaded_attachments = null;
 
 		// Create a GUID for this topic using the tag URI scheme
 		$guid = 'tag:' . parse_url($scripturl, PHP_URL_HOST) . ',' . gmdate('Y-m-d', $row['poster_time']) . ':topic=' . $row['id_topic'];
@@ -894,9 +934,9 @@ 
 					'length' => $attachment['filesize'],
 					'type' => $attachment['mime_type'],
 				);
+			} else {
+							$enclosure = null;
 			}
-			else
-				$enclosure = null;
 
 			$data[] = array(
 				'tag' => 'item',
@@ -942,8 +982,7 @@ 
 					),
 				),
 			);
-		}
-		elseif ($xml_format == 'rdf')
+		} elseif ($xml_format == 'rdf')
 		{
 			$data[] = array(
 				'tag' => 'item',
@@ -967,8 +1006,7 @@ 
 					),
 				),
 			);
-		}
-		elseif ($xml_format == 'atom')
+		} elseif ($xml_format == 'atom')
 		{
 			// Only one attachment allowed
 			if (!empty($loaded_attachments))
@@ -980,9 +1018,9 @@ 
 					'length' => $attachment['filesize'],
 					'type' => $attachment['mime_type'],
 				);
+			} else {
+							$enclosure = null;
 			}
-			else
-				$enclosure = null;
 
 			$data[] = array(
 				'tag' => 'entry',
@@ -1082,9 +1120,9 @@ 
 						)
 					);
 				}
+			} else {
+							$attachments = null;
 			}
-			else
-				$attachments = null;
 
 			$data[] = array(
 				'tag' => 'article',
@@ -1202,22 +1240,25 @@ 
 		if ($loops < 2 && $smcFunc['db_num_rows']($request) < $_GET['limit'])
 		{
 			$smcFunc['db_free_result']($request);
-			if (empty($_REQUEST['boards']) && empty($board))
-				unset($context['optimize_msg']['lowest']);
-			else
-				$context['optimize_msg']['lowest'] = $loops ? 'm.id_msg >= t.id_first_msg' : 'm.id_msg >= (t.id_last_msg - t.id_first_msg) / 2';
+			if (empty($_REQUEST['boards']) && empty($board)) {
+							unset($context['optimize_msg']['lowest']);
+			} else {
+							$context['optimize_msg']['lowest'] = $loops ? 'm.id_msg >= t.id_first_msg' : 'm.id_msg >= (t.id_last_msg - t.id_first_msg) / 2';
+			}
 			$loops++;
+		} else {
+					$done = true;
 		}
-		else
-			$done = true;
 	}
 	$messages = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$messages[] = $row['id_msg'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$messages[] = $row['id_msg'];
+	}
 	$smcFunc['db_free_result']($request);
 
-	if (empty($messages))
-		return array();
+	if (empty($messages)) {
+			return array();
+	}
 
 	// Find the most recent posts this user can see.
 	$request = $smcFunc['db_query']('', '
@@ -1247,8 +1288,9 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Limit the length of the message, if the option is set.
-		if (!empty($modSettings['xmlnews_maxlen']) && $smcFunc['strlen'](str_replace('<br>', "\n", $row['body'])) > $modSettings['xmlnews_maxlen'])
-			$row['body'] = strtr($smcFunc['substr'](str_replace('<br>', "\n", $row['body']), 0, $modSettings['xmlnews_maxlen'] - 3), array("\n" => '<br>')) . '...';
+		if (!empty($modSettings['xmlnews_maxlen']) && $smcFunc['strlen'](str_replace('<br>', "\n", $row['body'])) > $modSettings['xmlnews_maxlen']) {
+					$row['body'] = strtr($smcFunc['substr'](str_replace('<br>', "\n", $row['body']), 0, $modSettings['xmlnews_maxlen'] - 3), array("\n" => '<br>')) . '...';
+		}
 
 		$row['body'] = parse_bbc($row['body'], $row['smileys_enabled'], $row['id_msg']);
 
@@ -1275,8 +1317,9 @@ 
 			while ($attach = $smcFunc['db_fetch_assoc']($attach_request))
 			{
 				// Include approved attachments only
-				if ($attach['approved'])
-					$loaded_attachments['attachment_' . $attach['id_attach']] = $attach;
+				if ($attach['approved']) {
+									$loaded_attachments['attachment_' . $attach['id_attach']] = $attach;
+				}
 			}
 			$smcFunc['db_free_result']($attach_request);
 
@@ -1284,16 +1327,17 @@ 
 			if (!empty($loaded_attachments))
 			{
 				uasort($loaded_attachments, function($a, $b) {
-					if ($a['filesize'] == $b['filesize'])
-					        return 0;
+					if ($a['filesize'] == $b['filesize']) {
+										        return 0;
+					}
 					return ($a['filesize'] < $b['filesize']) ? -1 : 1;
 				});
+			} else {
+							$loaded_attachments = null;
 			}
-			else
-				$loaded_attachments = null;
+		} else {
+					$loaded_attachments = null;
 		}
-		else
-			$loaded_attachments = null;
 
 		// Create a GUID for this post using the tag URI scheme
 		$guid = 'tag:' . parse_url($scripturl, PHP_URL_HOST) . ',' . gmdate('Y-m-d', $row['poster_time']) . ':msg=' . $row['id_msg'];
@@ -1310,9 +1354,9 @@ 
 					'length' => $attachment['filesize'],
 					'type' => $attachment['mime_type'],
 				);
+			} else {
+							$enclosure = null;
 			}
-			else
-				$enclosure = null;
 
 			$data[] = array(
 				'tag' => 'item',
@@ -1358,8 +1402,7 @@ 
 					),
 				),
 			);
-		}
-		elseif ($xml_format == 'rdf')
+		} elseif ($xml_format == 'rdf')
 		{
 			$data[] = array(
 				'tag' => 'item',
@@ -1383,8 +1426,7 @@ 
 					),
 				),
 			);
-		}
-		elseif ($xml_format == 'atom')
+		} elseif ($xml_format == 'atom')
 		{
 			// Only one attachment allowed
 			if (!empty($loaded_attachments))
@@ -1396,9 +1438,9 @@ 
 					'length' => $attachment['filesize'],
 					'type' => $attachment['mime_type'],
 				);
+			} else {
+							$enclosure = null;
 			}
-			else
-				$enclosure = null;
 
 			$data[] = array(
 				'tag' => 'entry',
@@ -1498,9 +1540,9 @@ 
 						)
 					);
 				}
+			} else {
+							$attachments = null;
 			}
-			else
-				$attachments = null;
 
 			$data[] = array(
 				'tag' => 'recent-post',
@@ -1619,14 +1661,16 @@ 
 	global $scripturl, $memberContext, $user_profile, $user_info;
 
 	// You must input a valid user....
-	if (empty($_GET['u']) || !loadMemberData((int) $_GET['u']))
-		return array();
+	if (empty($_GET['u']) || !loadMemberData((int) $_GET['u'])) {
+			return array();
+	}
 
 	// Make sure the id is a number and not "I like trying to hack the database".
 	$_GET['u'] = (int) $_GET['u'];
 	// Load the member's contextual information!
-	if (!loadMemberContext($_GET['u']) || !allowedTo('profile_view'))
-		return array();
+	if (!loadMemberContext($_GET['u']) || !allowedTo('profile_view')) {
+			return array();
+	}
 
 	// Okay, I admit it, I'm lazy.  Stupid $_GET['u'] is long and hard to type.
 	$profile = &$memberContext[$_GET['u']];
@@ -1668,8 +1712,7 @@ 
 				),
 			)
 		);
-	}
-	elseif ($xml_format == 'rdf')
+	} elseif ($xml_format == 'rdf')
 	{
 		$data[] = array(
 			'tag' => 'item',
@@ -1693,8 +1736,7 @@ 
 				),
 			)
 		);
-	}
-	elseif ($xml_format == 'atom')
+	} elseif ($xml_format == 'atom')
 	{
 		$data[] = array(
 			'tag' => 'entry',
@@ -1747,8 +1789,7 @@ 
 				),
 			)
 		);
-	}
-	else
+	} else
 	{
 		$data = array(
 			array(

Sources/ManageAttachments.php

Spacing +2 added lines, -2 removed lines

@@ -1542,7 +1542,7 @@ 
 					'no_msg' => 0,
 					'substep' => $_GET['substep'],
 					'ignore_ids' => $ignore_ids,
-					'attach_thumb' => array(0,3),
+					'attach_thumb' => array(0, 3),
 				)
 			);
 			
@@ -1572,7 +1572,7 @@ 
 					array(
 						'to_remove' => $to_remove,
 						'no_member' => 0,
-						'attach_thumb' => array(0,3),
+						'attach_thumb' => array(0, 3),
 					)
 				);
 

Braces +429 added lines, -325 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * The main 'Attachments and Avatars' management function.
@@ -63,10 +64,11 @@ 
 	call_integration_hook('integrate_manage_attachments', array(&$subActions));
 
 	// Pick the correct sub-action.
-	if (isset($_REQUEST['sa']) && isset($subActions[$_REQUEST['sa']]))
-		$context['sub_action'] = $_REQUEST['sa'];
-	else
-		$context['sub_action'] = 'browse';
+	if (isset($_REQUEST['sa']) && isset($subActions[$_REQUEST['sa']])) {
+			$context['sub_action'] = $_REQUEST['sa'];
+	} else {
+			$context['sub_action'] = 'browse';
+	}
 
 	// Default page title is good.
 	$context['page_title'] = $txt['attachments_avatars'];
@@ -94,20 +96,20 @@ 
 	$context['attachmentUploadDir'] = $modSettings['attachmentUploadDir'][$modSettings['currentAttachmentUploadDir']];
 
 	// If not set, show a default path for the base directory
-	if (!isset($_GET['save']) && empty($modSettings['basedirectory_for_attachments']))
-		if (is_dir($modSettings['attachmentUploadDir'][1]))
+	if (!isset($_GET['save']) && empty($modSettings['basedirectory_for_attachments'])) {
+			if (is_dir($modSettings['attachmentUploadDir'][1]))
 			$modSettings['basedirectory_for_attachments'] = $modSettings['attachmentUploadDir'][1];
-
-	else
-		$modSettings['basedirectory_for_attachments'] = $context['attachmentUploadDir'];
+	} else {
+			$modSettings['basedirectory_for_attachments'] = $context['attachmentUploadDir'];
+	}
 
 	$context['valid_upload_dir'] = is_dir($context['attachmentUploadDir']) && is_writable($context['attachmentUploadDir']);
 
-	if (!empty($modSettings['automanage_attachments']))
-		$context['valid_basedirectory'] = !empty($modSettings['basedirectory_for_attachments']) && is_writable($modSettings['basedirectory_for_attachments']);
-
-	else
-		$context['valid_basedirectory'] = true;
+	if (!empty($modSettings['automanage_attachments'])) {
+			$context['valid_basedirectory'] = !empty($modSettings['basedirectory_for_attachments']) && is_writable($modSettings['basedirectory_for_attachments']);
+	} else {
+			$context['valid_basedirectory'] = true;
+	}
 
 	// A bit of razzle dazzle with the $txt strings. :)
 	$txt['attachment_path'] = $context['attachmentUploadDir'];
@@ -185,8 +187,9 @@ 
 
 	call_integration_hook('integrate_modify_attachment_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// These are very likely to come in handy! (i.e. without them we're doomed!)
 	require_once($sourcedir . '/ManagePermissions.php');
@@ -197,21 +200,24 @@ 
 	{
 		checkSession();
 
-		if (isset($_POST['attachmentUploadDir']))
-			unset($_POST['attachmentUploadDir']);
+		if (isset($_POST['attachmentUploadDir'])) {
+					unset($_POST['attachmentUploadDir']);
+		}
 
 		if (!empty($_POST['use_subdirectories_for_attachments']))
 		{
-			if (isset($_POST['use_subdirectories_for_attachments']) && empty($_POST['basedirectory_for_attachments']))
-				$_POST['basedirectory_for_attachments'] = (!empty($modSettings['basedirectory_for_attachments']) ? ($modSettings['basedirectory_for_attachments']) : $boarddir);
+			if (isset($_POST['use_subdirectories_for_attachments']) && empty($_POST['basedirectory_for_attachments'])) {
+							$_POST['basedirectory_for_attachments'] = (!empty($modSettings['basedirectory_for_attachments']) ? ($modSettings['basedirectory_for_attachments']) : $boarddir);
+			}
 
 			if (!empty($_POST['use_subdirectories_for_attachments']) && !empty($modSettings['attachment_basedirectories']))
 			{
-				if (!is_array($modSettings['attachment_basedirectories']))
-					$modSettings['attachment_basedirectories'] = $smcFunc['json_decode']($modSettings['attachment_basedirectories'], true);
+				if (!is_array($modSettings['attachment_basedirectories'])) {
+									$modSettings['attachment_basedirectories'] = $smcFunc['json_decode']($modSettings['attachment_basedirectories'], true);
+				}
+			} else {
+							$modSettings['attachment_basedirectories'] = array();
 			}
-			else
-				$modSettings['attachment_basedirectories'] = array();
 
 			if (!empty($_POST['use_subdirectories_for_attachments']) && !empty($_POST['basedirectory_for_attachments']) && !in_array($_POST['basedirectory_for_attachments'], $modSettings['attachment_basedirectories']))
 			{
@@ -219,8 +225,9 @@ 
 
 				if (!in_array($_POST['basedirectory_for_attachments'], $modSettings['attachmentUploadDir']))
 				{
-					if (!automanage_attachments_create_directory($_POST['basedirectory_for_attachments']))
-						$_POST['basedirectory_for_attachments'] = $modSettings['basedirectory_for_attachments'];
+					if (!automanage_attachments_create_directory($_POST['basedirectory_for_attachments'])) {
+											$_POST['basedirectory_for_attachments'] = $modSettings['basedirectory_for_attachments'];
+					}
 				}
 
 				if (!in_array($_POST['basedirectory_for_attachments'], $modSettings['attachment_basedirectories']))
@@ -336,8 +343,9 @@ 
 
 	call_integration_hook('integrate_modify_avatar_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// We need this file for the settings template.
 	require_once($sourcedir . '/ManageServer.php');
@@ -348,17 +356,21 @@ 
 		checkSession();
 
 		// These settings cannot be left empty!
-		if (empty($_POST['custom_avatar_dir']))
-			$_POST['custom_avatar_dir'] = $boarddir . '/custom_avatar';
+		if (empty($_POST['custom_avatar_dir'])) {
+					$_POST['custom_avatar_dir'] = $boarddir . '/custom_avatar';
+		}
 
-		if (empty($_POST['custom_avatar_url']))
-			$_POST['custom_avatar_url'] = $boardurl . '/custom_avatar';
+		if (empty($_POST['custom_avatar_url'])) {
+					$_POST['custom_avatar_url'] = $boardurl . '/custom_avatar';
+		}
 
-		if (empty($_POST['avatar_directory']))
-			$_POST['avatar_directory'] = $boarddir . '/avatars';
+		if (empty($_POST['avatar_directory'])) {
+					$_POST['avatar_directory'] = $boarddir . '/avatars';
+		}
 
-		if (empty($_POST['avatar_url']))
-			$_POST['avatar_url'] = $boardurl . '/avatars';
+		if (empty($_POST['avatar_url'])) {
+					$_POST['avatar_url'] = $boardurl . '/avatars';
+		}
 
 		call_integration_hook('integrate_save_avatar_settings');
 
@@ -406,11 +418,13 @@ 
 	$list_title = $txt['attachment_manager_browse_files'] . ': ';
 	foreach ($titles as $browse_type => $details)
 	{
-		if ($browse_type != 'attachments')
-			$list_title .= ' | ';
+		if ($browse_type != 'attachments') {
+					$list_title .= ' | ';
+		}
 
-		if ($context['browse_type'] == $browse_type)
-			$list_title .= '<img src="' . $settings['images_url'] . '/selected.png" alt="&gt;"> ';
+		if ($context['browse_type'] == $browse_type) {
+					$list_title .= '<img src="' . $settings['images_url'] . '/selected.png" alt="&gt;"> ';
+		}
 
 		$list_title .= '<a href="' . $scripturl . $details[0] . '">' . $details[1] . '</a>';
 	}
@@ -446,28 +460,33 @@ 
 						$link = '<a href="';
 
 						// In case of a custom avatar URL attachments have a fixed directory.
-						if ($rowData['attachment_type'] == 1)
-							$link .= sprintf('%1$s/%2$s', $modSettings['custom_avatar_url'], $rowData['filename']);
+						if ($rowData['attachment_type'] == 1) {
+													$link .= sprintf('%1$s/%2$s', $modSettings['custom_avatar_url'], $rowData['filename']);
+						}
 
 						// By default avatars are downloaded almost as attachments.
-						elseif ($context['browse_type'] == 'avatars')
-							$link .= sprintf('%1$s?action=dlattach;type=avatar;attach=%2$d', $scripturl, $rowData['id_attach']);
+						elseif ($context['browse_type'] == 'avatars') {
+													$link .= sprintf('%1$s?action=dlattach;type=avatar;attach=%2$d', $scripturl, $rowData['id_attach']);
+						}
 
 						// Normal attachments are always linked to a topic ID.
-						else
-							$link .= sprintf('%1$s?action=dlattach;topic=%2$d.0;attach=%3$d', $scripturl, $rowData['id_topic'], $rowData['id_attach']);
+						else {
+													$link .= sprintf('%1$s?action=dlattach;topic=%2$d.0;attach=%3$d', $scripturl, $rowData['id_topic'], $rowData['id_attach']);
+						}
 
 						$link .= '"';
 
 						// Show a popup on click if it's a picture and we know its dimensions.
-						if (!empty($rowData['width']) && !empty($rowData['height']))
-							$link .= sprintf(' onclick="return reqWin(this.href' . ($rowData['attachment_type'] == 1 ? '' : ' + \';image\'') . ', %1$d, %2$d, true);"', $rowData['width'] + 20, $rowData['height'] + 20);
+						if (!empty($rowData['width']) && !empty($rowData['height'])) {
+													$link .= sprintf(' onclick="return reqWin(this.href' . ($rowData['attachment_type'] == 1 ? '' : ' + \';image\'') . ', %1$d, %2$d, true);"', $rowData['width'] + 20, $rowData['height'] + 20);
+						}
 
 						$link .= sprintf('>%1$s</a>', preg_replace('~&amp;#(\\\\d{1,7}|x[0-9a-fA-F]{1,6});~', '&#\\\\1;', $smcFunc['htmlspecialchars']($rowData['filename'])));
 
 						// Show the dimensions.
-						if (!empty($rowData['width']) && !empty($rowData['height']))
-							$link .= sprintf(' <span class="smalltext">%1$dx%2$d</span>', $rowData['width'], $rowData['height']);
+						if (!empty($rowData['width']) && !empty($rowData['height'])) {
+													$link .= sprintf(' <span class="smalltext">%1$dx%2$d</span>', $rowData['width'], $rowData['height']);
+						}
 
 						return $link;
 					},
@@ -500,12 +519,14 @@ 
 					'function' => function($rowData) use ($scripturl, $smcFunc)
 					{
 						// In case of an attachment, return the poster of the attachment.
-						if (empty($rowData['id_member']))
-							return $smcFunc['htmlspecialchars']($rowData['poster_name']);
+						if (empty($rowData['id_member'])) {
+													return $smcFunc['htmlspecialchars']($rowData['poster_name']);
+						}
 
 						// Otherwise it must be an avatar, return the link to the owner of it.
-						else
-							return sprintf('<a href="%1$s?action=profile;u=%2$d">%3$s</a>', $scripturl, $rowData['id_member'], $rowData['poster_name']);
+						else {
+													return sprintf('<a href="%1$s?action=profile;u=%2$d">%3$s</a>', $scripturl, $rowData['id_member'], $rowData['poster_name']);
+						}
 					},
 				),
 				'sort' => array(
@@ -524,8 +545,9 @@ 
 						$date = empty($rowData['poster_time']) ? $txt['never'] : timeformat($rowData['poster_time']);
 
 						// Add a link to the topic in case of an attachment.
-						if ($context['browse_type'] !== 'avatars')
-							$date .= sprintf('<br>%1$s <a href="%2$s?topic=%3$d.msg%4$d#msg%4$d">%5$s</a>', $txt['in'], $scripturl, $rowData['id_topic'], $rowData['id_msg'], $rowData['subject']);
+						if ($context['browse_type'] !== 'avatars') {
+													$date .= sprintf('<br>%1$s <a href="%2$s?topic=%3$d.msg%4$d#msg%4$d">%5$s</a>', $txt['in'], $scripturl, $rowData['id_topic'], $rowData['id_msg'], $rowData['subject']);
+						}
 
 						return $date;
 					},
@@ -610,8 +632,8 @@ 
 	global $smcFunc, $txt;
 
 	// Choose a query depending on what we are viewing.
-	if ($browse_type === 'avatars')
-		$request = $smcFunc['db_query']('', '
+	if ($browse_type === 'avatars') {
+			$request = $smcFunc['db_query']('', '
 			SELECT
 				{string:blank_text} AS id_msg, COALESCE(mem.real_name, {string:not_applicable_text}) AS poster_name,
 				mem.last_login AS poster_time, 0 AS id_topic, a.id_member, a.id_attach, a.filename, a.file_hash, a.attachment_type,
@@ -630,8 +652,8 @@ 
 				'per_page' => $items_per_page,
 			)
 		);
-	else
-		$request = $smcFunc['db_query']('', '
+	} else {
+			$request = $smcFunc['db_query']('', '
 			SELECT
 				m.id_msg, COALESCE(mem.real_name, m.poster_name) AS poster_name, m.poster_time, m.id_topic, m.id_member,
 				a.id_attach, a.filename, a.file_hash, a.attachment_type, a.size, a.width, a.height, a.downloads, mf.subject, t.id_board
@@ -650,9 +672,11 @@ 
 				'per_page' => $items_per_page,
 			)
 		);
+	}
 	$files = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$files[] = $row;
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$files[] = $row;
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $files;
@@ -670,8 +694,8 @@ 
 	global $smcFunc;
 
 	// Depending on the type of file, different queries are used.
-	if ($browse_type === 'avatars')
-		$request = $smcFunc['db_query']('', '
+	if ($browse_type === 'avatars') {
+			$request = $smcFunc['db_query']('', '
 		SELECT COUNT(*)
 		FROM {db_prefix}attachments
 		WHERE id_member != {int:guest_id_member}',
@@ -679,8 +703,8 @@ 
 			'guest_id_member' => 0,
 		)
 	);
-	else
-		$request = $smcFunc['db_query']('', '
+	} else {
+			$request = $smcFunc['db_query']('', '
 			SELECT COUNT(*) AS num_attach
 			FROM {db_prefix}attachments AS a
 				INNER JOIN {db_prefix}messages AS m ON (m.id_msg = a.id_msg)
@@ -693,6 +717,7 @@ 
 				'guest_id_member' => 0,
 			)
 		);
+	}
 
 	list ($num_files) = $smcFunc['db_fetch_row']($request);
 	$smcFunc['db_free_result']($request);
@@ -775,12 +800,14 @@ 
 	$current_dir_size /= 1024;
 
 	// If they specified a limit only....
-	if (!empty($modSettings['attachmentDirSizeLimit']))
-		$context['attachment_space'] = comma_format(max($modSettings['attachmentDirSizeLimit'] - $current_dir_size, 0), 2);
+	if (!empty($modSettings['attachmentDirSizeLimit'])) {
+			$context['attachment_space'] = comma_format(max($modSettings['attachmentDirSizeLimit'] - $current_dir_size, 0), 2);
+	}
 	$context['attachment_current_size'] = comma_format($current_dir_size, 2);
 
-	if (!empty($modSettings['attachmentDirFileLimit']))
-		$context['attachment_files'] = comma_format(max($modSettings['attachmentDirFileLimit'] - $current_dir_files, 0), 0);
+	if (!empty($modSettings['attachmentDirFileLimit'])) {
+			$context['attachment_files'] = comma_format(max($modSettings['attachmentDirFileLimit'] - $current_dir_files, 0), 0);
+	}
 	$context['attachment_current_files'] = comma_format($current_dir_files, 0);
 
 	$context['attach_multiple_dirs'] = count($attach_dirs) > 1 ? true : false;
@@ -817,8 +844,8 @@ 
 		$messages = removeAttachments(array('attachment_type' => 0, 'poster_time' => (time() - 24 * 60 * 60 * $_POST['age'])), 'messages', true);
 
 		// Update the messages to reflect the change.
-		if (!empty($messages) && !empty($_POST['notice']))
-			$smcFunc['db_query']('', '
+		if (!empty($messages) && !empty($_POST['notice'])) {
+					$smcFunc['db_query']('', '
 				UPDATE {db_prefix}messages
 				SET body = CONCAT(body, {string:notice})
 				WHERE id_msg IN ({array_int:messages})',
@@ -827,8 +854,8 @@ 
 					'notice' => '<br><br>' . $_POST['notice'],
 				)
 			);
-	}
-	else
+		}
+	} else
 	{
 		// Remove all the old avatars.
 		removeAttachments(array('not_id_member' => 0, 'last_login' => (time() - 24 * 60 * 60 * $_POST['age'])), 'members');
@@ -853,8 +880,8 @@ 
 	$messages = removeAttachments(array('attachment_type' => 0, 'size' => 1024 * $_POST['size']), 'messages', true);
 
 	// And make a note on the post.
-	if (!empty($messages) && !empty($_POST['notice']))
-		$smcFunc['db_query']('', '
+	if (!empty($messages) && !empty($_POST['notice'])) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}messages
 			SET body = CONCAT(body, {string:notice})
 			WHERE id_msg IN ({array_int:messages})',
@@ -863,6 +890,7 @@ 
 				'notice' => '<br><br>' . $_POST['notice'],
 			)
 		);
+	}
 
 	redirectexit('action=admin;area=manageattachments;sa=maintenance');
 }
@@ -882,16 +910,17 @@ 
 	{
 		$attachments = array();
 		// There must be a quicker way to pass this safety test??
-		foreach ($_POST['remove'] as $removeID => $dummy)
-			$attachments[] = (int) $removeID;
+		foreach ($_POST['remove'] as $removeID => $dummy) {
+					$attachments[] = (int) $removeID;
+		}
 
 		// If the attachments are from a 3rd party, let them remove it. Hooks should remove their ids from the array.
 		$filesRemoved = false;
 		call_integration_hook('integrate_attachment_remove', array(&$filesRemoved, $attachments));
 
-		if ($_REQUEST['type'] == 'avatars' && !empty($attachments))
-			removeAttachments(array('id_attach' => $attachments));
-		else if (!empty($attachments))
+		if ($_REQUEST['type'] == 'avatars' && !empty($attachments)) {
+					removeAttachments(array('id_attach' => $attachments));
+		} else if (!empty($attachments))
 		{
 			$messages = removeAttachments(array('id_attach' => $attachments), 'messages', true);
 
@@ -930,12 +959,13 @@ 
 
 	$messages = removeAttachments(array('attachment_type' => 0), '', true);
 
-	if (!isset($_POST['notice']))
-		$_POST['notice'] = $txt['attachment_delete_admin'];
+	if (!isset($_POST['notice'])) {
+			$_POST['notice'] = $txt['attachment_delete_admin'];
+	}
 
 	// Add the notice on the end of the changed messages.
-	if (!empty($messages))
-		$smcFunc['db_query']('', '
+	if (!empty($messages)) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}messages
 			SET body = CONCAT(body, {string:deleted_message})
 			WHERE id_msg IN ({array_int:messages})',
@@ -944,6 +974,7 @@ 
 				'deleted_message' => '<br><br>' . $_POST['notice'],
 			)
 		);
+	}
 
 	redirectexit('action=admin;area=manageattachments;sa=maintenance');
 }
@@ -982,24 +1013,26 @@ 
 			$is_not = substr($real_type, 0, 4) == 'not_';
 			$type = $is_not ? substr($real_type, 4) : $real_type;
 
-			if (in_array($type, array('id_member', 'id_attach', 'id_msg')))
-				$new_condition[] = 'a.' . $type . ($is_not ? ' NOT' : '') . ' IN (' . (is_array($restriction) ? '{array_int:' . $real_type . '}' : '{int:' . $real_type . '}') . ')';
-			elseif ($type == 'attachment_type')
-				$new_condition[] = 'a.attachment_type = {int:' . $real_type . '}';
-			elseif ($type == 'poster_time')
-				$new_condition[] = 'm.poster_time < {int:' . $real_type . '}';
-			elseif ($type == 'last_login')
-				$new_condition[] = 'mem.last_login < {int:' . $real_type . '}';
-			elseif ($type == 'size')
-				$new_condition[] = 'a.size > {int:' . $real_type . '}';
-			elseif ($type == 'id_topic')
-				$new_condition[] = 'm.id_topic IN (' . (is_array($restriction) ? '{array_int:' . $real_type . '}' : '{int:' . $real_type . '}') . ')';
+			if (in_array($type, array('id_member', 'id_attach', 'id_msg'))) {
+							$new_condition[] = 'a.' . $type . ($is_not ? ' NOT' : '') . ' IN (' . (is_array($restriction) ? '{array_int:' . $real_type . '}' : '{int:' . $real_type . '}') . ')';
+			} elseif ($type == 'attachment_type') {
+							$new_condition[] = 'a.attachment_type = {int:' . $real_type . '}';
+			} elseif ($type == 'poster_time') {
+							$new_condition[] = 'm.poster_time < {int:' . $real_type . '}';
+			} elseif ($type == 'last_login') {
+							$new_condition[] = 'mem.last_login < {int:' . $real_type . '}';
+			} elseif ($type == 'size') {
+							$new_condition[] = 'a.size > {int:' . $real_type . '}';
+			} elseif ($type == 'id_topic') {
+							$new_condition[] = 'm.id_topic IN (' . (is_array($restriction) ? '{array_int:' . $real_type . '}' : '{int:' . $real_type . '}') . ')';
+			}
 
 			// Add the parameter!
 			$query_parameter[$real_type] = $restriction;
 
-			if ($type == 'do_logging')
-				$do_logging = $condition['id_attach'];
+			if ($type == 'do_logging') {
+							$do_logging = $condition['id_attach'];
+			}
 		}
 		$condition = implode(' AND ', $new_condition);
 	}
@@ -1031,15 +1064,15 @@ 
 			// wasn't it obvious? :P
 			// @todo look again at this.
 			@unlink($modSettings['custom_avatar_dir'] . '/' . $row['filename']);
-		}
-		else
+		} else
 		{
 			$filename = getAttachmentFilename($row['filename'], $row['id_attach'], $row['id_folder'], false, $row['file_hash']);
 			@unlink($filename);
 
 			// If this was a thumb, the parent attachment should know about it.
-			if (!empty($row['id_parent']))
-				$parents[] = $row['id_parent'];
+			if (!empty($row['id_parent'])) {
+							$parents[] = $row['id_parent'];
+			}
 
 			// If this attachments has a thumb, remove it as well.
 			if (!empty($row['id_thumb']) && $autoThumbRemoval)
@@ -1051,8 +1084,9 @@ 
 		}
 
 		// Make a list.
-		if ($return_affected_messages && empty($row['attachment_type']))
-			$msgs[] = $row['id_msg'];
+		if ($return_affected_messages && empty($row['attachment_type'])) {
+					$msgs[] = $row['id_msg'];
+		}
 
 		$attach[] = $row['id_attach'];
 	}
@@ -1060,8 +1094,8 @@ 
 
 	// Removed attachments don't have to be updated anymore.
 	$parents = array_diff($parents, $attach);
-	if (!empty($parents))
-		$smcFunc['db_query']('', '
+	if (!empty($parents)) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}attachments
 			SET id_thumb = {int:no_thumb}
 			WHERE id_attach IN ({array_int:parent_attachments})',
@@ -1070,6 +1104,7 @@ 
 				'no_thumb' => 0,
 			)
 		);
+	}
 
 	if (!empty($do_logging))
 	{
@@ -1086,31 +1121,34 @@ 
 			)
 		);
 
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			logAction(
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					logAction(
 				'remove_attach',
 				array(
 					'message' => $row['id_msg'],
 					'filename' => preg_replace('~&amp;#(\\d{1,7}|x[0-9a-fA-F]{1,6});~', '&#\\1;', $smcFunc['htmlspecialchars']($row['filename'])),
 				)
 			);
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
-	if (!empty($attach))
-		$smcFunc['db_query']('', '
+	if (!empty($attach)) {
+			$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}attachments
 			WHERE id_attach IN ({array_int:attachment_list})',
 			array(
 				'attachment_list' => $attach,
 			)
 		);
+	}
 
 	call_integration_hook('integrate_remove_attachments', array($attach));
 
-	if ($return_affected_messages)
-		return array_unique($msgs);
-}
+	if ($return_affected_messages) {
+			return array_unique($msgs);
+	}
+	}
 
 /**
  * This function should find attachments in the database that no longer exist and clear them, and fix filesize issues.
@@ -1122,8 +1160,9 @@ 
 	checkSession('get');
 
 	// If we choose cancel, redirect right back.
-	if (isset($_POST['cancel']))
-		redirectexit('action=admin;area=manageattachments;sa=maintenance');
+	if (isset($_POST['cancel'])) {
+			redirectexit('action=admin;area=manageattachments;sa=maintenance');
+	}
 
 	// Try give us a while to sort this out...
 	@set_time_limit(600);
@@ -1140,13 +1179,15 @@ 
 		if (isset($_GET['fixErrors']))
 		{
 			// Nothing?
-			if (empty($_POST['to_fix']))
-				redirectexit('action=admin;area=manageattachments;sa=maintenance');
+			if (empty($_POST['to_fix'])) {
+							redirectexit('action=admin;area=manageattachments;sa=maintenance');
+			}
 
 			$_SESSION['attachments_to_fix'] = array();
 			// @todo No need to do this I think.
-			foreach ($_POST['to_fix'] as $value)
-				$_SESSION['attachments_to_fix'][] = $value;
+			foreach ($_POST['to_fix'] as $value) {
+							$_SESSION['attachments_to_fix'][] = $value;
+			}
 		}
 	}
 
@@ -1213,13 +1254,14 @@ 
 					}
 				}
 			}
-			if ($smcFunc['db_num_rows']($result) != 0)
-				$to_fix[] = 'missing_thumbnail_parent';
+			if ($smcFunc['db_num_rows']($result) != 0) {
+							$to_fix[] = 'missing_thumbnail_parent';
+			}
 			$smcFunc['db_free_result']($result);
 
 			// Do we need to delete what we have?
-			if ($fix_errors && !empty($to_remove) && in_array('missing_thumbnail_parent', $to_fix))
-				$smcFunc['db_query']('', '
+			if ($fix_errors && !empty($to_remove) && in_array('missing_thumbnail_parent', $to_fix)) {
+							$smcFunc['db_query']('', '
 					DELETE FROM {db_prefix}attachments
 					WHERE id_attach IN ({array_int:to_remove})
 						AND attachment_type = {int:attachment_type}',
@@ -1228,6 +1270,7 @@ 
 						'attachment_type' => 3,
 					)
 				);
+			}
 
 			pauseAttachmentMaintenance($to_fix, $thumbnails);
 		}
@@ -1272,13 +1315,14 @@ 
 				$to_update[] = $row['id_attach'];
 				$context['repair_errors']['parent_missing_thumbnail']++;
 			}
-			if ($smcFunc['db_num_rows']($result) != 0)
-				$to_fix[] = 'parent_missing_thumbnail';
+			if ($smcFunc['db_num_rows']($result) != 0) {
+							$to_fix[] = 'parent_missing_thumbnail';
+			}
 			$smcFunc['db_free_result']($result);
 
 			// Do we need to delete what we have?
-			if ($fix_errors && !empty($to_update) && in_array('parent_missing_thumbnail', $to_fix))
-				$smcFunc['db_query']('', '
+			if ($fix_errors && !empty($to_update) && in_array('parent_missing_thumbnail', $to_fix)) {
+							$smcFunc['db_query']('', '
 					UPDATE {db_prefix}attachments
 					SET id_thumb = {int:no_thumb}
 					WHERE id_attach IN ({array_int:to_update})',
@@ -1287,6 +1331,7 @@ 
 						'no_thumb' => 0,
 					)
 				);
+			}
 
 			pauseAttachmentMaintenance($to_fix, $thumbnails);
 		}
@@ -1324,10 +1369,11 @@ 
 			while ($row = $smcFunc['db_fetch_assoc']($result))
 			{
 				// Get the filename.
-				if ($row['attachment_type'] == 1)
-					$filename = $modSettings['custom_avatar_dir'] . '/' . $row['filename'];
-				else
-					$filename = getAttachmentFilename($row['filename'], $row['id_attach'], $row['id_folder'], false, $row['file_hash']);
+				if ($row['attachment_type'] == 1) {
+									$filename = $modSettings['custom_avatar_dir'] . '/' . $row['filename'];
+				} else {
+									$filename = getAttachmentFilename($row['filename'], $row['id_attach'], $row['id_folder'], false, $row['file_hash']);
+				}
 
 				// File doesn't exist?
 				if (!file_exists($filename))
@@ -1339,15 +1385,16 @@ 
 						$attachment_name = $row['id_attach'] . '_' . $row['file_hash'] . '.dat';
 
 						// Loop through the other folders.
-						foreach ($modSettings['attachmentUploadDir'] as $id => $dir)
-							if (file_exists($dir . '/' . $attachment_name))
+						foreach ($modSettings['attachmentUploadDir'] as $id => $dir) {
+													if (file_exists($dir . '/' . $attachment_name))
 							{
 								$context['repair_errors']['wrong_folder']++;
+						}
 								$errors_found[] = 'wrong_folder';
 
 								// Are we going to fix this now?
-								if ($fix_errors && in_array('wrong_folder', $to_fix))
-									$smcFunc['db_query']('', '
+								if ($fix_errors && in_array('wrong_folder', $to_fix)) {
+																	$smcFunc['db_query']('', '
 										UPDATE {db_prefix}attachments
 										SET id_folder = {int:new_folder}
 										WHERE id_attach = {int:id_attach}',
@@ -1356,6 +1403,7 @@ 
 											'id_attach' => $row['id_attach'],
 										)
 									);
+								}
 
 								continue 2;
 							}
@@ -1364,8 +1412,7 @@ 
 					$to_remove[] = $row['id_attach'];
 					$context['repair_errors']['file_missing_on_disk']++;
 					$errors_found[] = 'file_missing_on_disk';
-				}
-				elseif (filesize($filename) == 0)
+				} elseif (filesize($filename) == 0)
 				{
 					$context['repair_errors']['file_size_of_zero']++;
 					$errors_found[] = 'file_size_of_zero';
@@ -1376,8 +1423,7 @@ 
 						$to_remove[] = $row['id_attach'];
 						@unlink($filename);
 					}
-				}
-				elseif (filesize($filename) != $row['size'])
+				} elseif (filesize($filename) != $row['size'])
 				{
 					$context['repair_errors']['file_wrong_size']++;
 					$errors_found[] = 'file_wrong_size';
@@ -1398,14 +1444,18 @@ 
 				}
 			}
 
-			if (in_array('file_missing_on_disk', $errors_found))
-				$to_fix[] = 'file_missing_on_disk';
-			if (in_array('file_size_of_zero', $errors_found))
-				$to_fix[] = 'file_size_of_zero';
-			if (in_array('file_wrong_size', $errors_found))
-				$to_fix[] = 'file_wrong_size';
-			if (in_array('wrong_folder', $errors_found))
-				$to_fix[] = 'wrong_folder';
+			if (in_array('file_missing_on_disk', $errors_found)) {
+							$to_fix[] = 'file_missing_on_disk';
+			}
+			if (in_array('file_size_of_zero', $errors_found)) {
+							$to_fix[] = 'file_size_of_zero';
+			}
+			if (in_array('file_wrong_size', $errors_found)) {
+							$to_fix[] = 'file_wrong_size';
+			}
+			if (in_array('wrong_folder', $errors_found)) {
+							$to_fix[] = 'wrong_folder';
+			}
 			$smcFunc['db_free_result']($result);
 
 			// Do we need to delete what we have?
@@ -1475,20 +1525,22 @@ 
 				// If we are repairing remove the file from disk now.
 				if ($fix_errors && in_array('avatar_no_member', $to_fix))
 				{
-					if ($row['attachment_type'] == 1)
-						$filename = $modSettings['custom_avatar_dir'] . '/' . $row['filename'];
-					else
-						$filename = getAttachmentFilename($row['filename'], $row['id_attach'], $row['id_folder'], false, $row['file_hash']);
+					if ($row['attachment_type'] == 1) {
+											$filename = $modSettings['custom_avatar_dir'] . '/' . $row['filename'];
+					} else {
+											$filename = getAttachmentFilename($row['filename'], $row['id_attach'], $row['id_folder'], false, $row['file_hash']);
+					}
 					@unlink($filename);
 				}
 			}
-			if ($smcFunc['db_num_rows']($result) != 0)
-				$to_fix[] = 'avatar_no_member';
+			if ($smcFunc['db_num_rows']($result) != 0) {
+							$to_fix[] = 'avatar_no_member';
+			}
 			$smcFunc['db_free_result']($result);
 
 			// Do we need to delete what we have?
-			if ($fix_errors && !empty($to_remove) && in_array('avatar_no_member', $to_fix))
-				$smcFunc['db_query']('', '
+			if ($fix_errors && !empty($to_remove) && in_array('avatar_no_member', $to_fix)) {
+							$smcFunc['db_query']('', '
 					DELETE FROM {db_prefix}attachments
 					WHERE id_attach IN ({array_int:to_remove})
 						AND id_member != {int:no_member}
@@ -1499,6 +1551,7 @@ 
 						'no_msg' => 0,
 					)
 				);
+			}
 
 			pauseAttachmentMaintenance($to_fix, $thumbnails);
 		}
@@ -1558,13 +1611,14 @@ 
 					@unlink($filename);
 				}
 			}
-			if ($smcFunc['db_num_rows']($result) != 0)
-				$to_fix[] = 'attachment_no_msg';
+			if ($smcFunc['db_num_rows']($result) != 0) {
+							$to_fix[] = 'attachment_no_msg';
+			}
 			$smcFunc['db_free_result']($result);
 
 			// Do we need to delete what we have?
-			if ($fix_errors && !empty($to_remove) && in_array('attachment_no_msg', $to_fix))
-				$smcFunc['db_query']('', '
+			if ($fix_errors && !empty($to_remove) && in_array('attachment_no_msg', $to_fix)) {
+							$smcFunc['db_query']('', '
 					DELETE FROM {db_prefix}attachments
 					WHERE id_attach IN ({array_int:to_remove})
 						AND id_member = {int:no_member}
@@ -1575,6 +1629,7 @@ 
 						'attach_thumb' => array(0,3),
 					)
 				);
+			}
 
 			pauseAttachmentMaintenance($to_fix, $thumbnails);
 		}
@@ -1598,8 +1653,9 @@ 
 			{
 				while ($file = readdir($dir))
 				{
-					if (in_array($file, array('.', '..', '.htaccess', 'index.php')))
-						continue;
+					if (in_array($file, array('.', '..', '.htaccess', 'index.php'))) {
+											continue;
+					}
 
 					if ($files_checked <= $current_check)
 					{
@@ -1607,8 +1663,9 @@ 
 						if (strpos($file, 'post_tmp_') !== false)
 						{
 							// Temp file is more than 5 hours old!
-							if (filemtime($attach_dir . '/' . $file) < time() - 18000)
-								@unlink($attach_dir . '/' . $file);
+							if (filemtime($attach_dir . '/' . $file) < time() - 18000) {
+															@unlink($attach_dir . '/' . $file);
+							}
 						}
 						// That should be an attachment, let's check if we have it in the database
 						elseif (strpos($file, '_') !== false)
@@ -1630,8 +1687,7 @@ 
 									if ($fix_errors && in_array('files_without_attachment', $to_fix))
 									{
 										@unlink($attach_dir . '/' . $file);
-									}
-									else
+									} else
 									{
 										$context['repair_errors']['files_without_attachment']++;
 										$to_fix[] = 'files_without_attachment';
@@ -1639,14 +1695,12 @@ 
 								}
 								$smcFunc['db_free_result']($request);
 							}
-						}
-						else
+						} else
 						{
 							if ($fix_errors && in_array('files_without_attachment', $to_fix))
 							{
 								@unlink($attach_dir . '/' . $file);
-							}
-							else
+							} else
 							{
 								$context['repair_errors']['files_without_attachment']++;
 								$to_fix[] = 'files_without_attachment';
@@ -1655,8 +1709,9 @@ 
 					}
 					$current_check++;
 					$_GET['substep'] = $current_check;
-					if ($current_check - $files_checked >= $max_checks)
-						pauseAttachmentMaintenance($to_fix);
+					if ($current_check - $files_checked >= $max_checks) {
+											pauseAttachmentMaintenance($to_fix);
+					}
 				}
 				closedir($dir);
 			}
@@ -1692,12 +1747,14 @@ 
 
 	// Try get more time...
 	@set_time_limit(600);
-	if (function_exists('apache_reset_timeout'))
-		@apache_reset_timeout();
+	if (function_exists('apache_reset_timeout')) {
+			@apache_reset_timeout();
+	}
 
 	// Have we already used our maximum time?
-	if ((time() - $time_start) < 3 || $context['starting_substep'] == $_GET['substep'])
-		return;
+	if ((time() - $time_start) < 3 || $context['starting_substep'] == $_GET['substep']) {
+			return;
+	}
 
 	$context['continue_get_data'] = '?action=admin;area=manageattachments;sa=repair' . (isset($_GET['fixErrors']) ? ';fixErrors' : '') . ';step=' . $_GET['step'] . ';substep=' . $_GET['substep'] . ';' . $context['session_var'] . '=' . $context['session_id'];
 	$context['page_title'] = $txt['not_done_title'];
@@ -1709,10 +1766,11 @@ 
 	$context[$context['admin_menu_name']]['current_subsection'] = 'maintenance';
 
 	// Change these two if more steps are added!
-	if (empty($max_substep))
-		$context['continue_percent'] = round(($_GET['step'] * 100) / 25);
-	else
-		$context['continue_percent'] = round(($_GET['step'] * 100 + ($_GET['substep'] * 100) / $max_substep) / 25);
+	if (empty($max_substep)) {
+			$context['continue_percent'] = round(($_GET['step'] * 100) / 25);
+	} else {
+			$context['continue_percent'] = round(($_GET['step'] * 100 + ($_GET['substep'] * 100) / $max_substep) / 25);
+	}
 
 	// Never more than 100%!
 	$context['continue_percent'] = min($context['continue_percent'], 100);
@@ -1754,15 +1812,17 @@ 
 				'attachment_type' => 0,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$attachments[] = $row['id_attach'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$attachments[] = $row['id_attach'];
+		}
 		$smcFunc['db_free_result']($request);
+	} elseif (!empty($_GET['aid'])) {
+			$attachments[] = (int) $_GET['aid'];
 	}
-	elseif (!empty($_GET['aid']))
-		$attachments[] = (int) $_GET['aid'];
 
-	if (empty($attachments))
-		fatal_lang_error('no_access', false);
+	if (empty($attachments)) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Now we have some ID's cleaned and ready to approve, but first - let's check we have permission!
 	$allowed_boards = boardsAllowedTo('approve_posts');
@@ -1795,17 +1855,18 @@ 
 	}
 	$smcFunc['db_free_result']($request);
 
-	if (empty($attachments))
-		fatal_lang_error('no_access', false);
+	if (empty($attachments)) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Finally, we are there. Follow through!
 	if ($is_approve)
 	{
 		// Checked and deemed worthy.
 		ApproveAttachments($attachments);
+	} else {
+			removeAttachments(array('id_attach' => $attachments, 'do_logging' => true));
 	}
-	else
-		removeAttachments(array('id_attach' => $attachments, 'do_logging' => true));
 
 	// Return to the topic....
 	redirectexit($redirect);
@@ -1821,8 +1882,9 @@ 
 {
 	global $smcFunc;
 
-	if (empty($attachments))
-		return 0;
+	if (empty($attachments)) {
+			return 0;
+	}
 
 	// For safety, check for thumbnails...
 	$request = $smcFunc['db_query']('', '
@@ -1841,15 +1903,17 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Update the thumbnail too...
-		if (!empty($row['id_thumb']))
-			$attachments[] = $row['id_thumb'];
+		if (!empty($row['id_thumb'])) {
+					$attachments[] = $row['id_thumb'];
+		}
 
 		$attachments[] = $row['id_attach'];
 	}
 	$smcFunc['db_free_result']($request);
 
-	if (empty($attachments))
-		return 0;
+	if (empty($attachments)) {
+			return 0;
+	}
 
 	// Approving an attachment is not hard - it's easy.
 	$smcFunc['db_query']('', '
@@ -1875,14 +1939,15 @@ 
 		)
 	);
 
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		logAction(
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			logAction(
 			'approve_attach',
 			array(
 				'message' => $row['id_msg'],
 				'filename' => preg_replace('~&amp;#(\\d{1,7}|x[0-9a-fA-F]{1,6});~', '&#\\1;', $smcFunc['htmlspecialchars']($row['filename'])),
 			)
 		);
+	}
 	$smcFunc['db_free_result']($request);
 
 	// Remove from the approval queue.
@@ -1905,11 +1970,11 @@ 
 	global $modSettings, $scripturl, $context, $txt, $sourcedir, $boarddir, $smcFunc, $settings;
 
 	// Since this needs to be done eventually.
-	if (!isset($modSettings['attachment_basedirectories']))
-		$modSettings['attachment_basedirectories'] = array();
-
-	elseif (!is_array($modSettings['attachment_basedirectories']))
-		$modSettings['attachment_basedirectories'] = $smcFunc['json_decode']($modSettings['attachment_basedirectories'], true);
+	if (!isset($modSettings['attachment_basedirectories'])) {
+			$modSettings['attachment_basedirectories'] = array();
+	} elseif (!is_array($modSettings['attachment_basedirectories'])) {
+			$modSettings['attachment_basedirectories'] = $smcFunc['json_decode']($modSettings['attachment_basedirectories'], true);
+	}
 
 	$errors = array();
 
@@ -1924,8 +1989,9 @@ 
 		{
 			$error = '';
 			$id = (int) $id;
-			if ($id < 1)
-				continue;
+			if ($id < 1) {
+							continue;
+			}
 
 			// Sorry, these dirs are NOT valid
 			$invalid_dirs = array($boarddir, $settings['default_theme_dir'], $sourcedir);
@@ -1944,8 +2010,7 @@ 
 				{
 						$errors[] = $path . ': ' . $txt['attach_dir_duplicate_msg'];
 						continue;
-				}
-				elseif (empty($path))
+				} elseif (empty($path))
 				{
 					// Ignore this and set $id to one less
 					continue;
@@ -1953,10 +2018,11 @@ 
 
 				// OK, so let's try to create it then.
 				require_once($sourcedir . '/Subs-Attachments.php');
-				if (automanage_attachments_create_directory($path))
-					$_POST['current_dir'] = $modSettings['currentAttachmentUploadDir'];
-				else
-					$errors[] = $path . ': ' . $txt[$context['dir_creation_error']];
+				if (automanage_attachments_create_directory($path)) {
+									$_POST['current_dir'] = $modSettings['currentAttachmentUploadDir'];
+				} else {
+									$errors[] = $path . ': ' . $txt[$context['dir_creation_error']];
+				}
 			}
 
 			// Changing a directory name?
@@ -1969,8 +2035,7 @@ 
 						$errors[] = $path . ': ' . $txt['attach_dir_no_rename'];
 						$path = $modSettings['attachmentUploadDir'][$id];
 					}
-				}
-				else
+				} else
 				{
 					$errors[] = $path . ': ' . $txt['attach_dir_exists_msg'];
 					$path = $modSettings['attachmentUploadDir'][$id];
@@ -1995,12 +2060,13 @@ 
 				$path = $modSettings['attachmentUploadDir'][$id];
 
 				// It's not a good idea to delete the current directory.
-				if ($id == (!empty($_POST['current_dir']) ? $_POST['current_dir'] : $modSettings['currentAttachmentUploadDir']))
-					$errors[] = $path . ': ' . $txt['attach_dir_is_current'];
+				if ($id == (!empty($_POST['current_dir']) ? $_POST['current_dir'] : $modSettings['currentAttachmentUploadDir'])) {
+									$errors[] = $path . ': ' . $txt['attach_dir_is_current'];
+				}
 				// Or the current base directory
-				elseif (!empty($modSettings['basedirectory_for_attachments']) && $modSettings['basedirectory_for_attachments'] == $modSettings['attachmentUploadDir'][$id])
-					$errors[] = $path . ': ' . $txt['attach_dir_is_current_bd'];
-				else
+				elseif (!empty($modSettings['basedirectory_for_attachments']) && $modSettings['basedirectory_for_attachments'] == $modSettings['attachmentUploadDir'][$id]) {
+									$errors[] = $path . ': ' . $txt['attach_dir_is_current_bd'];
+				} else
 				{
 					// Let's not try to delete a path with files in it.
 					$request = $smcFunc['db_query']('', '
@@ -2019,17 +2085,18 @@ 
 					if (!empty($modSettings['attachment_basedirectories']))
 					{
 						// Count any sub-folders.
-						foreach ($modSettings['attachmentUploadDir'] as $sub)
-							if (strpos($sub, $path . DIRECTORY_SEPARATOR) !== false)
+						foreach ($modSettings['attachmentUploadDir'] as $sub) {
+													if (strpos($sub, $path . DIRECTORY_SEPARATOR) !== false)
 								$num_attach++;
+						}
 					}
 
 					// It's safe to delete. So try to delete the folder also
 					if ($num_attach == 0)
 					{
-						if (is_dir($path))
-							$doit = true;
-						elseif (is_dir($boarddir . DIRECTORY_SEPARATOR . $path))
+						if (is_dir($path)) {
+													$doit = true;
+						} elseif (is_dir($boarddir . DIRECTORY_SEPARATOR . $path))
 						{
 							$doit = true;
 							$path = $boarddir . DIRECTORY_SEPARATOR . $path;
@@ -2039,8 +2106,9 @@ 
 						{
 							unlink($path . '/.htaccess');
 							unlink($path . '/index.php');
-							if (!@rmdir($path))
-								$error = $path . ': ' . $txt['attach_dir_no_delete'];
+							if (!@rmdir($path)) {
+															$error = $path . ': ' . $txt['attach_dir_no_delete'];
+							}
 						}
 
 						// Remove it from the base directory list.
@@ -2050,14 +2118,15 @@ 
 							updateSettings(array('attachment_basedirectories' => $smcFunc['json_encode']($modSettings['attachment_basedirectories'])));
 							$modSettings['attachment_basedirectories'] = $smcFunc['json_decode']($modSettings['attachment_basedirectories'], true);
 						}
+					} else {
+											$error = $path . ': ' . $txt['attach_dir_no_remove'];
 					}
-					else
-						$error = $path . ': ' . $txt['attach_dir_no_remove'];
 
-					if (empty($error))
-						continue;
-					else
-						$errors[] = $error;
+					if (empty($error)) {
+											continue;
+					} else {
+											$errors[] = $error;
+					}
 				}
 			}
 
@@ -2065,23 +2134,26 @@ 
 		}
 
 		// We need to make sure the current directory is right.
-		if (empty($_POST['current_dir']) && !empty($modSettings['currentAttachmentUploadDir']))
-			$_POST['current_dir'] = $modSettings['currentAttachmentUploadDir'];
+		if (empty($_POST['current_dir']) && !empty($modSettings['currentAttachmentUploadDir'])) {
+					$_POST['current_dir'] = $modSettings['currentAttachmentUploadDir'];
+		}
 
 		// Find the current directory if there's no value carried,
 		if (empty($_POST['current_dir']) || empty($new_dirs[$_POST['current_dir']]))
 		{
-			if (array_key_exists($modSettings['currentAttachmentUploadDir'], $modSettings['attachmentUploadDir']))
-				$_POST['current_dir'] = $modSettings['currentAttachmentUploadDir'];
-			else
-				$_POST['current_dir'] = max(array_keys($modSettings['attachmentUploadDir']));
+			if (array_key_exists($modSettings['currentAttachmentUploadDir'], $modSettings['attachmentUploadDir'])) {
+							$_POST['current_dir'] = $modSettings['currentAttachmentUploadDir'];
+			} else {
+							$_POST['current_dir'] = max(array_keys($modSettings['attachmentUploadDir']));
+			}
 		}
 
 		// If the user wishes to go back, update the last_dir array
 		if ($_POST['current_dir'] != $modSettings['currentAttachmentUploadDir'] && !empty($modSettings['last_attachments_directory']) && (isset($modSettings['last_attachments_directory'][$_POST['current_dir']]) || isset($modSettings['last_attachments_directory'][0])))
 		{
-			if (!is_array($modSettings['last_attachments_directory']))
-				$modSettings['last_attachments_directory'] = $smcFunc['json_decode']($modSettings['last_attachments_directory'], true);
+			if (!is_array($modSettings['last_attachments_directory'])) {
+							$modSettings['last_attachments_directory'] = $smcFunc['json_decode']($modSettings['last_attachments_directory'], true);
+			}
 			$num = substr(strrchr($modSettings['attachmentUploadDir'][$_POST['current_dir']], '_'), 1);
 
 			if (is_numeric($num))
@@ -2089,16 +2161,18 @@ 
 				// Need to find the base folder.
 				$bid = -1;
 				$use_subdirectories_for_attachments = 0;
-				if (!empty($modSettings['attachment_basedirectories']))
-					foreach ($modSettings['attachment_basedirectories'] as $bid => $base)
+				if (!empty($modSettings['attachment_basedirectories'])) {
+									foreach ($modSettings['attachment_basedirectories'] as $bid => $base)
 						if (strpos($modSettings['attachmentUploadDir'][$_POST['current_dir']], $base . DIRECTORY_SEPARATOR) !== false)
 						{
 							$use_subdirectories_for_attachments = 1;
+				}
 							break;
 						}
 
-				if ($use_subdirectories_for_attachments == 0 && strpos($modSettings['attachmentUploadDir'][$_POST['current_dir']], $boarddir . DIRECTORY_SEPARATOR) !== false)
-					$bid = 0;
+				if ($use_subdirectories_for_attachments == 0 && strpos($modSettings['attachmentUploadDir'][$_POST['current_dir']], $boarddir . DIRECTORY_SEPARATOR) !== false) {
+									$bid = 0;
+				}
 
 				$modSettings['last_attachments_directory'][$bid] = (int) $num;
 				$modSettings['basedirectory_for_attachments'] = !empty($modSettings['basedirectory_for_attachments']) ? $modSettings['basedirectory_for_attachments'] : '';
@@ -2117,8 +2191,8 @@ 
 			// We might need to reset the paths. This loop will just loop through once.
 			foreach ($new_dirs as $id => $dir)
 			{
-				if ($id != 1)
-					$smcFunc['db_query']('', '
+				if ($id != 1) {
+									$smcFunc['db_query']('', '
 						UPDATE {db_prefix}attachments
 						SET id_folder = {int:default_folder}
 						WHERE id_folder = {int:current_folder}',
@@ -2127,14 +2201,14 @@ 
 							'current_folder' => $id,
 						)
 					);
+				}
 
 				$update = array(
 					'currentAttachmentUploadDir' => 1,
 					'attachmentUploadDir' => $smcFunc['json_encode'](array(1 => $dir)),
 				);
 			}
-		}
-		else
+		} else
 		{
 			// Save it to the database.
 			$update = array(
@@ -2143,11 +2217,13 @@ 
 			);
 		}
 
-		if (!empty($update))
-			updateSettings($update);
+		if (!empty($update)) {
+					updateSettings($update);
+		}
 
-		if (!empty($errors))
-			$_SESSION['errors']['dir'] = $errors;
+		if (!empty($errors)) {
+					$_SESSION['errors']['dir'] = $errors;
+		}
 
 		redirectexit('action=admin;area=manageattachments;sa=attachpaths;' . $context['session_var'] . '=' . $context['session_id']);
 	}
@@ -2161,10 +2237,11 @@ 
 		$_POST['current_base_dir'] = isset($_POST['current_base_dir']) ? (int) $_POST['current_base_dir'] : 1;
 		if (empty($_POST['new_base_dir']) && !empty($_POST['current_base_dir']))
 		{
-			if ($modSettings['basedirectory_for_attachments'] != $modSettings['attachmentUploadDir'][$_POST['current_base_dir']])
-				$update = (array(
+			if ($modSettings['basedirectory_for_attachments'] != $modSettings['attachmentUploadDir'][$_POST['current_base_dir']]) {
+							$update = (array(
 					'basedirectory_for_attachments' => $modSettings['attachmentUploadDir'][$_POST['current_base_dir']],
 				));
+			}
 		}
 
 		if (isset($_POST['base_dir']))
@@ -2212,13 +2289,15 @@ 
 
 			if (!in_array($_POST['new_base_dir'], $modSettings['attachmentUploadDir']))
 			{
-				if (!automanage_attachments_create_directory($_POST['new_base_dir']))
-					$errors[] = $_POST['new_base_dir'] . ': ' . $txt['attach_dir_base_no_create'];
+				if (!automanage_attachments_create_directory($_POST['new_base_dir'])) {
+									$errors[] = $_POST['new_base_dir'] . ': ' . $txt['attach_dir_base_no_create'];
+				}
 			}
 
 			$modSettings['currentAttachmentUploadDir'] = array_search($_POST['new_base_dir'], $modSettings['attachmentUploadDir']);
-			if (!in_array($_POST['new_base_dir'], $modSettings['attachment_basedirectories']))
-				$modSettings['attachment_basedirectories'][$modSettings['currentAttachmentUploadDir']] = $_POST['new_base_dir'];
+			if (!in_array($_POST['new_base_dir'], $modSettings['attachment_basedirectories'])) {
+							$modSettings['attachment_basedirectories'][$modSettings['currentAttachmentUploadDir']] = $_POST['new_base_dir'];
+			}
 			ksort($modSettings['attachment_basedirectories']);
 
 			$update = (array(
@@ -2228,11 +2307,13 @@ 
 			));
 		}
 
-		if (!empty($errors))
-			$_SESSION['errors']['base'] = $errors;
+		if (!empty($errors)) {
+					$_SESSION['errors']['base'] = $errors;
+		}
 
-		if (!empty($update))
-			updateSettings($update);
+		if (!empty($update)) {
+					updateSettings($update);
+		}
 
 		redirectexit('action=admin;area=manageattachments;sa=attachpaths;' . $context['session_var'] . '=' . $context['session_id']);
 	}
@@ -2242,13 +2323,15 @@ 
 		if (is_array($_SESSION['errors']))
 		{
 			$errors = array();
-			if (!empty($_SESSION['errors']['dir']))
-				foreach ($_SESSION['errors']['dir'] as $error)
+			if (!empty($_SESSION['errors']['dir'])) {
+							foreach ($_SESSION['errors']['dir'] as $error)
 					$errors['dir'][] = $smcFunc['htmlspecialchars']($error, ENT_QUOTES);
+			}
 
-			if (!empty($_SESSION['errors']['base']))
-				foreach ($_SESSION['errors']['base'] as $error)
+			if (!empty($_SESSION['errors']['base'])) {
+							foreach ($_SESSION['errors']['base'] as $error)
 					$errors['base'][] = $smcFunc['htmlspecialchars']($error, ENT_QUOTES);
+			}
 		}
 		unset($_SESSION['errors']);
 	}
@@ -2458,8 +2541,9 @@ 
 	foreach ($modSettings['attachmentUploadDir'] as $id => $dir)
 	{
 		// If there aren't any attachments in this directory this won't exist.
-		if (!isset($expected_files[$id]))
-			$expected_files[$id] = 0;
+		if (!isset($expected_files[$id])) {
+					$expected_files[$id] = 0;
+		}
 
 		// Check if the directory is doing okay.
 		list ($status, $error, $files) = attachDirStatus($dir, $expected_files[$id]);
@@ -2472,10 +2556,11 @@ 
 			$is_base_dir = in_array($dir, $modSettings['attachment_basedirectories']);
 
 			// Count any sub-folders.
-			foreach ($modSettings['attachmentUploadDir'] as $sid => $sub)
-				if (strpos($sub, $dir . DIRECTORY_SEPARATOR) !== false)
+			foreach ($modSettings['attachmentUploadDir'] as $sid => $sub) {
+							if (strpos($sub, $dir . DIRECTORY_SEPARATOR) !== false)
 				{
 					$expected_files[$id]++;
+			}
 					$sub_dirs++;
 				}
 		}
@@ -2493,8 +2578,8 @@ 
 	}
 
 	// Just stick a new directory on at the bottom.
-	if (isset($_REQUEST['new_path']))
-		$attachdirs[] = array(
+	if (isset($_REQUEST['new_path'])) {
+			$attachdirs[] = array(
 			'id' => max(array_merge(array_keys($expected_files), array_keys($modSettings['attachmentUploadDir']))) + 1,
 			'current' => false,
 			'path' => '',
@@ -2502,6 +2587,7 @@ 
 			'num_files' => '',
 			'status' => '',
 		);
+	}
 
 	return $attachdirs;
 }
@@ -2514,8 +2600,9 @@ 
 {
 	global $modSettings, $txt;
 
-	if (empty($modSettings['attachment_basedirectories']))
-		return;
+	if (empty($modSettings['attachment_basedirectories'])) {
+			return;
+	}
 
 	$basedirs = array();
 	// Get a list of the base directories.
@@ -2523,16 +2610,18 @@ 
 	{
 		// Loop through the attach directory array to count any sub-directories
 		$expected_dirs = 0;
-		foreach ($modSettings['attachmentUploadDir'] as $sid => $sub)
-			if (strpos($sub, $dir . DIRECTORY_SEPARATOR) !== false)
+		foreach ($modSettings['attachmentUploadDir'] as $sid => $sub) {
+					if (strpos($sub, $dir . DIRECTORY_SEPARATOR) !== false)
 				$expected_dirs++;
+		}
 
-		if (!is_dir($dir))
-			$status = 'does_not_exist';
-		elseif (!is_writeable($dir))
-			$status = 'not_writable';
-		else
-			$status = 'ok';
+		if (!is_dir($dir)) {
+					$status = 'does_not_exist';
+		} elseif (!is_writeable($dir)) {
+					$status = 'not_writable';
+		} else {
+					$status = 'ok';
+		}
 
 		$basedirs[] = array(
 			'id' => $id,
@@ -2543,14 +2632,15 @@ 
 		);
 	}
 
-	if (isset($_REQUEST['new_base_path']))
-		$basedirs[] = array(
+	if (isset($_REQUEST['new_base_path'])) {
+			$basedirs[] = array(
 			'id' => '',
 			'current' => false,
 			'path' => '<input type="text" name="new_base_dir" value="" size="40">',
 			'num_dirs' => '',
 			'status' => '',
 		);
+	}
 
 	return $basedirs;
 }
@@ -2566,10 +2656,11 @@ 
  */
 function attachDirStatus($dir, $expected_files)
 {
-	if (!is_dir($dir))
-		return array('does_not_exist', true, '');
-	elseif (!is_writable($dir))
-		return array('not_writable', true, '');
+	if (!is_dir($dir)) {
+			return array('does_not_exist', true, '');
+	} elseif (!is_writable($dir)) {
+			return array('not_writable', true, '');
+	}
 
 	// Everything is okay so far, start to scan through the directory.
 	$num_files = 0;
@@ -2577,22 +2668,26 @@ 
 	while ($file = $dir_handle->read())
 	{
 		// Now do we have a real file here?
-		if (in_array($file, array('.', '..', '.htaccess', 'index.php')))
-			continue;
+		if (in_array($file, array('.', '..', '.htaccess', 'index.php'))) {
+					continue;
+		}
 
 		$num_files++;
 	}
 	$dir_handle->close();
 
-	if ($num_files < $expected_files)
-		return array('files_missing', true, $num_files);
+	if ($num_files < $expected_files) {
+			return array('files_missing', true, $num_files);
+	}
 	// Empty?
-	elseif ($expected_files == 0)
-		return array('unused', false, $num_files);
+	elseif ($expected_files == 0) {
+			return array('unused', false, $num_files);
+	}
 	// All good!
-	else
-		return array('ok', false, $num_files);
-}
+	else {
+			return array('ok', false, $num_files);
+	}
+	}
 
 /**
  * Maintance function to move attachments from one directory to another
@@ -2604,10 +2699,11 @@ 
 	checkSession();
 
 	$modSettings['attachmentUploadDir'] = $smcFunc['json_decode']($modSettings['attachmentUploadDir'], true);
-	if (!empty($modSettings['attachment_basedirectories']))
-		$modSettings['attachment_basedirectories'] = $smcFunc['json_decode']($modSettings['attachment_basedirectories'], true);
-	else
-		$modSettings['basedirectory_for_attachments'] = array();
+	if (!empty($modSettings['attachment_basedirectories'])) {
+			$modSettings['attachment_basedirectories'] = $smcFunc['json_decode']($modSettings['attachment_basedirectories'], true);
+	} else {
+			$modSettings['basedirectory_for_attachments'] = array();
+	}
 
 	$_POST['from'] = (int) $_POST['from'];
 	$_POST['auto'] = !empty($_POST['auto']) ? (int) $_POST['auto'] : 0;
@@ -2621,11 +2717,13 @@ 
 	$total_moved = 0;
 	$total_not_moved = 0;
 
-	if (empty($_POST['from']) || (empty($_POST['auto']) && empty($_POST['to'])))
-		$results[] = $txt['attachment_transfer_no_dir'];
+	if (empty($_POST['from']) || (empty($_POST['auto']) && empty($_POST['to']))) {
+			$results[] = $txt['attachment_transfer_no_dir'];
+	}
 
-	if ($_POST['from'] == $_POST['to'])
-		$results[] = $txt['attachment_transfer_same_dir'];
+	if ($_POST['from'] == $_POST['to']) {
+			$results[] = $txt['attachment_transfer_same_dir'];
+	}
 
 	if (empty($results))
 	{
@@ -2644,8 +2742,9 @@ 
 		$smcFunc['db_free_result']($request);
 		$total_progress -= $start;
 
-		if ($total_progress < 1)
-			$results[] = $txt['attachment_transfer_no_find'];
+		if ($total_progress < 1) {
+					$results[] = $txt['attachment_transfer_no_find'];
+		}
 	}
 
 	if (empty($results))
@@ -2661,9 +2760,9 @@ 
 
 			automanage_attachments_check_directory();
 			$new_dir = $modSettings['currentAttachmentUploadDir'];
+		} else {
+					$new_dir = $_POST['to'];
 		}
-		else
-			$new_dir = $_POST['to'];
 
 		$modSettings['currentAttachmentUploadDir'] = $new_dir;
 
@@ -2671,8 +2770,9 @@ 
 		while ($break == false)
 		{
 			@set_time_limit(300);
-			if (function_exists('apache_reset_timeout'))
-				@apache_reset_timeout();
+			if (function_exists('apache_reset_timeout')) {
+							@apache_reset_timeout();
+			}
 
 			// If limits are set, get the file count and size for the destination folder
 			if ($dir_files <= 0 && (!empty($modSettings['attachmentDirSizeLimit']) || !empty($modSettings['attachmentDirFileLimit'])))
@@ -2708,13 +2808,15 @@ 
 
 			if ($smcFunc['db_num_rows']($request) === 0)
 			{
-				if (empty($current_progress))
-					$results[] = $txt['attachment_transfer_no_find'];
+				if (empty($current_progress)) {
+									$results[] = $txt['attachment_transfer_no_find'];
+				}
 				break;
 			}
 
-			if ($smcFunc['db_num_rows']($request) < $limit)
-				$break = true;
+			if ($smcFunc['db_num_rows']($request) < $limit) {
+							$break = true;
+			}
 
 			// Move them
 			$moved = array();
@@ -2738,8 +2840,9 @@ 
 							automanage_attachments_by_space();
 
 							$results[] = sprintf($txt['attachments_transferred'], $total_moved, $modSettings['attachmentUploadDir'][$new_dir]);
-							if (!empty($total_not_moved))
-								$results[] = sprintf($txt['attachments_not_transferred'], $total_not_moved);
+							if (!empty($total_not_moved)) {
+															$results[] = sprintf($txt['attachments_not_transferred'], $total_not_moved);
+							}
 
 							$dir_files = 0;
 							$total_moved = 0;
@@ -2747,8 +2850,7 @@ 
 
 							$break = false;
 							break;
-						}
-						else
+						} else
 						{
 							// Hmm, not in auto. Time to bail out then...
 							$results[] = $txt['attachment_transfer_no_room'];
@@ -2763,9 +2865,9 @@ 
 					$total_moved++;
 					$current_progress++;
 					$moved[] = $row['id_attach'];
+				} else {
+									$total_not_moved++;
 				}
-				else
-					$total_not_moved++;
 			}
 			$smcFunc['db_free_result']($request);
 
@@ -2803,13 +2905,15 @@ 
 		}
 
 		$results[] = sprintf($txt['attachments_transferred'], $total_moved, $modSettings['attachmentUploadDir'][$new_dir]);
-		if (!empty($total_not_moved))
-			$results[] = sprintf($txt['attachments_not_transferred'], $total_not_moved);
+		if (!empty($total_not_moved)) {
+					$results[] = sprintf($txt['attachments_not_transferred'], $total_not_moved);
+		}
 	}
 
 	$_SESSION['results'] = $results;
-	if (file_exists($boarddir . '/progress.php'))
-		unlink($boarddir . '/progress.php');
+	if (file_exists($boarddir . '/progress.php')) {
+			unlink($boarddir . '/progress.php');
+	}
 
 	redirectexit('action=admin;area=manageattachments;sa=maintenance#transfer');
 }

Sources/CacheAPI-sqlite.php

Doc Comments +1 added lines, -1 removed lines

@@ -143,7 +143,7 @@
 	 *
 	 * @param string $dir A valid path
 	 *
-	 * @return boolean If this was successful or not.
+	 * @return boolean|null If this was successful or not.
 	 */
 	public function setCachedir($dir = null)
 	{

Spacing +4 added lines, -4 removed lines

@@ -108,14 +108,14 @@ 
 	 */
 	public function cleanCache($type = '')
 	{
-		if($type == 'expired')
-			$query = 'DELETE FROM cache WHERE ttl >= ' . time().';';
+		if ($type == 'expired')
+			$query = 'DELETE FROM cache WHERE ttl >= ' . time() . ';';
 		else
 			$query = 'DELETE FROM cache;';
 
 		$result = $this->cacheDB->exec($query);
 		
-		$query	= 'VACUUM;';
+		$query = 'VACUUM;';
 		$this->cacheDB->exec($query);
 
 		return $result;
@@ -156,7 +156,7 @@ 
 
 		// If its invalid, use SMF's.
 		if (is_null($dir) || !is_writable($dir))
-			if(is_null($cachedir_sqlite) || !is_writable($cachedir_sqlite))
+			if (is_null($cachedir_sqlite) || !is_writable($cachedir_sqlite))
 				$this->cachedir = $cachedir;
 			else
 				$this->cachedir = $cachedir_sqlite;

Braces +24 added lines, -17 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('Hacking attempt...');
+}
 
 /**
  * SQLite Cache API class
@@ -68,8 +69,9 @@ 
 	{
 		$supported = class_exists("SQLite3") && is_writable($this->cachedir);
 
-		if ($test)
-			return $supported;
+		if ($test) {
+					return $supported;
+		}
 
 		return parent::isSupported() && $supported;
 	}
@@ -84,8 +86,9 @@ 
 		$result = $this->cacheDB->query($query);
 
 		$value = null;
-		while ($res = $result->fetchArray(SQLITE3_ASSOC))
-			$value = $res['value'];
+		while ($res = $result->fetchArray(SQLITE3_ASSOC)) {
+					$value = $res['value'];
+		}
 
 		return !empty($value) ? $value : null;
 	}
@@ -108,10 +111,11 @@ 
 	 */
 	public function cleanCache($type = '')
 	{
-		if($type == 'expired')
-			$query = 'DELETE FROM cache WHERE ttl >= ' . time().';';
-		else
-			$query = 'DELETE FROM cache;';
+		if($type == 'expired') {
+					$query = 'DELETE FROM cache WHERE ttl >= ' . time().';';
+		} else {
+					$query = 'DELETE FROM cache;';
+		}
 
 		$result = $this->cacheDB->exec($query);
 		
@@ -131,8 +135,9 @@ 
 		$config_vars[] = $txt['cache_sqlite_settings'];
 		$config_vars[] = array('cachedir_sqlite', $txt['cachedir_sqlite'], 'file', 'text', 36, 'cache_sqlite_cachedir');
 
-		if (!isset($context['settings_post_javascript']))
-			$context['settings_post_javascript'] = '';
+		if (!isset($context['settings_post_javascript'])) {
+					$context['settings_post_javascript'] = '';
+		}
 
 		$context['settings_post_javascript'] .= '
 			$("#cache_accelerator").change(function (e) {
@@ -155,13 +160,15 @@ 
 		global $cachedir, $cachedir_sqlite;
 
 		// If its invalid, use SMF's.
-		if (is_null($dir) || !is_writable($dir))
-			if(is_null($cachedir_sqlite) || !is_writable($cachedir_sqlite))
+		if (is_null($dir) || !is_writable($dir)) {
+					if(is_null($cachedir_sqlite) || !is_writable($cachedir_sqlite))
 				$this->cachedir = $cachedir;
-			else
-				$this->cachedir = $cachedir_sqlite;
-		else
-			$this->cachedir = $dir;
+		} else {
+							$this->cachedir = $cachedir_sqlite;
+			}
+		else {
+					$this->cachedir = $dir;
+		}
 	}
 
 	/**

Sources/DbPackages-postgresql.php

Doc Comments +1 added lines, -1 removed lines

@@ -382,7 +382,7 @@
  * @param array $parameters Not used?
  * @param string $if_exists What to do if the index exists. If 'update', the definition will be updated.
  * @param string $error
- * @return boolean Whether or not the operation was successful
+ * @return false|null Whether or not the operation was successful
  */
 function smf_db_add_index($table_name, $index_info, $parameters = array(), $if_exists = 'update', $error = 'fatal')
 {

Spacing +8 added lines, -8 removed lines

@@ -122,11 +122,11 @@ 
 			$smcFunc['db_drop_table']($table_name);
 		else if ($if_exists == 'update')
 		{
-			$smcFunc['db_drop_table']($table_name.'_old');
+			$smcFunc['db_drop_table']($table_name . '_old');
 			$smcFunc['db_transaction']('begin');
 			$db_trans = true;
-			$smcFunc['db_query']('','
-				ALTER TABLE '. $table_name .' RENAME TO ' . $table_name . '_old',
+			$smcFunc['db_query']('', '
+				ALTER TABLE '. $table_name . ' RENAME TO ' . $table_name . '_old',
 				array(
 					'security_override' => true,
 				)
@@ -213,15 +213,15 @@ 
 	{
 		$same_col = array();
 
-		$request = $smcFunc['db_query']('','
+		$request = $smcFunc['db_query']('', '
 			SELECT count(*), column_name
 			FROM information_schema.columns
 			WHERE table_name in ({string:table1},{string:table2}) AND table_schema = {string:schema}
 			GROUP BY column_name
 			HAVING count(*) > 1',
-			array (
+			array(
 				'table1' => $table_name,
-				'table2' => $table_name.'_old',
+				'table2' => $table_name . '_old',
 				'schema' => 'public',
 			)
 		);
@@ -231,8 +231,8 @@ 
 			$same_col[] = $row['column_name'];
 		}
 
-		$smcFunc['db_query']('','
-			INSERT INTO ' . $table_name .'('
+		$smcFunc['db_query']('', '
+			INSERT INTO ' . $table_name . '('
 			. implode($same_col, ',') .
 			')
 			SELECT '. implode($same_col, ',') . '

Braces +122 added lines, -95 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Add the file functions to the $smcFunc array.
@@ -53,8 +54,9 @@ 
 		'messages', 'moderator_groups', 'moderators', 'package_servers', 'permission_profiles', 'permissions', 'personal_messages',
 		'pm_labeled_messages', 'pm_labels', 'pm_recipients', 'pm_rules', 'poll_choices', 'polls', 'scheduled_tasks', 'sessions', 'settings', 'smileys',
 		'spiders', 'subscriptions', 'themes', 'topics', 'user_alerts', 'user_alerts_prefs', 'user_drafts', 'user_likes');
-	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');
@@ -107,8 +109,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);
@@ -118,9 +121,9 @@ 
 	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 if ($if_exists == 'update')
+		if ($if_exists == 'overwrite') {
+					$smcFunc['db_drop_table']($table_name);
+		} else if ($if_exists == 'update')
 		{
 			$smcFunc['db_drop_table']($table_name.'_old');
 			$smcFunc['db_transaction']('begin');
@@ -132,47 +135,51 @@ 
 				)
 			);
 			$old_table_exists = true;
+		} else {
+					return $if_exists == 'ignore';
 		}
-		else
-			return $if_exists == 'ignore';
 	}
 
 	// If we've got this far - good news - no table exists. We can build our own!
-	if (!$db_trans)
-		$smcFunc['db_transaction']('begin');
+	if (!$db_trans) {
+			$smcFunc['db_transaction']('begin');
+	}
 	$table_query = 'CREATE TABLE ' . $table_name . "\n" . '(';
 	foreach ($columns as $column)
 	{
 		// If we have an auto increment do it!
 		if (!empty($column['auto']))
 		{
-			if (!$old_table_exists)
-				$smcFunc['db_query']('', '
+			if (!$old_table_exists) {
+							$smcFunc['db_query']('', '
 					DROP SEQUENCE IF EXISTS ' . $table_name . '_seq',
 					array(
 						'security_override' => true,
 					)
 				);
+			}
 
-			if (!$old_table_exists)
-				$smcFunc['db_query']('', '
+			if (!$old_table_exists) {
+							$smcFunc['db_query']('', '
 					CREATE SEQUENCE ' . $table_name . '_seq',
 					array(
 						'security_override' => true,
 					)
 				);
+			}
 			$default = 'default nextval(\'' . $table_name . '_seq\')';
+		} 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...
 		$column['size'] = isset($column['size']) && is_numeric($column['size']) ? $column['size'] : null;
 		list ($type, $size) = $smcFunc['db_calculate_type']($column['type'], $column['size']);
-		if ($size !== null)
-			$type = $type . '(' . $size . ')';
+		if ($size !== null) {
+					$type = $type . '(' . $size . ')';
+		}
 
 		// Now just put it together!
 		$table_query .= "\n\t\"" . $column['name'] . '" ' . $type . ' ' . (!empty($column['null']) ? '' : 'NOT NULL') . ' ' . $default . ',';
@@ -185,19 +192,21 @@ 
 		$columns = implode(',', $index['columns']);
 
 		// Primary goes in the table...
-		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']);
+			}
 			$index_queries[] = 'CREATE ' . (isset($index['type']) && $index['type'] == 'unique' ? 'UNIQUE' : '') . ' INDEX ' . $table_name . '_' . $index['name'] . ' ON ' . $table_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);
+	}
 
 	$table_query .= ')';
 
@@ -242,18 +251,20 @@ 
 	}
 
 	// And the indexes...
-	foreach ($index_queries as $query)
-		$smcFunc['db_query']('', $query,
+	foreach ($index_queries as $query) {
+			$smcFunc['db_query']('', $query,
 		array(
 			'security_override' => true,
 		)
 	);
+	}
 
 	// Go, go power rangers!
 	$smcFunc['db_transaction']('commit');
 
-	if ($old_table_exists)
-		$smcFunc['db_drop_table']($table_name . '_old');
+	if ($old_table_exists) {
+			$smcFunc['db_drop_table']($table_name . '_old');
+	}
 
 	return true;
 }
@@ -278,8 +289,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']()))
@@ -337,21 +349,24 @@ 
 
 	// 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...
 	$column_info['size'] = isset($column_info['size']) && is_numeric($column_info['size']) ? $column_info['size'] : null;
 	list ($type, $size) = $smcFunc['db_calculate_type']($column_info['type'], $column_info['size']);
-	if ($size !== null)
-		$type = $type . '(' . $size . ')';
+	if ($size !== null) {
+			$type = $type . '(' . $size . ')';
+	}
 
 	// Now add the thing!
 	$query = '
@@ -366,11 +381,12 @@ 
 	// If there's more attributes they need to be done via a change on PostgreSQL.
 	unset($column_info['type'], $column_info['size']);
 
-	if (count($column_info) != 1)
-		return $smcFunc['db_change_column']($table_name, $column_info['name'], $column_info);
-	else
-		return true;
-}
+	if (count($column_info) != 1) {
+			return $smcFunc['db_change_column']($table_name, $column_info['name'], $column_info);
+	} else {
+			return true;
+	}
+	}
 
 /**
  * Removes a column.
@@ -389,8 +405,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)
 		{
 			// If there is an auto we need remove it!
 			if ($column['auto'])
@@ -400,6 +416,7 @@ 
 						'security_override' => true,
 					)
 				);
+	}
 
 			$smcFunc['db_query']('', '
 				ALTER TABLE ' . $table_name . '
@@ -433,13 +450,15 @@ 
 	// 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;
+	}
 
 	// Now we check each bit individually and ALTER as required.
 	if (isset($column_info['name']) && $column_info['name'] != $old_column)
@@ -496,8 +515,9 @@ 
 	{
 		$column_info['size'] = isset($column_info['size']) && is_numeric($column_info['size']) ? $column_info['size'] : null;
 		list ($type, $size) = $smcFunc['db_calculate_type']($column_info['type'], $column_info['size']);
-		if ($size !== null)
-			$type = $type . '(' . $size . ')';
+		if ($size !== null) {
+					$type = $type . '(' . $size . ')';
+		}
 
 		// The alter is a pain.
 		$smcFunc['db_transaction']('begin');
@@ -598,21 +618,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'] = $table_name . implode('_', $index_info['columns']);
+		if (isset($index_info['type']) && $index_info['type'] == 'primary') {
+					$index_info['name'] = '';
+		} else {
+					$index_info['name'] = $table_name . implode('_', $index_info['columns']);
+		}
+	} else {
+			$index_info['name'] = $table_name . $index_info['name'];
 	}
-	else
-		$index_info['name'] = $table_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']);
@@ -625,10 +647,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']);
+			}
 		}
 	}
 
@@ -642,8 +665,7 @@ 
 				'security_override' => true,
 			)
 		);
-	}
-	else
+	} else
 	{
 		$smcFunc['db_query']('', '
 			CREATE ' . (isset($index_info['type']) && $index_info['type'] == 'unique' ? 'UNIQUE' : '') . ' INDEX ' . $index_info['name'] . ' ON ' . $table_name . ' (' . $columns . ')',
@@ -671,8 +693,9 @@ 
 
 	// Better exist!
 	$indexes = $smcFunc['db_list_indexes']($table_name, true);
-	if ($index_name != 'primary')
-		$index_name = $table_name . '_' . $index_name;
+	if ($index_name != 'primary') {
+			$index_name = $table_name . '_' . $index_name;
+	}
 
 	foreach ($indexes as $index)
 	{
@@ -736,8 +759,7 @@ 
 			'datetime' => 'timestamp without time zone',
 			'timestamp' => 'timestamp without time zone',
 		);
-	}
-	else
+	} else
 	{
 		$types = array(
 			'character varying' => 'varchar',
@@ -753,14 +775,16 @@ 
 	// Got it? Change it!
 	if (isset($types[$type_name]))
 	{
-		if ($type_name == 'tinytext')
-			$type_size = 255;
+		if ($type_name == 'tinytext') {
+					$type_size = 255;
+		}
 		$type_name = $types[$type_name];
 	}
 
 	// Only char fields got size
-	if (strpos($type_name, 'char') === false)
-			$type_size = null;
+	if (strpos($type_name, 'char') === false) {
+				$type_size = null;
+	}
 
 
 	return array($type_name, $type_size);
@@ -816,8 +840,7 @@ 
 		if (!$detail)
 		{
 			$columns[] = $row['column_name'];
-		}
-		else
+		} else
 		{
 			$auto = false;
 			// What is the default?
@@ -825,11 +848,11 @@ 
 			{
 				$default = null;
 				$auto = true;
+			} elseif (trim($row['column_default']) != '') {
+							$default = strpos($row['column_default'], '::') === false ? $row['column_default'] : substr($row['column_default'], 0, strpos($row['column_default'], '::'));
+			} else {
+							$default = null;
 			}
-			elseif (trim($row['column_default']) != '')
-				$default = strpos($row['column_default'], '::') === false ? $row['column_default'] : substr($row['column_default'], 0, strpos($row['column_default'], '::'));
-			else
-				$default = null;
 
 			// Make the type generic.
 			list ($type, $size) = $smcFunc['db_calculate_type']($row['data_type'], $row['character_maximum_length'], true);
@@ -880,26 +903,30 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($result))
 	{
 		// Try get the columns that make it up.
-		if (preg_match('~\(([^\)]+?)\)~i', $row['inddef'], $matches) == 0)
-			continue;
+		if (preg_match('~\(([^\)]+?)\)~i', $row['inddef'], $matches) == 0) {
+					continue;
+		}
 
 		$columns = explode(',', $matches[1]);
 
-		if (empty($columns))
-			continue;
+		if (empty($columns)) {
+					continue;
+		}
 
-		foreach ($columns as $k => $v)
-			$columns[$k] = trim($v);
+		foreach ($columns as $k => $v) {
+					$columns[$k] = trim($v);
+		}
 
 		// Fix up the name to be consistent cross databases
-		if (substr($row['name'], -5) == '_pkey' && $row['is_primary'] == 1)
-			$row['name'] = 'PRIMARY';
-		else
-			$row['name'] = str_replace($table_name . '_', '', $row['name']);
+		if (substr($row['name'], -5) == '_pkey' && $row['is_primary'] == 1) {
+					$row['name'] = 'PRIMARY';
+		} else {
+					$row['name'] = str_replace($table_name . '_', '', $row['name']);
+		}
 
-		if (!$detail)
-			$indexes[] = $row['name'];
-		else
+		if (!$detail) {
+					$indexes[] = $row['name'];
+		} else
 		{
 			$indexes[$row['name']] = array(
 				'name' => $row['name'],

Smileys/fugue/index.php

Braces +3 added lines, -2 removed lines

@@ -1,9 +1,10 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
+if (file_exists(dirname(dirname(__FILE__)) . '/index.php')) {
 	include (dirname(dirname(__FILE__)) . '/index.php');
-else
+} else {
 	exit;
+}
 
 ?>
\ No newline at end of file

Themes/default/languages/index.php

Braces +3 added lines, -2 removed lines

@@ -1,9 +1,10 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
+if (file_exists(dirname(dirname(__FILE__)) . '/index.php')) {
 	include (dirname(dirname(__FILE__)) . '/index.php');
-else
+} else {
 	exit;
+}
 
 ?>
\ No newline at end of file