SimpleMachines / SMF2.1

Sources/ReCaptcha/RequestMethod/SocketPost.php

Indentation +82 added lines, -82 removed lines

@@ -36,86 +36,86 @@
  */
 class SocketPost implements RequestMethod
 {
-    /**
-     * reCAPTCHA service host.
-     * @const string
-     */
-    const RECAPTCHA_HOST = 'www.google.com';
-
-    /**
-     * @const string reCAPTCHA service path
-     */
-    const SITE_VERIFY_PATH = '/recaptcha/api/siteverify';
-
-    /**
-     * @const string Bad request error
-     */
-    const BAD_REQUEST = '{"success": false, "error-codes": ["invalid-request"]}';
-
-    /**
-     * @const string Bad response error
-     */
-    const BAD_RESPONSE = '{"success": false, "error-codes": ["invalid-response"]}';
-
-    /**
-     * Socket to the reCAPTCHA service
-     * @var Socket
-     */
-    private $socket;
-
-    /**
-     * Constructor
-     *
-     * @param \ReCaptcha\RequestMethod\Socket $socket optional socket, injectable for testing
-     */
-    public function __construct(Socket $socket = null)
-    {
-        if (!is_null($socket)) {
-            $this->socket = $socket;
-        } else {
-            $this->socket = new Socket();
-        }
-    }
-
-    /**
-     * Submit the POST request with the specified parameters.
-     *
-     * @param RequestParameters $params Request parameters
-     * @return string Body of the reCAPTCHA response
-     */
-    public function submit(RequestParameters $params)
-    {
-        $errno = 0;
-        $errstr = '';
-
-        if (false === $this->socket->fsockopen('ssl://' . self::RECAPTCHA_HOST, 443, $errno, $errstr, 30)) {
-            return self::BAD_REQUEST;
-        }
-
-        $content = $params->toQueryString();
-
-        $request = "POST " . self::SITE_VERIFY_PATH . " HTTP/1.1\r\n";
-        $request .= "Host: " . self::RECAPTCHA_HOST . "\r\n";
-        $request .= "Content-Type: application/x-www-form-urlencoded\r\n";
-        $request .= "Content-length: " . strlen($content) . "\r\n";
-        $request .= "Connection: close\r\n\r\n";
-        $request .= $content . "\r\n\r\n";
-
-        $this->socket->fwrite($request);
-        $response = '';
-
-        while (!$this->socket->feof()) {
-            $response .= $this->socket->fgets(4096);
-        }
-
-        $this->socket->fclose();
-
-        if (0 !== strpos($response, 'HTTP/1.1 200 OK')) {
-            return self::BAD_RESPONSE;
-        }
-
-        $parts = preg_split("#\n\s*\n#Uis", $response);
-
-        return $parts[1];
-    }
+	/**
+	 * reCAPTCHA service host.
+	 * @const string
+	 */
+	const RECAPTCHA_HOST = 'www.google.com';
+
+	/**
+	 * @const string reCAPTCHA service path
+	 */
+	const SITE_VERIFY_PATH = '/recaptcha/api/siteverify';
+
+	/**
+	 * @const string Bad request error
+	 */
+	const BAD_REQUEST = '{"success": false, "error-codes": ["invalid-request"]}';
+
+	/**
+	 * @const string Bad response error
+	 */
+	const BAD_RESPONSE = '{"success": false, "error-codes": ["invalid-response"]}';
+
+	/**
+	 * Socket to the reCAPTCHA service
+	 * @var Socket
+	 */
+	private $socket;
+
+	/**
+	 * Constructor
+	 *
+	 * @param \ReCaptcha\RequestMethod\Socket $socket optional socket, injectable for testing
+	 */
+	public function __construct(Socket $socket = null)
+	{
+		if (!is_null($socket)) {
+			$this->socket = $socket;
+		} else {
+			$this->socket = new Socket();
+		}
+	}
+
+	/**
+	 * Submit the POST request with the specified parameters.
+	 *
+	 * @param RequestParameters $params Request parameters
+	 * @return string Body of the reCAPTCHA response
+	 */
+	public function submit(RequestParameters $params)
+	{
+		$errno = 0;
+		$errstr = '';
+
+		if (false === $this->socket->fsockopen('ssl://' . self::RECAPTCHA_HOST, 443, $errno, $errstr, 30)) {
+			return self::BAD_REQUEST;
+		}
+
+		$content = $params->toQueryString();
+
+		$request = "POST " . self::SITE_VERIFY_PATH . " HTTP/1.1\r\n";
+		$request .= "Host: " . self::RECAPTCHA_HOST . "\r\n";
+		$request .= "Content-Type: application/x-www-form-urlencoded\r\n";
+		$request .= "Content-length: " . strlen($content) . "\r\n";
+		$request .= "Connection: close\r\n\r\n";
+		$request .= $content . "\r\n\r\n";
+
+		$this->socket->fwrite($request);
+		$response = '';
+
+		while (!$this->socket->feof()) {
+			$response .= $this->socket->fgets(4096);
+		}
+
+		$this->socket->fclose();
+
+		if (0 !== strpos($response, 'HTTP/1.1 200 OK')) {
+			return self::BAD_RESPONSE;
+		}
+
+		$parts = preg_split("#\n\s*\n#Uis", $response);
+
+		return $parts[1];
+	}
 }

Sources/ReCaptcha/Response.php

Indentation +59 added lines, -59 removed lines

@@ -31,72 +31,72 @@
  */
 class Response
 {
-    /**
-     * Succes or failure.
-     * @var boolean
-     */
-    private $success = false;
+	/**
+	 * Succes or failure.
+	 * @var boolean
+	 */
+	private $success = false;
 
-    /**
-     * Error code strings.
-     * @var array
-     */
-    private $errorCodes = array();
+	/**
+	 * Error code strings.
+	 * @var array
+	 */
+	private $errorCodes = array();
 
-    /**
-     * Build the response from the expected JSON returned by the service.
-     *
-     * @param string $json
-     * @return \ReCaptcha\Response
-     */
-    public static function fromJson($json)
-    {
-        $responseData = json_decode($json, true);
+	/**
+	 * Build the response from the expected JSON returned by the service.
+	 *
+	 * @param string $json
+	 * @return \ReCaptcha\Response
+	 */
+	public static function fromJson($json)
+	{
+		$responseData = json_decode($json, true);
 
-        if (!$responseData) {
-            return new Response(false, array('invalid-json'));
-        }
+		if (!$responseData) {
+			return new Response(false, array('invalid-json'));
+		}
 
-        if (isset($responseData['success']) && $responseData['success'] == true) {
-            return new Response(true);
-        }
+		if (isset($responseData['success']) && $responseData['success'] == true) {
+			return new Response(true);
+		}
 
-        if (isset($responseData['error-codes']) && is_array($responseData['error-codes'])) {
-            return new Response(false, $responseData['error-codes']);
-        }
+		if (isset($responseData['error-codes']) && is_array($responseData['error-codes'])) {
+			return new Response(false, $responseData['error-codes']);
+		}
 
-        return new Response(false);
-    }
+		return new Response(false);
+	}
 
-    /**
-     * Constructor.
-     *
-     * @param boolean $success
-     * @param array $errorCodes
-     */
-    public function __construct($success, array $errorCodes = array())
-    {
-        $this->success = $success;
-        $this->errorCodes = $errorCodes;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param boolean $success
+	 * @param array $errorCodes
+	 */
+	public function __construct($success, array $errorCodes = array())
+	{
+		$this->success = $success;
+		$this->errorCodes = $errorCodes;
+	}
 
-    /**
-     * Is success?
-     *
-     * @return boolean
-     */
-    public function isSuccess()
-    {
-        return $this->success;
-    }
+	/**
+	 * Is success?
+	 *
+	 * @return boolean
+	 */
+	public function isSuccess()
+	{
+		return $this->success;
+	}
 
-    /**
-     * Get error codes.
-     *
-     * @return array
-     */
-    public function getErrorCodes()
-    {
-        return $this->errorCodes;
-    }
+	/**
+	 * Get error codes.
+	 *
+	 * @return array
+	 */
+	public function getErrorCodes()
+	{
+		return $this->errorCodes;
+	}
 }

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)
 {

Indentation +6 added lines, -6 removed lines

@@ -437,9 +437,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;
-						    return ($a['start_timestamp'] < $b['start_timestamp']) ? -1 : 1;
+							if ($a['start_timestamp'] == $b['start_timestamp'])
+								return 0;
+							return ($a['start_timestamp'] < $b['start_timestamp']) ? -1 : 1;
 						});
 
 						echo '
@@ -619,9 +619,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;
-								    return ($a['start_timestamp'] < $b['start_timestamp']) ? -1 : 1;
+									if ($a['start_timestamp'] == $b['start_timestamp'])
+										return 0;
+									return ($a['start_timestamp'] < $b['start_timestamp']) ? -1 : 1;
 								});
 
 								foreach ($day['events'] as $event)

Braces +154 added lines, -118 removed lines

@@ -40,16 +40,14 @@ 
 				', template_show_upcoming_list('main'), '
 			</div>
 		';
-	}
-	elseif ($context['calendar_view'] == 'viewweek')
+	} elseif ($context['calendar_view'] == 'viewweek')
 	{
 		echo '
 			<div id="main_grid">
 				', template_show_week_grid('main'), '
 			</div>
 		';
-	}
-	else
+	} else
 	{
 		echo '
 			<div id="main_grid">
@@ -75,8 +73,9 @@ 
 	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];
@@ -113,11 +112,13 @@ 
 					<li class="windowbg">
 						<b class="event_title">', $event['link'], '</b>';
 
-				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>';
@@ -125,14 +126,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']);
 
@@ -141,23 +142,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>';
@@ -189,8 +194,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);
 
@@ -221,8 +227,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);
@@ -245,17 +252,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']))
@@ -294,8 +303,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 '<table class="calendar_table">';
@@ -306,8 +316,9 @@ 
 		echo '<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 '<th>&nbsp;</th>';
+		if ($show_week_links === true) {
+					echo '<th>&nbsp;</th>';
+		}
 
 		// Now, loop through each actual day of the week.
 		foreach ($calendar_data['week_days'] as $day)
@@ -354,27 +365,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';
@@ -392,19 +405,21 @@ 
 				$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 '<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 '<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 '<span class="day_text">', $title_prefix, $day['day'], '</span>';
+				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 '<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 '<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 '<div class="smalltext holiday"><span>', $txt['calendar_prompt'], '</span> ', implode(', ', $day['holidays']), '</div>';
+					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']))
@@ -422,14 +437,16 @@ 
 							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'], '\').style.display = \'\'; document.getElementById(\'bdhidelink_', $day['day'], '\').style.display = \'none\'; return false;">(', sprintf($txt['calendar_click_all'], count($day['birthdays'])), ')</a></span><span id="bdhide_', $day['day'], '" style="display: none;">, ';
+							}
 
 							++$birthday_count;
 						}
-						if ($use_js_hide)
-							echo '</span>';
+						if ($use_js_hide) {
+													echo '</span>';
+						}
 
 						echo '</div>';
 					}
@@ -439,8 +456,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;
 						});
 
@@ -456,17 +474,19 @@ 
 
 							echo '<div class="event_wrapper', $event['starts_today'] == true ? ' event_starts_today' : '', $event['ends_today'] == true ? ' event_ends_today' : '', $event['allday'] == true ? ' allday' : '', $event['is_selected'] ? ' sel_event' : '', '">', $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 '<br><span class="event_location', empty($event_icons_needed) ? ' floatright' : '', '">' . $event['location'] . '</span>';
+							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'])
 							{
@@ -503,10 +523,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.
@@ -532,8 +553,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];
@@ -568,8 +590,9 @@ 
 					}
 
 					// 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>
@@ -608,10 +631,11 @@ 
 						<tr class="days_wrapper">
 							<td class="', implode(' ', $classes), ' act_day">';
 							// Should the day number be a link?
-							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'];
+							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'];
+							}
 
 							echo '</td>
 							<td class="', implode(' ', $classes), '', empty($day['events']) ? (' disabled' . ($context['can_post'] ? ' week_post' : '')) : ' events', ' event_col" data-css-prefix="' . $txt['events'] . ' ', (empty($day['events']) && empty($context['can_post'])) ? $txt['none'] : '', '">';
@@ -620,8 +644,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;
 								});
 
@@ -633,15 +658,17 @@ 
 
 									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><span class="event_location', empty($event_icons_needed) ? ' floatright' : '', '">' . $event['location'] . '</span>';
+									if (!empty($event['location'])) {
+																			echo '<br><span class="event_location', empty($event_icons_needed) ? ' floatright' : '', '">' . $event['location'] . '</span>';
+									}
 
 									if (!empty($event_icons_needed))
 									{
@@ -678,8 +705,7 @@ 
 									</div>
 									<br class="clear">';
 								}
-							}
-							else
+							} else
 							{
 								if (!empty($context['can_post']))
 								{
@@ -692,8 +718,9 @@ 
 							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>
 							<td class="', implode(' ', $classes), '', !empty($day['birthdays']) ? ' birthdays' : ' disabled', ' birthday_col" data-css-prefix="' . $txt['birthdays'] . ' ">';
@@ -751,8 +778,7 @@ 
 				<input type="text" name="end_date" id="end_date" maxlength="10" value="', $calendar_data['end_date'], '" tabindex="', $context['tabindex']++, '" class="input_text date_input end" data-type="date">
 				<input type="submit" class="button_submit" 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'], '">
@@ -794,8 +820,9 @@ 
 	echo '
 		<form action="', $scripturl, '?action=calendar;sa=post" method="post" name="postevent" accept-charset="', $context['character_set'], '" onsubmit="submitonce(this);smc_saveEntities(\'postevent\', [\'evtitle\']);" style="margin: 0;">';
 
-	if (!empty($context['event']['new']))
-		echo '<input type="hidden" name="eventid" value="', $context['event']['eventid'], '">';
+	if (!empty($context['event']['new'])) {
+			echo '<input type="hidden" name="eventid" value="', $context['event']['eventid'], '">';
+	}
 
 	// Start the main table.
 	echo '
@@ -845,9 +872,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'], '&nbsp;</option>';
+			}
 			echo '
 								</optgroup>';
 		}
@@ -883,9 +911,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 value="', $tz, '"', $tz == $context['event']['tz'] ? ' selected' : '', '>', $tzname, '</option>';
+	}
 
 	echo '
 							</select>
@@ -900,9 +929,10 @@ 
 	echo '
 				<input type="submit" value="', empty($context['event']['new']) ? $txt['save'] : $txt['post'], '" class="button_submit">';
 	// 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_submit you_sure">';
+	}
 
 	echo '
 				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -946,9 +976,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 '
@@ -973,13 +1004,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 '
@@ -1043,9 +1075,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 '
@@ -1062,13 +1095,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 +1161,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 '
@@ -1150,13 +1185,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 '

other/upgrade.php

Doc Comments +14 added lines, -1 removed lines

@@ -388,6 +388,9 @@ 
 }
 
 // Used to direct the user to another location.
+/**
+ * @param string $location
+ */
 function redirectLocation($location, $addForm = true)
 {
 	global $upgradeurl, $upcontext, $command_line;
@@ -1560,6 +1563,9 @@ 
 	return addslashes(preg_replace(array('~^\.([/\\\]|$)~', '~[/]+~', '~[\\\]+~', '~[/\\\]$~'), array($install_path . '$1', '/', '\\', ''), $path));
 }
 
+/**
+ * @param string $filename
+ */
 function parse_sql($filename)
 {
 	global $db_prefix, $db_collation, $boarddir, $boardurl, $command_line, $file_steps, $step_progress, $custom_warning;
@@ -1594,6 +1600,10 @@ 
 
 	// Our custom error handler - does nothing but does stop public errors from XML!
 	set_error_handler(
+
+		/**
+		 * @param string $errno
+		 */
 		function ($errno, $errstr, $errfile, $errline) use ($support_js)
 		{
 			if ($support_js)
@@ -1840,6 +1850,9 @@ 
 	return true;
 }
 
+/**
+ * @param string $string
+ */
 function upgrade_query($string, $unbuffered = false)
 {
 	global $db_connection, $db_server, $db_user, $db_passwd, $db_type, $command_line, $upcontext, $upgradeurl, $modSettings;
@@ -4495,7 +4508,7 @@ 
  * @param int $setSize The amount of entries after which to update the database.
  *
  * newCol needs to be a varbinary(16) null able field
- * @return bool
+ * @return boolean|null
  */
 function MySQLConvertOldIp($targetTable, $oldCol, $newCol, $limit = 50000, $setSize = 100)
 {

Indentation +1 added lines, -1 removed lines

@@ -82,7 +82,7 @@
 
 // The helper is crucial. Include it first thing.
 if (!file_exists($upgrade_path . '/upgrade-helper.php'))
-    die('upgrade-helper.php not found where it was expected: ' . $upgrade_path . '/upgrade-helper.php! Make sure you have uploaded ALL files from the upgrade package. The upgrader cannot continue.');
+	die('upgrade-helper.php not found where it was expected: ' . $upgrade_path . '/upgrade-helper.php! Make sure you have uploaded ALL files from the upgrade package. The upgrader cannot continue.');
 
 require_once($upgrade_path . '/upgrade-helper.php');
 

Spacing +89 added lines, -89 removed lines

@@ -1610,7 +1610,7 @@ 
 
 	// Our custom error handler - does nothing but does stop public errors from XML!
 	set_error_handler(
-		function ($errno, $errstr, $errfile, $errline) use ($support_js)
+		function($errno, $errstr, $errfile, $errline) use ($support_js)
 		{
 			if ($support_js)
 				return true;
@@ -2595,94 +2595,94 @@ 
 		// Translation table for the character sets not native for MySQL.
 		$translation_tables = array(
 			'windows-1255' => array(
-				'0x81' => '\'\'',		'0x8A' => '\'\'',		'0x8C' => '\'\'',
-				'0x8D' => '\'\'',		'0x8E' => '\'\'',		'0x8F' => '\'\'',
-				'0x90' => '\'\'',		'0x9A' => '\'\'',		'0x9C' => '\'\'',
-				'0x9D' => '\'\'',		'0x9E' => '\'\'',		'0x9F' => '\'\'',
-				'0xCA' => '\'\'',		'0xD9' => '\'\'',		'0xDA' => '\'\'',
-				'0xDB' => '\'\'',		'0xDC' => '\'\'',		'0xDD' => '\'\'',
-				'0xDE' => '\'\'',		'0xDF' => '\'\'',		'0xFB' => '0xD792',
-				'0xFC' => '0xE282AC',		'0xFF' => '0xD6B2',		'0xC2' => '0xFF',
-				'0x80' => '0xFC',		'0xE2' => '0xFB',		'0xA0' => '0xC2A0',
-				'0xA1' => '0xC2A1',		'0xA2' => '0xC2A2',		'0xA3' => '0xC2A3',
-				'0xA5' => '0xC2A5',		'0xA6' => '0xC2A6',		'0xA7' => '0xC2A7',
-				'0xA8' => '0xC2A8',		'0xA9' => '0xC2A9',		'0xAB' => '0xC2AB',
-				'0xAC' => '0xC2AC',		'0xAD' => '0xC2AD',		'0xAE' => '0xC2AE',
-				'0xAF' => '0xC2AF',		'0xB0' => '0xC2B0',		'0xB1' => '0xC2B1',
-				'0xB2' => '0xC2B2',		'0xB3' => '0xC2B3',		'0xB4' => '0xC2B4',
-				'0xB5' => '0xC2B5',		'0xB6' => '0xC2B6',		'0xB7' => '0xC2B7',
-				'0xB8' => '0xC2B8',		'0xB9' => '0xC2B9',		'0xBB' => '0xC2BB',
-				'0xBC' => '0xC2BC',		'0xBD' => '0xC2BD',		'0xBE' => '0xC2BE',
-				'0xBF' => '0xC2BF',		'0xD7' => '0xD7B3',		'0xD1' => '0xD781',
-				'0xD4' => '0xD7B0',		'0xD5' => '0xD7B1',		'0xD6' => '0xD7B2',
-				'0xE0' => '0xD790',		'0xEA' => '0xD79A',		'0xEC' => '0xD79C',
-				'0xED' => '0xD79D',		'0xEE' => '0xD79E',		'0xEF' => '0xD79F',
-				'0xF0' => '0xD7A0',		'0xF1' => '0xD7A1',		'0xF2' => '0xD7A2',
-				'0xF3' => '0xD7A3',		'0xF5' => '0xD7A5',		'0xF6' => '0xD7A6',
-				'0xF7' => '0xD7A7',		'0xF8' => '0xD7A8',		'0xF9' => '0xD7A9',
-				'0x82' => '0xE2809A',	'0x84' => '0xE2809E',	'0x85' => '0xE280A6',
-				'0x86' => '0xE280A0',	'0x87' => '0xE280A1',	'0x89' => '0xE280B0',
-				'0x8B' => '0xE280B9',	'0x93' => '0xE2809C',	'0x94' => '0xE2809D',
-				'0x95' => '0xE280A2',	'0x97' => '0xE28094',	'0x99' => '0xE284A2',
-				'0xC0' => '0xD6B0',		'0xC1' => '0xD6B1',		'0xC3' => '0xD6B3',
-				'0xC4' => '0xD6B4',		'0xC5' => '0xD6B5',		'0xC6' => '0xD6B6',
-				'0xC7' => '0xD6B7',		'0xC8' => '0xD6B8',		'0xC9' => '0xD6B9',
-				'0xCB' => '0xD6BB',		'0xCC' => '0xD6BC',		'0xCD' => '0xD6BD',
-				'0xCE' => '0xD6BE',		'0xCF' => '0xD6BF',		'0xD0' => '0xD780',
-				'0xD2' => '0xD782',		'0xE3' => '0xD793',		'0xE4' => '0xD794',
-				'0xE5' => '0xD795',		'0xE7' => '0xD797',		'0xE9' => '0xD799',
-				'0xFD' => '0xE2808E',	'0xFE' => '0xE2808F',	'0x92' => '0xE28099',
-				'0x83' => '0xC692',		'0xD3' => '0xD783',		'0x88' => '0xCB86',
-				'0x98' => '0xCB9C',		'0x91' => '0xE28098',	'0x96' => '0xE28093',
-				'0xBA' => '0xC3B7',		'0x9B' => '0xE280BA',	'0xAA' => '0xC397',
-				'0xA4' => '0xE282AA',	'0xE1' => '0xD791',		'0xE6' => '0xD796',
-				'0xE8' => '0xD798',		'0xEB' => '0xD79B',		'0xF4' => '0xD7A4',
+				'0x81' => '\'\'', '0x8A' => '\'\'', '0x8C' => '\'\'',
+				'0x8D' => '\'\'', '0x8E' => '\'\'', '0x8F' => '\'\'',
+				'0x90' => '\'\'', '0x9A' => '\'\'', '0x9C' => '\'\'',
+				'0x9D' => '\'\'', '0x9E' => '\'\'', '0x9F' => '\'\'',
+				'0xCA' => '\'\'', '0xD9' => '\'\'', '0xDA' => '\'\'',
+				'0xDB' => '\'\'', '0xDC' => '\'\'', '0xDD' => '\'\'',
+				'0xDE' => '\'\'', '0xDF' => '\'\'', '0xFB' => '0xD792',
+				'0xFC' => '0xE282AC', '0xFF' => '0xD6B2', '0xC2' => '0xFF',
+				'0x80' => '0xFC', '0xE2' => '0xFB', '0xA0' => '0xC2A0',
+				'0xA1' => '0xC2A1', '0xA2' => '0xC2A2', '0xA3' => '0xC2A3',
+				'0xA5' => '0xC2A5', '0xA6' => '0xC2A6', '0xA7' => '0xC2A7',
+				'0xA8' => '0xC2A8', '0xA9' => '0xC2A9', '0xAB' => '0xC2AB',
+				'0xAC' => '0xC2AC', '0xAD' => '0xC2AD', '0xAE' => '0xC2AE',
+				'0xAF' => '0xC2AF', '0xB0' => '0xC2B0', '0xB1' => '0xC2B1',
+				'0xB2' => '0xC2B2', '0xB3' => '0xC2B3', '0xB4' => '0xC2B4',
+				'0xB5' => '0xC2B5', '0xB6' => '0xC2B6', '0xB7' => '0xC2B7',
+				'0xB8' => '0xC2B8', '0xB9' => '0xC2B9', '0xBB' => '0xC2BB',
+				'0xBC' => '0xC2BC', '0xBD' => '0xC2BD', '0xBE' => '0xC2BE',
+				'0xBF' => '0xC2BF', '0xD7' => '0xD7B3', '0xD1' => '0xD781',
+				'0xD4' => '0xD7B0', '0xD5' => '0xD7B1', '0xD6' => '0xD7B2',
+				'0xE0' => '0xD790', '0xEA' => '0xD79A', '0xEC' => '0xD79C',
+				'0xED' => '0xD79D', '0xEE' => '0xD79E', '0xEF' => '0xD79F',
+				'0xF0' => '0xD7A0', '0xF1' => '0xD7A1', '0xF2' => '0xD7A2',
+				'0xF3' => '0xD7A3', '0xF5' => '0xD7A5', '0xF6' => '0xD7A6',
+				'0xF7' => '0xD7A7', '0xF8' => '0xD7A8', '0xF9' => '0xD7A9',
+				'0x82' => '0xE2809A', '0x84' => '0xE2809E', '0x85' => '0xE280A6',
+				'0x86' => '0xE280A0', '0x87' => '0xE280A1', '0x89' => '0xE280B0',
+				'0x8B' => '0xE280B9', '0x93' => '0xE2809C', '0x94' => '0xE2809D',
+				'0x95' => '0xE280A2', '0x97' => '0xE28094', '0x99' => '0xE284A2',
+				'0xC0' => '0xD6B0', '0xC1' => '0xD6B1', '0xC3' => '0xD6B3',
+				'0xC4' => '0xD6B4', '0xC5' => '0xD6B5', '0xC6' => '0xD6B6',
+				'0xC7' => '0xD6B7', '0xC8' => '0xD6B8', '0xC9' => '0xD6B9',
+				'0xCB' => '0xD6BB', '0xCC' => '0xD6BC', '0xCD' => '0xD6BD',
+				'0xCE' => '0xD6BE', '0xCF' => '0xD6BF', '0xD0' => '0xD780',
+				'0xD2' => '0xD782', '0xE3' => '0xD793', '0xE4' => '0xD794',
+				'0xE5' => '0xD795', '0xE7' => '0xD797', '0xE9' => '0xD799',
+				'0xFD' => '0xE2808E', '0xFE' => '0xE2808F', '0x92' => '0xE28099',
+				'0x83' => '0xC692', '0xD3' => '0xD783', '0x88' => '0xCB86',
+				'0x98' => '0xCB9C', '0x91' => '0xE28098', '0x96' => '0xE28093',
+				'0xBA' => '0xC3B7', '0x9B' => '0xE280BA', '0xAA' => '0xC397',
+				'0xA4' => '0xE282AA', '0xE1' => '0xD791', '0xE6' => '0xD796',
+				'0xE8' => '0xD798', '0xEB' => '0xD79B', '0xF4' => '0xD7A4',
 				'0xFA' => '0xD7AA',
 			),
 			'windows-1253' => array(
-				'0x81' => '\'\'',			'0x88' => '\'\'',			'0x8A' => '\'\'',
-				'0x8C' => '\'\'',			'0x8D' => '\'\'',			'0x8E' => '\'\'',
-				'0x8F' => '\'\'',			'0x90' => '\'\'',			'0x98' => '\'\'',
-				'0x9A' => '\'\'',			'0x9C' => '\'\'',			'0x9D' => '\'\'',
-				'0x9E' => '\'\'',			'0x9F' => '\'\'',			'0xAA' => '\'\'',
-				'0xD2' => '0xE282AC',			'0xFF' => '0xCE92',			'0xCE' => '0xCE9E',
-				'0xB8' => '0xCE88',		'0xBA' => '0xCE8A',		'0xBC' => '0xCE8C',
-				'0xBE' => '0xCE8E',		'0xBF' => '0xCE8F',		'0xC0' => '0xCE90',
-				'0xC8' => '0xCE98',		'0xCA' => '0xCE9A',		'0xCC' => '0xCE9C',
-				'0xCD' => '0xCE9D',		'0xCF' => '0xCE9F',		'0xDA' => '0xCEAA',
-				'0xE8' => '0xCEB8',		'0xEA' => '0xCEBA',		'0xEC' => '0xCEBC',
-				'0xEE' => '0xCEBE',		'0xEF' => '0xCEBF',		'0xC2' => '0xFF',
-				'0xBD' => '0xC2BD',		'0xED' => '0xCEBD',		'0xB2' => '0xC2B2',
-				'0xA0' => '0xC2A0',		'0xA3' => '0xC2A3',		'0xA4' => '0xC2A4',
-				'0xA5' => '0xC2A5',		'0xA6' => '0xC2A6',		'0xA7' => '0xC2A7',
-				'0xA8' => '0xC2A8',		'0xA9' => '0xC2A9',		'0xAB' => '0xC2AB',
-				'0xAC' => '0xC2AC',		'0xAD' => '0xC2AD',		'0xAE' => '0xC2AE',
-				'0xB0' => '0xC2B0',		'0xB1' => '0xC2B1',		'0xB3' => '0xC2B3',
-				'0xB5' => '0xC2B5',		'0xB6' => '0xC2B6',		'0xB7' => '0xC2B7',
-				'0xBB' => '0xC2BB',		'0xE2' => '0xCEB2',		'0x80' => '0xD2',
-				'0x82' => '0xE2809A',	'0x84' => '0xE2809E',	'0x85' => '0xE280A6',
-				'0x86' => '0xE280A0',	'0xA1' => '0xCE85',		'0xA2' => '0xCE86',
-				'0x87' => '0xE280A1',	'0x89' => '0xE280B0',	'0xB9' => '0xCE89',
-				'0x8B' => '0xE280B9',	'0x91' => '0xE28098',	'0x99' => '0xE284A2',
-				'0x92' => '0xE28099',	'0x93' => '0xE2809C',	'0x94' => '0xE2809D',
-				'0x95' => '0xE280A2',	'0x96' => '0xE28093',	'0x97' => '0xE28094',
-				'0x9B' => '0xE280BA',	'0xAF' => '0xE28095',	'0xB4' => '0xCE84',
-				'0xC1' => '0xCE91',		'0xC3' => '0xCE93',		'0xC4' => '0xCE94',
-				'0xC5' => '0xCE95',		'0xC6' => '0xCE96',		'0x83' => '0xC692',
-				'0xC7' => '0xCE97',		'0xC9' => '0xCE99',		'0xCB' => '0xCE9B',
-				'0xD0' => '0xCEA0',		'0xD1' => '0xCEA1',		'0xD3' => '0xCEA3',
-				'0xD4' => '0xCEA4',		'0xD5' => '0xCEA5',		'0xD6' => '0xCEA6',
-				'0xD7' => '0xCEA7',		'0xD8' => '0xCEA8',		'0xD9' => '0xCEA9',
-				'0xDB' => '0xCEAB',		'0xDC' => '0xCEAC',		'0xDD' => '0xCEAD',
-				'0xDE' => '0xCEAE',		'0xDF' => '0xCEAF',		'0xE0' => '0xCEB0',
-				'0xE1' => '0xCEB1',		'0xE3' => '0xCEB3',		'0xE4' => '0xCEB4',
-				'0xE5' => '0xCEB5',		'0xE6' => '0xCEB6',		'0xE7' => '0xCEB7',
-				'0xE9' => '0xCEB9',		'0xEB' => '0xCEBB',		'0xF0' => '0xCF80',
-				'0xF1' => '0xCF81',		'0xF2' => '0xCF82',		'0xF3' => '0xCF83',
-				'0xF4' => '0xCF84',		'0xF5' => '0xCF85',		'0xF6' => '0xCF86',
-				'0xF7' => '0xCF87',		'0xF8' => '0xCF88',		'0xF9' => '0xCF89',
-				'0xFA' => '0xCF8A',		'0xFB' => '0xCF8B',		'0xFC' => '0xCF8C',
-				'0xFD' => '0xCF8D',		'0xFE' => '0xCF8E',
+				'0x81' => '\'\'', '0x88' => '\'\'', '0x8A' => '\'\'',
+				'0x8C' => '\'\'', '0x8D' => '\'\'', '0x8E' => '\'\'',
+				'0x8F' => '\'\'', '0x90' => '\'\'', '0x98' => '\'\'',
+				'0x9A' => '\'\'', '0x9C' => '\'\'', '0x9D' => '\'\'',
+				'0x9E' => '\'\'', '0x9F' => '\'\'', '0xAA' => '\'\'',
+				'0xD2' => '0xE282AC', '0xFF' => '0xCE92', '0xCE' => '0xCE9E',
+				'0xB8' => '0xCE88', '0xBA' => '0xCE8A', '0xBC' => '0xCE8C',
+				'0xBE' => '0xCE8E', '0xBF' => '0xCE8F', '0xC0' => '0xCE90',
+				'0xC8' => '0xCE98', '0xCA' => '0xCE9A', '0xCC' => '0xCE9C',
+				'0xCD' => '0xCE9D', '0xCF' => '0xCE9F', '0xDA' => '0xCEAA',
+				'0xE8' => '0xCEB8', '0xEA' => '0xCEBA', '0xEC' => '0xCEBC',
+				'0xEE' => '0xCEBE', '0xEF' => '0xCEBF', '0xC2' => '0xFF',
+				'0xBD' => '0xC2BD', '0xED' => '0xCEBD', '0xB2' => '0xC2B2',
+				'0xA0' => '0xC2A0', '0xA3' => '0xC2A3', '0xA4' => '0xC2A4',
+				'0xA5' => '0xC2A5', '0xA6' => '0xC2A6', '0xA7' => '0xC2A7',
+				'0xA8' => '0xC2A8', '0xA9' => '0xC2A9', '0xAB' => '0xC2AB',
+				'0xAC' => '0xC2AC', '0xAD' => '0xC2AD', '0xAE' => '0xC2AE',
+				'0xB0' => '0xC2B0', '0xB1' => '0xC2B1', '0xB3' => '0xC2B3',
+				'0xB5' => '0xC2B5', '0xB6' => '0xC2B6', '0xB7' => '0xC2B7',
+				'0xBB' => '0xC2BB', '0xE2' => '0xCEB2', '0x80' => '0xD2',
+				'0x82' => '0xE2809A', '0x84' => '0xE2809E', '0x85' => '0xE280A6',
+				'0x86' => '0xE280A0', '0xA1' => '0xCE85', '0xA2' => '0xCE86',
+				'0x87' => '0xE280A1', '0x89' => '0xE280B0', '0xB9' => '0xCE89',
+				'0x8B' => '0xE280B9', '0x91' => '0xE28098', '0x99' => '0xE284A2',
+				'0x92' => '0xE28099', '0x93' => '0xE2809C', '0x94' => '0xE2809D',
+				'0x95' => '0xE280A2', '0x96' => '0xE28093', '0x97' => '0xE28094',
+				'0x9B' => '0xE280BA', '0xAF' => '0xE28095', '0xB4' => '0xCE84',
+				'0xC1' => '0xCE91', '0xC3' => '0xCE93', '0xC4' => '0xCE94',
+				'0xC5' => '0xCE95', '0xC6' => '0xCE96', '0x83' => '0xC692',
+				'0xC7' => '0xCE97', '0xC9' => '0xCE99', '0xCB' => '0xCE9B',
+				'0xD0' => '0xCEA0', '0xD1' => '0xCEA1', '0xD3' => '0xCEA3',
+				'0xD4' => '0xCEA4', '0xD5' => '0xCEA5', '0xD6' => '0xCEA6',
+				'0xD7' => '0xCEA7', '0xD8' => '0xCEA8', '0xD9' => '0xCEA9',
+				'0xDB' => '0xCEAB', '0xDC' => '0xCEAC', '0xDD' => '0xCEAD',
+				'0xDE' => '0xCEAE', '0xDF' => '0xCEAF', '0xE0' => '0xCEB0',
+				'0xE1' => '0xCEB1', '0xE3' => '0xCEB3', '0xE4' => '0xCEB4',
+				'0xE5' => '0xCEB5', '0xE6' => '0xCEB6', '0xE7' => '0xCEB7',
+				'0xE9' => '0xCEB9', '0xEB' => '0xCEBB', '0xF0' => '0xCF80',
+				'0xF1' => '0xCF81', '0xF2' => '0xCF82', '0xF3' => '0xCF83',
+				'0xF4' => '0xCF84', '0xF5' => '0xCF85', '0xF6' => '0xCF86',
+				'0xF7' => '0xCF87', '0xF8' => '0xCF88', '0xF9' => '0xCF89',
+				'0xFA' => '0xCF8A', '0xFB' => '0xCF8B', '0xFC' => '0xCF8C',
+				'0xFD' => '0xCF8D', '0xFE' => '0xCF8E',
 			),
 		);
 
@@ -3781,7 +3781,7 @@ 
 			<form action="', $upcontext['form_url'], '" name="upform" id="upform" method="post">
 			<input type="hidden" name="backup_done" id="backup_done" value="0">
 			<strong>Completed <span id="tab_done">', $upcontext['cur_table_num'], '</span> out of ', $upcontext['table_count'], ' tables.</strong>
-			<div id="debug_section" style="height: ', ($is_debug ? '115' : '12') , 'px; overflow: auto;">
+			<div id="debug_section" style="height: ', ($is_debug ? '115' : '12'), 'px; overflow: auto;">
 			<span id="debuginfo"></span>
 			</div>';
 
@@ -4282,7 +4282,7 @@ 
 			<form action="', $upcontext['form_url'], '" name="upform" id="upform" method="post">
 			<input type="hidden" name="utf8_done" id="utf8_done" value="0">
 			<strong>Completed <span id="tab_done">', $upcontext['cur_table_num'], '</span> out of ', $upcontext['table_count'], ' tables.</strong>
-			<div id="debug_section" style="height: ', ($is_debug ? '97' : '12') , 'px; overflow: auto;">
+			<div id="debug_section" style="height: ', ($is_debug ? '97' : '12'), 'px; overflow: auto;">
 			<span id="debuginfo"></span>
 			</div>';
 
@@ -4383,7 +4383,7 @@ 
 			<form action="', $upcontext['form_url'], '" name="upform" id="upform" method="post">
 			<input type="hidden" name="json_done" id="json_done" value="0">
 			<strong>Completed <span id="tab_done">', $upcontext['cur_table_num'], '</span> out of ', $upcontext['table_count'], ' tables.</strong>
-			<div id="debug_section" style="height: ', ($is_debug ? '115' : '12') , 'px; overflow: auto;">
+			<div id="debug_section" style="height: ', ($is_debug ? '115' : '12'), 'px; overflow: auto;">
 			<span id="debuginfo"></span>
 			</div>';
 

Braces +878 added lines, -645 removed lines

@@ -75,8 +75,9 @@ 
 $upcontext['inactive_timeout'] = 10;
 
 // The helper is crucial. Include it first thing.
-if (!file_exists($upgrade_path . '/upgrade-helper.php'))
+if (!file_exists($upgrade_path . '/upgrade-helper.php')) {
     die('upgrade-helper.php not found where it was expected: ' . $upgrade_path . '/upgrade-helper.php! Make sure you have uploaded ALL files from the upgrade package. The upgrader cannot continue.');
+}
 
 require_once($upgrade_path . '/upgrade-helper.php');
 
@@ -100,11 +101,14 @@ 
 	ini_set('default_socket_timeout', 900);
 }
 // Clean the upgrade path if this is from the client.
-if (!empty($_SERVER['argv']) && php_sapi_name() == 'cli' && empty($_SERVER['REMOTE_ADDR']))
-	for ($i = 1; $i < $_SERVER['argc']; $i++)
+if (!empty($_SERVER['argv']) && php_sapi_name() == 'cli' && empty($_SERVER['REMOTE_ADDR'])) {
+	for ($i = 1;
+}
+$i < $_SERVER['argc']; $i++)
 	{
-		if (preg_match('~^--path=(.+)$~', $_SERVER['argv'][$i], $match) != 0)
-			$upgrade_path = substr($match[1], -1) == '/' ? substr($match[1], 0, -1) : $match[1];
+		if (preg_match('~^--path=(.+)$~', $_SERVER['argv'][$i], $match) != 0) {
+					$upgrade_path = substr($match[1], -1) == '/' ? substr($match[1], 0, -1) : $match[1];
+		}
 	}
 
 // Are we from the client?
@@ -112,16 +116,17 @@ 
 {
 	$command_line = true;
 	$disable_security = true;
-}
-else
+} else {
 	$command_line = false;
+}
 
 // Load this now just because we can.
 require_once($upgrade_path . '/Settings.php');
 
 // We don't use "-utf8" anymore...  Tweak the entry that may have been loaded by Settings.php
-if (isset($language))
+if (isset($language)) {
 	$language = str_ireplace('-utf8', '', $language);
+}
 
 // Are we logged in?
 if (isset($upgradeData))
@@ -129,10 +134,12 @@ 
 	$upcontext['user'] = json_decode(base64_decode($upgradeData), true);
 
 	// Check for sensible values.
-	if (empty($upcontext['user']['started']) || $upcontext['user']['started'] < time() - 86400)
-		$upcontext['user']['started'] = time();
-	if (empty($upcontext['user']['updated']) || $upcontext['user']['updated'] < time() - 86400)
-		$upcontext['user']['updated'] = 0;
+	if (empty($upcontext['user']['started']) || $upcontext['user']['started'] < time() - 86400) {
+			$upcontext['user']['started'] = time();
+	}
+	if (empty($upcontext['user']['updated']) || $upcontext['user']['updated'] < time() - 86400) {
+			$upcontext['user']['updated'] = 0;
+	}
 
 	$upcontext['started'] = $upcontext['user']['started'];
 	$upcontext['updated'] = $upcontext['user']['updated'];
@@ -190,8 +197,9 @@ 
 			'db_error_skip' => true,
 		)
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$modSettings[$row['variable']] = $row['value'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$modSettings[$row['variable']] = $row['value'];
+	}
 	$smcFunc['db_free_result']($request);
 }
 
@@ -201,10 +209,12 @@ 
 	$modSettings['theme_url'] = 'Themes/default';
 	$modSettings['images_url'] = 'Themes/default/images';
 }
-if (!isset($settings['default_theme_url']))
+if (!isset($settings['default_theme_url'])) {
 	$settings['default_theme_url'] = $modSettings['theme_url'];
-if (!isset($settings['default_theme_dir']))
+}
+if (!isset($settings['default_theme_dir'])) {
 	$settings['default_theme_dir'] = $modSettings['theme_dir'];
+}
 
 $upcontext['is_large_forum'] = (empty($modSettings['smfVersion']) || $modSettings['smfVersion'] <= '1.1 RC1') && !empty($modSettings['totalMessages']) && $modSettings['totalMessages'] > 75000;
 // Default title...
@@ -222,13 +232,15 @@ 
 	$support_js = $upcontext['upgrade_status']['js'];
 
 	// Only set this if the upgrader status says so.
-	if (empty($is_debug))
-		$is_debug = $upcontext['upgrade_status']['debug'];
+	if (empty($is_debug)) {
+			$is_debug = $upcontext['upgrade_status']['debug'];
+	}
 
 	// Load the language.
-	if (file_exists($modSettings['theme_dir'] . '/languages/Install.' . $upcontext['language'] . '.php'))
-		require_once($modSettings['theme_dir'] . '/languages/Install.' . $upcontext['language'] . '.php');
-}
+	if (file_exists($modSettings['theme_dir'] . '/languages/Install.' . $upcontext['language'] . '.php')) {
+			require_once($modSettings['theme_dir'] . '/languages/Install.' . $upcontext['language'] . '.php');
+	}
+	}
 // Set the defaults.
 else
 {
@@ -246,15 +258,18 @@ 
 }
 
 // If this isn't the first stage see whether they are logging in and resuming.
-if ($upcontext['current_step'] != 0 || !empty($upcontext['user']['step']))
+if ($upcontext['current_step'] != 0 || !empty($upcontext['user']['step'])) {
 	checkLogin();
+}
 
-if ($command_line)
+if ($command_line) {
 	cmdStep0();
+}
 
 // Don't error if we're using xml.
-if (isset($_GET['xml']))
+if (isset($_GET['xml'])) {
 	$upcontext['return_error'] = true;
+}
 
 // Loop through all the steps doing each one as required.
 $upcontext['overall_percent'] = 0;
@@ -275,9 +290,9 @@ 
 		}
 
 		// Call the step and if it returns false that means pause!
-		if (function_exists($step[2]) && $step[2]() === false)
-			break;
-		elseif (function_exists($step[2])) {
+		if (function_exists($step[2]) && $step[2]() === false) {
+					break;
+		} elseif (function_exists($step[2])) {
 			//Start each new step with this unset, so the 'normal' template is called first
 			unset($_GET['xml']);
 			//Clear out warnings at the start of each step
@@ -323,17 +338,18 @@ 
 		// This should not happen my dear... HELP ME DEVELOPERS!!
 		if (!empty($command_line))
 		{
-			if (function_exists('debug_print_backtrace'))
-				debug_print_backtrace();
+			if (function_exists('debug_print_backtrace')) {
+							debug_print_backtrace();
+			}
 
 			echo "\n" . 'Error: Unexpected call to use the ' . (isset($upcontext['sub_template']) ? $upcontext['sub_template'] : '') . ' template. Please copy and paste all the text above and visit the SMF support forum to tell the Developers that they\'ve made a boo boo; they\'ll get you up and running again.';
 			flush();
 			die();
 		}
 
-		if (!isset($_GET['xml']))
-			template_upgrade_above();
-		else
+		if (!isset($_GET['xml'])) {
+					template_upgrade_above();
+		} else
 		{
 			header('Content-Type: text/xml; charset=UTF-8');
 			// Sadly we need to retain the $_GET data thanks to the old upgrade scripts.
@@ -355,25 +371,29 @@ 
 			$upcontext['form_url'] = $upgradeurl . '?step=' . $upcontext['current_step'] . '&amp;substep=' . $_GET['substep'] . '&amp;data=' . base64_encode(json_encode($upcontext['upgrade_status']));
 
 			// Custom stuff to pass back?
-			if (!empty($upcontext['query_string']))
-				$upcontext['form_url'] .= $upcontext['query_string'];
+			if (!empty($upcontext['query_string'])) {
+							$upcontext['form_url'] .= $upcontext['query_string'];
+			}
 
 			// Call the appropriate subtemplate
-			if (is_callable('template_' . $upcontext['sub_template']))
-				call_user_func('template_' . $upcontext['sub_template']);
-			else
-				die('Upgrade aborted!  Invalid template: template_' . $upcontext['sub_template']);
+			if (is_callable('template_' . $upcontext['sub_template'])) {
+							call_user_func('template_' . $upcontext['sub_template']);
+			} else {
+							die('Upgrade aborted!  Invalid template: template_' . $upcontext['sub_template']);
+			}
 		}
 
 		// Was there an error?
-		if (!empty($upcontext['forced_error_message']))
-			echo $upcontext['forced_error_message'];
+		if (!empty($upcontext['forced_error_message'])) {
+					echo $upcontext['forced_error_message'];
+		}
 
 		// Show the footer.
-		if (!isset($_GET['xml']))
-			template_upgrade_below();
-		else
-			template_xml_below();
+		if (!isset($_GET['xml'])) {
+					template_upgrade_below();
+		} else {
+					template_xml_below();
+		}
 	}
 
 
@@ -385,15 +405,19 @@ 
 		$seconds = intval($active % 60);
 
 		$totalTime = '';
-		if ($hours > 0)
-			$totalTime .= $hours . ' hour' . ($hours > 1 ? 's' : '') . ' ';
-		if ($minutes > 0)
-			$totalTime .= $minutes . ' minute' . ($minutes > 1 ? 's' : '') . ' ';
-		if ($seconds > 0)
-			$totalTime .= $seconds . ' second' . ($seconds > 1 ? 's' : '') . ' ';
+		if ($hours > 0) {
+					$totalTime .= $hours . ' hour' . ($hours > 1 ? 's' : '') . ' ';
+		}
+		if ($minutes > 0) {
+					$totalTime .= $minutes . ' minute' . ($minutes > 1 ? 's' : '') . ' ';
+		}
+		if ($seconds > 0) {
+					$totalTime .= $seconds . ' second' . ($seconds > 1 ? 's' : '') . ' ';
+		}
 
-		if (!empty($totalTime))
-			echo "\n" . 'Upgrade completed in ' . $totalTime . "\n";
+		if (!empty($totalTime)) {
+					echo "\n" . 'Upgrade completed in ' . $totalTime . "\n";
+		}
 	}
 
 	// Bang - gone!
@@ -406,8 +430,9 @@ 
 	global $upgradeurl, $upcontext, $command_line;
 
 	// Command line users can't be redirected.
-	if ($command_line)
-		upgradeExit(true);
+	if ($command_line) {
+			upgradeExit(true);
+	}
 
 	// Are we providing the core info?
 	if ($addForm)
@@ -433,12 +458,14 @@ 
 	define('SMF', 1);
 
 	// Start the session.
-	if (@ini_get('session.save_handler') == 'user')
-		@ini_set('session.save_handler', 'files');
+	if (@ini_get('session.save_handler') == 'user') {
+			@ini_set('session.save_handler', 'files');
+	}
 	@session_start();
 
-	if (empty($smcFunc))
-		$smcFunc = array();
+	if (empty($smcFunc)) {
+			$smcFunc = array();
+	}
 
 	// We need this for authentication and some upgrade code
 	require_once($sourcedir . '/Subs-Auth.php');
@@ -450,32 +477,36 @@ 
 	initialize_inputs();
 
 	// Get the database going!
-	if (empty($db_type) || $db_type == 'mysqli')
-		$db_type = 'mysql';
+	if (empty($db_type) || $db_type == 'mysqli') {
+			$db_type = 'mysql';
+	}
 
 	if (file_exists($sourcedir . '/Subs-Db-' . $db_type . '.php'))
 	{
 		require_once($sourcedir . '/Subs-Db-' . $db_type . '.php');
 
 		// Make the connection...
-		if (empty($db_connection))
-			$db_connection = smf_db_initiate($db_server, $db_name, $db_user, $db_passwd, $db_prefix, array('non_fatal' => true));
-		else
-			// If we've returned here, ping/reconnect to be safe
+		if (empty($db_connection)) {
+					$db_connection = smf_db_initiate($db_server, $db_name, $db_user, $db_passwd, $db_prefix, array('non_fatal' => true));
+		} else {
+					// If we've returned here, ping/reconnect to be safe
 			$smcFunc['db_ping']($db_connection);
+		}
 
 		// Oh dear god!!
-		if ($db_connection === null)
-			die('Unable to connect to database - please check username and password are correct in Settings.php');
+		if ($db_connection === null) {
+					die('Unable to connect to database - please check username and password are correct in Settings.php');
+		}
 
-		if ($db_type == 'mysql' && isset($db_character_set) && preg_match('~^\w+$~', $db_character_set) === 1)
-			$smcFunc['db_query']('', '
+		if ($db_type == 'mysql' && isset($db_character_set) && preg_match('~^\w+$~', $db_character_set) === 1) {
+					$smcFunc['db_query']('', '
 			SET NAMES {string:db_character_set}',
 			array(
 				'db_error_skip' => true,
 				'db_character_set' => $db_character_set,
 			)
 		);
+		}
 
 		// Load the modSettings data...
 		$request = $smcFunc['db_query']('', '
@@ -486,11 +517,11 @@ 
 			)
 		);
 		$modSettings = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$modSettings[$row['variable']] = $row['value'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$modSettings[$row['variable']] = $row['value'];
+		}
 		$smcFunc['db_free_result']($request);
-	}
-	else
+	} else
 	{
 		return throw_error('Cannot find ' . $sourcedir . '/Subs-Db-' . $db_type . '.php' . '. Please check you have uploaded all source files and have the correct paths set.');
 	}
@@ -504,9 +535,10 @@ 
 		cleanRequest();
 	}
 
-	if (!isset($_GET['substep']))
-		$_GET['substep'] = 0;
-}
+	if (!isset($_GET['substep'])) {
+			$_GET['substep'] = 0;
+	}
+	}
 
 function initialize_inputs()
 {
@@ -536,8 +568,9 @@ 
 		$dh = opendir(dirname(__FILE__));
 		while ($file = readdir($dh))
 		{
-			if (preg_match('~upgrade_\d-\d_([A-Za-z])+\.sql~i', $file, $matches) && isset($matches[1]))
-				@unlink(dirname(__FILE__) . '/' . $file);
+			if (preg_match('~upgrade_\d-\d_([A-Za-z])+\.sql~i', $file, $matches) && isset($matches[1])) {
+							@unlink(dirname(__FILE__) . '/' . $file);
+			}
 		}
 		closedir($dh);
 
@@ -566,8 +599,9 @@ 
 	$temp = 'upgrade_php?step';
 	while (strlen($temp) > 4)
 	{
-		if (isset($_GET[$temp]))
-			unset($_GET[$temp]);
+		if (isset($_GET[$temp])) {
+					unset($_GET[$temp]);
+		}
 		$temp = substr($temp, 1);
 	}
 
@@ -594,32 +628,39 @@ 
 		&& @file_exists(dirname(__FILE__) . '/upgrade_2-1_' . $db_type . '.sql');
 
 	// Need legacy scripts?
-	if (!isset($modSettings['smfVersion']) || $modSettings['smfVersion'] < 2.1)
-		$check &= @file_exists(dirname(__FILE__) . '/upgrade_2-0_' . $db_type . '.sql');
-	if (!isset($modSettings['smfVersion']) || $modSettings['smfVersion'] < 2.0)
-		$check &= @file_exists(dirname(__FILE__) . '/upgrade_1-1.sql');
-	if (!isset($modSettings['smfVersion']) || $modSettings['smfVersion'] < 1.1)
-		$check &= @file_exists(dirname(__FILE__) . '/upgrade_1-0.sql');
+	if (!isset($modSettings['smfVersion']) || $modSettings['smfVersion'] < 2.1) {
+			$check &= @file_exists(dirname(__FILE__) . '/upgrade_2-0_' . $db_type . '.sql');
+	}
+	if (!isset($modSettings['smfVersion']) || $modSettings['smfVersion'] < 2.0) {
+			$check &= @file_exists(dirname(__FILE__) . '/upgrade_1-1.sql');
+	}
+	if (!isset($modSettings['smfVersion']) || $modSettings['smfVersion'] < 1.1) {
+			$check &= @file_exists(dirname(__FILE__) . '/upgrade_1-0.sql');
+	}
 
 	// We don't need "-utf8" files anymore...
 	$upcontext['language'] = str_ireplace('-utf8', '', $upcontext['language']);
 
 	// This needs to exist!
-	if (!file_exists($modSettings['theme_dir'] . '/languages/Install.' . $upcontext['language'] . '.php'))
-		return throw_error('The upgrader could not find the &quot;Install&quot; language file for the forum default language, ' . $upcontext['language'] . '.<br><br>Please make certain you uploaded all the files included in the package, even the theme and language files for the default theme.<br>&nbsp;&nbsp;&nbsp;[<a href="' . $upgradeurl . '?lang=english">Try English</a>]');
-	else
-		require_once($modSettings['theme_dir'] . '/languages/Install.' . $upcontext['language'] . '.php');
+	if (!file_exists($modSettings['theme_dir'] . '/languages/Install.' . $upcontext['language'] . '.php')) {
+			return throw_error('The upgrader could not find the &quot;Install&quot; language file for the forum default language, ' . $upcontext['language'] . '.<br><br>Please make certain you uploaded all the files included in the package, even the theme and language files for the default theme.<br>&nbsp;&nbsp;&nbsp;[<a href="' . $upgradeurl . '?lang=english">Try English</a>]');
+	} else {
+			require_once($modSettings['theme_dir'] . '/languages/Install.' . $upcontext['language'] . '.php');
+	}
 
-	if (!$check)
-		// Don't tell them what files exactly because it's a spot check - just like teachers don't tell which problems they are spot checking, that's dumb.
+	if (!$check) {
+			// Don't tell them what files exactly because it's a spot check - just like teachers don't tell which problems they are spot checking, that's dumb.
 		return throw_error('The upgrader was unable to find some crucial files.<br><br>Please make sure you uploaded all of the files included in the package, including the Themes, Sources, and other directories.');
+	}
 
 	// Do they meet the install requirements?
-	if (!php_version_check())
-		return throw_error('Warning!  You do not appear to have a version of PHP installed on your webserver that meets SMF\'s minimum installations requirements.<br><br>Please ask your host to upgrade.');
+	if (!php_version_check()) {
+			return throw_error('Warning!  You do not appear to have a version of PHP installed on your webserver that meets SMF\'s minimum installations requirements.<br><br>Please ask your host to upgrade.');
+	}
 
-	if (!db_version_check())
-		return throw_error('Your ' . $databases[$db_type]['name'] . ' version does not meet the minimum requirements of SMF.<br><br>Please ask your host to upgrade.');
+	if (!db_version_check()) {
+			return throw_error('Your ' . $databases[$db_type]['name'] . ' version does not meet the minimum requirements of SMF.<br><br>Please ask your host to upgrade.');
+	}
 
 	// Do some checks to make sure they have proper privileges
 	db_extend('packages');
@@ -634,14 +675,16 @@ 
 	$drop = $smcFunc['db_drop_table']('{db_prefix}priv_check');
 
 	// Sorry... we need CREATE, ALTER and DROP
-	if (!$create || !$alter || !$drop)
-		return throw_error('The ' . $databases[$db_type]['name'] . ' user you have set in Settings.php does not have proper privileges.<br><br>Please ask your host to give this user the ALTER, CREATE, and DROP privileges.');
+	if (!$create || !$alter || !$drop) {
+			return throw_error('The ' . $databases[$db_type]['name'] . ' user you have set in Settings.php does not have proper privileges.<br><br>Please ask your host to give this user the ALTER, CREATE, and DROP privileges.');
+	}
 
 	// Do a quick version spot check.
 	$temp = substr(@implode('', @file($boarddir . '/index.php')), 0, 4096);
 	preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $temp, $match);
-	if (empty($match[1]) || (trim($match[1]) != SMF_VERSION))
-		return throw_error('The upgrader found some old or outdated files.<br><br>Please make certain you uploaded the new versions of all the files included in the package.');
+	if (empty($match[1]) || (trim($match[1]) != SMF_VERSION)) {
+			return throw_error('The upgrader found some old or outdated files.<br><br>Please make certain you uploaded the new versions of all the files included in the package.');
+	}
 
 	// What absolutely needs to be writable?
 	$writable_files = array(
@@ -663,12 +706,13 @@ 
 	quickFileWritable($custom_av_dir);
 
 	// Are we good now?
-	if (!is_writable($custom_av_dir))
-		return throw_error(sprintf('The directory: %1$s has to be writable to continue the upgrade. Please make sure permissions are correctly set to allow this.', $custom_av_dir));
-	elseif ($need_settings_update)
+	if (!is_writable($custom_av_dir)) {
+			return throw_error(sprintf('The directory: %1$s has to be writable to continue the upgrade. Please make sure permissions are correctly set to allow this.', $custom_av_dir));
+	} elseif ($need_settings_update)
 	{
-		if (!function_exists('cache_put_data'))
-			require_once($sourcedir . '/Load.php');
+		if (!function_exists('cache_put_data')) {
+					require_once($sourcedir . '/Load.php');
+		}
 		updateSettings(array('custom_avatar_dir' => $custom_av_dir));
 		updateSettings(array('custom_avatar_url' => $custom_av_url));
 	}
@@ -677,28 +721,33 @@ 
 
 	// Check the cache directory.
 	$cachedir_temp = empty($cachedir) ? $boarddir . '/cache' : $cachedir;
-	if (!file_exists($cachedir_temp))
-		@mkdir($cachedir_temp);
-	if (!file_exists($cachedir_temp))
-		return throw_error('The cache directory could not be found.<br><br>Please make sure you have a directory called &quot;cache&quot; in your forum directory before continuing.');
-
-	if (!file_exists($modSettings['theme_dir'] . '/languages/index.' . $upcontext['language'] . '.php') && !isset($modSettings['smfVersion']) && !isset($_GET['lang']))
-		return throw_error('The upgrader was unable to find language files for the language specified in Settings.php.<br>SMF will not work without the primary language files installed.<br><br>Please either install them, or <a href="' . $upgradeurl . '?step=0;lang=english">use english instead</a>.');
-	elseif (!isset($_GET['skiplang']))
+	if (!file_exists($cachedir_temp)) {
+			@mkdir($cachedir_temp);
+	}
+	if (!file_exists($cachedir_temp)) {
+			return throw_error('The cache directory could not be found.<br><br>Please make sure you have a directory called &quot;cache&quot; in your forum directory before continuing.');
+	}
+
+	if (!file_exists($modSettings['theme_dir'] . '/languages/index.' . $upcontext['language'] . '.php') && !isset($modSettings['smfVersion']) && !isset($_GET['lang'])) {
+			return throw_error('The upgrader was unable to find language files for the language specified in Settings.php.<br>SMF will not work without the primary language files installed.<br><br>Please either install them, or <a href="' . $upgradeurl . '?step=0;lang=english">use english instead</a>.');
+	} elseif (!isset($_GET['skiplang']))
 	{
 		$temp = substr(@implode('', @file($modSettings['theme_dir'] . '/languages/index.' . $upcontext['language'] . '.php')), 0, 4096);
 		preg_match('~(?://|/\*)\s*Version:\s+(.+?);\s*index(?:[\s]{2}|\*/)~i', $temp, $match);
 
-		if (empty($match[1]) || $match[1] != SMF_LANG_VERSION)
-			return throw_error('The upgrader found some old or outdated language files, for the forum default language, ' . $upcontext['language'] . '.<br><br>Please make certain you uploaded the new versions of all the files included in the package, even the theme and language files for the default theme.<br>&nbsp;&nbsp;&nbsp;[<a href="' . $upgradeurl . '?skiplang">SKIP</a>] [<a href="' . $upgradeurl . '?lang=english">Try English</a>]');
+		if (empty($match[1]) || $match[1] != SMF_LANG_VERSION) {
+					return throw_error('The upgrader found some old or outdated language files, for the forum default language, ' . $upcontext['language'] . '.<br><br>Please make certain you uploaded the new versions of all the files included in the package, even the theme and language files for the default theme.<br>&nbsp;&nbsp;&nbsp;[<a href="' . $upgradeurl . '?skiplang">SKIP</a>] [<a href="' . $upgradeurl . '?lang=english">Try English</a>]');
+		}
 	}
 
-	if (!makeFilesWritable($writable_files))
-		return false;
+	if (!makeFilesWritable($writable_files)) {
+			return false;
+	}
 
 	// Check agreement.txt. (it may not exist, in which case $boarddir must be writable.)
-	if (isset($modSettings['agreement']) && (!is_writable($boarddir) || file_exists($boarddir . '/agreement.txt')) && !is_writable($boarddir . '/agreement.txt'))
-		return throw_error('The upgrader was unable to obtain write access to agreement.txt.<br><br>If you are using a linux or unix based server, please ensure that the file is chmod\'d to 777, or if it does not exist that the directory this upgrader is in is 777.<br>If your server is running Windows, please ensure that the internet guest account has the proper permissions on it or its folder.');
+	if (isset($modSettings['agreement']) && (!is_writable($boarddir) || file_exists($boarddir . '/agreement.txt')) && !is_writable($boarddir . '/agreement.txt')) {
+			return throw_error('The upgrader was unable to obtain write access to agreement.txt.<br><br>If you are using a linux or unix based server, please ensure that the file is chmod\'d to 777, or if it does not exist that the directory this upgrader is in is 777.<br>If your server is running Windows, please ensure that the internet guest account has the proper permissions on it or its folder.');
+	}
 
 	// Upgrade the agreement.
 	elseif (isset($modSettings['agreement']))
@@ -709,8 +758,8 @@ 
 	}
 
 	// We're going to check that their board dir setting is right in case they've been moving stuff around.
-	if (strtr($boarddir, array('/' => '', '\\' => '')) != strtr(dirname(__FILE__), array('/' => '', '\\' => '')))
-		$upcontext['warning'] = '
+	if (strtr($boarddir, array('/' => '', '\\' => '')) != strtr(dirname(__FILE__), array('/' => '', '\\' => ''))) {
+			$upcontext['warning'] = '
 			It looks as if your board directory settings <em>might</em> be incorrect. Your board directory is currently set to &quot;' . $boarddir . '&quot; but should probably be &quot;' . dirname(__FILE__) . '&quot;. Settings.php currently lists your paths as:<br>
 			<ul>
 				<li>Board Directory: ' . $boarddir . '</li>
@@ -718,15 +767,18 @@ 
 				<li>Cache Directory: ' . $cachedir_temp . '</li>
 			</ul>
 			If these seem incorrect please open Settings.php in a text editor before proceeding with this upgrade. If they are incorrect due to you moving your forum to a new location please download and execute the <a href="https://download.simplemachines.org/?tools">Repair Settings</a> tool from the Simple Machines website before continuing.';
+	}
 
 	// Check for https stream support.
 	$supported_streams = stream_get_wrappers();
-	if (!in_array('https', $supported_streams))
-		$upcontext['custom_warning'] = $txt['install_no_https'];
+	if (!in_array('https', $supported_streams)) {
+			$upcontext['custom_warning'] = $txt['install_no_https'];
+	}
 
 	// Either we're logged in or we're going to present the login.
-	if (checkLogin())
-		return true;
+	if (checkLogin()) {
+			return true;
+	}
 
 	$upcontext += createToken('login');
 
@@ -740,15 +792,17 @@ 
 	global $smcFunc, $db_type, $support_js;
 
 	// Don't bother if the security is disabled.
-	if ($disable_security)
-		return true;
+	if ($disable_security) {
+			return true;
+	}
 
 	// Are we trying to login?
 	if (isset($_POST['contbutt']) && (!empty($_POST['user'])))
 	{
 		// If we've disabled security pick a suitable name!
-		if (empty($_POST['user']))
-			$_POST['user'] = 'Administrator';
+		if (empty($_POST['user'])) {
+					$_POST['user'] = 'Administrator';
+		}
 
 		// Before 2.0 these column names were different!
 		$oldDB = false;
@@ -763,16 +817,17 @@ 
 					'db_error_skip' => true,
 				)
 			);
-			if ($smcFunc['db_num_rows']($request) != 0)
-				$oldDB = true;
+			if ($smcFunc['db_num_rows']($request) != 0) {
+							$oldDB = true;
+			}
 			$smcFunc['db_free_result']($request);
 		}
 
 		// Get what we believe to be their details.
 		if (!$disable_security)
 		{
-			if ($oldDB)
-				$request = $smcFunc['db_query']('', '
+			if ($oldDB) {
+							$request = $smcFunc['db_query']('', '
 					SELECT id_member, memberName AS member_name, passwd, id_group,
 					additionalGroups AS additional_groups, lngfile
 					FROM {db_prefix}members
@@ -782,8 +837,8 @@ 
 						'db_error_skip' => true,
 					)
 				);
-			else
-				$request = $smcFunc['db_query']('', '
+			} else {
+							$request = $smcFunc['db_query']('', '
 					SELECT id_member, member_name, passwd, id_group, additional_groups, lngfile
 					FROM {db_prefix}members
 					WHERE member_name = {string:member_name}',
@@ -792,6 +847,7 @@ 
 						'db_error_skip' => true,
 					)
 				);
+			}
 			if ($smcFunc['db_num_rows']($request) != 0)
 			{
 				list ($id_member, $name, $password, $id_group, $addGroups, $user_language) = $smcFunc['db_fetch_row']($request);
@@ -799,16 +855,17 @@ 
 				$groups = explode(',', $addGroups);
 				$groups[] = $id_group;
 
-				foreach ($groups as $k => $v)
-					$groups[$k] = (int) $v;
+				foreach ($groups as $k => $v) {
+									$groups[$k] = (int) $v;
+				}
 
 				$sha_passwd = sha1(strtolower($name) . un_htmlspecialchars($_REQUEST['passwrd']));
 
 				// We don't use "-utf8" anymore...
 				$user_language = str_ireplace('-utf8', '', $user_language);
+			} else {
+							$upcontext['username_incorrect'] = true;
 			}
-			else
-				$upcontext['username_incorrect'] = true;
 			$smcFunc['db_free_result']($request);
 		}
 		$upcontext['username'] = $_POST['user'];
@@ -818,13 +875,14 @@ 
 		{
 			$upcontext['upgrade_status']['js'] = 1;
 			$support_js = 1;
+		} else {
+					$support_js = 0;
 		}
-		else
-			$support_js = 0;
 
 		// Note down the version we are coming from.
-		if (!empty($modSettings['smfVersion']) && empty($upcontext['user']['version']))
-			$upcontext['user']['version'] = $modSettings['smfVersion'];
+		if (!empty($modSettings['smfVersion']) && empty($upcontext['user']['version'])) {
+					$upcontext['user']['version'] = $modSettings['smfVersion'];
+		}
 
 		// Didn't get anywhere?
 		if (!$disable_security && (empty($sha_passwd) || (!empty($password) ? $password : '') != $sha_passwd) && !hash_verify_password((!empty($name) ? $name : ''), $_REQUEST['passwrd'], (!empty($password) ? $password : '')) && empty($upcontext['username_incorrect']))
@@ -858,15 +916,15 @@ 
 							'db_error_skip' => true,
 						)
 					);
-					if ($smcFunc['db_num_rows']($request) == 0)
-						return throw_error('You need to be an admin to perform an upgrade!');
+					if ($smcFunc['db_num_rows']($request) == 0) {
+											return throw_error('You need to be an admin to perform an upgrade!');
+					}
 					$smcFunc['db_free_result']($request);
 				}
 
 				$upcontext['user']['id'] = $id_member;
 				$upcontext['user']['name'] = $name;
-			}
-			else
+			} else
 			{
 				$upcontext['user']['id'] = 1;
 				$upcontext['user']['name'] = 'Administrator';
@@ -882,11 +940,11 @@ 
 				$temp = substr(@implode('', @file($modSettings['theme_dir'] . '/languages/index.' . $user_language . '.php')), 0, 4096);
 				preg_match('~(?://|/\*)\s*Version:\s+(.+?);\s*index(?:[\s]{2}|\*/)~i', $temp, $match);
 
-				if (empty($match[1]) || $match[1] != SMF_LANG_VERSION)
-					$upcontext['upgrade_options_warning'] = 'The language files for your selected language, ' . $user_language . ', have not been updated to the latest version. Upgrade will continue with the forum default, ' . $upcontext['language'] . '.';
-				elseif (!file_exists($modSettings['theme_dir'] . '/languages/Install.' . basename($user_language, '.lng') . '.php'))
-					$upcontext['upgrade_options_warning'] = 'The language files for your selected language, ' . $user_language . ', have not been uploaded/updated as the &quot;Install&quot; language file is missing. Upgrade will continue with the forum default, ' . $upcontext['language'] . '.';
-				else
+				if (empty($match[1]) || $match[1] != SMF_LANG_VERSION) {
+									$upcontext['upgrade_options_warning'] = 'The language files for your selected language, ' . $user_language . ', have not been updated to the latest version. Upgrade will continue with the forum default, ' . $upcontext['language'] . '.';
+				} elseif (!file_exists($modSettings['theme_dir'] . '/languages/Install.' . basename($user_language, '.lng') . '.php')) {
+									$upcontext['upgrade_options_warning'] = 'The language files for your selected language, ' . $user_language . ', have not been uploaded/updated as the &quot;Install&quot; language file is missing. Upgrade will continue with the forum default, ' . $upcontext['language'] . '.';
+				} else
 				{
 					// Set this as the new language.
 					$upcontext['language'] = $user_language;
@@ -930,8 +988,9 @@ 
 	unset($member_columns);
 
 	// If we've not submitted then we're done.
-	if (empty($_POST['upcont']))
-		return false;
+	if (empty($_POST['upcont'])) {
+			return false;
+	}
 
 	// Firstly, if they're enabling SM stat collection just do it.
 	if (!empty($_POST['stats']) && substr($boardurl, 0, 16) != 'http://localhost' && empty($modSettings['allow_sm_stats']) && empty($modSettings['enable_sm_stats']))
@@ -951,16 +1010,17 @@ 
 				fwrite($fp, $out);
 
 				$return_data = '';
-				while (!feof($fp))
-					$return_data .= fgets($fp, 128);
+				while (!feof($fp)) {
+									$return_data .= fgets($fp, 128);
+				}
 
 				fclose($fp);
 
 				// Get the unique site ID.
 				preg_match('~SITE-ID:\s(\w{10})~', $return_data, $ID);
 
-				if (!empty($ID[1]))
-					$smcFunc['db_insert']('replace',
+				if (!empty($ID[1])) {
+									$smcFunc['db_insert']('replace',
 						$db_prefix . 'settings',
 						array('variable' => 'string', 'value' => 'string'),
 						array(
@@ -969,9 +1029,9 @@ 
 						),
 						array('variable')
 					);
+				}
 			}
-		}
-		else
+		} else
 		{
 			$smcFunc['db_insert']('replace',
 				$db_prefix . 'settings',
@@ -982,8 +1042,8 @@ 
 		}
 	}
 	// Don't remove stat collection unless we unchecked the box for real, not from the loop.
-	elseif (empty($_POST['stats']) && empty($upcontext['allow_sm_stats']))
-		$smcFunc['db_query']('', '
+	elseif (empty($_POST['stats']) && empty($upcontext['allow_sm_stats'])) {
+			$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}settings
 			WHERE variable = {string:enable_sm_stats}',
 			array(
@@ -991,6 +1051,7 @@ 
 				'db_error_skip' => true,
 			)
 		);
+	}
 
 	// Deleting old karma stuff?
 	if (!empty($_POST['delete_karma']))
@@ -1005,20 +1066,22 @@ 
 		);
 
 		// Cleaning up old karma member settings.
-		if ($upcontext['karma_installed']['good'])
-			$smcFunc['db_query']('', '
+		if ($upcontext['karma_installed']['good']) {
+					$smcFunc['db_query']('', '
 				ALTER TABLE {db_prefix}members
 				DROP karma_good',
 				array()
 			);
+		}
 
 		// Does karma bad was enable?
-		if ($upcontext['karma_installed']['bad'])
-			$smcFunc['db_query']('', '
+		if ($upcontext['karma_installed']['bad']) {
+					$smcFunc['db_query']('', '
 				ALTER TABLE {db_prefix}members
 				DROP karma_bad',
 				array()
 			);
+		}
 
 		// Cleaning up old karma permissions.
 		$smcFunc['db_query']('', '
@@ -1031,26 +1094,29 @@ 
 	}
 
 	// Emptying the error log?
-	if (!empty($_POST['empty_error']))
-		$smcFunc['db_query']('truncate_table', '
+	if (!empty($_POST['empty_error'])) {
+			$smcFunc['db_query']('truncate_table', '
 			TRUNCATE {db_prefix}log_errors',
 			array(
 			)
 		);
+	}
 
 	$changes = array();
 
 	// Add proxy settings.
-	if (!isset($GLOBALS['image_proxy_maxsize']))
-		$changes += array(
+	if (!isset($GLOBALS['image_proxy_maxsize'])) {
+			$changes += array(
 			'image_proxy_secret' => '\'' . substr(sha1(mt_rand()), 0, 20) . '\'',
 			'image_proxy_maxsize' => 5190,
 			'image_proxy_enabled' => 0,
 		);
+	}
 
 	// If we're overriding the language follow it through.
-	if (isset($_GET['lang']) && file_exists($modSettings['theme_dir'] . '/languages/index.' . $_GET['lang'] . '.php'))
-		$changes['language'] = '\'' . $_GET['lang'] . '\'';
+	if (isset($_GET['lang']) && file_exists($modSettings['theme_dir'] . '/languages/index.' . $_GET['lang'] . '.php')) {
+			$changes['language'] = '\'' . $_GET['lang'] . '\'';
+	}
 
 	if (!empty($_POST['maint']))
 	{
@@ -1062,30 +1128,34 @@ 
 		{
 			$changes['mtitle'] = '\'' . addslashes($_POST['maintitle']) . '\'';
 			$changes['mmessage'] = '\'' . addslashes($_POST['mainmessage']) . '\'';
-		}
-		else
+		} else
 		{
 			$changes['mtitle'] = '\'Upgrading the forum...\'';
 			$changes['mmessage'] = '\'Don\\\'t worry, we will be back shortly with an updated forum.  It will only be a minute ;).\'';
 		}
 	}
 
-	if ($command_line)
-		echo ' * Updating Settings.php...';
+	if ($command_line) {
+			echo ' * Updating Settings.php...';
+	}
 
 	// Fix some old paths.
-	if (substr($boarddir, 0, 1) == '.')
-		$changes['boarddir'] = '\'' . fixRelativePath($boarddir) . '\'';
+	if (substr($boarddir, 0, 1) == '.') {
+			$changes['boarddir'] = '\'' . fixRelativePath($boarddir) . '\'';
+	}
 
-	if (substr($sourcedir, 0, 1) == '.')
-		$changes['sourcedir'] = '\'' . fixRelativePath($sourcedir) . '\'';
+	if (substr($sourcedir, 0, 1) == '.') {
+			$changes['sourcedir'] = '\'' . fixRelativePath($sourcedir) . '\'';
+	}
 
-	if (empty($cachedir) || substr($cachedir, 0, 1) == '.')
-		$changes['cachedir'] = '\'' . fixRelativePath($boarddir) . '/cache\'';
+	if (empty($cachedir) || substr($cachedir, 0, 1) == '.') {
+			$changes['cachedir'] = '\'' . fixRelativePath($boarddir) . '/cache\'';
+	}
 
 	// Not had the database type added before?
-	if (empty($db_type))
-		$changes['db_type'] = 'mysql';
+	if (empty($db_type)) {
+			$changes['db_type'] = 'mysql';
+	}
 
 	// If they have a "host:port" setup for the host, split that into separate values
 	// You should never have a : in the hostname if you're not on MySQL, but better safe than sorry
@@ -1096,32 +1166,36 @@ 
 		$changes['db_server'] = '\'' . $db_server . '\'';
 
 		// Only set this if we're not using the default port
-		if ($db_port != ini_get('mysqli.default_port'))
-			$changes['db_port'] = (int) $db_port;
-	}
-	elseif (!empty($db_port))
+		if ($db_port != ini_get('mysqli.default_port')) {
+					$changes['db_port'] = (int) $db_port;
+		}
+	} elseif (!empty($db_port))
 	{
 		// If db_port is set and is the same as the default, set it to ''
 		if ($db_type == 'mysql')
 		{
-			if ($db_port == ini_get('mysqli.default_port'))
-				$changes['db_port'] = '\'\'';
-			elseif ($db_type == 'postgresql' && $db_port == 5432)
-				$changes['db_port'] = '\'\'';
+			if ($db_port == ini_get('mysqli.default_port')) {
+							$changes['db_port'] = '\'\'';
+			} elseif ($db_type == 'postgresql' && $db_port == 5432) {
+							$changes['db_port'] = '\'\'';
+			}
 		}
 	}
 
 	// Maybe we haven't had this option yet?
-	if (empty($packagesdir))
-		$changes['packagesdir'] = '\'' . fixRelativePath($boarddir) . '/Packages\'';
+	if (empty($packagesdir)) {
+			$changes['packagesdir'] = '\'' . fixRelativePath($boarddir) . '/Packages\'';
+	}
 
 	// Add support for $tasksdir var.
-	if (empty($tasksdir))
-		$changes['tasksdir'] = '\'' . fixRelativePath($sourcedir) . '/tasks\'';
+	if (empty($tasksdir)) {
+			$changes['tasksdir'] = '\'' . fixRelativePath($sourcedir) . '/tasks\'';
+	}
 
 	// Make sure we fix the language as well.
-	if (stristr($language, '-utf8'))
-		$changes['language'] = '\'' . str_ireplace('-utf8', '', $language) . '\'';
+	if (stristr($language, '-utf8')) {
+			$changes['language'] = '\'' . str_ireplace('-utf8', '', $language) . '\'';
+	}
 
 	// @todo Maybe change the cookie name if going to 1.1, too?
 
@@ -1129,8 +1203,9 @@ 
 	require_once($sourcedir . '/Subs-Admin.php');
 	updateSettingsFile($changes);
 
-	if ($command_line)
-		echo ' Successful.' . "\n";
+	if ($command_line) {
+			echo ' Successful.' . "\n";
+	}
 
 	// Are we doing debug?
 	if (isset($_POST['debug']))
@@ -1140,8 +1215,9 @@ 
 	}
 
 	// If we're not backing up then jump one.
-	if (empty($_POST['backup']))
-		$upcontext['current_step']++;
+	if (empty($_POST['backup'])) {
+			$upcontext['current_step']++;
+	}
 
 	// If we've got here then let's proceed to the next step!
 	return true;
@@ -1156,8 +1232,9 @@ 
 	$upcontext['page_title'] = 'Backup Database';
 
 	// Done it already - js wise?
-	if (!empty($_POST['backup_done']))
-		return true;
+	if (!empty($_POST['backup_done'])) {
+			return true;
+	}
 
 	// Some useful stuff here.
 	db_extend();
@@ -1171,9 +1248,10 @@ 
 	$tables = $smcFunc['db_list_tables']($db, $filter);
 
 	$table_names = array();
-	foreach ($tables as $table)
-		if (substr($table, 0, 7) !== 'backup_')
+	foreach ($tables as $table) {
+			if (substr($table, 0, 7) !== 'backup_')
 			$table_names[] = $table;
+	}
 
 	$upcontext['table_count'] = count($table_names);
 	$upcontext['cur_table_num'] = $_GET['substep'];
@@ -1183,12 +1261,14 @@ 
 	$file_steps = $upcontext['table_count'];
 
 	// What ones have we already done?
-	foreach ($table_names as $id => $table)
-		if ($id < $_GET['substep'])
+	foreach ($table_names as $id => $table) {
+			if ($id < $_GET['substep'])
 			$upcontext['previous_tables'][] = $table;
+	}
 
-	if ($command_line)
-		echo 'Backing Up Tables.';
+	if ($command_line) {
+			echo 'Backing Up Tables.';
+	}
 
 	// If we don't support javascript we backup here.
 	if (!$support_js || isset($_GET['xml']))
@@ -1207,8 +1287,9 @@ 
 			backupTable($table_names[$substep]);
 
 			// If this is XML to keep it nice for the user do one table at a time anyway!
-			if (isset($_GET['xml']))
-				return upgradeExit();
+			if (isset($_GET['xml'])) {
+							return upgradeExit();
+			}
 		}
 
 		if ($command_line)
@@ -1241,9 +1322,10 @@ 
 
 	$smcFunc['db_backup_table']($table, 'backup_' . $table);
 
-	if ($command_line)
-		echo ' done.';
-}
+	if ($command_line) {
+			echo ' done.';
+	}
+	}
 
 // Step 2: Everything.
 function DatabaseChanges()
@@ -1252,8 +1334,9 @@ 
 	global $upcontext, $support_js, $db_type;
 
 	// Have we just completed this?
-	if (!empty($_POST['database_done']))
-		return true;
+	if (!empty($_POST['database_done'])) {
+			return true;
+	}
 
 	$upcontext['sub_template'] = isset($_GET['xml']) ? 'database_xml' : 'database_changes';
 	$upcontext['page_title'] = 'Database Changes';
@@ -1268,15 +1351,16 @@ 
 	);
 
 	// How many files are there in total?
-	if (isset($_GET['filecount']))
-		$upcontext['file_count'] = (int) $_GET['filecount'];
-	else
+	if (isset($_GET['filecount'])) {
+			$upcontext['file_count'] = (int) $_GET['filecount'];
+	} else
 	{
 		$upcontext['file_count'] = 0;
 		foreach ($files as $file)
 		{
-			if (!isset($modSettings['smfVersion']) || $modSettings['smfVersion'] < $file[1])
-				$upcontext['file_count']++;
+			if (!isset($modSettings['smfVersion']) || $modSettings['smfVersion'] < $file[1]) {
+							$upcontext['file_count']++;
+			}
 		}
 	}
 
@@ -1286,9 +1370,9 @@ 
 	$upcontext['cur_file_num'] = 0;
 	foreach ($files as $file)
 	{
-		if ($did_not_do)
-			$did_not_do--;
-		else
+		if ($did_not_do) {
+					$did_not_do--;
+		} else
 		{
 			$upcontext['cur_file_num']++;
 			$upcontext['cur_file_name'] = $file[0];
@@ -1315,12 +1399,13 @@ 
 					// Flag to move on to the next.
 					$upcontext['completed_step'] = true;
 					// Did we complete the whole file?
-					if ($nextFile)
-						$upcontext['current_debug_item_num'] = -1;
+					if ($nextFile) {
+											$upcontext['current_debug_item_num'] = -1;
+					}
 					return upgradeExit();
+				} elseif ($support_js) {
+									break;
 				}
-				elseif ($support_js)
-					break;
 			}
 			// Set the progress bar to be right as if we had - even if we hadn't...
 			$upcontext['step_progress'] = ($upcontext['cur_file_num'] / $upcontext['file_count']) * 100;
@@ -1345,8 +1430,9 @@ 
 	global $command_line, $language, $upcontext, $sourcedir, $forum_version, $user_info, $maintenance, $smcFunc, $db_type;
 
 	// Now it's nice to have some of the basic SMF source files.
-	if (!isset($_GET['ssi']) && !$command_line)
-		redirectLocation('&ssi=1');
+	if (!isset($_GET['ssi']) && !$command_line) {
+			redirectLocation('&ssi=1');
+	}
 
 	$upcontext['sub_template'] = 'upgrade_complete';
 	$upcontext['page_title'] = 'Upgrade Complete';
@@ -1362,14 +1448,16 @@ 
 	// Are we in maintenance mode?
 	if (isset($upcontext['user']['main']))
 	{
-		if ($command_line)
-			echo ' * ';
+		if ($command_line) {
+					echo ' * ';
+		}
 		$upcontext['removed_maintenance'] = true;
 		$changes['maintenance'] = $upcontext['user']['main'];
 	}
 	// Otherwise if somehow we are in 2 let's go to 1.
-	elseif (!empty($maintenance) && $maintenance == 2)
-		$changes['maintenance'] = 1;
+	elseif (!empty($maintenance) && $maintenance == 2) {
+			$changes['maintenance'] = 1;
+	}
 
 	// Wipe this out...
 	$upcontext['user'] = array();
@@ -1384,9 +1472,9 @@ 
 	$upcontext['can_delete_script'] = is_writable(dirname(__FILE__)) || is_writable(__FILE__);
 
 	// Now is the perfect time to fetch the SM files.
-	if ($command_line)
-		cli_scheduled_fetchSMfiles();
-	else
+	if ($command_line) {
+			cli_scheduled_fetchSMfiles();
+	} else
 	{
 		require_once($sourcedir . '/ScheduledTasks.php');
 		$forum_version = SMF_VERSION; // The variable is usually defined in index.php so lets just use the constant to do it for us.
@@ -1394,8 +1482,9 @@ 
 	}
 
 	// Log what we've done.
-	if (empty($user_info['id']))
-		$user_info['id'] = !empty($upcontext['user']['id']) ? $upcontext['user']['id'] : 0;
+	if (empty($user_info['id'])) {
+			$user_info['id'] = !empty($upcontext['user']['id']) ? $upcontext['user']['id'] : 0;
+	}
 
 	// Log the action manually, so CLI still works.
 	$smcFunc['db_insert']('',
@@ -1414,8 +1503,9 @@ 
 
 	// Save the current database version.
 	$server_version = $smcFunc['db_server_info']();
-	if ($db_type == 'mysql' && in_array(substr($server_version, 0, 6), array('5.0.50', '5.0.51')))
-		updateSettings(array('db_mysql_group_by_fix' => '1'));
+	if ($db_type == 'mysql' && in_array(substr($server_version, 0, 6), array('5.0.50', '5.0.51'))) {
+			updateSettings(array('db_mysql_group_by_fix' => '1'));
+	}
 
 	if ($command_line)
 	{
@@ -1427,8 +1517,9 @@ 
 
 	// Make sure it says we're done.
 	$upcontext['overall_percent'] = 100;
-	if (isset($upcontext['step_progress']))
-		unset($upcontext['step_progress']);
+	if (isset($upcontext['step_progress'])) {
+			unset($upcontext['step_progress']);
+	}
 
 	$_GET['substep'] = 0;
 	return false;
@@ -1439,8 +1530,9 @@ 
 {
 	global $sourcedir, $language, $forum_version, $modSettings, $smcFunc;
 
-	if (empty($modSettings['time_format']))
-		$modSettings['time_format'] = '%B %d, %Y, %I:%M:%S %p';
+	if (empty($modSettings['time_format'])) {
+			$modSettings['time_format'] = '%B %d, %Y, %I:%M:%S %p';
+	}
 
 	// What files do we want to get
 	$request = $smcFunc['db_query']('', '
@@ -1474,8 +1566,9 @@ 
 		$file_data = fetch_web_data($url);
 
 		// If we got an error - give up - the site might be down.
-		if ($file_data === false)
-			return throw_error(sprintf('Could not retrieve the file %1$s.', $url));
+		if ($file_data === false) {
+					return throw_error(sprintf('Could not retrieve the file %1$s.', $url));
+		}
 
 		// Save the file to the database.
 		$smcFunc['db_query']('substring', '
@@ -1517,8 +1610,9 @@ 
 	$themeData = array();
 	foreach ($values as $variable => $value)
 	{
-		if (!isset($value) || $value === null)
-			$value = 0;
+		if (!isset($value) || $value === null) {
+					$value = 0;
+		}
 
 		$themeData[] = array(0, 1, $variable, $value);
 	}
@@ -1547,8 +1641,9 @@ 
 
 	foreach ($values as $variable => $value)
 	{
-		if (empty($modSettings[$value[0]]))
-			continue;
+		if (empty($modSettings[$value[0]])) {
+					continue;
+		}
 
 		$smcFunc['db_query']('', '
 			INSERT IGNORE INTO {db_prefix}themes
@@ -1634,19 +1729,21 @@ 
 	set_error_handler(
 		function ($errno, $errstr, $errfile, $errline) use ($support_js)
 		{
-			if ($support_js)
-				return true;
-			else
-				echo 'Error: ' . $errstr . ' File: ' . $errfile . ' Line: ' . $errline;
+			if ($support_js) {
+							return true;
+			} else {
+							echo 'Error: ' . $errstr . ' File: ' . $errfile . ' Line: ' . $errline;
+			}
 		}
 	);
 
 	// If we're on MySQL, set {db_collation}; this approach is used throughout upgrade_2-0_mysql.php to set new tables to utf8
 	// Note it is expected to be in the format: ENGINE=MyISAM{$db_collation};
-	if ($db_type == 'mysql')
-		$db_collation = ' DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci';
-	else
-		$db_collation = '';
+	if ($db_type == 'mysql') {
+			$db_collation = ' DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci';
+	} else {
+			$db_collation = '';
+	}
 
 	$endl = $command_line ? "\n" : '<br>' . "\n";
 
@@ -1658,8 +1755,9 @@ 
 	$last_step = '';
 
 	// Make sure all newly created tables will have the proper characters set; this approach is used throughout upgrade_2-1_mysql.php
-	if (isset($db_character_set) && $db_character_set === 'utf8')
-		$lines = str_replace(') ENGINE=MyISAM;', ') ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;', $lines);
+	if (isset($db_character_set) && $db_character_set === 'utf8') {
+			$lines = str_replace(') ENGINE=MyISAM;', ') ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;', $lines);
+	}
 
 	// Count the total number of steps within this file - for progress.
 	$file_steps = substr_count(implode('', $lines), '---#');
@@ -1679,15 +1777,18 @@ 
 		$do_current = $substep >= $_GET['substep'];
 
 		// Get rid of any comments in the beginning of the line...
-		if (substr(trim($line), 0, 2) === '/*')
-			$line = preg_replace('~/\*.+?\*/~', '', $line);
+		if (substr(trim($line), 0, 2) === '/*') {
+					$line = preg_replace('~/\*.+?\*/~', '', $line);
+		}
 
 		// Always flush.  Flush, flush, flush.  Flush, flush, flush, flush!  FLUSH!
-		if ($is_debug && !$support_js && $command_line)
-			flush();
+		if ($is_debug && !$support_js && $command_line) {
+					flush();
+		}
 
-		if (trim($line) === '')
-			continue;
+		if (trim($line) === '') {
+					continue;
+		}
 
 		if (trim(substr($line, 0, 3)) === '---')
 		{
@@ -1697,8 +1798,9 @@ 
 			if (trim($current_data) != '' && $type !== '}')
 			{
 				$upcontext['error_message'] = 'Error in upgrade script - line ' . $line_number . '!' . $endl;
-				if ($command_line)
-					echo $upcontext['error_message'];
+				if ($command_line) {
+									echo $upcontext['error_message'];
+				}
 			}
 
 			if ($type == ' ')
@@ -1716,17 +1818,18 @@ 
 				if ($do_current)
 				{
 					$upcontext['actioned_items'][] = $last_step;
-					if ($command_line)
-						echo ' * ';
+					if ($command_line) {
+											echo ' * ';
+					}
 				}
-			}
-			elseif ($type == '#')
+			} elseif ($type == '#')
 			{
 				$upcontext['step_progress'] += (100 / $upcontext['file_count']) / $file_steps;
 
 				$upcontext['current_debug_item_num']++;
-				if (trim($line) != '---#')
-					$upcontext['current_debug_item_name'] = htmlspecialchars(rtrim(substr($line, 4)));
+				if (trim($line) != '---#') {
+									$upcontext['current_debug_item_name'] = htmlspecialchars(rtrim(substr($line, 4)));
+				}
 
 				// Have we already done something?
 				if (isset($_GET['xml']) && $done_something)
@@ -1737,34 +1840,36 @@ 
 
 				if ($do_current)
 				{
-					if (trim($line) == '---#' && $command_line)
-						echo ' done.', $endl;
-					elseif ($command_line)
-						echo ' +++ ', rtrim(substr($line, 4));
-					elseif (trim($line) != '---#')
+					if (trim($line) == '---#' && $command_line) {
+											echo ' done.', $endl;
+					} elseif ($command_line) {
+											echo ' +++ ', rtrim(substr($line, 4));
+					} elseif (trim($line) != '---#')
 					{
-						if ($is_debug)
-							$upcontext['actioned_items'][] = htmlspecialchars(rtrim(substr($line, 4)));
+						if ($is_debug) {
+													$upcontext['actioned_items'][] = htmlspecialchars(rtrim(substr($line, 4)));
+						}
 					}
 				}
 
 				if ($substep < $_GET['substep'] && $substep + 1 >= $_GET['substep'])
 				{
-					if ($command_line)
-						echo ' * ';
-					else
-						$upcontext['actioned_items'][] = $last_step;
+					if ($command_line) {
+											echo ' * ';
+					} else {
+											$upcontext['actioned_items'][] = $last_step;
+					}
 				}
 
 				// Small step - only if we're actually doing stuff.
-				if ($do_current)
-					nextSubstep(++$substep);
-				else
-					$substep++;
-			}
-			elseif ($type == '{')
-				$current_type = 'code';
-			elseif ($type == '}')
+				if ($do_current) {
+									nextSubstep(++$substep);
+				} else {
+									$substep++;
+				}
+			} elseif ($type == '{') {
+							$current_type = 'code';
+			} elseif ($type == '}')
 			{
 				$current_type = 'sql';
 
@@ -1777,8 +1882,9 @@ 
 				if (eval('global $db_prefix, $modSettings, $smcFunc; ' . $current_data) === false)
 				{
 					$upcontext['error_message'] = 'Error in upgrade script ' . basename($filename) . ' on line ' . $line_number . '!' . $endl;
-					if ($command_line)
-						echo $upcontext['error_message'];
+					if ($command_line) {
+											echo $upcontext['error_message'];
+					}
 				}
 
 				// Done with code!
@@ -1858,8 +1964,9 @@ 
 	$db_unbuffered = false;
 
 	// Failure?!
-	if ($result !== false)
-		return $result;
+	if ($result !== false) {
+			return $result;
+	}
 
 	$db_error_message = $smcFunc['db_error']($db_connection);
 	// If MySQL we do something more clever.
@@ -1887,54 +1994,61 @@ 
 			{
 				mysqli_query($db_connection, 'REPAIR TABLE `' . $match[1] . '`');
 				$result = mysqli_query($db_connection, $string);
-				if ($result !== false)
-					return $result;
+				if ($result !== false) {
+									return $result;
+				}
 			}
-		}
-		elseif ($mysqli_errno == 2013)
+		} elseif ($mysqli_errno == 2013)
 		{
 			$db_connection = mysqli_connect($db_server, $db_user, $db_passwd);
 			mysqli_select_db($db_connection, $db_name);
 			if ($db_connection)
 			{
 				$result = mysqli_query($db_connection, $string);
-				if ($result !== false)
-					return $result;
+				if ($result !== false) {
+									return $result;
+				}
 			}
 		}
 		// Duplicate column name... should be okay ;).
-		elseif (in_array($mysqli_errno, array(1060, 1061, 1068, 1091)))
-			return false;
+		elseif (in_array($mysqli_errno, array(1060, 1061, 1068, 1091))) {
+					return false;
+		}
 		// Duplicate insert... make sure it's the proper type of query ;).
-		elseif (in_array($mysqli_errno, array(1054, 1062, 1146)) && $error_query)
-			return false;
+		elseif (in_array($mysqli_errno, array(1054, 1062, 1146)) && $error_query) {
+					return false;
+		}
 		// Creating an index on a non-existent column.
-		elseif ($mysqli_errno == 1072)
-			return false;
-		elseif ($mysqli_errno == 1050 && substr(trim($string), 0, 12) == 'RENAME TABLE')
-			return false;
+		elseif ($mysqli_errno == 1072) {
+					return false;
+		} elseif ($mysqli_errno == 1050 && substr(trim($string), 0, 12) == 'RENAME TABLE') {
+					return false;
+		}
 	}
 	// If a table already exists don't go potty.
 	else
 	{
 		if (in_array(substr(trim($string), 0, 8), array('CREATE T', 'CREATE S', 'DROP TABL', 'ALTER TA', 'CREATE I', 'CREATE U')))
 		{
-			if (strpos($db_error_message, 'exist') !== false)
-				return true;
-		}
-		elseif (strpos(trim($string), 'INSERT ') !== false)
+			if (strpos($db_error_message, 'exist') !== false) {
+							return true;
+			}
+		} elseif (strpos(trim($string), 'INSERT ') !== false)
 		{
-			if (strpos($db_error_message, 'duplicate') !== false)
-				return true;
+			if (strpos($db_error_message, 'duplicate') !== false) {
+							return true;
+			}
 		}
 	}
 
 	// Get the query string so we pass everything.
 	$query_string = '';
-	foreach ($_GET as $k => $v)
-		$query_string .= ';' . $k . '=' . $v;
-	if (strlen($query_string) != 0)
-		$query_string = '?' . substr($query_string, 1);
+	foreach ($_GET as $k => $v) {
+			$query_string .= ';' . $k . '=' . $v;
+	}
+	if (strlen($query_string) != 0) {
+			$query_string = '?' . substr($query_string, 1);
+	}
 
 	if ($command_line)
 	{
@@ -1989,16 +2103,18 @@ 
 			{
 				$found |= 1;
 				// Do some checks on the data if we have it set.
-				if (isset($change['col_type']))
-					$found &= $change['col_type'] === $column['type'];
-				if (isset($change['null_allowed']))
-					$found &= $column['null'] == $change['null_allowed'];
-				if (isset($change['default']))
-					$found &= $change['default'] === $column['default'];
+				if (isset($change['col_type'])) {
+									$found &= $change['col_type'] === $column['type'];
+				}
+				if (isset($change['null_allowed'])) {
+									$found &= $column['null'] == $change['null_allowed'];
+				}
+				if (isset($change['default'])) {
+									$found &= $change['default'] === $column['default'];
+				}
 			}
 		}
-	}
-	elseif ($change['type'] === 'index')
+	} elseif ($change['type'] === 'index')
 	{
 		$request = upgrade_query('
 			SHOW INDEX
@@ -2007,9 +2123,10 @@ 
 		{
 			$cur_index = array();
 
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				if ($row['Key_name'] === $change['name'])
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							if ($row['Key_name'] === $change['name'])
 					$cur_index[(int) $row['Seq_in_index']] = $row['Column_name'];
+			}
 
 			ksort($cur_index, SORT_NUMERIC);
 			$found = array_values($cur_index) === $change['target_columns'];
@@ -2019,14 +2136,17 @@ 
 	}
 
 	// If we're trying to add and it's added, we're done.
-	if ($found && in_array($change['method'], array('add', 'change')))
-		return true;
+	if ($found && in_array($change['method'], array('add', 'change'))) {
+			return true;
+	}
 	// Otherwise if we're removing and it wasn't found we're also done.
-	elseif (!$found && in_array($change['method'], array('remove', 'change_remove')))
-		return true;
+	elseif (!$found && in_array($change['method'], array('remove', 'change_remove'))) {
+			return true;
+	}
 	// Otherwise is it just a test?
-	elseif ($is_test)
-		return false;
+	elseif ($is_test) {
+			return false;
+	}
 
 	// Not found it yet? Bummer! How about we see if we're currently doing it?
 	$running = false;
@@ -2037,8 +2157,9 @@ 
 			SHOW FULL PROCESSLIST');
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (strpos($row['Info'], 'ALTER TABLE ' . $db_prefix . $change['table']) !== false && strpos($row['Info'], $change['text']) !== false)
-				$found = true;
+			if (strpos($row['Info'], 'ALTER TABLE ' . $db_prefix . $change['table']) !== false && strpos($row['Info'], $change['text']) !== false) {
+							$found = true;
+			}
 		}
 
 		// Can't find it? Then we need to run it fools!
@@ -2050,8 +2171,9 @@ 
 				ALTER TABLE ' . $db_prefix . $change['table'] . '
 				' . $change['text'], true) !== false;
 
-			if (!$success)
-				return false;
+			if (!$success) {
+							return false;
+			}
 
 			// Return
 			$running = true;
@@ -2093,8 +2215,9 @@ 
 			'db_error_skip' => true,
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) === 0)
-		die('Unable to find column ' . $change['column'] . ' inside table ' . $db_prefix . $change['table']);
+	if ($smcFunc['db_num_rows']($request) === 0) {
+			die('Unable to find column ' . $change['column'] . ' inside table ' . $db_prefix . $change['table']);
+	}
 	$table_row = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -2116,18 +2239,19 @@ 
 			)
 		);
 		// No results? Just forget it all together.
-		if ($smcFunc['db_num_rows']($request) === 0)
-			unset($table_row['Collation']);
-		else
-			$collation_info = $smcFunc['db_fetch_assoc']($request);
+		if ($smcFunc['db_num_rows']($request) === 0) {
+					unset($table_row['Collation']);
+		} else {
+					$collation_info = $smcFunc['db_fetch_assoc']($request);
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
 	if ($column_fix)
 	{
 		// Make sure there are no NULL's left.
-		if ($null_fix)
-			$smcFunc['db_query']('', '
+		if ($null_fix) {
+					$smcFunc['db_query']('', '
 				UPDATE {db_prefix}' . $change['table'] . '
 				SET ' . $change['column'] . ' = {string:default}
 				WHERE ' . $change['column'] . ' IS NULL',
@@ -2136,6 +2260,7 @@ 
 					'db_error_skip' => true,
 				)
 			);
+		}
 
 		// Do the actual alteration.
 		$smcFunc['db_query']('', '
@@ -2164,8 +2289,9 @@ 
 	}
 
 	// Not a column we need to check on?
-	if (!in_array($change['name'], array('memberGroups', 'passwordSalt')))
-		return;
+	if (!in_array($change['name'], array('memberGroups', 'passwordSalt'))) {
+			return;
+	}
 
 	// Break it up you (six|seven).
 	$temp = explode(' ', str_replace('NOT NULL', 'NOT_NULL', $change['text']));
@@ -2184,13 +2310,13 @@ 
 				'new_name' => $temp[2],
 		));
 		// !!! This doesn't technically work because we don't pass request into it, but it hasn't broke anything yet.
-		if ($smcFunc['db_num_rows'] != 1)
-			return;
+		if ($smcFunc['db_num_rows'] != 1) {
+					return;
+		}
 
 		list (, $current_type) = $smcFunc['db_fetch_assoc']($request);
 		$smcFunc['db_free_result']($request);
-	}
-	else
+	} else
 	{
 		// Do this the old fashion, sure method way.
 		$request = $smcFunc['db_query']('', '
@@ -2201,21 +2327,24 @@ 
 		));
 		// Mayday!
 		// !!! This doesn't technically work because we don't pass request into it, but it hasn't broke anything yet.
-		if ($smcFunc['db_num_rows'] == 0)
-			return;
+		if ($smcFunc['db_num_rows'] == 0) {
+					return;
+		}
 
 		// Oh where, oh where has my little field gone. Oh where can it be...
-		while ($row = $smcFunc['db_query']($request))
-			if ($row['Field'] == $temp[1] || $row['Field'] == $temp[2])
+		while ($row = $smcFunc['db_query']($request)) {
+					if ($row['Field'] == $temp[1] || $row['Field'] == $temp[2])
 			{
 				$current_type = $row['Type'];
+		}
 				break;
 			}
 	}
 
 	// If this doesn't match, the column may of been altered for a reason.
-	if (trim($current_type) != trim($temp[3]))
-		$temp[3] = $current_type;
+	if (trim($current_type) != trim($temp[3])) {
+			$temp[3] = $current_type;
+	}
 
 	// Piece this back together.
 	$change['text'] = str_replace('NOT_NULL', 'NOT NULL', implode(' ', $temp));
@@ -2227,8 +2356,9 @@ 
 	global $start_time, $timeLimitThreshold, $command_line, $custom_warning;
 	global $step_progress, $is_debug, $upcontext;
 
-	if ($_GET['substep'] < $substep)
-		$_GET['substep'] = $substep;
+	if ($_GET['substep'] < $substep) {
+			$_GET['substep'] = $substep;
+	}
 
 	if ($command_line)
 	{
@@ -2241,29 +2371,33 @@ 
 	}
 
 	@set_time_limit(300);
-	if (function_exists('apache_reset_timeout'))
-		@apache_reset_timeout();
+	if (function_exists('apache_reset_timeout')) {
+			@apache_reset_timeout();
+	}
 
-	if (time() - $start_time <= $timeLimitThreshold)
-		return;
+	if (time() - $start_time <= $timeLimitThreshold) {
+			return;
+	}
 
 	// Do we have some custom step progress stuff?
 	if (!empty($step_progress))
 	{
 		$upcontext['substep_progress'] = 0;
 		$upcontext['substep_progress_name'] = $step_progress['name'];
-		if ($step_progress['current'] > $step_progress['total'])
-			$upcontext['substep_progress'] = 99.9;
-		else
-			$upcontext['substep_progress'] = ($step_progress['current'] / $step_progress['total']) * 100;
+		if ($step_progress['current'] > $step_progress['total']) {
+					$upcontext['substep_progress'] = 99.9;
+		} else {
+					$upcontext['substep_progress'] = ($step_progress['current'] / $step_progress['total']) * 100;
+		}
 
 		// Make it nicely rounded.
 		$upcontext['substep_progress'] = round($upcontext['substep_progress'], 1);
 	}
 
 	// If this is XML we just exit right away!
-	if (isset($_GET['xml']))
-		return upgradeExit();
+	if (isset($_GET['xml'])) {
+			return upgradeExit();
+	}
 
 	// We're going to pause after this!
 	$upcontext['pause'] = true;
@@ -2271,13 +2405,15 @@ 
 	$upcontext['query_string'] = '';
 	foreach ($_GET as $k => $v)
 	{
-		if ($k != 'data' && $k != 'substep' && $k != 'step')
-			$upcontext['query_string'] .= ';' . $k . '=' . $v;
+		if ($k != 'data' && $k != 'substep' && $k != 'step') {
+					$upcontext['query_string'] .= ';' . $k . '=' . $v;
+		}
 	}
 
 	// Custom warning?
-	if (!empty($custom_warning))
-		$upcontext['custom_warning'] = $custom_warning;
+	if (!empty($custom_warning)) {
+			$upcontext['custom_warning'] = $custom_warning;
+	}
 
 	upgradeExit();
 }
@@ -2292,25 +2428,26 @@ 
 	ob_implicit_flush(true);
 	@set_time_limit(600);
 
-	if (!isset($_SERVER['argv']))
-		$_SERVER['argv'] = array();
+	if (!isset($_SERVER['argv'])) {
+			$_SERVER['argv'] = array();
+	}
 	$_GET['maint'] = 1;
 
 	foreach ($_SERVER['argv'] as $i => $arg)
 	{
-		if (preg_match('~^--language=(.+)$~', $arg, $match) != 0)
-			$_GET['lang'] = $match[1];
-		elseif (preg_match('~^--path=(.+)$~', $arg) != 0)
-			continue;
-		elseif ($arg == '--no-maintenance')
-			$_GET['maint'] = 0;
-		elseif ($arg == '--debug')
-			$is_debug = true;
-		elseif ($arg == '--backup')
-			$_POST['backup'] = 1;
-		elseif ($arg == '--template' && (file_exists($boarddir . '/template.php') || file_exists($boarddir . '/template.html') && !file_exists($modSettings['theme_dir'] . '/converted')))
-			$_GET['conv'] = 1;
-		elseif ($i != 0)
+		if (preg_match('~^--language=(.+)$~', $arg, $match) != 0) {
+					$_GET['lang'] = $match[1];
+		} elseif (preg_match('~^--path=(.+)$~', $arg) != 0) {
+					continue;
+		} elseif ($arg == '--no-maintenance') {
+					$_GET['maint'] = 0;
+		} elseif ($arg == '--debug') {
+					$is_debug = true;
+		} elseif ($arg == '--backup') {
+					$_POST['backup'] = 1;
+		} elseif ($arg == '--template' && (file_exists($boarddir . '/template.php') || file_exists($boarddir . '/template.html') && !file_exists($modSettings['theme_dir'] . '/converted'))) {
+					$_GET['conv'] = 1;
+		} elseif ($i != 0)
 		{
 			echo 'SMF Command-line Upgrader
 Usage: /path/to/php -f ' . basename(__FILE__) . ' -- [OPTION]...
@@ -2324,10 +2461,12 @@ 
 		}
 	}
 
-	if (!php_version_check())
-		print_error('Error: PHP ' . PHP_VERSION . ' does not match version requirements.', true);
-	if (!db_version_check())
-		print_error('Error: ' . $databases[$db_type]['name'] . ' ' . $databases[$db_type]['version'] . ' does not match minimum requirements.', true);
+	if (!php_version_check()) {
+			print_error('Error: PHP ' . PHP_VERSION . ' does not match version requirements.', true);
+	}
+	if (!db_version_check()) {
+			print_error('Error: ' . $databases[$db_type]['name'] . ' ' . $databases[$db_type]['version'] . ' does not match minimum requirements.', true);
+	}
 
 	// Do some checks to make sure they have proper privileges
 	db_extend('packages');
@@ -2342,34 +2481,39 @@ 
 	$drop = $smcFunc['db_drop_table']('{db_prefix}priv_check');
 
 	// Sorry... we need CREATE, ALTER and DROP
-	if (!$create || !$alter || !$drop)
-		print_error("The " . $databases[$db_type]['name'] . " user you have set in Settings.php does not have proper privileges.\n\nPlease ask your host to give this user the ALTER, CREATE, and DROP privileges.", true);
+	if (!$create || !$alter || !$drop) {
+			print_error("The " . $databases[$db_type]['name'] . " user you have set in Settings.php does not have proper privileges.\n\nPlease ask your host to give this user the ALTER, CREATE, and DROP privileges.", true);
+	}
 
 	$check = @file_exists($modSettings['theme_dir'] . '/index.template.php')
 		&& @file_exists($sourcedir . '/QueryString.php')
 		&& @file_exists($sourcedir . '/ManageBoards.php');
-	if (!$check && !isset($modSettings['smfVersion']))
-		print_error('Error: Some files are missing or out-of-date.', true);
+	if (!$check && !isset($modSettings['smfVersion'])) {
+			print_error('Error: Some files are missing or out-of-date.', true);
+	}
 
 	// Do a quick version spot check.
 	$temp = substr(@implode('', @file($boarddir . '/index.php')), 0, 4096);
 	preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $temp, $match);
-	if (empty($match[1]) || (trim($match[1]) != SMF_VERSION))
-		print_error('Error: Some files have not yet been updated properly.');
+	if (empty($match[1]) || (trim($match[1]) != SMF_VERSION)) {
+			print_error('Error: Some files have not yet been updated properly.');
+	}
 
 	// Make sure Settings.php is writable.
 		quickFileWritable($boarddir . '/Settings.php');
-	if (!is_writable($boarddir . '/Settings.php'))
-		print_error('Error: Unable to obtain write access to "Settings.php".', true);
+	if (!is_writable($boarddir . '/Settings.php')) {
+			print_error('Error: Unable to obtain write access to "Settings.php".', true);
+	}
 
 	// Make sure Settings_bak.php is writable.
 		quickFileWritable($boarddir . '/Settings_bak.php');
-	if (!is_writable($boarddir . '/Settings_bak.php'))
-		print_error('Error: Unable to obtain write access to "Settings_bak.php".');
+	if (!is_writable($boarddir . '/Settings_bak.php')) {
+			print_error('Error: Unable to obtain write access to "Settings_bak.php".');
+	}
 
-	if (isset($modSettings['agreement']) && (!is_writable($boarddir) || file_exists($boarddir . '/agreement.txt')) && !is_writable($boarddir . '/agreement.txt'))
-		print_error('Error: Unable to obtain write access to "agreement.txt".');
-	elseif (isset($modSettings['agreement']))
+	if (isset($modSettings['agreement']) && (!is_writable($boarddir) || file_exists($boarddir . '/agreement.txt')) && !is_writable($boarddir . '/agreement.txt')) {
+			print_error('Error: Unable to obtain write access to "agreement.txt".');
+	} elseif (isset($modSettings['agreement']))
 	{
 		$fp = fopen($boarddir . '/agreement.txt', 'w');
 		fwrite($fp, $modSettings['agreement']);
@@ -2379,31 +2523,36 @@ 
 	// Make sure Themes is writable.
 	quickFileWritable($modSettings['theme_dir']);
 
-	if (!is_writable($modSettings['theme_dir']) && !isset($modSettings['smfVersion']))
-		print_error('Error: Unable to obtain write access to "Themes".');
+	if (!is_writable($modSettings['theme_dir']) && !isset($modSettings['smfVersion'])) {
+			print_error('Error: Unable to obtain write access to "Themes".');
+	}
 
 	// Make sure cache directory exists and is writable!
 	$cachedir_temp = empty($cachedir) ? $boarddir . '/cache' : $cachedir;
-	if (!file_exists($cachedir_temp))
-		@mkdir($cachedir_temp);
+	if (!file_exists($cachedir_temp)) {
+			@mkdir($cachedir_temp);
+	}
 
 	// Make sure the cache temp dir is writable.
 	quickFileWritable($cachedir_temp);
 
-	if (!is_writable($cachedir_temp))
-		print_error('Error: Unable to obtain write access to "cache".', true);
+	if (!is_writable($cachedir_temp)) {
+			print_error('Error: Unable to obtain write access to "cache".', true);
+	}
 
-	if (!file_exists($modSettings['theme_dir'] . '/languages/index.' . $upcontext['language'] . '.php') && !isset($modSettings['smfVersion']) && !isset($_GET['lang']))
-		print_error('Error: Unable to find language files!', true);
-	else
+	if (!file_exists($modSettings['theme_dir'] . '/languages/index.' . $upcontext['language'] . '.php') && !isset($modSettings['smfVersion']) && !isset($_GET['lang'])) {
+			print_error('Error: Unable to find language files!', true);
+	} else
 	{
 		$temp = substr(@implode('', @file($modSettings['theme_dir'] . '/languages/index.' . $upcontext['language'] . '.php')), 0, 4096);
 		preg_match('~(?://|/\*)\s*Version:\s+(.+?);\s*index(?:[\s]{2}|\*/)~i', $temp, $match);
 
-		if (empty($match[1]) || $match[1] != SMF_LANG_VERSION)
-			print_error('Error: Language files out of date.', true);
-		if (!file_exists($modSettings['theme_dir'] . '/languages/Install.' . $upcontext['language'] . '.php'))
-			print_error('Error: Install language is missing for selected language.', true);
+		if (empty($match[1]) || $match[1] != SMF_LANG_VERSION) {
+					print_error('Error: Language files out of date.', true);
+		}
+		if (!file_exists($modSettings['theme_dir'] . '/languages/Install.' . $upcontext['language'] . '.php')) {
+					print_error('Error: Install language is missing for selected language.', true);
+		}
 
 		// Otherwise include it!
 		require_once($modSettings['theme_dir'] . '/languages/Install.' . $upcontext['language'] . '.php');
@@ -2422,8 +2571,9 @@ 
 	global $upcontext, $db_character_set, $sourcedir, $smcFunc, $modSettings, $language, $db_prefix, $db_type, $command_line, $support_js;
 
 	// Done it already?
-	if (!empty($_POST['utf8_done']))
-		return true;
+	if (!empty($_POST['utf8_done'])) {
+			return true;
+	}
 
 	// First make sure they aren't already on UTF-8 before we go anywhere...
 	if ($db_type == 'postgresql' || ($db_character_set === 'utf8' && !empty($modSettings['global_character_set']) && $modSettings['global_character_set'] === 'UTF-8'))
@@ -2436,8 +2586,7 @@ 
 		);
 
 		return true;
-	}
-	else
+	} else
 	{
 		$upcontext['page_title'] = 'Converting to UTF8';
 		$upcontext['sub_template'] = isset($_GET['xml']) ? 'convert_xml' : 'convert_utf8';
@@ -2481,8 +2630,9 @@ 
 			)
 		);
 		$db_charsets = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$db_charsets[] = $row['Charset'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$db_charsets[] = $row['Charset'];
+		}
 
 		$smcFunc['db_free_result']($request);
 
@@ -2518,13 +2668,15 @@ 
 		// If there's a fulltext index, we need to drop it first...
 		if ($request !== false || $smcFunc['db_num_rows']($request) != 0)
 		{
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				if ($row['Column_name'] == 'body' && (isset($row['Index_type']) && $row['Index_type'] == 'FULLTEXT' || isset($row['Comment']) && $row['Comment'] == 'FULLTEXT'))
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							if ($row['Column_name'] == 'body' && (isset($row['Index_type']) && $row['Index_type'] == 'FULLTEXT' || isset($row['Comment']) && $row['Comment'] == 'FULLTEXT'))
 					$upcontext['fulltext_index'][] = $row['Key_name'];
+			}
 			$smcFunc['db_free_result']($request);
 
-			if (isset($upcontext['fulltext_index']))
-				$upcontext['fulltext_index'] = array_unique($upcontext['fulltext_index']);
+			if (isset($upcontext['fulltext_index'])) {
+							$upcontext['fulltext_index'] = array_unique($upcontext['fulltext_index']);
+			}
 		}
 
 		// Drop it and make a note...
@@ -2714,8 +2866,9 @@ 
 			$replace = '%field%';
 
 			// Build a huge REPLACE statement...
-			foreach ($translation_tables[$upcontext['charset_detected']] as $from => $to)
-				$replace = 'REPLACE(' . $replace . ', ' . $from . ', ' . $to . ')';
+			foreach ($translation_tables[$upcontext['charset_detected']] as $from => $to) {
+							$replace = 'REPLACE(' . $replace . ', ' . $from . ', ' . $to . ')';
+			}
 		}
 
 		// Get a list of table names ahead of time... This makes it easier to set our substep and such
@@ -2725,9 +2878,10 @@ 
 		$upcontext['table_count'] = count($queryTables);
 
 		// What ones have we already done?
-		foreach ($queryTables as $id => $table)
-			if ($id < $_GET['substep'])
+		foreach ($queryTables as $id => $table) {
+					if ($id < $_GET['substep'])
 				$upcontext['previous_tables'][] = $table;
+		}
 
 		$upcontext['cur_table_num'] = $_GET['substep'];
 		$upcontext['cur_table_name'] = str_replace($db_prefix, '', $queryTables[$_GET['substep']]);
@@ -2764,8 +2918,9 @@ 
 			nextSubstep($substep);
 
 			// Just to make sure it doesn't time out.
-			if (function_exists('apache_reset_timeout'))
-				@apache_reset_timeout();
+			if (function_exists('apache_reset_timeout')) {
+							@apache_reset_timeout();
+			}
 
 			$table_charsets = array();
 
@@ -2788,8 +2943,9 @@ 
 
 						// Build structure of columns to operate on organized by charset; only operate on columns not yet utf8
 						if ($charset != 'utf8') {
-							if (!isset($table_charsets[$charset]))
-								$table_charsets[$charset] = array();
+							if (!isset($table_charsets[$charset])) {
+															$table_charsets[$charset] = array();
+							}
 
 							$table_charsets[$charset][] = $column_info;
 						}
@@ -2830,10 +2986,11 @@ 
 				if (isset($translation_tables[$upcontext['charset_detected']]))
 				{
 					$update = '';
-					foreach ($table_charsets as $charset => $columns)
-						foreach ($columns as $column)
+					foreach ($table_charsets as $charset => $columns) {
+											foreach ($columns as $column)
 							$update .= '
 								' . $column['Field'] . ' = ' . strtr($replace, array('%field%' => $column['Field'])) . ',';
+					}
 
 					$smcFunc['db_query']('', '
 						UPDATE {raw:table_name}
@@ -2858,8 +3015,9 @@ 
 			// Now do the actual conversion (if still needed).
 			if ($charsets[$upcontext['charset_detected']] !== 'utf8')
 			{
-				if ($command_line)
-					echo 'Converting table ' . $table_info['Name'] . ' to UTF-8...';
+				if ($command_line) {
+									echo 'Converting table ' . $table_info['Name'] . ' to UTF-8...';
+				}
 
 				$smcFunc['db_query']('', '
 					ALTER TABLE {raw:table_name}
@@ -2869,12 +3027,14 @@ 
 					)
 				);
 
-				if ($command_line)
-					echo " done.\n";
+				if ($command_line) {
+									echo " done.\n";
+				}
 			}
 			// If this is XML to keep it nice for the user do one table at a time anyway!
-			if (isset($_GET['xml']))
-				return upgradeExit();
+			if (isset($_GET['xml'])) {
+							return upgradeExit();
+			}
 		}
 
 		$prev_charset = empty($translation_tables[$upcontext['charset_detected']]) ? $charsets[$upcontext['charset_detected']] : $translation_tables[$upcontext['charset_detected']];
@@ -2903,8 +3063,8 @@ 
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (@safe_unserialize($row['extra']) === false && preg_match('~^(a:3:{s:5:"topic";i:\d+;s:7:"subject";s:)(\d+):"(.+)"(;s:6:"member";s:5:"\d+";})$~', $row['extra'], $matches) === 1)
-				$smcFunc['db_query']('', '
+			if (@safe_unserialize($row['extra']) === false && preg_match('~^(a:3:{s:5:"topic";i:\d+;s:7:"subject";s:)(\d+):"(.+)"(;s:6:"member";s:5:"\d+";})$~', $row['extra'], $matches) === 1) {
+							$smcFunc['db_query']('', '
 					UPDATE {db_prefix}log_actions
 					SET extra = {string:extra}
 					WHERE id_action = {int:current_action}',
@@ -2913,6 +3073,7 @@ 
 						'extra' => $matches[1] . strlen($matches[3]) . ':"' . $matches[3] . '"' . $matches[4],
 					)
 				);
+			}
 		}
 		$smcFunc['db_free_result']($request);
 
@@ -2934,15 +3095,17 @@ 
 	// First thing's first - did we already do this?
 	if (!empty($modSettings['json_done']))
 	{
-		if ($command_line)
-			return DeleteUpgrade();
-		else
-			return true;
+		if ($command_line) {
+					return DeleteUpgrade();
+		} else {
+					return true;
+		}
 	}
 
 	// Done it already - js wise?
-	if (!empty($_POST['json_done']))
-		return true;
+	if (!empty($_POST['json_done'])) {
+			return true;
+	}
 
 	// List of tables affected by this function
 	// name => array('key', col1[,col2|true[,col3]])
@@ -2974,12 +3137,14 @@ 
 	$upcontext['cur_table_name'] = isset($keys[$_GET['substep']]) ? $keys[$_GET['substep']] : $keys[0];
 	$upcontext['step_progress'] = (int) (($upcontext['cur_table_num'] / $upcontext['table_count']) * 100);
 
-	foreach ($keys as $id => $table)
-		if ($id < $_GET['substep'])
+	foreach ($keys as $id => $table) {
+			if ($id < $_GET['substep'])
 			$upcontext['previous_tables'][] = $table;
+	}
 
-	if ($command_line)
-		echo 'Converting data from serialize() to json_encode().';
+	if ($command_line) {
+			echo 'Converting data from serialize() to json_encode().';
+	}
 
 	if (!$support_js || isset($_GET['xml']))
 	{
@@ -3019,8 +3184,9 @@ 
 
 				// Loop through and fix these...
 				$new_settings = array();
-				if ($command_line)
-					echo "\n" . 'Fixing some settings...';
+				if ($command_line) {
+									echo "\n" . 'Fixing some settings...';
+				}
 
 				foreach ($serialized_settings as $var)
 				{
@@ -3028,22 +3194,24 @@ 
 					{
 						// Attempt to unserialize the setting
 						$temp = @safe_unserialize($modSettings[$var]);
-						if (!$temp && $command_line)
-							echo "\n - Failed to unserialize the '" . $var . "' setting. Skipping.";
-						elseif ($temp !== false)
-							$new_settings[$var] = json_encode($temp);
+						if (!$temp && $command_line) {
+													echo "\n - Failed to unserialize the '" . $var . "' setting. Skipping.";
+						} elseif ($temp !== false) {
+													$new_settings[$var] = json_encode($temp);
+						}
 					}
 				}
 
 				// Update everything at once
-				if (!function_exists('cache_put_data'))
-					require_once($sourcedir . '/Load.php');
+				if (!function_exists('cache_put_data')) {
+									require_once($sourcedir . '/Load.php');
+				}
 				updateSettings($new_settings, true);
 
-				if ($command_line)
-					echo ' done.';
-			}
-			elseif ($table == 'themes')
+				if ($command_line) {
+									echo ' done.';
+				}
+			} elseif ($table == 'themes')
 			{
 				// Finally, fix the admin prefs. Unfortunately this is stored per theme, but hopefully they only have one theme installed at this point...
 				$query = $smcFunc['db_query']('', '
@@ -3062,10 +3230,11 @@ 
 
 						if ($command_line)
 						{
-							if ($temp === false)
-								echo "\n" . 'Unserialize of admin_preferences for user ' . $row['id_member'] . ' failed. Skipping.';
-							else
-								echo "\n" . 'Fixing admin preferences...';
+							if ($temp === false) {
+															echo "\n" . 'Unserialize of admin_preferences for user ' . $row['id_member'] . ' failed. Skipping.';
+							} else {
+															echo "\n" . 'Fixing admin preferences...';
+							}
 						}
 
 						if ($temp !== false)
@@ -3087,15 +3256,15 @@ 
 								)
 							);
 
-							if ($command_line)
-								echo ' done.';
+							if ($command_line) {
+															echo ' done.';
+							}
 						}
 					}
 
 					$smcFunc['db_free_result']($query);
 				}
-			}
-			else
+			} else
 			{
 				// First item is always the key...
 				$key = $info[0];
@@ -3106,8 +3275,7 @@ 
 				{
 					$col_select = $info[1];
 					$where = ' WHERE ' . $info[1] . ' != {empty}';
-				}
-				else
+				} else
 				{
 					$col_select = implode(', ', $info);
 				}
@@ -3140,8 +3308,7 @@ 
 								if ($temp === false && $command_line)
 								{
 									echo "\nFailed to unserialize " . $row[$col] . "... Skipping\n";
-								}
-								else
+								} else
 								{
 									$row[$col] = json_encode($temp);
 
@@ -3166,16 +3333,18 @@ 
 						}
 					}
 
-					if ($command_line)
-						echo ' done.';
+					if ($command_line) {
+											echo ' done.';
+					}
 
 					// Free up some memory...
 					$smcFunc['db_free_result']($query);
 				}
 			}
 			// If this is XML to keep it nice for the user do one table at a time anyway!
-			if (isset($_GET['xml']))
-				return upgradeExit();
+			if (isset($_GET['xml'])) {
+							return upgradeExit();
+			}
 		}
 
 		if ($command_line)
@@ -3190,8 +3359,9 @@ 
 
 		$_GET['substep'] = 0;
 		// Make sure we move on!
-		if ($command_line)
-			return DeleteUpgrade();
+		if ($command_line) {
+					return DeleteUpgrade();
+		}
 
 		return true;
 	}
@@ -3211,14 +3381,16 @@ 
 	global $upcontext, $txt, $settings;
 
 	// Don't call me twice!
-	if (!empty($upcontext['chmod_called']))
-		return;
+	if (!empty($upcontext['chmod_called'])) {
+			return;
+	}
 
 	$upcontext['chmod_called'] = true;
 
 	// Nothing?
-	if (empty($upcontext['chmod']['files']) && empty($upcontext['chmod']['ftp_error']))
-		return;
+	if (empty($upcontext['chmod']['files']) && empty($upcontext['chmod']['ftp_error'])) {
+			return;
+	}
 
 	// Was it a problem with Windows?
 	if (!empty($upcontext['chmod']['ftp_error']) && $upcontext['chmod']['ftp_error'] == 'total_mess')
@@ -3250,11 +3422,12 @@ 
 					content.write(\'<div class="windowbg description">\n\t\t\t<h4>The following files needs to be made writable to continue:</h4>\n\t\t\t\');
 					content.write(\'<p>', implode('<br>\n\t\t\t', $upcontext['chmod']['files']), '</p>\n\t\t\t\');';
 
-	if (isset($upcontext['systemos']) && $upcontext['systemos'] == 'linux')
-		echo '
+	if (isset($upcontext['systemos']) && $upcontext['systemos'] == 'linux') {
+			echo '
 					content.write(\'<hr>\n\t\t\t\');
 					content.write(\'<p>If you have a shell account, the convenient below command can automatically correct permissions on these files</p>\n\t\t\t\');
 					content.write(\'<tt># chmod a+w ', implode(' ', $upcontext['chmod']['files']), '</tt>\n\t\t\t\');';
+	}
 
 	echo '
 					content.write(\'<a href="javascript:self.close();">close</a>\n\t\t</div>\n\t</body>\n</html>\');
@@ -3262,17 +3435,19 @@ 
 				}
 			</script>';
 
-	if (!empty($upcontext['chmod']['ftp_error']))
-		echo '
+	if (!empty($upcontext['chmod']['ftp_error'])) {
+			echo '
 			<div class="error_message red">
 				The following error was encountered when trying to connect:<br><br>
 				<code>', $upcontext['chmod']['ftp_error'], '</code>
 			</div>
 			<br>';
+	}
 
-	if (empty($upcontext['chmod_in_form']))
-		echo '
+	if (empty($upcontext['chmod_in_form'])) {
+			echo '
 	<form action="', $upcontext['form_url'], '" method="post">';
+	}
 
 	echo '
 		<table width="520" border="0" align="center" style="margin-bottom: 1ex;">
@@ -3307,10 +3482,11 @@ 
 		<div class="righttext" style="margin: 1ex;"><input type="submit" value="', $txt['ftp_connect'], '" class="button_submit"></div>
 	</div>';
 
-	if (empty($upcontext['chmod_in_form']))
-		echo '
+	if (empty($upcontext['chmod_in_form'])) {
+			echo '
 	</form>';
-}
+	}
+	}
 
 function template_upgrade_above()
 {
@@ -3370,9 +3546,10 @@ 
 				<h2>', $txt['upgrade_progress'], '</h2>
 				<ul>';
 
-	foreach ($upcontext['steps'] as $num => $step)
-		echo '
+	foreach ($upcontext['steps'] as $num => $step) {
+			echo '
 						<li class="', $num < $upcontext['current_step'] ? 'stepdone' : ($num == $upcontext['current_step'] ? 'stepcurrent' : 'stepwaiting'), '">', $txt['upgrade_step'], ' ', $step[0], ': ', $step[1], '</li>';
+	}
 
 	echo '
 					</ul>
@@ -3385,8 +3562,8 @@ 
 				</div>
 			</div>';
 
-	if (isset($upcontext['step_progress']))
-		echo '
+	if (isset($upcontext['step_progress'])) {
+			echo '
 				<br>
 				<br>
 				<div id="progress_bar_step">
@@ -3395,6 +3572,7 @@ 
 						<span>', $txt['upgrade_step_progress'], '</span>
 					</div>
 				</div>';
+	}
 
 	echo '
 				<div id="substep_bar_div" class="smalltext" style="float: left;width: 50%;margin-top: 0.6em;display: ', isset($upcontext['substep_progress']) ? '' : 'none', ';">', isset($upcontext['substep_progress_name']) ? trim(strtr($upcontext['substep_progress_name'], array('.' => ''))) : '', ':</div>
@@ -3425,32 +3603,36 @@ 
 {
 	global $upcontext, $txt;
 
-	if (!empty($upcontext['pause']))
-		echo '
+	if (!empty($upcontext['pause'])) {
+			echo '
 								<em>', $txt['upgrade_incomplete'], '.</em><br>
 
 								<h2 style="margin-top: 2ex;">', $txt['upgrade_not_quite_done'], '</h2>
 								<h3>
 									', $txt['upgrade_paused_overload'], '
 								</h3>';
+	}
 
-	if (!empty($upcontext['custom_warning']))
-		echo '
+	if (!empty($upcontext['custom_warning'])) {
+			echo '
 								<div style="margin: 2ex; padding: 2ex; border: 2px dashed #cc3344; color: black; background-color: #ffe4e9;">
 									<div style="float: left; width: 2ex; font-size: 2em; color: red;">!!</div>
 									<strong style="text-decoration: underline;">', $txt['upgrade_note'], '</strong><br>
 									<div style="padding-left: 6ex;">', $upcontext['custom_warning'], '</div>
 								</div>';
+	}
 
 	echo '
 								<div class="righttext" style="margin: 1ex;">';
 
-	if (!empty($upcontext['continue']))
-		echo '
+	if (!empty($upcontext['continue'])) {
+			echo '
 									<input type="submit" id="contbutt" name="contbutt" value="', $txt['upgrade_continue'], '"', $upcontext['continue'] == 2 ? ' disabled' : '', ' class="button_submit">';
-	if (!empty($upcontext['skip']))
-		echo '
+	}
+	if (!empty($upcontext['skip'])) {
+			echo '
 									<input type="submit" id="skip" name="skip" value="', $txt['upgrade_skip'], '" onclick="dontSubmit = true; document.getElementById(\'contbutt\').disabled = \'disabled\'; return true;" class="button_submit">';
+	}
 
 	echo '
 								</div>
@@ -3500,11 +3682,12 @@ 
 	echo '<', '?xml version="1.0" encoding="UTF-8"?', '>
 	<smf>';
 
-	if (!empty($upcontext['get_data']))
-		foreach ($upcontext['get_data'] as $k => $v)
+	if (!empty($upcontext['get_data'])) {
+			foreach ($upcontext['get_data'] as $k => $v)
 			echo '
 		<get key="', $k, '">', $v, '</get>';
-}
+	}
+	}
 
 function template_xml_below()
 {
@@ -3545,8 +3728,8 @@ 
 	template_chmod();
 
 	// For large, pre 1.1 RC2 forums give them a warning about the possible impact of this upgrade!
-	if ($upcontext['is_large_forum'])
-		echo '
+	if ($upcontext['is_large_forum']) {
+			echo '
 		<div style="margin: 2ex; padding: 2ex; border: 2px dashed #cc3344; color: black; background-color: #ffe4e9;">
 			<div style="float: left; width: 2ex; font-size: 2em; color: red;">!!</div>
 			<strong style="text-decoration: underline;">', $txt['upgrade_warning'], '</strong><br>
@@ -3554,10 +3737,11 @@ 
 				', $txt['upgrade_warning_lots_data'], '
 			</div>
 		</div>';
+	}
 
 	// A warning message?
-	if (!empty($upcontext['warning']))
-		echo '
+	if (!empty($upcontext['warning'])) {
+			echo '
 		<div style="margin: 2ex; padding: 2ex; border: 2px dashed #cc3344; color: black; background-color: #ffe4e9;">
 			<div style="float: left; width: 2ex; font-size: 2em; color: red;">!!</div>
 			<strong style="text-decoration: underline;">', $txt['upgrade_warning'], '</strong><br>
@@ -3565,6 +3749,7 @@ 
 				', $upcontext['warning'], '
 			</div>
 		</div>';
+	}
 
 	// Paths are incorrect?
 	echo '
@@ -3580,20 +3765,22 @@ 
 	if (!empty($upcontext['user']['id']) && (time() - $upcontext['started'] < 72600 || time() - $upcontext['updated'] < 3600))
 	{
 		$ago = time() - $upcontext['started'];
-		if ($ago < 60)
-			$ago = $ago . ' seconds';
-		elseif ($ago < 3600)
-			$ago = (int) ($ago / 60) . ' minutes';
-		else
-			$ago = (int) ($ago / 3600) . ' hours';
+		if ($ago < 60) {
+					$ago = $ago . ' seconds';
+		} elseif ($ago < 3600) {
+					$ago = (int) ($ago / 60) . ' minutes';
+		} else {
+					$ago = (int) ($ago / 3600) . ' hours';
+		}
 
 		$active = time() - $upcontext['updated'];
-		if ($active < 60)
-			$updated = $active . ' seconds';
-		elseif ($active < 3600)
-			$updated = (int) ($active / 60) . ' minutes';
-		else
-			$updated = (int) ($active / 3600) . ' hours';
+		if ($active < 60) {
+					$updated = $active . ' seconds';
+		} elseif ($active < 3600) {
+					$updated = (int) ($active / 60) . ' minutes';
+		} else {
+					$updated = (int) ($active / 3600) . ' hours';
+		}
 
 		echo '
 		<div style="margin: 2ex; padding: 2ex; border: 2px dashed #cc3344; color: black; background-color: #ffe4e9;">
@@ -3602,16 +3789,18 @@ 
 			<div style="padding-left: 6ex;">
 				&quot;', $upcontext['user']['name'], '&quot; has been running the upgrade script for the last ', $ago, ' - and was last active ', $updated, ' ago.';
 
-		if ($active < 600)
-			echo '
+		if ($active < 600) {
+					echo '
 				We recommend that you do not run this script unless you are sure that ', $upcontext['user']['name'], ' has completed their upgrade.';
+		}
 
-		if ($active > $upcontext['inactive_timeout'])
-			echo '
+		if ($active > $upcontext['inactive_timeout']) {
+					echo '
 				<br><br>You can choose to either run the upgrade again from the beginning - or alternatively continue from the last step reached during the last upgrade.';
-		else
-			echo '
+		} else {
+					echo '
 				<br><br>This upgrade script cannot be run until ', $upcontext['user']['name'], ' has been inactive for at least ', ($upcontext['inactive_timeout'] > 120 ? round($upcontext['inactive_timeout'] / 60, 1) . ' minutes!' : $upcontext['inactive_timeout'] . ' seconds!');
+		}
 
 		echo '
 			</div>
@@ -3627,9 +3816,10 @@ 
 					<td>
 						<input type="text" name="user" value="', !empty($upcontext['username']) ? $upcontext['username'] : '', '"', $disable_security ? ' disabled' : '', ' class="input_text">';
 
-	if (!empty($upcontext['username_incorrect']))
-		echo '
+	if (!empty($upcontext['username_incorrect'])) {
+			echo '
 						<div class="smalltext" style="color: red;">Username Incorrect</div>';
+	}
 
 	echo '
 					</td>
@@ -3640,9 +3830,10 @@ 
 						<input type="password" name="passwrd" value=""', $disable_security ? ' disabled' : '', ' class="input_password">
 						<input type="hidden" name="hash_passwrd" value="">';
 
-	if (!empty($upcontext['password_failed']))
-		echo '
+	if (!empty($upcontext['password_failed'])) {
+			echo '
 						<div class="smalltext" style="color: red;">Password Incorrect</div>';
+	}
 
 	echo '
 					</td>
@@ -3713,8 +3904,8 @@ 
 			<form action="', $upcontext['form_url'], '" method="post" name="upform" id="upform">';
 
 	// Warning message?
-	if (!empty($upcontext['upgrade_options_warning']))
-		echo '
+	if (!empty($upcontext['upgrade_options_warning'])) {
+			echo '
 		<div style="margin: 1ex; padding: 1ex; border: 1px dashed #cc3344; color: black; background-color: #ffe4e9;">
 			<div style="float: left; width: 2ex; font-size: 2em; color: red;">!!</div>
 			<strong style="text-decoration: underline;">Warning!</strong><br>
@@ -3722,6 +3913,7 @@ 
 				', $upcontext['upgrade_options_warning'], '
 			</div>
 		</div>';
+	}
 
 	echo '
 				<table>
@@ -3764,8 +3956,8 @@ 
 						</td>
 					</tr>';
 
-	if (!empty($upcontext['karma_installed']['good']) || !empty($upcontext['karma_installed']['bad']))
-		echo '
+	if (!empty($upcontext['karma_installed']['good']) || !empty($upcontext['karma_installed']['bad'])) {
+			echo '
 					<tr valign="top">
 						<td width="2%">
 							<input type="checkbox" name="delete_karma" id="delete_karma" value="1" class="input_check">
@@ -3774,6 +3966,7 @@ 
 							<label for="delete_karma">Delete all karma settings and info from the DB</label>
 						</td>
 					</tr>';
+	}
 
 	echo '
 					<tr valign="top">
@@ -3811,10 +4004,11 @@ 
 			</div>';
 
 	// Dont any tables so far?
-	if (!empty($upcontext['previous_tables']))
-		foreach ($upcontext['previous_tables'] as $table)
+	if (!empty($upcontext['previous_tables'])) {
+			foreach ($upcontext['previous_tables'] as $table)
 			echo '
 			<br>Completed Table: &quot;', $table, '&quot;.';
+	}
 
 	echo '
 			<h3 id="current_tab_div">Current Table: &quot;<span id="current_table">', $upcontext['cur_table_name'], '</span>&quot;</h3>
@@ -3851,12 +4045,13 @@ 
 				updateStepProgress(iTableNum, ', $upcontext['table_count'], ', ', $upcontext['step_weight'] * ((100 - $upcontext['step_progress']) / 100), ');';
 
 		// If debug flood the screen.
-		if ($is_debug)
-			echo '
+		if ($is_debug) {
+					echo '
 				setOuterHTML(document.getElementById(\'debuginfo\'), \'<br>Completed Table: &quot;\' + sCompletedTableName + \'&quot;.<span id="debuginfo"><\' + \'/span>\');
 
 				if (document.getElementById(\'debug_section\').scrollHeight)
 					document.getElementById(\'debug_section\').scrollTop = document.getElementById(\'debug_section\').scrollHeight';
+		}
 
 		echo '
 				// Get the next update...
@@ -3889,8 +4084,9 @@ 
 {
 	global $upcontext, $support_js, $is_debug, $timeLimitThreshold;
 
-	if (empty($is_debug) && !empty($upcontext['upgrade_status']['debug']))
-		$is_debug = true;
+	if (empty($is_debug) && !empty($upcontext['upgrade_status']['debug'])) {
+			$is_debug = true;
+	}
 
 	echo '
 		<h3>Executing database changes</h3>
@@ -3905,8 +4101,9 @@ 
 	{
 		foreach ($upcontext['actioned_items'] as $num => $item)
 		{
-			if ($num != 0)
-				echo ' Successful!';
+			if ($num != 0) {
+							echo ' Successful!';
+			}
 			echo '<br>' . $item;
 		}
 		if (!empty($upcontext['changes_complete']))
@@ -3919,28 +4116,32 @@ 
 				$seconds = intval($active % 60);
 
 				$totalTime = '';
-				if ($hours > 0)
-					$totalTime .= $hours . ' hour' . ($hours > 1 ? 's' : '') . ' ';
-				if ($minutes > 0)
-					$totalTime .= $minutes . ' minute' . ($minutes > 1 ? 's' : '') . ' ';
-				if ($seconds > 0)
-					$totalTime .= $seconds . ' second' . ($seconds > 1 ? 's' : '') . ' ';
+				if ($hours > 0) {
+									$totalTime .= $hours . ' hour' . ($hours > 1 ? 's' : '') . ' ';
+				}
+				if ($minutes > 0) {
+									$totalTime .= $minutes . ' minute' . ($minutes > 1 ? 's' : '') . ' ';
+				}
+				if ($seconds > 0) {
+									$totalTime .= $seconds . ' second' . ($seconds > 1 ? 's' : '') . ' ';
+				}
 			}
 
-			if ($is_debug && !empty($totalTime))
-				echo ' Successful! Completed in ', $totalTime, '<br><br>';
-			else
-				echo ' Successful!<br><br>';
+			if ($is_debug && !empty($totalTime)) {
+							echo ' Successful! Completed in ', $totalTime, '<br><br>';
+			} else {
+							echo ' Successful!<br><br>';
+			}
 
 			echo '<span id="commess" style="font-weight: bold;">1 Database Updates Complete! Click Continue to Proceed.</span><br>';
 		}
-	}
-	else
+	} else
 	{
 		// Tell them how many files we have in total.
-		if ($upcontext['file_count'] > 1)
-			echo '
+		if ($upcontext['file_count'] > 1) {
+					echo '
 		<strong id="info1">Executing upgrade script <span id="file_done">', $upcontext['cur_file_num'], '</span> of ', $upcontext['file_count'], '.</strong>';
+		}
 
 		echo '
 		<h3 id="info2"><strong>Executing:</strong> &quot;<span id="cur_item_name">', $upcontext['current_item_name'], '</span>&quot; (<span id="item_num">', $upcontext['current_item_num'], '</span> of <span id="total_items"><span id="item_count">', $upcontext['total_items'], '</span>', $upcontext['file_count'] > 1 ? ' - of this script' : '', ')</span></h3>
@@ -3956,19 +4157,23 @@ 
 				$seconds = intval($active % 60);
 
 				$totalTime = '';
-				if ($hours > 0)
-					$totalTime .= $hours . ' hour' . ($hours > 1 ? 's' : '') . ' ';
-				if ($minutes > 0)
-					$totalTime .= $minutes . ' minute' . ($minutes > 1 ? 's' : '') . ' ';
-				if ($seconds > 0)
-					$totalTime .= $seconds . ' second' . ($seconds > 1 ? 's' : '') . ' ';
+				if ($hours > 0) {
+									$totalTime .= $hours . ' hour' . ($hours > 1 ? 's' : '') . ' ';
+				}
+				if ($minutes > 0) {
+									$totalTime .= $minutes . ' minute' . ($minutes > 1 ? 's' : '') . ' ';
+				}
+				if ($seconds > 0) {
+									$totalTime .= $seconds . ' second' . ($seconds > 1 ? 's' : '') . ' ';
+				}
 			}
 
 			echo '
 			<br><span id="upgradeCompleted">';
 
-			if (!empty($totalTime))
-				echo 'Completed in ', $totalTime, '<br>';
+			if (!empty($totalTime)) {
+							echo 'Completed in ', $totalTime, '<br>';
+			}
 
 			echo '</span>
 			<div id="debug_section" style="height: 59px; overflow: auto;">
@@ -4005,9 +4210,10 @@ 
 			var getData = "";
 			var debugItems = ', $upcontext['debug_items'], ';';
 
-		if ($is_debug)
-			echo '
+		if ($is_debug) {
+					echo '
 			var upgradeStartTime = ' . $upcontext['started'] . ';';
+		}
 
 		echo '
 			function getNextItem()
@@ -4047,9 +4253,10 @@ 
 						document.getElementById("error_block").style.display = "";
 						setInnerHTML(document.getElementById("error_message"), "Error retrieving information on step: " + (sDebugName == "" ? sLastString : sDebugName));';
 
-	if ($is_debug)
-		echo '
+	if ($is_debug) {
+			echo '
 						setOuterHTML(document.getElementById(\'debuginfo\'), \'<span style="color: red;">failed<\' + \'/span><span id="debuginfo"><\' + \'/span>\');';
+	}
 
 	echo '
 					}
@@ -4070,9 +4277,10 @@ 
 						document.getElementById("error_block").style.display = "";
 						setInnerHTML(document.getElementById("error_message"), "Upgrade script appears to be going into a loop - step: " + sDebugName);';
 
-	if ($is_debug)
-		echo '
+	if ($is_debug) {
+			echo '
 						setOuterHTML(document.getElementById(\'debuginfo\'), \'<span style="color: red;">failed<\' + \'/span><span id="debuginfo"><\' + \'/span>\');';
+	}
 
 	echo '
 					}
@@ -4131,8 +4339,8 @@ 
 				if (bIsComplete && iDebugNum == -1 && curFile >= ', $upcontext['file_count'], ')
 				{';
 
-		if ($is_debug)
-			echo '
+		if ($is_debug) {
+					echo '
 					document.getElementById(\'debug_section\').style.display = "none";
 
 					var upgradeFinishedTime = parseInt(oXMLDoc.getElementsByTagName("curtime")[0].childNodes[0].nodeValue);
@@ -4150,6 +4358,7 @@ 
 						totalTime = totalTime + diffSeconds + " second" + (diffSeconds > 1 ? "s" : "");
 
 					setInnerHTML(document.getElementById("upgradeCompleted"), "Completed in " + totalTime);';
+		}
 
 		echo '
 
@@ -4157,9 +4366,10 @@ 
 					document.getElementById(\'contbutt\').disabled = 0;
 					document.getElementById(\'database_done\').value = 1;';
 
-		if ($upcontext['file_count'] > 1)
-			echo '
+		if ($upcontext['file_count'] > 1) {
+					echo '
 					document.getElementById(\'info1\').style.display = "none";';
+		}
 
 		echo '
 					document.getElementById(\'info2\').style.display = "none";
@@ -4172,9 +4382,10 @@ 
 					lastItem = 0;
 					prevFile = curFile;';
 
-		if ($is_debug)
-			echo '
+		if ($is_debug) {
+					echo '
 					setOuterHTML(document.getElementById(\'debuginfo\'), \'Moving to next script file...done<br><span id="debuginfo"><\' + \'/span>\');';
+		}
 
 		echo '
 					getNextItem();
@@ -4182,8 +4393,8 @@ 
 				}';
 
 		// If debug scroll the screen.
-		if ($is_debug)
-			echo '
+		if ($is_debug) {
+					echo '
 				if (iLastSubStepProgress == -1)
 				{
 					// Give it consistent dots.
@@ -4202,6 +4413,7 @@ 
 
 				if (document.getElementById(\'debug_section\').scrollHeight)
 					document.getElementById(\'debug_section\').scrollTop = document.getElementById(\'debug_section\').scrollHeight';
+		}
 
 		echo '
 				// Update the page.
@@ -4262,9 +4474,10 @@ 
 			}';
 
 		// Start things off assuming we've not errored.
-		if (empty($upcontext['error_message']))
-			echo '
+		if (empty($upcontext['error_message'])) {
+					echo '
 			getNextItem();';
+		}
 
 		echo '
 		//# sourceURL=dynamicScript-dbch.js
@@ -4282,18 +4495,21 @@ 
 	<item num="', $upcontext['current_item_num'], '">', $upcontext['current_item_name'], '</item>
 	<debug num="', $upcontext['current_debug_item_num'], '" percent="', isset($upcontext['substep_progress']) ? $upcontext['substep_progress'] : '-1', '" complete="', empty($upcontext['completed_step']) ? 0 : 1, '">', $upcontext['current_debug_item_name'], '</debug>';
 
-	if (!empty($upcontext['error_message']))
-		echo '
+	if (!empty($upcontext['error_message'])) {
+			echo '
 	<error>', $upcontext['error_message'], '</error>';
+	}
 
-	if (!empty($upcontext['error_string']))
-		echo '
+	if (!empty($upcontext['error_string'])) {
+			echo '
 	<sql>', $upcontext['error_string'], '</sql>';
+	}
 
-	if ($is_debug)
-		echo '
+	if ($is_debug) {
+			echo '
 	<curtime>', time(), '</curtime>';
-}
+	}
+	}
 
 // Template for the UTF-8 conversion step. Basically a copy of the backup stuff with slight modifications....
 function template_convert_utf8()
@@ -4312,18 +4528,20 @@ 
 			</div>';
 
 	// Done any tables so far?
-	if (!empty($upcontext['previous_tables']))
-		foreach ($upcontext['previous_tables'] as $table)
+	if (!empty($upcontext['previous_tables'])) {
+			foreach ($upcontext['previous_tables'] as $table)
 			echo '
 			<br>Completed Table: &quot;', $table, '&quot;.';
+	}
 
 	echo '
 			<h3 id="current_tab_div">Current Table: &quot;<span id="current_table">', $upcontext['cur_table_name'], '</span>&quot;</h3>';
 
 	// If we dropped their index, let's let them know
-	if ($upcontext['dropping_index'])
-		echo '
+	if ($upcontext['dropping_index']) {
+			echo '
 				<br><span id="indexmsg" style="font-weight: bold; font-style: italic; display: ', $upcontext['cur_table_num'] == $upcontext['table_count'] ? 'inline' : 'none', ';">Please note that your fulltext index was dropped to facilitate the conversion and will need to be recreated in the admin area after the upgrade is complete.</span>';
+	}
 
 	// Completion notification
 	echo '
@@ -4360,12 +4578,13 @@ 
 				updateStepProgress(iTableNum, ', $upcontext['table_count'], ', ', $upcontext['step_weight'] * ((100 - $upcontext['step_progress']) / 100), ');';
 
 		// If debug flood the screen.
-		if ($is_debug)
-			echo '
+		if ($is_debug) {
+					echo '
 				setOuterHTML(document.getElementById(\'debuginfo\'), \'<br>Completed Table: &quot;\' + sCompletedTableName + \'&quot;.<span id="debuginfo"><\' + \'/span>\');
 
 				if (document.getElementById(\'debug_section\').scrollHeight)
 					document.getElementById(\'debug_section\').scrollTop = document.getElementById(\'debug_section\').scrollHeight';
+		}
 
 		echo '
 				// Get the next update...
@@ -4413,19 +4632,21 @@ 
 			</div>';
 
 	// Dont any tables so far?
-	if (!empty($upcontext['previous_tables']))
-		foreach ($upcontext['previous_tables'] as $table)
+	if (!empty($upcontext['previous_tables'])) {
+			foreach ($upcontext['previous_tables'] as $table)
 			echo '
 			<br>Completed Table: &quot;', $table, '&quot;.';
+	}
 
 	echo '
 			<h3 id="current_tab_div">Current Table: &quot;<span id="current_table">', $upcontext['cur_table_name'], '</span>&quot;</h3>
 			<br><span id="commess" style="font-weight: bold; display: ', $upcontext['cur_table_num'] == $upcontext['table_count'] ? 'inline' : 'none', ';">Convert to JSON Complete! Click Continue to Proceed.</span>';
 
 	// Try to make sure substep was reset.
-	if ($upcontext['cur_table_num'] == $upcontext['table_count'])
-		echo '
+	if ($upcontext['cur_table_num'] == $upcontext['table_count']) {
+			echo '
 			<input type="hidden" name="substep" id="substep" value="0">';
+	}
 
 	// Continue please!
 	$upcontext['continue'] = $support_js ? 2 : 1;
@@ -4458,12 +4679,13 @@ 
 				updateStepProgress(iTableNum, ', $upcontext['table_count'], ', ', $upcontext['step_weight'] * ((100 - $upcontext['step_progress']) / 100), ');';
 
 		// If debug flood the screen.
-		if ($is_debug)
-			echo '
+		if ($is_debug) {
+					echo '
 				setOuterHTML(document.getElementById(\'debuginfo\'), \'<br>Completed Table: &quot;\' + sCompletedTableName + \'&quot;.<span id="debuginfo"><\' + \'/span>\');
 
 				if (document.getElementById(\'debug_section\').scrollHeight)
 					document.getElementById(\'debug_section\').scrollTop = document.getElementById(\'debug_section\').scrollHeight';
+		}
 
 		echo '
 				// Get the next update...
@@ -4499,8 +4721,8 @@ 
 	<h3>That wasn\'t so hard, was it?  Now you are ready to use <a href="', $boardurl, '/index.php">your installation of SMF</a>.  Hope you like it!</h3>
 	<form action="', $boardurl, '/index.php">';
 
-	if (!empty($upcontext['can_delete_script']))
-		echo '
+	if (!empty($upcontext['can_delete_script'])) {
+			echo '
 			<label for="delete_self"><input type="checkbox" id="delete_self" onclick="doTheDelete(this);" class="input_check"> Delete upgrade.php and its data files now</label> <em>(doesn\'t work on all servers).</em>
 			<script>
 				function doTheDelete(theCheck)
@@ -4512,6 +4734,7 @@ 
 				}
 			</script>
 			<img src="', $settings['default_theme_url'], '/images/blank.png" alt="" id="delete_upgrader"><br>';
+	}
 
 	$active = time() - $upcontext['started'];
 	$hours = floor($active / 3600);
@@ -4521,16 +4744,20 @@ 
 	if ($is_debug)
 	{
 		$totalTime = '';
-		if ($hours > 0)
-			$totalTime .= $hours . ' hour' . ($hours > 1 ? 's' : '') . ' ';
-		if ($minutes > 0)
-			$totalTime .= $minutes . ' minute' . ($minutes > 1 ? 's' : '') . ' ';
-		if ($seconds > 0)
-			$totalTime .= $seconds . ' second' . ($seconds > 1 ? 's' : '') . ' ';
+		if ($hours > 0) {
+					$totalTime .= $hours . ' hour' . ($hours > 1 ? 's' : '') . ' ';
+		}
+		if ($minutes > 0) {
+					$totalTime .= $minutes . ' minute' . ($minutes > 1 ? 's' : '') . ' ';
+		}
+		if ($seconds > 0) {
+					$totalTime .= $seconds . ' second' . ($seconds > 1 ? 's' : '') . ' ';
+		}
 	}
 
-	if ($is_debug && !empty($totalTime))
-		echo '<br> Upgrade completed in ', $totalTime, '<br><br>';
+	if ($is_debug && !empty($totalTime)) {
+			echo '<br> Upgrade completed in ', $totalTime, '<br><br>';
+	}
 
 	echo '<br>
 			If you had any problems with this upgrade, or have any problems using SMF, please don\'t hesitate to <a href="https://www.simplemachines.org/community/index.php">look to us for assistance</a>.<br>
@@ -4557,8 +4784,9 @@ 
 
 	$current_substep = $_GET['substep'];
 
-	if (empty($_GET['a']))
-		$_GET['a'] = 0;
+	if (empty($_GET['a'])) {
+			$_GET['a'] = 0;
+	}
 	$step_progress['name'] = 'Converting ips';
 	$step_progress['current'] = $_GET['a'];
 
@@ -4601,16 +4829,19 @@ 
 				'empty' => '',
 				'limit' => $limit,
 		));
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$arIp[] = $row[$oldCol];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$arIp[] = $row[$oldCol];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Special case, null ip could keep us in a loop.
-		if (is_null($arIp[0]))
-			unset($arIp[0]);
+		if (is_null($arIp[0])) {
+					unset($arIp[0]);
+		}
 
-		if (empty($arIp))
-			$is_done = true;
+		if (empty($arIp)) {
+					$is_done = true;
+		}
 
 		$updates = array();
 		$cases = array();
@@ -4619,16 +4850,18 @@ 
 		{
 			$arIp[$i] = trim($arIp[$i]);
 
-			if (empty($arIp[$i]))
-				continue;
+			if (empty($arIp[$i])) {
+							continue;
+			}
 
 			$updates['ip' . $i] = $arIp[$i];
 			$cases[$arIp[$i]] = 'WHEN ' . $oldCol . ' = {string:ip' . $i . '} THEN {inet:ip' . $i . '}';
 
 			if ($setSize > 0 && $i % $setSize === 0)
 			{
-				if (count($updates) == 1)
-					continue;
+				if (count($updates) == 1) {
+									continue;
+				}
 
 				$updates['whereSet'] = array_values($updates);
 				$smcFunc['db_query']('', '
@@ -4662,8 +4895,7 @@ 
 							'ip' => $ip
 					));
 				}
-			}
-			else
+			} else
 			{
 				$updates['whereSet'] = array_values($updates);
 				$smcFunc['db_query']('', '
@@ -4677,9 +4909,9 @@ 
 					$updates
 				);
 			}
+		} else {
+					$is_done = true;
 		}
-		else
-			$is_done = true;
 
 		$_GET['a'] += $limit;
 		$step_progress['current'] = $_GET['a'];
@@ -4705,10 +4937,11 @@ 
 
  	$columns = $smcFunc['db_list_columns']($targetTable, true);
 
-	if (isset($columns[$column]))
-		return $columns[$column];
-	else
-		return null;
-}
+	if (isset($columns[$column])) {
+			return $columns[$column];
+	} else {
+			return null;
+	}
+	}
 
 ?>
\ No newline at end of file

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 +4 added lines, -4 removed lines

@@ -97,7 +97,7 @@ 
 	* Start the curl object
 	* - allow for user override values
 	*
-	* @param array $options An array of cURL options
+	* @param integer[] $options An array of cURL options
 	* @param int $max_redirect Maximum number of redirects
 	*/
 	public function __construct($options = array(), $max_redirect = 3)
@@ -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;
 
 	}
 
@@ -295,9 +300,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))
@@ -336,8 +341,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

Doc Comments +1 added lines

@@ -497,6 +497,7 @@
  * @param string $xml_format The format to use ('atom', 'rss', 'rss2' or empty for plain XML)
  * @param array $forceCdataKeys A list of keys on which to force cdata wrapping (used by mods, maybe)
  * @param array $nsKeys Key-value pairs of namespace prefixes to pass to cdata_parse() (used by mods, maybe)
+ * @param string $tag
  */
 function dumpTags($data, $i, $tag = null, $xml_format = '', $forceCdataKeys = array(), $nsKeys = array())
 {

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(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;
 		}
@@ -558,8 +587,9 @@ 
 		'gender',
 		'blurb',
 	);
-	if ($xml_format != 'atom')
-		$keysToCdata[] = 'category';
+	if ($xml_format != 'atom') {
+			$keysToCdata[] = 'category';
+	}
 
 	if (!empty($forceCdataKeys))
 	{
@@ -576,8 +606,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] : '';
@@ -590,16 +621,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 '>';
 
@@ -611,11 +642,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, '>';
@@ -635,8 +668,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']('', '
@@ -655,8 +689,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(
@@ -684,8 +718,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(
@@ -703,8 +737,8 @@ 
 					),
 				),
 			);
-		elseif ($xml_format == 'atom')
-			$data[] = array(
+		} elseif ($xml_format == 'atom') {
+					$data[] = array(
 				'tag' => 'entry',
 				'content' => array(
 					array(
@@ -733,9 +767,10 @@ 
 					),
 				),
 			);
+		}
 		// More logical format for the data, but harder to apply.
-		else
-			$data[] = array(
+		else {
+					$data[] = array(
 				'tag' => 'member',
 				'content' => array(
 					array(
@@ -756,6 +791,7 @@ 
 					),
 				),
 			);
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -816,22 +852,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']);
 
@@ -858,8 +896,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);
 
@@ -867,16 +906,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'];
@@ -893,9 +933,9 @@ 
 					'length' => $attachment['filesize'],
 					'type' => $attachment['mime_type'],
 				);
+			} else {
+							$enclosure = null;
 			}
-			else
-				$enclosure = null;
 
 			$data[] = array(
 				'tag' => 'item',
@@ -941,8 +981,7 @@ 
 					),
 				),
 			);
-		}
-		elseif ($xml_format == 'rdf')
+		} elseif ($xml_format == 'rdf')
 		{
 			$data[] = array(
 				'tag' => 'item',
@@ -966,8 +1005,7 @@ 
 					),
 				),
 			);
-		}
-		elseif ($xml_format == 'atom')
+		} elseif ($xml_format == 'atom')
 		{
 			// Only one attachment allowed
 			if (!empty($loaded_attachments))
@@ -979,9 +1017,9 @@ 
 					'length' => $attachment['filesize'],
 					'type' => $attachment['mime_type'],
 				);
+			} else {
+							$enclosure = null;
 			}
-			else
-				$enclosure = null;
 
 			$data[] = array(
 				'tag' => 'entry',
@@ -1081,9 +1119,9 @@ 
 						)
 					);
 				}
+			} else {
+							$attachments = null;
 			}
-			else
-				$attachments = null;
 
 			$data[] = array(
 				'tag' => 'article',
@@ -1201,22 +1239,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']('', '
@@ -1246,8 +1287,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']);
 
@@ -1274,8 +1316,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);
 
@@ -1283,16 +1326,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'];
@@ -1309,9 +1353,9 @@ 
 					'length' => $attachment['filesize'],
 					'type' => $attachment['mime_type'],
 				);
+			} else {
+							$enclosure = null;
 			}
-			else
-				$enclosure = null;
 
 			$data[] = array(
 				'tag' => 'item',
@@ -1357,8 +1401,7 @@ 
 					),
 				),
 			);
-		}
-		elseif ($xml_format == 'rdf')
+		} elseif ($xml_format == 'rdf')
 		{
 			$data[] = array(
 				'tag' => 'item',
@@ -1382,8 +1425,7 @@ 
 					),
 				),
 			);
-		}
-		elseif ($xml_format == 'atom')
+		} elseif ($xml_format == 'atom')
 		{
 			// Only one attachment allowed
 			if (!empty($loaded_attachments))
@@ -1395,9 +1437,9 @@ 
 					'length' => $attachment['filesize'],
 					'type' => $attachment['mime_type'],
 				);
+			} else {
+							$enclosure = null;
 			}
-			else
-				$enclosure = null;
 
 			$data[] = array(
 				'tag' => 'entry',
@@ -1497,9 +1539,9 @@ 
 						)
 					);
 				}
+			} else {
+							$attachments = null;
 			}
-			else
-				$attachments = null;
 
 			$data[] = array(
 				'tag' => 'recent-post',
@@ -1618,14 +1660,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']];
@@ -1667,8 +1711,7 @@ 
 				),
 			)
 		);
-	}
-	elseif ($xml_format == 'rdf')
+	} elseif ($xml_format == 'rdf')
 	{
 		$data[] = array(
 			'tag' => 'item',
@@ -1692,8 +1735,7 @@ 
 				),
 			)
 		);
-	}
-	elseif ($xml_format == 'atom')
+	} elseif ($xml_format == 'atom')
 	{
 		$data[] = array(
 			'tag' => 'entry',
@@ -1746,8 +1788,7 @@ 
 				),
 			)
 		);
-	}
-	else
+	} else
 	{
 		$data = array(
 			array(

Themes/default/index.template.php

Spacing +1 added lines, -1 removed lines

@@ -229,7 +229,7 @@
 			//In maintenance mode, only login is allowed and don't show OverlayDiv
 			echo '
 			<ul class="floatleft welcome">
-				<li>', sprintf($txt['welcome_guest'], $txt['guest_title'], '', $scripturl. '?action=login', 'return true;'), '</li>
+				<li>', sprintf($txt['welcome_guest'], $txt['guest_title'], '', $scripturl . '?action=login', 'return true;'), '</li>
 			</ul>';
 
 	if (!empty($modSettings['userLanguage']) && !empty($context['languages']) && count($context['languages']) > 1)

Braces +89 added lines, -61 removed lines

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

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'] = smf_json_decode($modSettings['attachment_basedirectories'], true);
+				if (!is_array($modSettings['attachment_basedirectories'])) {
+									$modSettings['attachment_basedirectories'] = smf_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() - array_sum(explode(' ', $time_start)) < 3 || $context['starting_substep'] == $_GET['substep'])
-		return;
+	if (time() - array_sum(explode(' ', $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'] = smf_json_decode($modSettings['attachment_basedirectories'], true);
+	if (!isset($modSettings['attachment_basedirectories'])) {
+			$modSettings['attachment_basedirectories'] = array();
+	} elseif (!is_array($modSettings['attachment_basedirectories'])) {
+			$modSettings['attachment_basedirectories'] = smf_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' => json_encode($modSettings['attachment_basedirectories'])));
 							$modSettings['attachment_basedirectories'] = smf_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'] = smf_json_decode($modSettings['last_attachments_directory'], true);
+			if (!is_array($modSettings['last_attachments_directory'])) {
+							$modSettings['last_attachments_directory'] = smf_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' => 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'] = smf_json_decode($modSettings['attachmentUploadDir'], true);
-	if (!empty($modSettings['attachment_basedirectories']))
-		$modSettings['attachment_basedirectories'] = smf_json_decode($modSettings['attachment_basedirectories'], true);
-	else
-		$modSettings['basedirectory_for_attachments'] = array();
+	if (!empty($modSettings['attachment_basedirectories'])) {
+			$modSettings['attachment_basedirectories'] = smf_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)
 	{

Braces +3 added lines, -3 removed lines

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